From bb47332a37bec273d333dc356ac30f629a8b142c Mon Sep 17 00:00:00 2001
From: Neslihan <tur.neslihan@gmail.com>
Date: Sun, 14 May 2017 14:26:16 +0300
Subject: [PATCH] Remove conflicts

---
 .../java/fr/free/nrw/commons/nearby/NearbyMapFragment.java  | 6 ++++++
 app/src/main/res/values/strings.xml                         | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
index de92a596b..c15a407c3 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java
@@ -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);
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0414f98fa..536f66e41 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -170,5 +170,7 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="beta_opt_in_link">https://play.google.com/apps/testing/fr.free.nrw.commons</string>
   <string name="use_wikidata">Use Wikidata</string>
   <string name="use_wikidata_summary">(Warning: disabling this may cause large mobile data consumption)</string>
+  <string name="map_theme_light">mapbox://styles/mapbox/traffic-day-v2</string>
+  <string name="map_theme_dark">mapbox://styles/mapbox/traffic-night-v2</string>
   <string name="mapbox_commons_app_token">pk.eyJ1IjoibWFza2FyYXZpdmVrIiwiYSI6ImNqMmxvdzFjMTAwMHYzM283ZWM3eW5tcDAifQ.ib5SZ9EVjwJe6GSKve0bcg</string>
 </resources>