From 23aa691275f949820411e42df9b47ebe41cb7b26 Mon Sep 17 00:00:00 2001
From: Neslihan <tur.neslihan@gmail.com>
Date: Wed, 15 Mar 2017 18:58:57 +0300
Subject: [PATCH] Prepare xml files

---
 .../fr/free/nrw/commons/SettingsActivity.java |   8 +++
 .../ContributionsListFragment.java            |  49 ++++++++++++++++++
 app/src/main/res/drawable/toggle.png          | Bin 0 -> 3582 bytes
 app/src/main/res/drawable/toggle_inverse.png  | Bin 0 -> 3771 bytes
 app/src/main/res/drawable/toggle_selector.xml |   9 ++++
 app/src/main/res/layout/activity_share.xml    |   2 +-
 app/src/main/res/layout/activity_welcome.xml  |   2 +-
 .../main/res/layout/detail_category_item.xml  |   2 +-
 .../res/layout/fragment_categorization.xml    |   2 +-
 .../res/layout/fragment_contributions.xml     |   2 +-
 .../main/res/layout/fragment_media_detail.xml |  16 +++---
 .../res/menu/fragment_contributions_list.xml  |   5 ++
 app/src/main/res/values/attrs.xml             |  11 ++++
 app/src/main/res/values/colors.xml            |  21 +++++++-
 app/src/main/res/values/strings.xml           |   3 ++
 15 files changed, 117 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/toggle.png
 create mode 100644 app/src/main/res/drawable/toggle_inverse.png
 create mode 100644 app/src/main/res/drawable/toggle_selector.xml
 create mode 100644 app/src/main/res/values/attrs.xml

diff --git a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
index 933d39bbd..4f8dd8745 100644
--- a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons;
 
+import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.os.Bundle;
@@ -21,6 +22,13 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
     protected void onCreate(Bundle savedInstanceState) {
         getDelegate().installViewFactory();
         getDelegate().onCreate(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);
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preferences);
         ListPreference licensePreference = (ListPreference) findPreference(Prefs.DEFAULT_LICENSE);
diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
index cc0df0e2d..ed6d2c0a7 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsListFragment.java
@@ -10,6 +10,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.ContextCompat;
+import android.support.v4.content.IntentCompat;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -23,6 +24,8 @@ import android.widget.ListAdapter;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.lang.reflect.Method;
+
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
@@ -163,6 +166,27 @@ public class ContributionsListFragment extends Fragment {
                     startActivity(nearbyIntent);
                     return true;
                 }
+            case R.id.menu_theme_toggle:
+                final SharedPreferences prefs = getActivity().getSharedPreferences("prefs", Context.MODE_PRIVATE);
+                prefs.registerOnSharedPreferenceChangeListener(new SharedPreferences.OnSharedPreferenceChangeListener() {
+                    @Override
+                    public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
+                        if(s.equals("theme")){
+                            //http://stackoverflow.com/questions/5659742/onsharedpreferencechanged-called-multiple-times-why
+                            prefs.unregisterOnSharedPreferenceChangeListener(this);
+                            //Finish current activity and tart new one with selected theme
+                            Intent intent = getActivity().getIntent();
+                            intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | IntentCompat.FLAG_ACTIVITY_CLEAR_TASK);
+                            getActivity().finish();
+                            startActivity(intent);
+                        }
+                    }
+                });
+                SharedPreferences.Editor editor = prefs.edit();
+                //put inverse of selected boolean
+                editor.putBoolean("theme", !prefs.getBoolean("theme", false));
+                editor.commit();
+                return true;
             case R.id.menu_refresh:
                 ((SourceRefresher)getActivity()).refreshSource();
                 return true;
@@ -207,6 +231,31 @@ public class ContributionsListFragment extends Fragment {
         menu.findItem(R.id.menu_refresh).setVisible(false);
     }
 
