From b09fdde9195c93bd0c5b127c9b9c83bef1ed50f4 Mon Sep 17 00:00:00 2001
From: Roman Romanov <rromanov@65gb.net>
Date: Wed, 18 Jan 2017 14:40:38 +0400
Subject: [PATCH] [android] Added large fonts size settings.

---
 android/jni/com/mapswithme/util/Config.cpp    | 19 +++++++++++++++++++
 android/res/values/donottranslate.xml         |  1 +
 android/res/xml-v21/prefs_misc.xml            |  7 +++++++
 android/res/xml/prefs_misc.xml                |  5 +++++
 .../maps/settings/MiscPrefsFragment.java      | 18 +++++++++++++++++-
 android/src/com/mapswithme/util/Config.java   | 12 ++++++++++++
 6 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/android/jni/com/mapswithme/util/Config.cpp b/android/jni/com/mapswithme/util/Config.cpp
index 136909ef5e..3c40e73cd0 100644
--- a/android/jni/com/mapswithme/util/Config.cpp
+++ b/android/jni/com/mapswithme/util/Config.cpp
@@ -1,6 +1,11 @@
 #include "../core/jni_helper.hpp"
+#include "../maps/Framework.hpp"
 #include "platform/settings.hpp"
 
+namespace
+{
+::Framework * frm() { return g_framework->NativeFramework(); }
+}
 
 extern "C"
 {
@@ -83,4 +88,18 @@ extern "C"
     {
       (void)settings::Set(jni::ToNativeString(env, name), jni::ToNativeString(env, value));
     }
+
+    JNIEXPORT jboolean JNICALL
+    Java_com_mapswithme_util_Config_nativeGetLargeFontsSize(JNIEnv * env, jclass thiz)
+    {
+      return frm()->LoadLargeFontsSize();
+    }
+
+    JNIEXPORT void JNICALL
+    Java_com_mapswithme_util_Config_nativeSetLargeFontsSize(JNIEnv * env, jclass thiz,
+                                                            jboolean value)
+    {
+      frm()->SaveLargeFontsSize(value);
+      frm()->SetLargeFontsSize(value);
+    }
 } // extern "C"
diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index 7e8f321ff9..144e9ea09c 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -48,6 +48,7 @@
   <string name="pref_showcase_switched_on" translatable="false">DisplayShowcase</string>
   <string name="pref_osm_profile" translatable="false">Osm profile</string>
   <string name="pref_auto_zoom" translatable="false">AutoZoom</string>
+  <string name="pref_large_fonts_size" translatable="false">LargeFontSize</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
   <string name="notification_ticker_rtl" translatable="false">%2$s :%1$s</string>
diff --git a/android/res/xml-v21/prefs_misc.xml b/android/res/xml-v21/prefs_misc.xml
index 09754335cc..4f09084dda 100644
--- a/android/res/xml-v21/prefs_misc.xml
+++ b/android/res/xml-v21/prefs_misc.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
+  <SwitchPreference
+    android:key="@string/pref_large_fonts_size"
+    android:title="@string/big_font"
+    android:defaultValue="false"
+    android:switchTextOff=""
+    android:switchTextOn=""/>
+
   <SwitchPreference
     android:key="@string/pref_showcase_switched_on"
     android:title="@string/showcase_settings_title"
diff --git a/android/res/xml/prefs_misc.xml b/android/res/xml/prefs_misc.xml
index 9298dd176d..6fa3acc580 100644
--- a/android/res/xml/prefs_misc.xml
+++ b/android/res/xml/prefs_misc.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen
   xmlns:android="http://schemas.android.com/apk/res/android">
+  <CheckBoxPreference
+    android:key="@string/pref_large_fonts_size"
+    android:title="@string/big_font"
+    android:defaultValue="false"/>
+
   <CheckBoxPreference
     android:key="@string/pref_showcase_switched_on"
     android:title="@string/showcase_settings_title"
diff --git a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
index 89b199ca33..4045026d1c 100644
--- a/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MiscPrefsFragment.java
@@ -26,7 +26,23 @@ public class MiscPrefsFragment extends BaseXmlSettingsFragment
   {
     super.onCreate(savedInstanceState);
 
-    Preference pref = findPreference(getString(R.string.pref_send_statistics));
+    Preference pref = findPreference(getString(R.string.pref_large_fonts_size));
+    ((TwoStatePreference)pref).setChecked(Config.isLargeFontsSize());
+    pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+    {
+      @Override
+      public boolean onPreferenceChange(Preference preference, Object newValue)
+      {
+        boolean oldVal = Config.isLargeFontsSize();
+        boolean newVal = (Boolean) newValue;
+        if (oldVal != newVal)
+          Config.setLargeFontsSize(newVal);
+
+        return true;
+      }
+    });
+
+    pref = findPreference(getString(R.string.pref_send_statistics));
     ((TwoStatePreference)pref).setChecked(Config.isStatisticsEnabled());
     pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
     {
diff --git a/android/src/com/mapswithme/util/Config.java b/android/src/com/mapswithme/util/Config.java
index 3e8f5af659..f19fdacec5 100644
--- a/android/src/com/mapswithme/util/Config.java
+++ b/android/src/com/mapswithme/util/Config.java
@@ -344,6 +344,16 @@ public final class Config
     return true;
   }
 
+  public static boolean isLargeFontsSize()
+  {
+    return nativeGetLargeFontsSize();
+  }
+
+  public static void setLargeFontsSize(boolean value)
+  {
+    nativeSetLargeFontsSize(value);
+  }
+
   private static native boolean nativeGetBoolean(String name, boolean defaultValue);
   private static native void nativeSetBoolean(String name, boolean value);
   private static native int nativeGetInt(String name, int defaultValue);
@@ -354,4 +364,6 @@ public final class Config
   private static native void nativeSetDouble(String name, double value);
   private static native String nativeGetString(String name, String defaultValue);
   private static native void nativeSetString(String name, String value);
+  private static native boolean nativeGetLargeFontsSize();
+  private static native void nativeSetLargeFontsSize(boolean value);
 }