Merge branch 'main' into dependabot/bundler/cyclonedx-cocoapods-1.4.1

.github/pull_request_template.md

@@ -5,6 +5,7 @@ _Ticket:_ [Name](URL)
 What is this PR for?
 
 - [ ] If you added any user facing strings on iOS, are they included in Localizable.xcstrings?
+  - [ ] Add temporary machine translations, marked "Needs Review"
 
 ### Testing
 

.github/workflows/ci.yaml

@@ -149,15 +149,15 @@ jobs:
           MAPBOX_SECRET_TOKEN: ${{ secrets.MAPBOX_SECRET_TOKEN }}
           MAPBOX_PUBLIC_TOKEN: ${{ secrets.MAPBOX_PUBLIC_TOKEN }}
         run: |
-          bundle exec fastlane android build
+          bundle exec fastlane android build flavor:Staging
       - uses: actions/upload-artifact@v4
         with:
           name: android-apk
-          path: androidApp/build/outputs/apk/release/androidApp-release.apk
+          path: androidApp/build/outputs/apk/staging/release/androidApp-staging-release.apk
       - uses: actions/upload-artifact@v4
         with:
           name: android-aab
-          path: androidApp/build/outputs/bundle/release/androidApp-release.aab
+          path: androidApp/build/outputs/bundle/stagingRelease/androidApp-staging-release.aab
   deploy-android:
     name: Upload to Google Play
     if: github.event_name != 'pull_request'
@@ -177,12 +177,12 @@ jobs:
       - uses: actions/download-artifact@v4
         with:
           name: android-aab
-          path: androidApp/build/outputs/bundle/release
+          path: androidApp/build/outputs/bundle/stagingRelease
       - uses: ./.github/actions/setup
         with:
           gcp-provider: ${{ secrets.GCP_WORKLOAD_IDENTITY_PROVIDER }}
           gcp-service-account: ${{ secrets.GCP_SERVICE_ACCOUNT }}
           ruby: true
       - name: Upload to Google Play
         run: |
-          bundle exec fastlane android internal
+          bundle exec fastlane android internal flavor:Staging

README.md

@@ -63,6 +63,10 @@ ios app:
 - Populate any configuration needed in your the .envrc file. These will be read by a build phase
   script and set as info.plist values so that they can be read by the application.
 
+### Android
+
+To switch between the staging and prod app flavors, go to Build > Select Build Variant and then set the `:androidApp` Active Build Variant.
+
 ## Running Tests
 
 ### Unit Tests

androidApp/build.gradle.kts

@@ -1,11 +1,12 @@
+import com.mbta.tid.mbta_app.gradle.ConvertIosMapIconsTask
+
 plugins {
     alias(libs.plugins.androidApplication)
     alias(libs.plugins.compose)
     alias(libs.plugins.cycloneDx)
     alias(libs.plugins.kotlinAndroid)
     alias(libs.plugins.serialization)
     id("check-mapbox-bridge")
-    id("ios-assets")
 }
 
 android {
@@ -23,6 +24,15 @@ android {
     buildFeatures { compose = true }
     packaging { resources { excludes += "/META-INF/{AL2.0,LGPL2.1}" } }
     buildTypes { getByName("release") { isMinifyEnabled = false } }
+    flavorDimensions += "environment"
+    productFlavors {
+        create("staging") {
+            dimension = "environment"
+            applicationIdSuffix = ".staging"
+        }
+
+        create("prod") { dimension = "environment" }
+    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
@@ -64,6 +74,11 @@ tasks.cyclonedxBom {
         listOf("implementationDependenciesMetadata", "releaseImplementationDependenciesMetadata")
 }
 
+task<ConvertIosMapIconsTask>("convertIosIconsToAssets") {
+    assetsToRender = listOf("alert-large-*", "alert-small-*", "map-stop-*")
+    assetsToReturnByName = listOf("alert-borderless-*")
+}
+
 // https://github.com/mapbox/mapbox-gl-native-android/blob/7f03a710afbd714368084e4b514d3880bad11c27/gradle/gradle-config.gradle
 task("accessToken") {
     val tokenFile = File("${projectDir}/src/main/res/values/secrets.xml")

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/component/HeadsignRowViewTest.kt

@@ -80,17 +80,13 @@ class HeadsignRowViewTest {
                         TripInstantDisplay.Boarding
                     )
                 ),
-                secondaryAlert =
-                    RealtimePatterns.Format.SecondaryAlert(
-                        "alert-large-green-issue",
-                        Alert.Effect.ServiceChange
-                    )
+                secondaryAlert = RealtimePatterns.Format.SecondaryAlert("alert-large-green-issue")
             )
         )
 
         composeTestRule.onNodeWithText("A Place").assertIsDisplayed()
         composeTestRule.onNodeWithText("BRD").assertIsDisplayed()
-        composeTestRule.onNodeWithContentDescription("ServiceChange").assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Alert").assertIsDisplayed()
     }
 
     @Test
