From a2354e57254c31efd40477d307d62bdd93b919f6 Mon Sep 17 00:00:00 2001 From: jannis Date: Wed, 4 Dec 2019 21:58:36 +0100 Subject: [PATCH] #26 Imperial weight isn't calculated correctly --- .../java/de/tadris/fitness/activity/SettingsActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/de/tadris/fitness/activity/SettingsActivity.java b/app/src/main/java/de/tadris/fitness/activity/SettingsActivity.java index 567789d..1537f5f 100644 --- a/app/src/main/java/de/tadris/fitness/activity/SettingsActivity.java +++ b/app/src/main/java/de/tadris/fitness/activity/SettingsActivity.java @@ -270,6 +270,8 @@ public class SettingsActivity extends PreferenceActivity { } private boolean showWeightPicker() { + UnitUtils.setUnit(this); // Maybe the user changed unit system + final AlertDialog.Builder d = new AlertDialog.Builder(this); final SharedPreferences preferences= PreferenceManager.getDefaultSharedPreferences(this); d.setTitle(getString(R.string.pref_weight)); @@ -278,7 +280,7 @@ public class SettingsActivity extends PreferenceActivity { np.setMaxValue((int) UnitUtils.CHOSEN_SYSTEM.getWeightFromKilogram(150)); np.setMinValue((int) UnitUtils.CHOSEN_SYSTEM.getWeightFromKilogram(20)); np.setFormatter(value -> value + " " + UnitUtils.CHOSEN_SYSTEM.getWeightUnit()); - np.setValue(preferences.getInt("weight", 80)); + np.setValue((int)Math.round(UnitUtils.CHOSEN_SYSTEM.getWeightFromKilogram(preferences.getInt("weight", 80)))); np.setWrapSelectorWheel(false); d.setView(v);