Author: Adam Pioterek <adam.pioterek@protonmail.ch>
empty state disable colour
app/src/main/res/drawable/ic_traffic.xml | 2 +- app/src/main/res/layout/activity_stop.xml | 11 ++++++++--- app/src/main/res/values-night/colors.xml | 4 +++- app/src/main/res/values-notnight/colors.xml | 4 +++- app/src/main/res/values/colors.xml | 4 +++-
diff --git a/app/src/main/res/drawable/ic_traffic.xml b/app/src/main/res/drawable/ic_traffic.xml index 081757364d3c63690943ab9b31d5c4109f420e2b..bf022cdda4939866e398ea8f7cd71e8015f188ab 100644 --- a/app/src/main/res/drawable/ic_traffic.xml +++ b/app/src/main/res/drawable/ic_traffic.xml @@ -4,6 +4,6 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> <path - android:fillColor="@color/textDark" + android:fillColor="#ffffff" android:pathData="M20,10h-3L17,8.86c1.72,-0.45 3,-2 3,-3.86h-3L17,4c0,-0.55 -0.45,-1 -1,-1L8,3c-0.55,0 -1,0.45 -1,1v1L4,5c0,1.86 1.28,3.41 3,3.86L7,10L4,10c0,1.86 1.28,3.41 3,3.86L7,15L4,15c0,1.86 1.28,3.41 3,3.86L7,20c0,0.55 0.45,1 1,1h8c0.55,0 1,-0.45 1,-1v-1.14c1.72,-0.45 3,-2 3,-3.86h-3v-1.14c1.72,-0.45 3,-2 3,-3.86zM12,19c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,14c-1.11,0 -2,-0.9 -2,-2s0.89,-2 2,-2c1.1,0 2,0.9 2,2s-0.89,2 -2,2zM12,9c-1.11,0 -2,-0.9 -2,-2 0,-1.11 0.89,-2 2,-2 1.1,0 2,0.89 2,2 0,1.1 -0.89,2 -2,2z"/> </vector> diff --git a/app/src/main/res/layout/activity_stop.xml b/app/src/main/res/layout/activity_stop.xml index b3f8038ef17369a5e258300fb6a1f6ce48168dad..e3edb3af00ca28936faa18d73db9c50a732294c0 100644 --- a/app/src/main/res/layout/activity_stop.xml +++ b/app/src/main/res/layout/activity_stop.xml @@ -12,8 +12,10 @@android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="0dp" android:paddingTop="@dimen/appbar_padding_top" - android:theme="@style/AppTheme.AppBarOverlay"> + android:theme="@style/AppTheme.AppBarOverlay" + app:layout_constraintTop_toTopOf="parent"> <androidx.appcompat.widget.Toolbar android:id="@+id/toolbar" @@ -52,13 +54,14 @@ app:layout_constraintTop_toBottomOf="@id/appbar" /> <ImageView android:id="@+id/emptyStateIcon" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="48dp" + android:layout_height="48dp" android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" android:contentDescription="@string/departures_empty_state_icon" + android:tint="@color/textDarkMedium" android:visibility="gone" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -74,6 +77,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:text="@string/no_departures" + android:textColor="@color/textDarkMedium" android:visibility="gone" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -88,6 +92,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 06523ae87b1d3d5e0ca0bf98a16847c862b5a204..1837105e06b078e212608ec54f3543aeacafedb1 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,8 @@ #00adef <color name="bus">#c4212a</color> <color name="text_on_toolbar">#ffffff</color> - <color name="textDark">#141415</color> + <color name="textDark">#de000000</color> + <color name="textDarkMedium">#99000000</color> + <color name="textDarkDisabled">#45000000</color> <color name="cardColor">#ffffff</color> </resources> diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 8e119ee3098433568eb49ff01bb88d7ddaa2ea10..a17e646959c11a4b4716bb7b800264a91cb92e80 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="textDark">#ffffff</color> + <color name="textDark">#deffffff</color> + <color name="textDarkMedium">#99ffffff</color> + <color name="textDarkDisabled">#45ffffff</color> <color name="cardColor">#424242</color> </resources> \ No newline at end of file diff --git a/app/src/main/res/values-notnight/colors.xml b/app/src/main/res/values-notnight/colors.xml index 224b4ca09a92f2c1d20e77c508f1c06a425aafde..2dbc91375d0d6af1a61b7634050086b1e5a1c301 100644 --- a/app/src/main/res/values-notnight/colors.xml +++ b/app/src/main/res/values-notnight/colors.xml @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <color name="textDark">#141415</color> + <color name="textDark">#de000000</color> + <color name="textDarkMedium">#99000000</color> + <color name="textDarkDisabled">#45000000</color> <color name="cardColor">#ffffff</color> </resources> \ No newline at end of file