mirrors/oeffi
1
0
Fork 0
mirror of https://gitlab.com/oeffi/oeffi.git synced 2025-07-07 21:38:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Inset maps disclaimers, too.

Browse source
This commit is contained in:
Andreas Schildbach 2021-01-29 19:02:28 +01:00
parent 2c33349988
commit 4ca33551be
5 changed files with 30 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
oeffi/src/de/schildbach/oeffi/directions/DirectionsActivity.java
View file

@ -489,8 +489,12 @@ public class DirectionsActivity extends OeffiMainActivity implements ActivityCom
return false; return false;
} }
}); });
((TextView) findViewById(R.id.directions_map_disclaimer)) final TextView mapDisclaimerView = findViewById(R.id.directions_map_disclaimer);
.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); 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); final ZoomControls zoom = findViewById(R.id.directions_map_zoom);
mapView.setZoomControls(zoom); mapView.setZoomControls(zoom);

8
oeffi/src/de/schildbach/oeffi/directions/TripDetailsActivity.java
View file

@ -303,8 +303,12 @@ public class TripDetailsActivity extends OeffiActivity implements LocationListen
return trip.legs.get(selectedLegIndex).equals(part); return trip.legs.get(selectedLegIndex).equals(part);
} }
}); });
((TextView) findViewById(R.id.directions_trip_details_map_disclaimer)) final TextView mapDisclaimerView = findViewById(R.id.directions_trip_details_map_disclaimer);
.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice());
mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> {
v.setPadding(0,0,0, insets.getSystemWindowInsetBottom());
return insets;
});
} }
@Override @Override

8
oeffi/src/de/schildbach/oeffi/network/NetworkPickerActivity.java
View file

@ -138,8 +138,12 @@ public class NetworkPickerActivity extends Activity implements ActivityCompat.On
}); });
mapView = findViewById(R.id.network_picker_map); mapView = findViewById(R.id.network_picker_map);
((TextView) findViewById(R.id.network_picker_map_disclaimer)) final TextView mapDisclaimerView = findViewById(R.id.network_picker_map_disclaimer);
.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); mapDisclaimerView.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice());
mapDisclaimerView.setOnApplyWindowInsetsListener((v, insets) -> {
v.setPadding(0, 0, 0, insets.getSystemWindowInsetBottom());
return insets;
});
if (network == null) { if (network == null) {
findViewById(R.id.network_picker_firsttime_message_shadow).setForeground(null); findViewById(R.id.network_picker_firsttime_message_shadow).setForeground(null);

8
oeffi/src/de/schildbach/oeffi/stations/StationDetailsActivity.java
View file

@ -179,8 +179,12 @@ public class StationDetailsActivity extends OeffiActivity implements StationsAwa
mapView = findViewById(R.id.stations_station_details_map); mapView = findViewById(R.id.stations_station_details_map);
mapView.setStationsAware(this); mapView.setStationsAware(this);
((TextView) findViewById(R.id.stations_station_details_map_disclaimer)) final TextView mapDisclaimerView = findViewById(R.id.stations_station_details_map_disclaimer);
.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); 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); resultStatusView = findViewById(R.id.stations_station_details_result_status);

8
oeffi/src/de/schildbach/oeffi/stations/StationsActivity.java
View file

@ -255,8 +255,12 @@ public class StationsActivity extends OeffiMainActivity implements StationsAware
mapView = findViewById(R.id.stations_map); mapView = findViewById(R.id.stations_map);
mapView.setStationsAware(this); mapView.setStationsAware(this);
mapView.setLocationAware(this); mapView.setLocationAware(this);
((TextView) findViewById(R.id.stations_map_disclaimer)) final TextView mapDisclaimerView = findViewById(R.id.stations_map_disclaimer);
.setText(mapView.getTileProvider().getTileSource().getCopyrightNotice()); 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); final ZoomControls zoom = findViewById(R.id.stations_map_zoom);
mapView.setZoomControls(zoom); mapView.setZoomControls(zoom);