mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 21:03:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

add constants file for map styles used across various fragments (#5200)

Browse source
This commit is contained in:
Ritika Pahwa 2023-04-05 12:35:05 +05:30 • committed by GitHub
parent 07616485ae
commit cf35307d9a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerActivity.java
View file

@ -53,6 +53,7 @@ import com.mapbox.mapboxsdk.maps.UiSettings;
import com.mapbox.mapboxsdk.style.layers.Layer; import com.mapbox.mapboxsdk.style.layers.Layer;
import com.mapbox.mapboxsdk.style.layers.SymbolLayer; import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
import com.mapbox.mapboxsdk.style.sources.GeoJsonSource; import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
import fr.free.nrw.commons.MapStyle;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.kvstore.JsonKvStore; import fr.free.nrw.commons.kvstore.JsonKvStore;
@ -248,8 +249,7 @@ public class LocationPickerActivity extends BaseActivity implements OnMapReadyCa
@Override @Override
public void onMapReady(final MapboxMap mapboxMap) { public void onMapReady(final MapboxMap mapboxMap) {
this.mapboxMap = mapboxMap; this.mapboxMap = mapboxMap;
mapboxMap.setStyle(isDarkTheme ? LocationPickerConstants.DARK_MAP_STYLE : mapboxMap.setStyle(isDarkTheme ? MapStyle.DARK : MapStyle.STREETS, this::onStyleLoaded);
LocationPickerConstants.STREETS_MAP_STYLE, this::onStyleLoaded);
} }
/** /**

6
app/src/main/java/fr/free/nrw/commons/LocationPicker/LocationPickerConstants.java
View file

@ -13,12 +13,6 @@ public final class LocationPickerConstants {
public static final String MAP_CAMERA_POSITION public static final String MAP_CAMERA_POSITION
= "location.picker.cameraPosition"; = "location.picker.cameraPosition";
public static final String DARK_MAP_STYLE
= Style.getPredefinedStyle("Dark");
public static final String STREETS_MAP_STYLE
= Style.getPredefinedStyle("Streets");
private LocationPickerConstants() { private LocationPickerConstants() {
} }

12
app/src/main/java/fr/free/nrw/commons/MapStyle.java Normal file
View file

@ -0,0 +1,12 @@
package fr.free.nrw.commons;
import com.mapbox.mapboxsdk.maps.Style;
/**
* Constants for various map styles
*/
public final class MapStyle {
public static final String DARK = Style.getPredefinedStyle("Dark");
public static final String OUTDOORS = Style.getPredefinedStyle("Outdoors");
public static final String STREETS = Style.getPredefinedStyle("Streets");
}

5
app/src/main/java/fr/free/nrw/commons/explore/map/ExploreMapFragment.java
View file

@ -54,6 +54,7 @@ import com.mapbox.mapboxsdk.maps.UiSettings;
import com.mapbox.pluginscalebar.ScaleBarOptions; import com.mapbox.pluginscalebar.ScaleBarOptions;
import com.mapbox.pluginscalebar.ScaleBarPlugin; import com.mapbox.pluginscalebar.ScaleBarPlugin;
import fr.free.nrw.commons.MapController; import fr.free.nrw.commons.MapController;
import fr.free.nrw.commons.MapStyle;
import fr.free.nrw.commons.Media; import fr.free.nrw.commons.Media;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
@ -190,8 +191,8 @@ public class ExploreMapFragment extends CommonsDaggerSupportFragment
mapBox = mapBoxMap; mapBox = mapBoxMap;
initViews(); initViews();
presenter.setActionListeners(applicationKvStore); presenter.setActionListeners(applicationKvStore);
mapBoxMap.setStyle(isDarkTheme? Style.getPredefinedStyle("Dark"): mapBoxMap.setStyle(isDarkTheme? MapStyle.DARK :
Style.getPredefinedStyle("Outdoors"), style -> { MapStyle.OUTDOORS, style -> {
final UiSettings uiSettings = mapBoxMap.getUiSettings(); final UiSettings uiSettings = mapBoxMap.getUiSettings();
uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT); uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
uiSettings.setCompassMargins(12, 0, 0, 24); uiSettings.setCompassMargins(12, 0, 0, 24);

4
app/src/main/java/fr/free/nrw/commons/nearby/fragments/NearbyParentFragment.java
View file

@ -82,6 +82,7 @@ import com.mapbox.pluginscalebar.ScaleBarOptions;
import com.mapbox.pluginscalebar.ScaleBarPlugin; import com.mapbox.pluginscalebar.ScaleBarPlugin;
import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.MapController.NearbyPlacesInfo; import fr.free.nrw.commons.MapController.NearbyPlacesInfo;
import fr.free.nrw.commons.MapStyle;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.Utils; import fr.free.nrw.commons.Utils;
import fr.free.nrw.commons.auth.LoginActivity; import fr.free.nrw.commons.auth.LoginActivity;
@ -316,7 +317,8 @@ public class NearbyParentFragment extends CommonsDaggerSupportFragment
initViews(); initViews();
presenter.setActionListeners(applicationKvStore); presenter.setActionListeners(applicationKvStore);
initNearbyFilter(); initNearbyFilter();
mapBoxMap.setStyle(isDarkTheme?Style.getPredefinedStyle("Dark"):Style.getPredefinedStyle("Outdoors"), style -> { mapBoxMap.setStyle(isDarkTheme? MapStyle.DARK :
MapStyle.OUTDOORS, style -> {
final UiSettings uiSettings = mapBoxMap.getUiSettings(); final UiSettings uiSettings = mapBoxMap.getUiSettings();
uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT); uiSettings.setCompassGravity(Gravity.BOTTOM | Gravity.LEFT);
uiSettings.setCompassMargins(12, 0, 0, 24); uiSettings.setCompassMargins(12, 0, 0, 24);