feat: Update & All clear alert summaries (#1541)

* feat: update & all clear summaries

* fix strings files

Author: BrandonTR

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

@@ -18,6 +18,7 @@ fun AlertIcon(alertState: StopAlertState, color: Color?, modifier: Modifier = Mo
             StopAlertState.Issue -> R.drawable.alert_borderless_issue
             StopAlertState.Shuttle -> R.drawable.alert_borderless_shuttle
             StopAlertState.Suspension -> R.drawable.alert_borderless_suspension
+            StopAlertState.AllClear -> R.drawable.alert_borderless_allclear
             else -> return
         }
 

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

@@ -4,6 +4,7 @@ import com.mbta.tid.mbta_app.android.R
 
 fun drawableByName(name: String): Int =
     when (name) {
+        "alert-borderless-allclear" -> R.drawable.alert_borderless_allclear
         "alert-borderless-issue" -> R.drawable.alert_borderless_issue
         "alert-borderless-shuttle" -> R.drawable.alert_borderless_shuttle
         "alert-borderless-suspension" -> R.drawable.alert_borderless_suspension

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

@@ -32,6 +32,8 @@ import com.mbta.tid.mbta_app.android.util.modifiers.haloContainer
 import com.mbta.tid.mbta_app.model.Alert
 import com.mbta.tid.mbta_app.model.AlertSummary
 import com.mbta.tid.mbta_app.model.ObjectCollectionBuilder
+import com.mbta.tid.mbta_app.model.StopAlertState
+import com.mbta.tid.mbta_app.utils.EasternTimeInstant
 
 enum class AlertCardSpec {
     Major,
@@ -79,8 +81,12 @@ fun AlertCard(
             horizontalArrangement = Arrangement.spacedBy(16.dp),
             verticalAlignment = Alignment.CenterVertically,
         ) {
+            val alertState =
+                if (alert.allClear(EasternTimeInstant.now())) StopAlertState.AllClear
+                else alert.alertState
+            val iconSize = if (alertState == StopAlertState.AllClear) 36.dp else iconSize
             AlertIcon(
-                alertState = alert.alertState,
+                alertState = alertState,
                 color = color,
                 modifier =
                     Modifier.clearAndSetSemantics {}

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

@@ -83,16 +83,40 @@ data class FormattedAlert(
         )
 
     private fun summary(resources: Resources) =
-        alertSummary?.let {
-            AnnotatedString.fromHtml(
-                resources.getString(
-                    R.string.alert_summary,
-                    resources.getString(sentenceEffectRes),
-                    summaryLocation(resources),
-                    summaryTimeframe(resources),
-                    summaryRecurrence(resources),
+        alertSummary?.let { summary ->
+            alertSummary.update?.let { update ->
+                when (update) {
+                    AlertSummary.Update.Active ->
+                        AnnotatedString.fromHtml(
+                            resources.getString(
+                                R.string.alert_summary_with_update,
+                                resources.getString(sentenceEffectRes),
+                                summaryLocation(resources),
+                                summaryTimeframe(resources),
+                                summaryRecurrence(resources),
+                            )
+                        )
+
+                    AlertSummary.Update.AllClear ->
+                        AnnotatedString.fromHtml(
+                            resources.getString(
+                                R.string.alert_summary_all_clear,
+                                summaryLocation(resources),
+                            )
+                        )
+
+                    AlertSummary.Update.Unknown -> null
+                }
+            }
+                ?: AnnotatedString.fromHtml(
+                    resources.getString(
+                        R.string.alert_summary,
+                        resources.getString(sentenceEffectRes),
+                        summaryLocation(resources),
+                        summaryTimeframe(resources),
+                        summaryRecurrence(resources),
+                    )
                 )
-            )
         }
 
     fun alertCardHeader(spec: AlertCardSpec, resources: Resources) =

androidApp/src/main/res/drawable/alert_borderless_allclear.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="36dp"
+    android:height="36dp"
+    android:viewportWidth="36"
+    android:viewportHeight="36">
+  <path
+      android:pathData="M17.918,3C9.635,3.044 2.956,9.796 3,18.08C3.044,26.364 9.795,33.044 18.078,33C26.481,32.784 33.214,25.953 32.994,17.92C32.767,9.639 26.201,2.956 17.918,3zM25.502,11.75C25.822,11.75 26.143,11.871 26.387,12.115L26.383,12.115C26.871,12.604 26.871,13.397 26.383,13.885L16.383,23.885C15.895,24.373 15.102,24.373 14.613,23.885L9.613,18.885C9.125,18.397 9.125,17.604 9.613,17.115C10.102,16.627 10.895,16.627 11.383,17.115L15.5,21.23L24.617,12.115C24.861,11.871 25.182,11.75 25.502,11.75z"
+      android:fillColor="#192026"
+      android:fillType="evenOdd"/>
+</vector>

androidApp/src/main/res/values-b+es/strings_ios_converted.xml

@@ -23,6 +23,7 @@
     <string name="alert_elevator_header">Cierre del elevador (%1$s)</string>
     <string name="alert_ended">La alerta ya no está vigente</string>
     <string name="alert_summary">&lt;b>%1$s&lt;/b>%2$s%3$s%4$s</string>
+    <string name="alert_summary_all_clear">&lt;b>Todo despejado:&lt;/b> Servicio regular%1$s</string>
     <string name="alert_summary_location_direction_to_stop">\u0020desde paradas en &lt;b>%1$s&lt;/b> hasta &lt;b>%2$s&lt;/b></string>
     <string name="alert_summary_location_single">\u0020en &lt;b>%1$s&lt;/b></string>
     <string name="alert_summary_location_stop_to_direction">\u0020desde &lt;b>%1$s&lt;/b> hasta paradas en &lt;b>%2$s&lt;/b></string>
@@ -35,6 +36,7 @@
     <string name="alert_summary_timeframe_time">\u0020hasta las %1$s</string>
     <string name="alert_summary_timeframe_tomorrow">\u0020hasta mañana</string>
     <string name="alert_summary_timeframe_until_further_notice">\u0020hasta nuevo aviso</string>
+    <string name="alert_summary_with_update">&lt;b>Actualización:&lt;/b> %1$s%2$s%3$s%4$s</string>
     <string name="alternative_path">Camino alternativo</string>
     <string name="amber_alert">Alerta Amber</string>
     <string name="amber_alert_sentence_case">Alerta Amber</string>

androidApp/src/main/res/values-b+fr/strings_ios_converted.xml

@@ -23,6 +23,7 @@
     <string name="alert_elevator_header">Fermeture de l’ascenseur (%1$s)</string>
     <string name="alert_ended">L’alerte n’est plus en vigueur</string>
     <string name="alert_summary">&lt;b>%1$s&lt;/b>%2$s%3$s%4$s</string>
+    <string name="alert_summary_all_clear">&lt;b>Tout est clair :&lt;/b> Service normal %1$s</string>
     <string name="alert_summary_location_direction_to_stop">\u0020depuis les arrêts en direction de &lt;b>%1$s&lt;/b> jusqu’à &lt;b>%2$s&lt;/b></string>
     <string name="alert_summary_location_single">\u0020à &lt;b>%1$s&lt;/b></string>
     <string name="alert_summary_location_stop_to_direction">\u0020de &lt;b>%1$s&lt;/b> aux arrêts en direction de &lt;b>%2$s&lt;/b></string>
@@ -35,6 +36,7 @@
     <string name="alert_summary_timeframe_time">\u0020jusqu’à %1$s</string>
     <string name="alert_summary_timeframe_tomorrow">\u0020jusqu’à demain</string>
     <string name="alert_summary_timeframe_until_further_notice">\u0020jusqu’à nouvel ordre</string>
+    <string name="alert_summary_with_update">&lt;b>Mise à jour :&lt;/b> %1$s%2$s%3$s%4$s</string>
     <string name="alternative_path">Trajet alternatif</string>
     <string name="amber_alert">Alerte Amber</string>
     <string name="amber_alert_sentence_case">Alerte Amber</string>

androidApp/src/main/res/values-b+ht/strings_ios_converted.xml

@@ -26,6 +26,7 @@
     <string name="alert_elevator_header">Fèmti Asansè (%1$s)</string>
     <string name="alert_ended">Avètisman an pa aplikab ankò</string>
     <string name="alert_summary">&lt;b>%1$s&lt;/b>%2$s%3$s%4$s</string>
+    <string name="alert_summary_all_clear">&lt;b>Tout bagay klè:&lt;/b> Sèvis regilye %1$s</string>
     <string name="alert_summary_location_direction_to_stop">\u0020soti nan &lt;b>%1$s&lt;/b> sispann rive nan &lt;b>%2$s&lt;/b></string>
     <string name="alert_summary_location_single">\u0020nan &lt;b>%1$s&lt;/b></string>
     <string name="alert_summary_location_stop_to_direction">\u0020soti nan &lt;b>%1$s&lt;/b> rive nan &lt;b>%2$s&lt;/b> sispann</string>
@@ -38,6 +39,7 @@
     <string name="alert_summary_timeframe_time">\u0020jiska %1$s</string>
     <string name="alert_summary_timeframe_tomorrow">\u0020jiska demen</string>
     <string name="alert_summary_timeframe_until_further_notice">\u0020jiskaske yo bay lòt avi</string>
+    <string name="alert_summary_with_update">&lt;b>Mizajou:&lt;/b> %1$s%2$s%3$s%4$s</string>
     <string name="alternative_path">Lòt chemen</string>
     <string name="amber_alert">Avètisman Amber</string>
     <string name="amber_alert_sentence_case">Avètisman amber</string>

androidApp/src/main/res/values-b+pt+BR/strings_ios_converted.xml

@@ -23,6 +23,7 @@
     <string name="alert_elevator_header">Fechamento dos elevadores (%1$s)</string>
     <string name="alert_ended">O alerta não está mais em efeito</string>
     <string name="alert_summary">&lt;b>%1$s&lt;/b>%2$s%3$s%4$s</string>
+    <string name="alert_summary_all_clear">&lt;b>Tudo certo:&lt;/b> Serviço regular%1$s</string>
     <string name="alert_summary_location_direction_to_stop">\u0020de &lt;b>%1$s&lt;/b> paradas a &lt;b>%2$s&lt;/b></string>
     <string name="alert_summary_location_single">\u0020em &lt;b>%1$s&lt;/b></string>
     <string name="alert_summary_location_stop_to_direction">\u0020de &lt;b>%1$s&lt;/b> a &lt;b>%2$s&lt;/b> paradas</string>
@@ -35,6 +36,7 @@
     <string name="alert_summary_timeframe_time">\u0020até %1$s</string>
     <string name="alert_summary_timeframe_tomorrow">\u0020até amanhã</string>
     <string name="alert_summary_timeframe_until_further_notice">\u0020até novo aviso</string>
+    <string name="alert_summary_with_update">&lt;b>Atualização:&lt;/b> %1$s%2$s%3$s%4$s</string>
     <string name="alternative_path">Caminho alternativo</string>
     <string name="amber_alert">Alerta amarelo</string>
     <string name="amber_alert_sentence_case">Alerta amarelo</string>

androidApp/src/main/res/values-b+vi/strings_ios_converted.xml

@@ -21,6 +21,7 @@
     <string name="alert_elevator_header">Thang máy đóng (%1$s)</string>
     <string name="alert_ended">Cảnh báo không còn hiệu lực</string>
     <string name="alert_summary">&lt;b>%1$s&lt;/b>%2$s%3$s%4$s</string>
+    <string name="alert_summary_all_clear">&lt;b>Đã thông thoáng:&lt;/b> Dịch vụ thường lệ%1$s</string>
     <string name="alert_summary_location_direction_to_stop">\u0020từ các điểm dừng &lt;b>%1$s&lt;/b> đến &lt;b>%2$s&lt;/b></string>
     <string name="alert_summary_location_single">\u0020tại &lt;b>%1$s&lt;/b></string>
     <string name="alert_summary_location_stop_to_direction">\u0020từ &lt;b>%1$s&lt;/b> đến các điểm dừng &lt;b>%2$s&lt;/b></string>
@@ -33,6 +34,7 @@
     <string name="alert_summary_timeframe_time">\u0020đến %1$s</string>
     <string name="alert_summary_timeframe_tomorrow">\u0020đến ngày mai</string>
     <string name="alert_summary_timeframe_until_further_notice">\u0020cho đến khi có thông báo mới</string>
+    <string name="alert_summary_with_update">&lt;b>Cập nhật:&lt;/b> %1$s%2$s%3$s%4$s</string>
     <string name="alternative_path">Đường đi thay thế</string>
     <string name="amber_alert">Cảnh báo Amber</string>
     <string name="amber_alert_sentence_case">Cảnh báo Amber</string>