From 3c9697b566214e50f2b78ec72151e221f4f9ad6d Mon Sep 17 00:00:00 2001
From: Ayoub DARDORY <ayoubuto@gmail.com>
Date: Thu, 25 Jul 2013 12:55:36 +0100
Subject: [PATCH] night mode removed from menu and placed in settings

---
 res/menu/main.xml                                 |  2 --
 res/values/strings.xml                            |  3 ++-
 res/xml/preferences.xml                           |  1 +
 .../kiwix/kiwixmobile/KiwixMobileActivity.java    | 15 +++++++++------
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/res/menu/main.xml b/res/menu/main.xml
index 6e233be3e..f6ebbf25d 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -60,8 +60,6 @@
         
         android:orderInCategory="0"
         android:showAsAction="never" />
-    
-    <item android:id="@+id/menu_togglenightmode" android:title="@string/menu_togglenightmode" android:orderInCategory="0" android:showAsAction="never"></item>
     <item android:id="@+id/menu_help"
         android:title="@string/menu_help"
 		android:icon="@drawable/action_help"                        
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 84fd6d54d..a24fb71d2 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -29,7 +29,8 @@
         <item>Large</item>
     </string-array>
     <string name="menu_exit">Exit</string>
-    <string name="menu_togglenightmode">Toggle night mode</string>
     <string name="pref_zoom_enable">Enable Zoom</string>
     <string name="pref_zoom_enable_summary">Enable or disable the zoom controls</string>
+    <string name="pref_nightmode">Enabled night mode</string>
+    <string name="pref_nightmode_summary">Enable or disable the night mode</string>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 2365df7fd..9018d8ab4 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -12,6 +12,7 @@
         	android:entryValues="@array/pref_zoom_entryvalues"
         	android:defaultValue="automatic" />
         <CheckBoxPreference android:key="pref_zoom_enabled" android:title="@string/pref_zoom_enable" android:summary="@string/pref_zoom_enable_summary" android:defaultValue="false"/>
+        <CheckBoxPreference android:key="pref_nightmode" android:title="@string/pref_nightmode" android:defaultValue="false" android:summary="@string/pref_nightmode_summary"/>
         
     </PreferenceCategory>
     <!-- PreferenceCategory 
diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index 0454f138b..70481652d 100644
--- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -223,8 +223,8 @@ public class KiwixMobileActivity extends Activity {
                         		 requestClearHistoryAfterLoad=false;
                         	 }
 
-                        	 
-                        	 if(NightMode){
+                        	 Log.d("kiwix", "Loaded URL: "+webView.getUrl());                        	 
+                        	 if(NightMode){ 
                 				NightMode=false;
                 				ToggleNightMode();
                 			}
@@ -344,6 +344,7 @@ public class KiwixMobileActivity extends Activity {
     	  SharedPreferences mySharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
     	  String pref_zoom = mySharedPreferences.getString("pref_zoom", "automatic");
     	  Boolean pref_zoom_enabled = mySharedPreferences.getBoolean("pref_zoom_enabled", false);
+    	  Boolean pref_nightmode= mySharedPreferences.getBoolean("pref_nightmode", false);
 
     	  if (pref_zoom.equals("automatic")) {
       		 setDefaultZoom();
@@ -361,6 +362,12 @@ public class KiwixMobileActivity extends Activity {
          //Pinch to zoom
     	 Log.d("kiwix","pref_zoom_enabled value ("+pref_zoom_enabled+")");
     	 webView.getSettings().setBuiltInZoomControls(pref_zoom_enabled);
+
+         //Night mode status
+    	 Log.d("kiwix","pref_nightmode value ("+pref_nightmode+")");
+    	 if(NightMode!=pref_nightmode)
+    		 ToggleNightMode();
+    	 
     }
     
 
@@ -453,10 +460,6 @@ public class KiwixMobileActivity extends Activity {
             	Intent i = new Intent(this, KiwixSettings.class);
                 startActivityForResult(i, PREFERENCES_REQUEST_CODE);
             	break;
-            	
-            case R.id.menu_togglenightmode:
-            	ToggleNightMode();
-            	break;         
         }
         
         return super.onOptionsItemSelected(item);