Author: Adam Evyčędo <git@apiote.xyz>
show alerts in safety colours
%!v(PANIC=String method: strings: negative Repeat count)
diff --git a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt index 38af68e15afc52a001ccc1b82da91fec2e6c0b7a..7ca5fdd2e9c1aa3ecd557d91170aa87bad477a82 100644 --- a/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt +++ b/app/src/main/java/xyz/apiote/bimba/czwek/departures/DeparturesActivity.kt @@ -86,6 +86,7 @@ MaterialAlertDialogBuilder(this) .setTitle("Alerts") .setPositiveButton(R.string.ok) { _, _ -> } .setMessage(alertDescriptions) + .show() } viewModel.departures.observe(this) { stopDepartures -> diff --git a/app/src/main/res/drawable/warning.xml b/app/src/main/res/drawable/warning.xml new file mode 100644 index 0000000000000000000000000000000000000000..a723869292bf9df8a361a303666a36509b143ef0 --- /dev/null +++ b/app/src/main/res/drawable/warning.xml @@ -0,0 +1,10 @@ +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="?attr/colorOnSurface"> + <path + android:fillColor="@android:color/white" + android:pathData="M40,840L480,80L920,840L40,840ZM178,760L782,760L480,240L178,760ZM480,720Q497,720 508.5,708.5Q520,697 520,680Q520,663 508.5,651.5Q497,640 480,640Q463,640 451.5,651.5Q440,663 440,680Q440,697 451.5,708.5Q463,720 480,720ZM440,600L520,600L520,400L440,400L440,600ZM480,500L480,500L480,500L480,500Z"/> +</vector> diff --git a/app/src/main/res/layout/activity_departures.xml b/app/src/main/res/layout/activity_departures.xml index 873f304d42f6344e8c7ee0e9c769214f00d61b22..6dcbe613b9299466942966ea78addb1a2d5dd644 100644 --- a/app/src/main/res/layout/activity_departures.xml +++ b/app/src/main/res/layout/activity_departures.xml @@ -26,7 +26,7 @@android:id="@+id/alerts" android:layout_width="match_parent" android:layout_height="100dp" - app:cardBackgroundColor="?attr/colorSurface" + android:backgroundTint="@color/safety" app:layout_anchor="@id/app_bar_layout" android:visibility="gone" app:layout_anchorGravity="bottom"> @@ -44,6 +44,7 @@ android:layout_height="0dp" android:layout_marginTop="58dp" android:ellipsize="end" android:maxLines="2" + android:textColor="@color/black" tool:text="Warning: Serious blockade on Piastowska towards Wojska Polskiego. Lines 5, 14, 163 diverted. Change for other means of transport, e.g. lines \n\naaaaa" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/more_button" @@ -56,6 +57,7 @@ android:id="@+id/more_button" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/more" + android:textColor="@color/link" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> </androidx.constraintlayout.widget.ConstraintLayout> diff --git a/app/src/main/res/layout/departure_bottom_sheet.xml b/app/src/main/res/layout/departure_bottom_sheet.xml index c382f48f2bcde9de24332391cdb8a681e1b1de17..aff2ace0c5751d220569ca16d751fe4f1502e399 100644 --- a/app/src/main/res/layout/departure_bottom_sheet.xml +++ b/app/src/main/res/layout/departure_bottom_sheet.xml @@ -240,6 +240,8 @@ android:id="@+id/alerts" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="16dp" + android:background="@color/safety" + android:textColor="@color/black" android:visibility="gone" app:layout_constraintTop_toBottomOf="@+id/capabilities" tool:text="Severe stops on Metropolitan line towards Tower Hill through Victoria" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 338d4237c2978af3fe102d073f412fb1d23d9c81..6f5f27b1f333372ff398c544e20ae0630f122041 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -16,6 +16,8 @@ #197f00 <color name="bimba_orange">#be7e3e</color> <color name="black">#FF000000</color> <color name="white">#FFFFFFFF</color> + <color name="safety">#eeD202</color> + <color name="link">#0000ff</color> <color name="seed">#54af39</color> <color name="md_theme_light_primary">#1A6D00</color> <!-- 40 -->