From 2740f699e803b8e5c3d1a43fd4a8f13308848a61 Mon Sep 17 00:00:00 2001
From: Lukas Zielinski <lukas@lukaszielinski.de>
Date: Mon, 19 Jan 2015 16:24:09 +0100
Subject: [PATCH] TRACKING APP: fixes for preferences, course over ground
 display, strings updated

---
 .../res/layout-land/fragment_speed.xml         |  2 +-
 .../res/layout/fragment_speed.xml              |  2 +-
 .../res/values-de/preferences.xml              |  8 ++++----
 .../res/values-de/strings.xml                  |  1 +
 .../res/values/preferences.xml                 | 10 +++++-----
 .../res/values/strings.xml                     |  1 +
 .../res/xml/preference_general.xml             | 10 +++++-----
 .../preference/GeneralPreferenceFragment.java  | 18 ++++++++++++++++--
 .../tracking/app/utils/AppPreferences.java     | 12 ++++++++++--
 9 files changed, 44 insertions(+), 20 deletions(-)

diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
index 940552b2cbb..fff13903128 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_speed.xml
@@ -12,7 +12,7 @@
         android:id="@+id/speed_header_text_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sog"
+        android:text="@string/speed_over_ground"
         android:textColor="@android:color/darker_gray"
         android:textSize="14sp"
         android:paddingLeft="10dp"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
index 1602ea5b2fe..cb7defda5de 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_speed.xml
@@ -10,7 +10,7 @@
         android:id="@+id/speed_header_text_view"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:text="@string/sog"
+        android:text="@string/speed_over_ground"
         android:textColor="@android:color/darker_gray"
         android:textSize="14sp"
         android:paddingLeft="10dp"
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/preferences.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/preferences.xml
index ad12738f3ef..f137d2cb89f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/preferences.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/preferences.xml
@@ -6,10 +6,10 @@
     <string name="preference_energy_saving_is_disabled">Aus</string>
     <string name="prefrence_energy_saving_summary_is_enabled">GPS Updates werden alle 30 Sekunden verschickt.</string>
     <string name="prefrence_energy_saving_summary_is_disabled">GPS Updates werden alle 3 Sekunden verschickt.</string>
-    <string name="preference_heading_with_declination_subtracted_key_is_enabled">Ein</string>
-    <string name="preference_heading_with_declination_subtracted_key_is_disabled">Aus</string>
-    <string name="preference_heading_with_declination_subtracted_key_summary_is_enabled">Anzeige: Magnetkompasskurs ohne Ablenkung</string>
-    <string name="preference_heading_with_declination_subtracted_key_summary_is_disabled">Anzeige: Magnetkompasskurs mit Ablenkung</string>
+    <string name="preference_heading_with_declination_subtracted_is_enabled">Ein</string>
+    <string name="preference_heading_with_declination_subtracted_is_disabled">Aus</string>
+    <string name="preference_heading_with_declination_subtracted_summary_is_enabled">Anzeige: Ablenkung abziehen</string>
+    <string name="preference_heading_with_declination_subtracted_summary_is_disabled">Anzeige: Course over Ground</string>
     <string name="preference_heading_with_declination_subtracted_enabled">Richtung</string>
     
     
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
index d104433dc10..d124bdcfd26 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values-de/strings.xml
@@ -108,6 +108,7 @@
 	<string name="hud_speed_over_ground_prefix">SPD: </string>
 	<string name="heading">Kurs</string>
 	<string name="course_over_ground">Course over Ground</string>
+    <string name="speed_over_ground">Speed over Ground</string>
 	<string name="sog">SOG</string>
 	<string name="none">Keine</string>
 	<string name="show_leaderboard">Leaderboard</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
index 2056e0a2f2b..08a0d664cc8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/preferences.xml
@@ -10,7 +10,7 @@
     <string name="preference_server_url_default">http://95.85.58.11:8000</string>
     
     <string name="preference_energy_saving_enabled_key">preferenceEnergySavingEnabled</string>
-    <string name="preference_heading_with_declination_subtracted">preferenceHeadingWithDeclinationSubtracted</string>
+    <string name="preference_heading_with_declination_subtracted_key">preferenceHeadingWithDeclinationSubtracted</string>
     
     <string name="settings_category_energy_saving">Battery Saving</string>
     <string name="energy_saving_enabled">Save Energy</string>
@@ -29,9 +29,9 @@
     <string name="preference_tracker_is_tracking_checkin_digest">trackerIsTrackingCheckinDigest</string>
     <string name="preference_last_scanned_qr_code">lastScannedQRCode</string>
 
-    <string name="preference_heading_with_declination_subtracted_key_is_enabled">On</string>
-    <string name="preference_heading_with_declination_subtracted_key_is_disabled">Off</string>
-    <string name="preference_heading_with_declination_subtracted_key_summary_is_enabled">Display: Course without declination</string>
-    <string name="preference_heading_with_declination_subtracted_key_summary_is_disabled">Display: Course with declination</string>
+    <string name="preference_heading_with_declination_subtracted_is_enabled">On</string>
+    <string name="preference_heading_with_declination_subtracted_is_disabled">Off</string>
+    <string name="preference_heading_with_declination_subtracted_summary_is_enabled">Display: Subtract declination</string>
+    <string name="preference_heading_with_declination_subtracted_summary_is_disabled">Display: Course over ground</string>
     <string name="preference_heading_with_declination_subtracted_enabled">Heading</string>
 </resources>
