From 0351617fe1508fb5d90e4766149029f9d5547e08 Mon Sep 17 00:00:00 2001
From: Ayoub DARDORY <ayoubuto@gmail.com>
Date: Thu, 18 Jul 2013 23:31:07 +0100
Subject: [PATCH] zoom controls settings, fixed night mode status for all pages

---
 res/values/strings.xml                        |  2 ++
 res/xml/preferences.xml                       |  1 +
 .../kiwixmobile/KiwixMobileActivity.java      | 20 +++++++++++++++++--
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index e220743a9..84fd6d54d 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -30,4 +30,6 @@
     </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>
 </resources>
diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 3d149f39b..2365df7fd 100644
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -11,6 +11,7 @@
         	android:entries="@array/pref_zoom_entries"
         	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"/>
         
     </PreferenceCategory>
     <!-- PreferenceCategory 
diff --git a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
index 4ec01d5a6..0454f138b 100644
--- a/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
+++ b/src/org/kiwix/kiwixmobile/KiwixMobileActivity.java
@@ -56,6 +56,7 @@ public class KiwixMobileActivity extends Activity {
 	private ArrayAdapter<String> adapter;
 	protected boolean requestClearHistoryAfterLoad;
 	protected boolean requestShowAllMenuItems;
+	protected boolean NightMode;
 	protected int requestWebReloadOnFinished;
 	private static final int ZIMFILESELECT_REQUEST_CODE = 1234;
 	private static final int PREFERENCES_REQUEST_CODE = 1235;
@@ -131,6 +132,7 @@ public class KiwixMobileActivity extends Activity {
         requestClearHistoryAfterLoad=false;
         requestWebReloadOnFinished = 0;
         requestShowAllMenuItems = false;
+        NightMode = false;
 
 
         this.requestWindowFeature(Window.FEATURE_PROGRESS);
@@ -220,6 +222,13 @@ public class KiwixMobileActivity extends Activity {
                         		 webView.clearHistory();
                         		 requestClearHistoryAfterLoad=false;
                         	 }
+
+                        	 
+                        	 if(NightMode){
+                				NightMode=false;
+                				ToggleNightMode();
+                			}
+                        	 
                          }
                          }
         });
@@ -284,8 +293,7 @@ public class KiwixMobileActivity extends Activity {
         	 });
 
         loadPref();
-      //Pinch to zoom
-        webView.getSettings().setBuiltInZoomControls(true);
+
         //webView.getSettings().setLoadsImagesAutomatically(false);
         //Does not make much sense to cache data from zim files.(Not clear whether
         // this actually has any effect)
@@ -335,6 +343,8 @@ public class KiwixMobileActivity extends Activity {
     private void loadPref(){
     	  SharedPreferences mySharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
     	  String pref_zoom = mySharedPreferences.getString("pref_zoom", "automatic");
+    	  Boolean pref_zoom_enabled = mySharedPreferences.getBoolean("pref_zoom_enabled", false);
+
     	  if (pref_zoom.equals("automatic")) {
       		 setDefaultZoom();
     	  } else if (pref_zoom.equals("medium")) {
@@ -347,6 +357,10 @@ public class KiwixMobileActivity extends Activity {
     		 Log.w("kiwix", "pref_displayZoom value ("+pref_zoom+" unknown. Assuming automatic");
     		 webView.getSettings().setDefaultZoom(WebSettings.ZoomDensity.MEDIUM);
     	 }
+
+         //Pinch to zoom
+    	 Log.d("kiwix","pref_zoom_enabled value ("+pref_zoom_enabled+")");
+    	 webView.getSettings().setBuiltInZoomControls(pref_zoom_enabled);
     }
     
 
@@ -600,6 +614,7 @@ public class KiwixMobileActivity extends Activity {
 			hideSearchBar();
 			webView.loadUrl(Uri.parse(ZimContentProvider.CONTENT_URI
 		            +articleUrl).toString());
+			
 			return true;
 		} else {
 			String errorString = String.format(getResources().getString(R.string.error_articlenotfound), articleSearchtextView.getText().toString());
@@ -654,6 +669,7 @@ public class KiwixMobileActivity extends Activity {
 			stream.close();
 			String JSInvert = new String(buffer);
 			webView.loadUrl("javascript:"+JSInvert);
+			NightMode = !NightMode;
 		} catch (IOException e) {
 
 		}