From cfb3f39924f1e961424a5adbad603deae7ccdea9 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Wed, 20 Jan 2021 17:05:46 +0100 Subject: [PATCH] Extend content under system status and navigation bars. --- .../directions_trip_details_content.xml | 6 ++- .../directions_trip_overview_content.xml | 42 +++++++++------- oeffi/res/layout/favorites_content.xml | 3 +- oeffi/res/layout/network_picker_content.xml | 3 +- oeffi/res/layout/plans_content.xml | 50 +++++++++++-------- oeffi/res/layout/plans_picker_content.xml | 3 +- oeffi/res/layout/stations_content.xml | 7 ++- .../stations_station_details_content.xml | 7 ++- oeffi/res/values-night-v29/colors.xml | 9 ++++ oeffi/res/values-night/colors.xml | 1 + oeffi/res/values-night/styles.xml | 3 +- oeffi/res/values-v29/colors.xml | 9 ++++ oeffi/res/values/colors.xml | 3 ++ oeffi/res/values/styles.xml | 6 ++- .../oeffi/directions/DirectionsActivity.java | 8 +++ .../oeffi/directions/TripDetailsActivity.java | 2 + .../directions/TripsOverviewActivity.java | 2 + .../oeffi/network/NetworkPickerActivity.java | 7 +++ .../schildbach/oeffi/plans/PlanActivity.java | 4 +- .../oeffi/plans/PlansPickerActivity.java | 7 +++ .../stations/FavoriteStationsActivity.java | 8 +++ .../stations/StationDetailsActivity.java | 7 +++ .../oeffi/stations/StationsActivity.java | 7 +++ 23 files changed, 152 insertions(+), 52 deletions(-) create mode 100644 oeffi/res/values-night-v29/colors.xml create mode 100644 oeffi/res/values-v29/colors.xml diff --git a/oeffi/res/layout/directions_trip_details_content.xml b/oeffi/res/layout/directions_trip_details_content.xml index 589eb54..87ba115 100644 --- a/oeffi/res/layout/directions_trip_details_content.xml +++ b/oeffi/res/layout/directions_trip_details_content.xml @@ -90,7 +90,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_margin="4dp" + android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" + android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" + android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" + android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax" + android:fitsSystemWindows="true" android:baselineAligned="false" android:orientation="horizontal"> diff --git a/oeffi/res/layout/directions_trip_overview_content.xml b/oeffi/res/layout/directions_trip_overview_content.xml index 3590868..61b9a9f 100644 --- a/oeffi/res/layout/directions_trip_overview_content.xml +++ b/oeffi/res/layout/directions_trip_overview_content.xml @@ -19,24 +19,32 @@ android:spacing="0px" android:unselectedAlpha="1" /> - + - + + + + diff --git a/oeffi/res/layout/favorites_content.xml b/oeffi/res/layout/favorites_content.xml index a62bbbd..86d872e 100644 --- a/oeffi/res/layout/favorites_content.xml +++ b/oeffi/res/layout/favorites_content.xml @@ -15,7 +15,8 @@ + android:layout_height="match_parent" + android:clipToPadding="false" /> + android:layout_height="match_parent" + android:clipToPadding="false" /> diff --git a/oeffi/res/layout/plans_content.xml b/oeffi/res/layout/plans_content.xml index e0944bc..f31476d 100644 --- a/oeffi/res/layout/plans_content.xml +++ b/oeffi/res/layout/plans_content.xml @@ -67,28 +67,36 @@ - + - + + + + diff --git a/oeffi/res/layout/plans_picker_content.xml b/oeffi/res/layout/plans_picker_content.xml index 7ace335..fad3e7d 100644 --- a/oeffi/res/layout/plans_picker_content.xml +++ b/oeffi/res/layout/plans_picker_content.xml @@ -74,7 +74,8 @@ + android:layout_height="match_parent" + android:clipToPadding="false" /> @@ -370,7 +369,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:layout_margin="4dp" + android:layout_marginLeft="@dimen/list_entry_padding_horizontal_verylax" + android:layout_marginRight="@dimen/list_entry_padding_horizontal_verylax" + android:layout_marginTop="@dimen/list_entry_padding_vertical_lax" + android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax" + android:fitsSystemWindows="true" android:baselineAligned="false" android:orientation="horizontal"> diff --git a/oeffi/res/layout/stations_station_details_content.xml b/oeffi/res/layout/stations_station_details_content.xml index 57aaef7..2ad24e4 100644 --- a/oeffi/res/layout/stations_station_details_content.xml +++ b/oeffi/res/layout/stations_station_details_content.xml @@ -29,7 +29,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:paddingBottom="48dp" android:scrollbars="none" /> diff --git a/oeffi/res/values-night-v29/colors.xml b/oeffi/res/values-night-v29/colors.xml new file mode 100644 index 0000000..1734f89 --- /dev/null +++ b/oeffi/res/values-night-v29/colors.xml @@ -0,0 +1,9 @@ + + + + + @android:color/transparent + @android:color/transparent + @android:color/transparent + + diff --git a/oeffi/res/values-night/colors.xml b/oeffi/res/values-night/colors.xml index 7bd043d..427d3d5 100644 --- a/oeffi/res/values-night/colors.xml +++ b/oeffi/res/values-night/colors.xml @@ -22,6 +22,7 @@ #444444 #ffff00 #bbbbbb + #44000000 0.7 diff --git a/oeffi/res/values-night/styles.xml b/oeffi/res/values-night/styles.xml index 91cd0e8..bd90f01 100644 --- a/oeffi/res/values-night/styles.xml +++ b/oeffi/res/values-night/styles.xml @@ -5,7 +5,8 @@