\ No newline at end of file
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
index 83642f70d25..fe898f2427c 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/values/strings.xml
@@ -67,6 +67,7 @@
 	<string name="regatta_in_progress">The regatta is in progress.</string>
 	<string name="heading">Heading</string>
 	<string name="course_over_ground">Course over Ground</string>
+    <string name="speed_over_ground">Speed over Ground</string>
 	<string name="sog">Speed over Ground</string>
 	<string name="none">None</string>
 	<string name="show_leaderboard">Leader board</string>
diff --git a/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_general.xml b/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_general.xml
index 673f06714aa..747f29c33b8 100644
--- a/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_general.xml
+++ b/mobile/com.sap.sailing.android.tracking.app/res/xml/preference_general.xml
@@ -23,11 +23,11 @@
         
          <SwitchPreference
             android:defaultValue="true"
-            android:key="@string/preference_heading_with_declination_subtracted"
-            android:switchTextOn="@string/preference_heading_with_declination_subtracted_key_is_enabled"
-            android:switchTextOff="@string/preference_heading_with_declination_subtracted_key_is_disabled"
-            android:summaryOn="@string/preference_heading_with_declination_subtracted_key_summary_is_enabled"
-            android:summaryOff="@string/preference_heading_with_declination_subtracted_key_summary_is_disabled"
+            android:key="@string/preference_heading_with_declination_subtracted_key"
+            android:switchTextOn="@string/preference_heading_with_declination_subtracted_is_enabled"
+            android:switchTextOff="@string/preference_heading_with_declination_subtracted_is_disabled"
+            android:summaryOn="@string/preference_heading_with_declination_subtracted_summary_is_enabled"
+            android:summaryOff="@string/preference_heading_with_declination_subtracted_summary_is_disabled"
             android:title="@string/preference_heading_with_declination_subtracted_enabled" />
     </PreferenceCategory>
     
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
index 9635fadfc94..21c1d8dcdfd 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/preference/GeneralPreferenceFragment.java
@@ -3,7 +3,9 @@ package com.sap.sailing.android.tracking.app.ui.fragments.preference;
 
 import android.os.Bundle;
 import android.preference.Preference;
+import android.preference.SwitchPreference;
 
+import com.sap.sailing.android.shared.logging.ExLog;
 import com.sap.sailing.android.shared.ui.fragments.preference.BasePreferenceFragment;
 import com.sap.sailing.android.tracking.app.R;
 import com.sap.sailing.android.tracking.app.utils.AppPreferences;
@@ -15,7 +17,7 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         addPreferencesFromResource(R.xml.preference_general);
-        
+
         AppPreferences prefs = new AppPreferences(getActivity());
         String currentDeviceId = prefs.getDeviceIdentifier();
         
@@ -33,5 +35,17 @@ public class GeneralPreferenceFragment extends BasePreferenceFragment {
         	deviceIdPreference.setSummary(newDeviceId);
         }
     }
- 
+
+    @Override
+    public void onPause() {
+        super.onPause();
+
+        SwitchPreference prefEnergy = (SwitchPreference)findPreference(R.string.preference_energy_saving_enabled_key);
+        SwitchPreference prefDeclination = (SwitchPreference)findPreference(R.string.preference_heading_with_declination_subtracted_key);
+
+        AppPreferences prefs = new AppPreferences(getActivity());
+
+        prefs.setEnergySavingEnabledByUser(prefEnergy.isChecked());
+        prefs.setDisplayHeadingWithSubtractedDeclination(prefDeclination.isChecked());
+    }
 }
diff --git a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
index 71aba81d0e5..a3ae92ed27f 100644
--- a/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
+++ b/mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/utils/AppPreferences.java
@@ -91,13 +91,21 @@ public class AppPreferences {
     public void setCompetitorId(String id) {
         preferences.edit().putString(context.getString(R.string.preference_competitor_key), id).commit();
     }
+
+    public void setEnergySavingEnabledByUser(boolean newValue) {
+        preferences.edit().putBoolean(context.getString(R.string.preference_energy_saving_enabled_key), newValue).commit();
+    }
     
     public boolean getEnergySavingEnabledByUser() {
     	return preferences.getBoolean(context.getString(R.string.preference_energy_saving_enabled_key), false);
     }
+
+    public void setDisplayHeadingWithSubtractedDeclination(boolean newValue) {
+        preferences.edit().putBoolean(context.getString(R.string.preference_heading_with_declination_subtracted_key), newValue).commit();
+    }
     
     public boolean getDisplayHeadingWithSubtractedDeclination() {
-    	return preferences.getBoolean(context.getString(R.string.preference_heading_with_declination_subtracted_enabled), true);
+    	return preferences.getBoolean(context.getString(R.string.preference_heading_with_declination_subtracted_key), true);
     }
     
     public void setTrackingTimerStarted(long milliseconds)
@@ -149,4 +157,4 @@ public class AppPreferences {
     {
     	preferences.edit().putInt(context.getString(R.string.preference_messageResendIntervalMillis_key), interval).commit();
     }
-}
+}
\ No newline at end of file