From 2c3334998864639fa95954e3348d321e95ca0979 Mon Sep 17 00:00:00 2001 From: Andreas Schildbach Date: Fri, 29 Jan 2021 18:37:51 +0100 Subject: [PATCH] For insetting the content, use window insets listeners rather than the fitsSystemWindows XML attribute. --- oeffi/res/layout/directions_trip_details_content.xml | 2 +- oeffi/res/layout/directions_trip_overview_content.xml | 4 ++-- oeffi/res/layout/stations_content.xml | 2 +- oeffi/res/layout/stations_station_details_content.xml | 2 +- .../de/schildbach/oeffi/directions/TripDetailsActivity.java | 4 ++++ .../schildbach/oeffi/directions/TripsOverviewActivity.java | 5 +++++ .../de/schildbach/oeffi/stations/StationDetailsActivity.java | 4 ++++ oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java | 4 ++++ 8 files changed, 22 insertions(+), 5 deletions(-) diff --git a/oeffi/res/layout/directions_trip_details_content.xml b/oeffi/res/layout/directions_trip_details_content.xml index 48a24cf..19dfaa0 100644 --- a/oeffi/res/layout/directions_trip_details_content.xml +++ b/oeffi/res/layout/directions_trip_details_content.xml @@ -87,6 +87,7 @@ diff --git a/oeffi/res/layout/directions_trip_overview_content.xml b/oeffi/res/layout/directions_trip_overview_content.xml index 61b9a9f..ee00676 100644 --- a/oeffi/res/layout/directions_trip_overview_content.xml +++ b/oeffi/res/layout/directions_trip_overview_content.xml @@ -20,13 +20,13 @@ android:unselectedAlpha="1" /> + android:layout_marginBottom="@dimen/list_entry_padding_vertical_lax"> diff --git a/oeffi/res/layout/stations_station_details_content.xml b/oeffi/res/layout/stations_station_details_content.xml index 0716e63..d38dfbb 100644 --- a/oeffi/res/layout/stations_station_details_content.xml +++ b/oeffi/res/layout/stations_station_details_content.xml @@ -43,6 +43,7 @@ diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java index cd4a998..30d82f2 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java @@ -274,6 +274,10 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen ((TextView) findViewById(R.id.directions_trip_details_footer)) .setText(Html.fromHtml(getString(R.string.directions_trip_details_realtime))); + findViewById(R.id.directions_trip_details_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); + return insets; + }); final TextView disclaimerSourceView = findViewById(R.id.directions_trip_details_disclaimer_source); updateDisclaimerSource(disclaimerSourceView, network.name(), null); diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java index b4738dd..6e701ab 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripsOverviewActivity.java @@ -160,6 +160,11 @@ public class TripsOverviewActivity extends OeffiActivity { }); barView.setOnScrollListener(() -> handler.post(checkMoreRunnable)); + findViewById(R.id.directions_trip_overview_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); + return insets; + }); + processResult(result, dep); } diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index b05b409..6bc25d6 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -269,6 +269,10 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa favoriteButton .setChecked(selectedFavState != null && selectedFavState == FavoriteStationsProvider.TYPE_FAVORITE); + findViewById(R.id.stations_station_details_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); + return insets; + }); disclaimerSourceView = findViewById(R.id.stations_station_details_disclaimer_source); updateDisclaimerSource(disclaimerSourceView, selectedNetwork.name(), null); } diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 93d90a5..915d517 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -262,6 +262,10 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware mapView.setZoomControls(zoom); connectivityWarningView = findViewById(R.id.stations_connectivity_warning_box); + findViewById(R.id.stations_disclaimer_group).setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); + return insets; + }); disclaimerSourceView = findViewById(R.id.stations_disclaimer_source); // initialize stations list