From 8c714d80f9e126fff2842923cdd55f4071b97686 Mon Sep 17 00:00:00 2001
From: OliE <olie.xdev@googlemail.com>
Date: Sun, 9 Aug 2015 15:29:47 +0200
Subject: [PATCH] display a short message for hip/waist circumference

---
 .../com/health/openscale/gui/OverviewFragment.java  | 13 ++++++++++++-
 android_app/app/src/main/res/values-de/strings.xml  |  2 ++
 android_app/app/src/main/res/values-ja/strings.xml  |  2 ++
 android_app/app/src/main/res/values/strings.xml     |  2 ++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
index 1c5e27cc..402207b5 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
@@ -104,7 +104,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
 
     private Spinner spinUser;
 
-    private enum lines {WEIGHT, FAT, WATER, MUSCLE}
+    private enum lines {WEIGHT, FAT, WATER, MUSCLE, WAIST, HIP}
     private ArrayList<lines> activeLines;
 
     private SharedPreferences prefs;
@@ -557,10 +557,13 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
 
         if(prefs.getBoolean("waistEnable", true)) {
             lines.add(lineWaist);
+            activeLines.add(OverviewFragment.lines.WAIST);
+
         }
 
         if(prefs.getBoolean("hipEnable", true)) {
             lines.add(lineHip);
+            activeLines.add(OverviewFragment.lines.HIP);
         }
 
         LineChartData lineData = new LineChartData(lines);
@@ -709,6 +712,14 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
                 case MUSCLE:
                     Toast.makeText(getActivity(), getResources().getString(R.string.info_your_muscle) + " " + scaleData.muscle + "% " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
                     break;
+                case WAIST:
+                    Toast.makeText(getActivity(), getResources().getString(R.string.info_your_waist) + " " + scaleData.waist + "cm " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
+                    break;
+                case HIP:
+                    Toast.makeText(getActivity(), getResources().getString(R.string.info_your_hip) + " " + scaleData.hip + "cm " + getResources().getString(R.string.info_on_date) + " " + date_time, Toast.LENGTH_SHORT).show();
+                    break;
+                default:
+                    break;
             }
         }
 
diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml
index 81b9a94e..688763ef 100644
--- a/android_app/app/src/main/res/values-de/strings.xml
+++ b/android_app/app/src/main/res/values-de/strings.xml
@@ -91,4 +91,6 @@
     <string name="info_is_enable">ist eingeschaltet</string>
     <string name="label_waist">Bauchumfang</string>
     <string name="label_hip">Hüftumfang</string>
+    <string name="info_your_hip">Dein Hüftumfang war</string>
+    <string name="info_your_waist">Dein Bauchumfang war</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml
index bb8f87a2..fbffe953 100644
--- a/android_app/app/src/main/res/values-ja/strings.xml
+++ b/android_app/app/src/main/res/values-ja/strings.xml
@@ -91,4 +91,6 @@
     <string name="error_waist_value_required">胴囲が必要です</string>
     <string name="label_waist">胴囲</string>
     <string name="label_hip">腰囲</string>
+    <string name="info_your_waist">あなたは胴囲が</string>
+    <string name="info_your_hip">あなたは腰囲が</string>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index 3b88d1be..326b45a1 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -105,5 +105,7 @@
     <string name="info_your_fat">Your body fat was</string>
     <string name="info_your_water">Your water percentage was</string>
     <string name="info_your_muscle">Your muscle percentage was</string>
+    <string name="info_your_waist">Your waist circumference was</string>
+    <string name="info_your_hip">Your hip circumference was</string>
     <string name="info_on_date">on</string>
 </resources>