Remove conflicts

This commit is contained in:
Neslihan 2017-05-14 14:26:16 +03:00
parent e651aca20d
commit bb47332a37
2 changed files with 8 additions and 0 deletions

View file

@ -2,6 +2,7 @@ package fr.free.nrw.commons.nearby;
import android.net.Uri;
import android.os.Bundle;
import android.preference.PreferenceManager;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
@ -93,6 +94,11 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
});
}
});
if (PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("theme",true)) {
mapView.setStyleUrl(getResources().getString(R.string.map_theme_dark));
} else {
mapView.setStyleUrl(getResources().getString(R.string.map_theme_light));
}
setHasOptionsMenu(false);