diff --git a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java index e9997b0..929ea9f 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java @@ -489,8 +489,12 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom return false; } }); - ((TextView) findViewById(R.id.directions_map_disclaimer)) - .setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + final TextView mapDisclaimerView = findViewById(R.id.directions_map_disclaimer); + mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0,0,0, insets.getSystemWindowInsetBottom()); + return insets; + }); final ZoomControls zoom = findViewById(R.id.directions_map_zoom); mapView.setZoomControls(zoom); diff --git a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java index 30d82f2..130dd5d 100644 --- a/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java @@ -303,8 +303,12 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen return trip.legs.get(selectedLegIndex).equals(part); } }); - ((TextView) findViewById(R.id.directions_trip_details_map_disclaimer)) - .setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + final TextView mapDisclaimerView = findViewById(R.id.directions_trip_details_map_disclaimer); + mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0,0,0, insets.getSystemWindowInsetBottom()); + return insets; + }); } @Override diff --git a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java index 6bc2591..a9b48b2 100644 --- a/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java +++ b/oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java @@ -138,8 +138,12 @@ public class NetworkPickerActivity extends Activity implements ActivityCompat.On }); mapView = findViewById(R.id.network_picker_map); - ((TextView) findViewById(R.id.network_picker_map_disclaimer)) - .setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + final TextView mapDisclaimerView = findViewById(R.id.network_picker_map_disclaimer); + mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); + return insets; + }); if (network == null) { findViewById(R.id.network_picker_firsttime_message_shadow).setForeground(null); diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java index 6bc25d6..2072cc4 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java @@ -179,8 +179,12 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa mapView = findViewById(R.id.stations_station_details_map); mapView.setStationsAware(this); - ((TextView) findViewById(R.id.stations_station_details_map_disclaimer)) - .setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + final TextView mapDisclaimerView = findViewById(R.id.stations_station_details_map_disclaimer); + mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0,0,0, insets.getSystemWindowInsetBottom()); + return insets; + }); resultStatusView = findViewById(R.id.stations_station_details_result_status); diff --git a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java index 915d517..6d873b9 100644 --- a/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java +++ b/oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java @@ -255,8 +255,12 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware mapView = findViewById(R.id.stations_map); mapView.setStationsAware(this); mapView.setLocationAware(this); - ((TextView) findViewById(R.id.stations_map_disclaimer)) - .setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + final TextView mapDisclaimerView = findViewById(R.id.stations_map_disclaimer); + mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); + mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> { + v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom()); + return insets; + }); final ZoomControls zoom = findViewById(R.id.stations_map_zoom); mapView.setZoomControls(zoom);