From 1c63681e646f041793f8fd3569d458a17a23b590 Mon Sep 17 00:00:00 2001
From: mebr1416 <bruke.mekuria@outlook.com>
Date: Thu, 3 Aug 2017 15:01:22 +0300
Subject: [PATCH 1/2] Resolve for "Day mode by default #825"

---
 app/src/main/res/xml/preferences.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 316affb9f..6f105836e 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -26,7 +26,7 @@
 
     <CheckBoxPreference
         android:title="@string/preference_theme"
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:summary="@string/preference_theme_summary"
         android:key="theme"
         />

From 0c303298b24e0bb77186ec3fb50d87d466b715f7 Mon Sep 17 00:00:00 2001
From: mebr1416 <bruke.mekuria@outlook.com>
Date: Fri, 4 Aug 2017 18:40:22 +0300
Subject: [PATCH 2/2] Resolve for "Day mode by default #825"

---
 app/src/main/java/fr/free/nrw/commons/Utils.java                | 2 +-
 .../main/java/fr/free/nrw/commons/nearby/NearbyMapFragment.java | 2 +-
 .../java/fr/free/nrw/commons/settings/SettingsActivity.java     | 2 +-
 app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java   | 2 +-
 .../java/fr/free/nrw/commons/upload/SingleUploadFragment.java   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/Utils.java b/app/src/main/java/fr/free/nrw/commons/Utils.java
index af19a5232..7e75f8718 100644
--- a/app/src/main/java/fr/free/nrw/commons/Utils.java
+++ b/app/src/main/java/fr/free/nrw/commons/Utils.java
@@ -277,6 +277,6 @@ public class Utils {
     }
 
     public static boolean isDarkTheme(Context context) {
-        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",true);
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean("theme",false);
     }
 }
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 bc5830809..efa88819c 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
@@ -102,7 +102,7 @@ public class NearbyMapFragment extends android.support.v4.app.Fragment {
 
             addCurrentLocationMarker(mapboxMap);
         });
-        if (PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("theme",true)) {
+        if (PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("theme",false)) {
             mapView.setStyleUrl(getResources().getString(R.string.map_theme_dark));
         } else {
             mapView.setStyleUrl(getResources().getString(R.string.map_theme_light));
diff --git a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
index 42b222cab..5814ec904 100644
--- a/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/settings/SettingsActivity.java
@@ -17,7 +17,7 @@ public class SettingsActivity extends NavigationBaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // Check prefs on every activity starts
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
+        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
             setTheme(R.style.DarkAppTheme);
         } else {
             setTheme(R.style.LightAppTheme);
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
index d674542e0..af4f0eff4 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
@@ -27,7 +27,7 @@ public class BaseActivity extends AppCompatActivity {
     @Override
     protected void onResume() {
         // Restart activity if theme is changed
-        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
+        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
         if(currentTheme!=newTheme){ //is activity theme changed
             Intent intent = getIntent();
             finish();
diff --git a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
index 9f2ab5ba5..161054053 100644
--- a/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/upload/SingleUploadFragment.java
@@ -112,7 +112,7 @@ public class SingleUploadFragment extends Fragment {
         Timber.d(license);
 
         ArrayAdapter<String> adapter;
-        if (PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("theme",true)) {
+        if (PreferenceManager.getDefaultSharedPreferences(getActivity()).getBoolean("theme",false)) {
             // dark theme
             adapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, licenseItems);
         }else {