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

Style the map according to new version of mapbox map

Browse source
This commit is contained in:
neslihanturan 2019-09-04 15:29:38 +03:00
parent b736087697
commit c7261ca823
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestLayersFragment.java
View file

@ -7,6 +7,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log; import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -26,11 +27,13 @@ import com.mapbox.mapboxsdk.maps.OnMapReadyCallback;
import com.mapbox.mapboxsdk.maps.Style; import com.mapbox.mapboxsdk.maps.Style;
import javax.inject.Inject; import javax.inject.Inject;
import javax.inject.Named;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.contributions.MainActivity; import fr.free.nrw.commons.contributions.MainActivity;
import fr.free.nrw.commons.di.CommonsDaggerSupportFragment; import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
import fr.free.nrw.commons.kvstore.JsonKvStore;
import fr.free.nrw.commons.location.LocationServiceManager; import fr.free.nrw.commons.location.LocationServiceManager;
import fr.free.nrw.commons.nearby.mvp.contract.NearbyParentFragmentContract; import fr.free.nrw.commons.nearby.mvp.contract.NearbyParentFragmentContract;
import fr.free.nrw.commons.nearby.mvp.presenter.NearbyParentFragmentPresenter; import fr.free.nrw.commons.nearby.mvp.presenter.NearbyParentFragmentPresenter;
@ -55,6 +58,11 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
@Inject @Inject
NearbyController nearbyController; NearbyController nearbyController;
@Inject
@Named("default_preferences")
JsonKvStore applicationKvStore;
private static final double ZOOM_LEVEL = 14f;
private final String NETWORK_INTENT_ACTION = "android.net.conn.CONNECTIVITY_CHANGE"; private final String NETWORK_INTENT_ACTION = "android.net.conn.CONNECTIVITY_CHANGE";
private BroadcastReceiver broadcastReceiver; private BroadcastReceiver broadcastReceiver;
private boolean isNetworkErrorOccurred = false; private boolean isNetworkErrorOccurred = false;
@ -63,6 +71,7 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
NearbyParentFragmentPresenter nearbyParentFragmentPresenter; NearbyParentFragmentPresenter nearbyParentFragmentPresenter;
SupportMapFragment mapFragment; SupportMapFragment mapFragment;
boolean isDarkTheme;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -89,10 +98,16 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
FragmentTransaction transaction = getChildFragmentManager().beginTransaction(); FragmentTransaction transaction = getChildFragmentManager().beginTransaction();
// Build mapboxMap // Build mapboxMap
MapboxMapOptions options = MapboxMapOptions.createFromAttributes(getActivity(), null); isDarkTheme = applicationKvStore.getBoolean("theme", false);
options.camera(new CameraPosition.Builder() MapboxMapOptions options = new MapboxMapOptions()
.target(new LatLng(-52.6885, -70.1395)) .compassGravity(Gravity.BOTTOM | Gravity.LEFT)
.zoom(9) .compassMargins(new int[]{12, 0, 0, 24})
//.styleUrl(isDarkTheme ? Style.DARK : Style.OUTDOORS)
.logoEnabled(false)
.attributionEnabled(false)
.camera(new CameraPosition.Builder()
.zoom(ZOOM_LEVEL)
.target(new com.mapbox.mapboxsdk.geometry.LatLng(-52.6885, -70.1395))
.build()); .build());
// Create map fragment // Create map fragment
@ -110,7 +125,7 @@ public class NearbyTestLayersFragment extends CommonsDaggerSupportFragment imple
@Override @Override
public void onMapReady(@NonNull MapboxMap mapboxMap) { public void onMapReady(@NonNull MapboxMap mapboxMap) {
mapboxMap.setStyle(Style.SATELLITE, new Style.OnStyleLoaded() { mapboxMap.setStyle(NearbyTestLayersFragment.this.isDarkTheme ? Style.DARK : Style.OUTDOORS, new Style.OnStyleLoaded() {
@Override @Override
public void onStyleLoaded(@NonNull Style style) { public void onStyleLoaded(@NonNull Style style) {
NearbyTestLayersFragment.this.childMapFragmentAttached(); NearbyTestLayersFragment.this.childMapFragmentAttached();