From f00c2deb1f4f75c7a8e075f9828314debaa17dcf Mon Sep 17 00:00:00 2001
From: Chet Henry <henry@visionlink.org>
Date: Sun, 30 Nov 2014 21:55:08 -0700
Subject: [PATCH] Allow user to display imperial units

---
 contrib/RideLogger/res/values/strings.xml     |  4 +
 .../RideLogger/res/xml/sensors_settings.xml   |  6 ++
 .../com/ridelogger/CurrentValuesAdapter.java  | 93 +++++++++++++++++--
 3 files changed, 95 insertions(+), 8 deletions(-)

diff --git a/contrib/RideLogger/res/values/strings.xml b/contrib/RideLogger/res/values/strings.xml
index 443fd0762..7d14feafc 100644
--- a/contrib/RideLogger/res/values/strings.xml
+++ b/contrib/RideLogger/res/values/strings.xml
@@ -75,6 +75,9 @@
     <string name="setting_sensors_title">Display Sensors</string>
     <string name="setting_sensors_note">List of Sensors Display</string>
     
+    <string name="imperial_units_title">Imperial Units</string>
+    <string name="imperial_units_note">Show Measurements in Imperial Units</string>
+    
     <string name="setting_size_title">Display Text Size</string>
     
     <string name="PREFS_NAME">RideLogger</string>      
@@ -86,5 +89,6 @@
     <string name="PREF_PHONE_HOME_PERIOD">PhoneHomePeriod</string>
     <string name="PREF_TRACKING_SENSORS">TrackingSensors</string>
     <string name="PREF_TRACKING_SIZE">TrackingSize</string>
+    <string name="PREF_TRACKING_IMPERIAL_UNITS">TrackingImperialUnits</string>
     
 </resources>
diff --git a/contrib/RideLogger/res/xml/sensors_settings.xml b/contrib/RideLogger/res/xml/sensors_settings.xml
index 10342c463..4f70fdd6e 100644
--- a/contrib/RideLogger/res/xml/sensors_settings.xml
+++ b/contrib/RideLogger/res/xml/sensors_settings.xml
@@ -8,6 +8,12 @@
             android:title="@string/setting_sensors_title"
             android:summary="@string/setting_sensors_note"
             />
+        <CheckBoxPreference 
+            android:key="@string/PREF_TRACKING_IMPERIAL_UNITS"
+            android:title="@string/imperial_units_title"
+            android:summary="@string/imperial_units_note"
+            />
+        
         <EditTextPreference 
             android:key="@string/PREF_TRACKING_SIZE"
             android:title="@string/setting_size_title"