@@ -106,17 +102,13 @@ class HeadsignRowViewTest {
         init(
             "Somewhere",
             RealtimePatterns.Format.None(
-                secondaryAlert =
-                    RealtimePatterns.Format.SecondaryAlert(
-                        "alert-large-bus-issue",
-                        Alert.Effect.Detour
-                    )
+                secondaryAlert = RealtimePatterns.Format.SecondaryAlert("alert-large-bus-issue")
             )
         )
 
         composeTestRule.onNodeWithText("Somewhere").assertIsDisplayed()
         composeTestRule.onNodeWithText("No Predictions").assertIsDisplayed()
-        composeTestRule.onNodeWithContentDescription("Detour").assertIsDisplayed()
+        composeTestRule.onNodeWithContentDescription("Alert").assertIsDisplayed()
     }
 
     @Test

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsRouteViewTest.kt

@@ -110,7 +110,8 @@ class StopDetailsRouteViewTest {
                                         ) to listOf(UpcomingTrip(trip, prediction))
                                     ),
                                 parentStopId = stop.id,
-                                alerts = emptyList(),
+                                alertsHere = emptyList(),
+                                alertsDownstream = emptyList(),
                                 hasSchedulesTodayByPattern = null,
                                 allDataLoaded = false
                             )

androidApp/src/androidTest/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsViewTest.kt

@@ -214,7 +214,8 @@ class StopDetailsViewTest {
                                                             listOf(UpcomingTrip(trip, prediction))
                                                     ),
                                                 parentStopId = stop.id,
-                                                alerts = emptyList(),
+                                                alertsHere = emptyList(),
+                                                alertsDownstream = emptyList(),
                                                 hasSchedulesTodayByPattern = null,
                                                 allDataLoaded = false
                                             )

androidApp/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
-        android:label="MBTA Transit"
+        android:label="MBTA Go"
         android:networkSecurityConfig="@xml/network_security_config"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">

androidApp/src/main/java/com/mbta/tid/mbta_app/android/MainApplication.kt

@@ -1,15 +1,15 @@
 package com.mbta.tid.mbta_app.android
 
 import android.app.Application
-import com.mbta.tid.mbta_app.AppVariant
 import com.mbta.tid.mbta_app.android.phoenix.wrapped
 import com.mbta.tid.mbta_app.android.util.decodeMessage
 import com.mbta.tid.mbta_app.dependencyInjection.makeNativeModule
 import com.mbta.tid.mbta_app.initKoin
 import com.mbta.tid.mbta_app.repositories.AccessibilityStatusRepository
 import org.phoenixframework.Socket
 
-val appVariant = AppVariant.Prod
+// unfortunately, expect/actual only works in multiplatform projects, so we can't
+// expect val appVariant: AppVariant
 
 class MainApplication : Application() {
     private val socket = Socket(appVariant.socketUrl, decode = ::decodeMessage)

androidApp/src/main/java/com/mbta/tid/mbta_app/android/component/HeadsignRowView.kt

@@ -73,32 +73,21 @@ fun HeadsignRowViewPreview() {
                             TripInstantDisplay.Minutes(15)
                         )
                     ),
