mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-22 16:23:09 +02:00
Code Issues Releases Wiki Activity

display a short message for hip/waist circumference

Browse Source
This commit is contained in:
OliE
2015-08-09 15:29:47 +02:00
parent 436396659c
commit 8c714d80f9
4 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
android_app/app/src/main/java/com/health/openscale/gui/OverviewFragment.java
View File

@@ -104,7 +104,7 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
private Spinner spinUser; private Spinner spinUser;
private enum lines {WEIGHT, FAT, WATER, MUSCLE} private enum lines {WEIGHT, FAT, WATER, MUSCLE, WAIST, HIP}
private ArrayList<lines> activeLines; private ArrayList<lines> activeLines;
private SharedPreferences prefs; private SharedPreferences prefs;
@@ -557,10 +557,13 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
if(prefs.getBoolean("waistEnable", true)) { if(prefs.getBoolean("waistEnable", true)) {
lines.add(lineWaist); lines.add(lineWaist);
activeLines.add(OverviewFragment.lines.WAIST);
} }
if(prefs.getBoolean("hipEnable", true)) { if(prefs.getBoolean("hipEnable", true)) {
lines.add(lineHip); lines.add(lineHip);
activeLines.add(OverviewFragment.lines.HIP);
} }
LineChartData lineData = new LineChartData(lines); LineChartData lineData = new LineChartData(lines);
@@ -709,6 +712,14 @@ public class OverviewFragment extends Fragment implements FragmentUpdateListener
case MUSCLE: 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(); 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; 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;
} }
} }

2
android_app/app/src/main/res/values-de/strings.xml
View File

@@ -91,4 +91,6 @@
<string name="info_is_enable">ist eingeschaltet</string> <string name="info_is_enable">ist eingeschaltet</string>
<string name="label_waist">Bauchumfang</string> <string name="label_waist">Bauchumfang</string>
<string name="label_hip">Hüftumfang</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> </resources>

2
android_app/app/src/main/res/values-ja/strings.xml
View File

@@ -91,4 +91,6 @@
<string name="error_waist_value_required">胴囲が必要です</string> <string name="error_waist_value_required">胴囲が必要です</string>
<string name="label_waist">胴囲</string> <string name="label_waist">胴囲</string>
<string name="label_hip">腰囲</string> <string name="label_hip">腰囲</string>
<string name="info_your_waist">あなたは胴囲が</string>
<string name="info_your_hip">あなたは腰囲が</string>
</resources> </resources>

2
android_app/app/src/main/res/values/strings.xml
View File

@@ -105,5 +105,7 @@
<string name="info_your_fat">Your body fat was</string> <string name="info_your_fat">Your body fat was</string>
<string name="info_your_water">Your water percentage 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_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> <string name="info_on_date">on</string>
</resources> </resources>