From 1fb8dc0c2d5587e172e2dbffe5eb4e1280367912 Mon Sep 17 00:00:00 2001
From: Alexander Marchuk <alexm@maps.me>
Date: Wed, 13 Jan 2016 13:32:30 +0300
Subject: [PATCH] [android] fix: Display current theme in settings. fix: GPS
 track record switch and length selector merged into single entry. del:
 Removed "2 days" entry.

---
 android/res/values/donottranslate.xml         |  2 +-
 android/res/values/string-arrays.xml          | 11 ++----
 .../maps/settings/MapPrefsFragment.java       | 39 ++++++++-----------
 3 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/android/res/values/donottranslate.xml b/android/res/values/donottranslate.xml
index e0a763d8c5..1cafb61885 100644
--- a/android/res/values/donottranslate.xml
+++ b/android/res/values/donottranslate.xml
@@ -43,7 +43,7 @@
   <string name="pref_3d" translatable="false">3D</string>
   <string name="pref_3d_buildings" translatable="false">3DBuildings</string>
   <string name="pref_track_record_enabled" translatable="false">TrackRecordEnabled</string>
-  <string name="pref_track_record_length" translatable="false">TrackRecordLength</string>
+  <string name="pref_track_record" translatable="false">TrackRecord</string>
   <string name="pref_showcase_switched_on" translatable="false">DisplayShowcase</string>
 
   <string name="notification_ticker_ltr" translatable="false">%1$s: %2$s</string>
diff --git a/android/res/values/string-arrays.xml b/android/res/values/string-arrays.xml
index 8d12a58871..92230801e6 100644
--- a/android/res/values/string-arrays.xml
+++ b/android/res/values/string-arrays.xml
@@ -24,24 +24,21 @@
     <item>@string/theme_auto</item>
   </string-array>
 
-  <string-array name="track_lengths">
+  <string-array name="track_length">
+    <item>@string/duration_disabled</item>
     <item>@string/duration_1_hour</item>
     <item>@string/duration_2_hours</item>
     <item>@string/duration_6_hours</item>
     <item>@string/duration_12_hours</item>
     <item>@string/duration_1_day</item>
-    <!-- TODO: Remove in release -->
-    <item>2 days</item>
   </string-array>
 
-  <string-array name="track_lengths_values"
-                translatable="false">
+  <string-array name="track_length_values">
+    <item>0</item>
     <item>1</item>
     <item>2</item>
     <item>6</item>
     <item>12</item>
     <item>24</item>
-    <!-- TODO: Remove in release -->
-    <item>48</item>
   </string-array>
 </resources>
\ No newline at end of file
diff --git a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
index 58e26a4262..2b269c41f4 100644
--- a/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
+++ b/android/src/com/mapswithme/maps/settings/MapPrefsFragment.java
@@ -106,9 +106,11 @@ public class MapPrefsFragment extends BaseXmlSettingsFragment
       }
     });
 
-    pref = findPreference(getString(R.string.pref_map_style));
-    ((ListPreference) pref).setValue(Config.getUiThemeSettings());
-    pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+    String curTheme = Config.getUiThemeSettings();
+    ListPreference stylePref = (ListPreference)findPreference(getString(R.string.pref_map_style));
+    stylePref.setValue(curTheme);
+    stylePref.setSummary(stylePref.getEntry());
+    stylePref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
     {
       @Override
       public boolean onPreferenceChange(Preference preference, Object newValue)
@@ -154,34 +156,27 @@ public class MapPrefsFragment extends BaseXmlSettingsFragment
     else
       getPreferenceScreen().removePreference(pref);
 
-    pref = findPreference(getString(R.string.pref_track_record_enabled));
-    ((TwoStatePreference)pref).setChecked(TrackRecorder.isEnabled());
-    pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
-    {
-      @Override
-      public boolean onPreferenceChange(Preference preference, Object newValue)
-      {
-        TrackRecorder.setEnabled((Boolean)newValue);
-        return true;
-      }
-    });
-
-    pref = findPreference(getString(R.string.pref_track_record_length));
-    String value = String.valueOf(TrackRecorder.getDuration());
-    ((ListPreference)pref).setValue(value);
-    pref.setSummary(((ListPreference)pref).getEntry());
-    pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
+    final ListPreference trackPref = (ListPreference)findPreference(getString(R.string.pref_track_record));
+    String value = (TrackRecorder.isEnabled() ? String.valueOf(TrackRecorder.getDuration()) : "0");
+    trackPref.setValue(value);
+    trackPref.setSummary(trackPref.getEntry());
+    trackPref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener()
     {
       @Override
       public boolean onPreferenceChange(final Preference preference, Object newValue)
       {
-        TrackRecorder.setDuration(Integer.valueOf((String)newValue));
+        int value = Integer.valueOf((String)newValue);
+        TrackRecorder.setEnabled(value != 0);
+
+        if (value != 0)
+          TrackRecorder.setDuration(value);
+
         UiThread.runLater(new Runnable()
         {
           @Override
           public void run()
           {
-            preference.setSummary(((ListPreference)preference).getEntry());
+            trackPref.setSummary(trackPref.getEntry());
           }
         });
         return true;