-                    secondaryAlert =
-                        RealtimePatterns.Format.SecondaryAlert(
-                            "alert-large-bus-issue",
-                            Alert.Effect.Detour
-                        )
+                    secondaryAlert = RealtimePatterns.Format.SecondaryAlert("alert-large-bus-issue")
                 )
             )
             HeadsignRowView("None", RealtimePatterns.Format.None(secondaryAlert = null))
             HeadsignRowView(
                 "None with Alert",
                 RealtimePatterns.Format.None(
-                    secondaryAlert =
-                        RealtimePatterns.Format.SecondaryAlert(
-                            "alert-large-bus-issue",
-                            Alert.Effect.Detour
-                        )
+                    secondaryAlert = RealtimePatterns.Format.SecondaryAlert("alert-large-bus-issue")
                 )
             )
             HeadsignRowView(
                 "Decorated None with Alert",
                 RealtimePatterns.Format.None(
                     secondaryAlert =
-                        RealtimePatterns.Format.SecondaryAlert(
-                            "alert-large-green-issue",
-                            Alert.Effect.ServiceChange
-                        )
+                        RealtimePatterns.Format.SecondaryAlert("alert-large-green-issue")
                 ),
                 pillDecoration =
                     PillDecoration.OnRow(

androidApp/src/main/java/com/mbta/tid/mbta_app/android/component/PredictionRowView.kt

@@ -45,10 +45,7 @@ fun PredictionRowView(
         verticalAlignment = Alignment.CenterVertically,
     ) {
         predictions.secondaryAlert?.let { secondaryAlert ->
-            Image(
-                painterResource(drawableByName(secondaryAlert.iconName)),
-                secondaryAlert.alertEffect.name
-            )
+            Image(painterResource(drawableByName(secondaryAlert.iconName)), "Alert")
         }
         if (pillDecoration is PillDecoration.OnRow) {
             RoutePill(pillDecoration.route, line = null, RoutePillType.Flex)

androidApp/src/main/java/com/mbta/tid/mbta_app/android/map/drawableByName.kt

@@ -61,20 +61,6 @@ fun drawableByName(name: String): Int =
         "alert-small-silver-issue" -> R.drawable.alert_small_silver_issue
         "alert-small-silver-shuttle" -> R.drawable.alert_small_silver_shuttle
         "alert-small-silver-suspension" -> R.drawable.alert_small_silver_suspension
-        "fa-chevron-down" -> R.drawable.fa_chevron_down
-        "fa-chevron-left" -> R.drawable.fa_chevron_left
-        "fa-chevron-right" -> R.drawable.fa_chevron_right
-        "fa-chevron-up" -> R.drawable.fa_chevron_up
-        "fa-circle-info" -> R.drawable.fa_circle_info
-        "fa-clock" -> R.drawable.fa_clock
-        "fa-location-arrow-solid" -> R.drawable.fa_location_arrow_solid
-        "fa-magnifying-glass-solid" -> R.drawable.fa_magnifying_glass_solid
-        "fa-route" -> R.drawable.fa_route
-        "fa-xmark" -> R.drawable.fa_xmark
-        "live-data" -> R.drawable.live_data
-        "location-dot" -> R.drawable.location_dot
-        "location-halo" -> R.drawable.location_halo
-        "map-nearby-location-cursor" -> R.drawable.map_nearby_location_cursor
         "map-stop-close-BLUE" -> R.drawable.map_stop_close_blue
         "map-stop-close-BUS" -> R.drawable.map_stop_close_bus
         "map-stop-close-BUS-transfer" -> R.drawable.map_stop_close_bus_transfer
@@ -129,14 +115,5 @@ fun drawableByName(name: String): Int =
         "map-stop-wide-SILVER-terminal-746" -> R.drawable.map_stop_wide_silver_terminal_746
         "map-stop-wide-SILVER-terminal-749" -> R.drawable.map_stop_wide_silver_terminal_749
         "map-stop-wide-SILVER-terminal-751" -> R.drawable.map_stop_wide_silver_terminal_751
-        "mode-bus" -> R.drawable.mode_bus
-        "mode-cr" -> R.drawable.mode_cr
-        "mode-ferry" -> R.drawable.mode_ferry
-        "mode-subway" -> R.drawable.mode_subway
-        "pinned-route-active" -> R.drawable.pinned_route_active
-        "pinned-route-inactive" -> R.drawable.pinned_route_inactive
-        "t-logo" -> R.drawable.t_logo
-        "vehicle-halo" -> R.drawable.vehicle_halo
-        "vehicle-puck" -> R.drawable.vehicle_puck
         else -> throw IllegalArgumentException("Invalid drawable name $name")
     }

androidApp/src/main/java/com/mbta/tid/mbta_app/android/pages/NearbyTransitPage.kt

@@ -148,7 +148,7 @@ fun NearbyTransitPage(
                             fun updateStopDepartures(departures: StopDetailsDepartures?) {
                                 stopDetailsDepartures = departures
                                 if (departures != null && stopDetailsFilter == null) {
-                                    stopDetailsFilter = departures.autoFilter()
+                                    stopDetailsFilter = departures.autoStopFilter()
                                 }
                             }
 

androidApp/src/main/java/com/mbta/tid/mbta_app/android/stopDetails/StopDetailsView.kt

@@ -92,7 +92,7 @@ fun StopDetailsView(
                 departures,
                 globalResponse,
                 now,
-                filter ?: departures.autoFilter(),
+                filter ?: departures.autoStopFilter(),
                 togglePinnedRoute,
                 pinnedRoutes,
                 updateStopFilter

androidApp/src/main/res/drawable-night/vehicle_halo.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="m31,16c0,-8.284 -6.716,-15 -15,-15h-0.02,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.03 -0.029,-0.029 -0.03,-0.029 -0.029,-0.03 -0.029,-0.03 -0.03,-0.029 -0.03,-0.03 -0.029,-0.03 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.029,-0.029 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.028 -0.028,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.027 -0.027,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.026,-0.026 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.025,-0.025 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.024,-0.024 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.023 -0.023,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.022,-0.022 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.021 -0.021,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.02 -0.02,-0.019 -0.019,-0.019 -0.019,-0.019 -0.019,-0.019 -0.019,-0.019 -0.019,-0.019 -0.018,-0.018 -0.018,-0.018 -0.018,-0.018 -0.018,-0.018 -0.018,-0.018 -0.018,-0.017 -0.017,-0.017 -0.017,-0.017 -0.017,-0.017 -0.017,-0.017 -0.017,-0.017 -0.016,-0.016 -0.016,-0.016 -0.016,-0.016 -0.016,-0.016 -0.016,-0.016 -0.015,-0.015c-1.108,0 -1.997,0.897 -1.997,1.999v0.016,0.016 0.016,0.016 0.016,0.016 0.016,0.017 0.017,0.017 0.017,0.017 0.017,0.017 0.017,0.017 0.018,0.018 0.018,0.018 0.018,0.018 0.018,0.018 0.018,0.018 0.018,0.019 0.019,0.019 0.019,0.019 0.019,0.019 0.019,0.019 0.019,0.02 0.02,0.02 0.02,0.02 0.02,0.02 0.02,0.02 0.02,0.02 0.021,0.021 0.021,0.021 0.021,0.021 0.021,0.021 0.021,0.021 0.021,0.021 0.022,0.022 0.022,0.022 0.022,0.022 0.022,0.022 0.022,0.022 0.022,0.022 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.03,0.03 0.029,0.03 0.03,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.029 0.029,0.028 0.029,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.028 0.028,0.027 0.027,0.027 0.027l0,0.027v0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.027,0.027 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.026 0.026,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.025 0.025,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.024 0.024,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.023 0.023,0.022 0.022,0.022 0.022,0.022 0.022,0.022 0.022,0.022 0.022,0.022 0.022,0.021 0.021,0.021 0.021,0.021 0.021,0.021 0.021,0.021 0.021,0.021 0.021,0.02 0.02,0.02 0.02,0.02 0.02,0.02 0.02,0.02 0.02,0.02 0.019,0.019 0.019,0.019 0.019,0.019 0.019,0.019 0.019,0.019 0.018,0.018 0.018,0.018 0.018,0.018 0.018,0.018 0.018,0.018 0.017,0.017 0.017,0.017c0,8.284 6.716,15 15,15 8.284,0 15,-6.716 15,-15z"
+      android:strokeAlpha="0.5"
+      android:strokeWidth="2"
+      android:fillColor="#000"
+      android:strokeColor="#000"
+      android:fillAlpha="0.5"/>
+</vector>