From 514776940510490b817ccc79ff51179027aae67a Mon Sep 17 00:00:00 2001
From: Neslihan <tur.neslihan@gmail.com>
Date: Wed, 15 Mar 2017 18:20:59 +0300
Subject: [PATCH] Add BaseActivity and BaseAppcompatActivity

---
 .../fr/free/nrw/commons/AboutActivity.java    |  3 +--
 .../fr/free/nrw/commons/BaseActivity.java     | 19 ++++++++++++++
 .../nrw/commons/BaseAppCompatActivity.java    | 19 ++++++++++++++
 .../fr/free/nrw/commons/WelcomeActivity.java  |  3 +--
 .../commons/auth/AuthenticatedActivity.java   |  3 ++-
 .../free/nrw/commons/auth/SignupActivity.java |  5 ++--
 .../nrw/commons/nearby/NearbyActivity.java    |  4 +--
 app/src/main/res/values/styles.xml            | 25 +++++++++++++++++--
 8 files changed, 70 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/fr/free/nrw/commons/BaseActivity.java
 create mode 100644 app/src/main/java/fr/free/nrw/commons/BaseAppCompatActivity.java

diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
index 4fb9bc70b..dc79f51ba 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -1,12 +1,11 @@
 package fr.free.nrw.commons;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
-public class AboutActivity extends Activity {
+public class AboutActivity extends BaseActivity {
     private TextView versionText;
     private TextView licenseText;
     private TextView improveText;
diff --git a/app/src/main/java/fr/free/nrw/commons/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/BaseActivity.java
new file mode 100644
index 000000000..176c4e192
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/BaseActivity.java
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons;
+
+import android.app.Activity;
+import android.content.Context;
+import android.os.Bundle;
+
+
+public class BaseActivity extends Activity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        //Check prefs on every activity starts
+        if (getSharedPreferences("prefs", Context.MODE_PRIVATE).getBoolean("theme", false)) {
+            setTheme(R.style.LightAppTheme);
+        }else {
+            setTheme(R.style.DarkAppTheme); //default
+        }
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/BaseAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/BaseAppCompatActivity.java
new file mode 100644
index 000000000..54fa81379
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/BaseAppCompatActivity.java
@@ -0,0 +1,19 @@
+package fr.free.nrw.commons;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+
+
+public class BaseAppCompatActivity extends AppCompatActivity {
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        //Check prefs on every activity starts
+        if (getSharedPreferences("prefs", Context.MODE_PRIVATE).getBoolean("theme", false)) {
+            setTheme(R.style.LightAppTheme);
+        }else {
+            setTheme(R.style.DarkAppTheme); //default
+        }
+        super.onCreate(savedInstanceState);
+    }
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
index e075f793b..2bf750645 100644
--- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons;
 
-import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
@@ -10,7 +9,7 @@ import android.widget.Button;
 
 import com.viewpagerindicator.CirclePageIndicator;
 
-public class WelcomeActivity extends Activity {
+public class WelcomeActivity extends BaseActivity {
     static final int PAGE_WIKIPEDIA = 0,
             PAGE_DO_UPLOAD = 1,
             PAGE_DONT_UPLOAD = 2,
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
index f5eccf6fb..261d51f55 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/AuthenticatedActivity.java
@@ -15,10 +15,11 @@ import android.support.v7.app.AppCompatActivity;
 
 import java.io.IOException;
 
+import fr.free.nrw.commons.BaseAppCompatActivity;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.Utils;
 
-public abstract class AuthenticatedActivity extends AppCompatActivity {
+public abstract class AuthenticatedActivity extends BaseAppCompatActivity {
 
     String accountType;
     CommonsApplication app;
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
index 57f35aed0..8aabb85f1 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons.auth;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.util.Log;
@@ -9,7 +8,9 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
-public class SignupActivity extends Activity {
+import fr.free.nrw.commons.BaseActivity;
+
+public class SignupActivity extends BaseActivity {
 
     private WebView webView;
 
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
index c94700dda..e275a4fd1 100644
--- a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyActivity.java
@@ -7,12 +7,12 @@ import android.location.LocationListener;
 import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 
+import fr.free.nrw.commons.BaseAppCompatActivity;
 import fr.free.nrw.commons.R;
 
-public class NearbyActivity extends AppCompatActivity {
+public class NearbyActivity extends BaseAppCompatActivity {
 
     private MyLocationListener myLocationListener;
     private LocationManager locationManager;
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 900cac66e..1484ae59c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,8 +1,29 @@
 <resources>
 
-    <style name="AppTheme" parent="Theme.AppCompat" />
+    <style name="DarkAppTheme" parent="Theme.AppCompat">
+        <item name="mainBackground">@color/main_background_dark</item>
+        <item name="semitransparentText">@color/commons_app_blue_dark</item>
+        <item name="commonsAppBlue">@color/activity_welcome_background_dark</item>
+        <item name="subBackground">@color/sub_background_dark</item>
+        <item name="fragmentCategorisationBackground">@color/fragment_categorisation_background_dark</item>
+        <item name="buttonBackground">@color/button_background_dark</item>
+        <item name="uploadOverlayBackground">@color/upload_overlay_background_dark</item>
+        <item name="toggleButtonIcon">@drawable/toggle_inverse</item>
 
-    <style name="NoTitle" parent="AppTheme">
+    </style>
+
+    <style name="LightAppTheme" parent="Theme.AppCompat.Light">
+        <item name="mainBackground">@color/main_background_light</item>
+        <item name="semitransparentText">@color/commons_app_blue_light</item>
+        <item name="commonsAppBlue">@color/activity_welcome_background_light</item>
+        <item name="subBackground">@color/sub_background_light</item>
+        <item name="fragmentCategorisationBackground">@color/fragment_categorisation_background_light</item>
+        <item name="buttonBackground">@color/button_background_light</item>
+        <item name="uploadOverlayBackground">@color/upload_overlay_background_light</item>
+        <item name="toggleButtonIcon">@drawable/toggle</item>
+    </style>
+
+    <style name="NoTitle" parent="DarkAppTheme">
         <item name="android:windowNoTitle">true</item>
     </style>