+    /*http://stackoverflow.com/questions/30076392/how-does-this-strange-condition-happens-when-show-menu-item-icon-in-toolbar-over/30337653#30337653
+    Overriden to show toggle_layout button on overlay menu
+    */
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        if(menu != null){
+            if(menu.getClass().getSimpleName().equals("MenuBuilder")){
+                try{
+                    Method m = menu.getClass().getDeclaredMethod(
+                            "setOptionalIconsVisible", Boolean.TYPE);
+                    m.setAccessible(true);
+                    m.invoke(menu, true);
+                }
+                catch(NoSuchMethodException e){
+                    Log.e(TAG, "onMenuOpened", e);
+                }
+                catch(Exception e){
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+        super.onPrepareOptionsMenu(menu);
+    }
+
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
diff --git a/app/src/main/res/drawable/toggle.png b/app/src/main/res/drawable/toggle.png
new file mode 100644
index 0000000000000000000000000000000000000000..4871bf0b4920c61d31de38d62164603eaf9cc130
GIT binary patch
literal 3582
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/toggle_inverse.png b/app/src/main/res/drawable/toggle_inverse.png
new file mode 100644
index 0000000000000000000000000000000000000000..c08d7fc9321d5717c0a5418a0d92d619ec6b5ece
GIT binary patch
literal 3771
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/toggle_selector.xml b/app/src/main/res/drawable/toggle_selector.xml
new file mode 100644
index 000000000..778560709
--- /dev/null
+++ b/app/src/main/res/drawable/toggle_selector.xml
@@ -0,0 +1,9 @@
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/toggle"
+        android:state_checked="true"/>
+
+    <item
+        android:drawable="@drawable/toggle_inverse"
+        android:state_checked="false"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index e1e58d8dd..3eecb6ec1 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -1,7 +1,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000"
+    android:background="?attr/mainBackground"
     >
 
     <ImageView
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index d6fb4c760..adc99d05f 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -2,7 +2,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#0c609c"
+    android:background="?attr/commonsAppBlue"
     >
 
     <android.support.v4.view.ViewPager
diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml
index c5dec7db7..3b74af4d4 100644
--- a/app/src/main/res/layout/detail_category_item.xml
+++ b/app/src/main/res/layout/detail_category_item.xml
@@ -14,7 +14,7 @@
         android:id="@+id/mediaDetailCategoryItemText"
         android:textSize="14sp"
         android:textColor="@android:color/white"
-        android:background="#20ffffff"
+        android:background="?attr/subBackground"
         />
 
     <fr.free.nrw.commons.media.MediaDetailSpacer
diff --git a/app/src/main/res/layout/fragment_categorization.xml b/app/src/main/res/layout/fragment_categorization.xml
index 35a71fb7a..1ac12143e 100644
--- a/app/src/main/res/layout/fragment_categorization.xml
+++ b/app/src/main/res/layout/fragment_categorization.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#AA000000"
+    android:background="?attr/fragmentCategorisationBackground"
     android:paddingBottom="8dip"
     android:paddingLeft="16dip"
     android:paddingStart="16dip"
diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml
index 2ca9ae14b..2be422005 100644
--- a/app/src/main/res/layout/fragment_contributions.xml
+++ b/app/src/main/res/layout/fragment_contributions.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#000000"
+    android:background="?attr/mainBackground"
     >
 
     <TextView
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index b315b0825..1e07a18e1 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -58,7 +58,7 @@
                 android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="#AA000000"
+                android:background="?attr/fragmentCategorisationBackground"
                 android:padding="16dp"
                 >
 
@@ -66,7 +66,7 @@
                     android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#20ffffff"
+                    android:background="?attr/subBackground"
                     android:padding="16dp"
                     >
                     <TextView
@@ -85,7 +85,7 @@
                         android:id="@+id/mediaDetailTitle"
                         android:layout_gravity="left|start"
                         android:textColor="@android:color/white"
-                        android:background="#20ffffff"
+                        android:background="?attr/subBackground"
                         android:textSize="14sp"
                         android:padding="12dp"
                         />
@@ -100,7 +100,7 @@
                     android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#20ffffff"
+                    android:background="?attr/subBackground"
                     android:padding="16dp"
                     >
                     <TextView
@@ -116,7 +116,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/media_detail_description_explanation"
-                        android:background="#20ffffff"
+                        android:background="?attr/subBackground"
                         android:id="@+id/mediaDetailDesc"
                         android:textColor="@android:color/white"
                         android:layout_gravity="left|start"
@@ -134,7 +134,7 @@
                     android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#20ffffff"
+                    android:background="?attr/subBackground"
                     android:padding="16dp"
                     >
                     <TextView
@@ -152,7 +152,7 @@
                         android:text="License link"
                         android:id="@+id/mediaDetailLicense"
                         android:layout_gravity="left|start"
-                        android:background="#20ffffff"
+                        android:background="?attr/subBackground"
                         android:textColor="@android:color/white"
                         android:textSize="14sp"
                         android:padding="12dp"
@@ -168,7 +168,7 @@
                     android:orientation="vertical"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="#20ffffff"
+                    android:background="?attr/subBackground"
                     android:padding="16dp"
                     android:textStyle="bold"
                     >
diff --git a/app/src/main/res/menu/fragment_contributions_list.xml b/app/src/main/res/menu/fragment_contributions_list.xml
index 06c39006c..20a08cedc 100644
--- a/app/src/main/res/menu/fragment_contributions_list.xml
+++ b/app/src/main/res/menu/fragment_contributions_list.xml
@@ -28,6 +28,11 @@
         android:title="@string/menu_nearby"
         app:showAsAction="never"
         />
+    <item android:id="@+id/menu_theme_toggle"
+        android:title="Night mode"
+        android:icon="?attr/toggleButtonIcon"
+        app:showAsAction="never"
+        />
     <item android:id="@+id/menu_refresh"
           android:title="@string/menu_refresh"
           app:showAsAction="never"
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
new file mode 100644
index 000000000..daf787222
--- /dev/null
+++ b/app/src/main/res/values/attrs.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <attr name="mainBackground" format="reference"/>
+    <attr name="semitransparentText" format="reference"/>
+    <attr name="commonsAppBlue" format="reference"/>
+    <attr name="subBackground" format="reference"/>
+    <attr name="fragmentCategorisationBackground" format="reference"/>
+    <attr name="buttonBackground" format="reference"/>
+    <attr name="uploadOverlayBackground" format="reference"/>
+    <attr name="toggleButtonIcon" format="reference"/>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 824528460..7c8fad193 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,6 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!-- Some colours are same for dark/light themes. They are written two times in case
+    we want to change light ones later.
+      -->
     <color name="text_background">#90000000</color>
+    <color name="item_white_background">#ffffffff</color>
+    <color name="main_background_dark">#000000</color>
+    <color name="main_background_light">#bdbdbd</color>
+    <color name="commons_app_blue_dark">#33FFFFFF</color>
+    <color name="commons_app_blue_light">#33FFFFFF</color>
+    <color name="activity_welcome_background_dark">#0c609c</color>
+    <color name="activity_welcome_background_light">#0c609c</color>
+    <color name="sub_background_dark">#20ffffff</color>
+    <color name="sub_background_light">#20ffffff</color>
+    <color name="fragment_categorisation_background_dark">#AA000000</color>
+    <color name="fragment_categorisation_background_light">#44ffffff</color>
+    <color name="button_background_dark">#90000000</color>
+    <color name="button_background_light">#60000000</color>
+    <color name="upload_overlay_background_dark">#77000000</color>
+    <color name="upload_overlay_background_light">#44000000</color>
 
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 88317229e..3d620bcc2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,6 +33,7 @@
   <string name="menu_from_camera">Take photo</string>
   <string name="menu_nearby">Nearby</string>
   <string name="provider_contributions">My uploads</string>
+  <string name="menu_theme_toggle">Night mode</string>
   <string name="menu_share">Share</string>
   <string name="menu_open_in_browser">View in Browser</string>
   <string name="share_title_hint">Title</string>
@@ -90,6 +91,8 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="use_previous">Use previous title/description</string>
   <string name="allow_gps">Automatically get current location</string>
   <string name="allow_gps_summary">Retrieve current location to offer category suggestions if image is not geotagged</string>
+  <string name="preference_theme">Select theme</string>
+  <string name="preference_theme_summary">Select application theme as light/dark</string>
   <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
   <string name="license_name_cc_by_four"> Attribution 4.0</string>
   <string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.0</string>