diff --git a/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java b/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java
index 2afc0588e..bcb27adf0 100644
--- a/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java
+++ b/contrib/RideLogger/src/com/ridelogger/CurrentValuesAdapter.java
@@ -13,13 +13,15 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 public class CurrentValuesAdapter extends BaseAdapter {
-    public StartActivity  context;
-    public int            count     = 0;
-    public int[]          keys;
-    public TextView[]     keyTvs    = new TextView[RideService.TOTALSENSORS];
-    public TextView[]     valuesTvs = new TextView[RideService.TOTALSENSORS];
+    public StartActivity    context;
+    
+    public int[]            keys;
+    public TextView[]       keyTvs    = new TextView[RideService.TOTALSENSORS];
+    public TextView[]       valuesTvs = new TextView[RideService.TOTALSENSORS];
     public RelativeLayout[] lls       = new RelativeLayout[RideService.TOTALSENSORS];
-    public int            size      = 20;
+    public int              size      = 20;
+    public boolean          imperial  = false;
+    public int              count     = 0;
     public static SharedPreferences.OnSharedPreferenceChangeListener spChanged;
 
     public CurrentValuesAdapter(StartActivity c) {
@@ -27,6 +29,8 @@ public class CurrentValuesAdapter extends BaseAdapter {
         SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
         Set<String> sensors        = settings.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null);
         size                       = Integer.valueOf(settings.getString(context.getString(R.string.PREF_TRACKING_SIZE), "20"));
+        imperial                   = settings.getBoolean(context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS), false);
+        
         
         if(sensors != null && sensors.size() > 0) {
             keys = new int[sensors.size()];
@@ -55,6 +59,7 @@ public class CurrentValuesAdapter extends BaseAdapter {
                             valuesTvs[key].setTextSize(TypedValue.COMPLEX_UNIT_SP, size);
                             keyTvs[key].setTextSize(TypedValue.COMPLEX_UNIT_SP, (int) (size * 0.75));
                         }
+                        notifyDataSetChanged();
                     } else if (pkey == context.getString(R.string.PREF_TRACKING_SENSORS)) {
                         Set<String> sensors = sharedPreferences.getStringSet(context.getString(R.string.PREF_TRACKING_SENSORS), null);
                         keys = new int[sensors.size()];
@@ -66,6 +71,36 @@ public class CurrentValuesAdapter extends BaseAdapter {
                         }
                         
                         context.layout.setAdapter(CurrentValuesAdapter.this);
+                    } else if (pkey == context.getString(R.string.PREF_TRACKING_IMPERIAL_UNITS)) {
+                        imperial = sharedPreferences.getBoolean(pkey, false);
+                        
+                        if(!imperial) {
+                            for(int key : keys) {
+                                keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
+                            }
+                        } else {
+                            for(int key : keys) {
+                                switch (key) {
+                                    case RideService.ALTITUDE:
+                                        keyTvs[key].setText("ft");
+                                        break;
+                                        
+                                    case RideService.KPH:
+                                        keyTvs[key].setText("mph");
+                                        break;
+                                        
+                                    case RideService.KM:
+                                        keyTvs[key].setText("m");
+                                        break;
+                        
+                                    default:
+                                        keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
+                                        break;
+                                }
+                            }
+                        }
+                        
+                        notifyDataSetChanged();
                     }
                 }
             }
@@ -112,7 +147,29 @@ public class CurrentValuesAdapter extends BaseAdapter {
         keyTvs[key] = new TextView(context);
         
         keyTvs[key].setTextSize(TypedValue.COMPLEX_UNIT_SP, (int) (size * 0.55));
-        keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
+        
+        
+        if(!imperial) {
+            keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
+        } else {
+            switch (key) {
+                case RideService.ALTITUDE:
+                    keyTvs[key].setText("ft");
+                    break;
+                    
+                case RideService.KPH:
+                    keyTvs[key].setText("mph");
+                    break;
+                    
+                case RideService.KM:
+                    keyTvs[key].setText("miles");
+                    break;
+    
+                default:
+                    keyTvs[key].setText(RideService.KEYS[key].toString().toLowerCase());
+                    break;
+            }
+        }
     }
     
     
@@ -146,7 +203,27 @@ public class CurrentValuesAdapter extends BaseAdapter {
     
     public void update(float[] values) {
         for (int key: keys) {
-            valuesTvs[key].setText(String.format("%.2f", values[key]));
+            if(!imperial) {
+                valuesTvs[key].setText(String.format("%.2f", values[key]));
+            } else {
+                switch (key) {
+                    case RideService.ALTITUDE:
+                        valuesTvs[key].setText(String.format("%.2f", values[key] * 3.28084));
+                        break;
+                    
+                    case RideService.KPH:
+                        valuesTvs[key].setText(String.format("%.2f", values[key] * 0.621371));
+                        break;
+
+                    case RideService.KM:
+                        valuesTvs[key].setText(String.format("%.2f", values[key] * 0.621371));
+                        break;
+        
+                    default:
+                        valuesTvs[key].setText(String.format("%.2f", values[key]));
+                        break;
+                }
+            }
         }
         
         notifyDataSetChanged();