From 17887c8663eb06c3713ca7f9b18ea6c13adba5c5 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Wed, 24 Jan 2018 22:53:00 +0100
Subject: [PATCH] Use unit and gender enum directly

---
 .../gui/activities/UserSettingsActivity.java  | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
index 80465764..9dc4b49d 100644
--- a/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
+++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
@@ -280,54 +280,52 @@ public class UserSettingsActivity extends Activity {
                     float initial_weight = Float.valueOf(txtInitialWeight.getText().toString());
                     float goal_weight = Float.valueOf(txtGoalWeight.getText().toString());
 
-                    int scale_unit = -1;
+                    Converters.WeightUnit scale_unit = Converters.WeightUnit.KG;
 
                     switch (checkedRadioButtonId) {
                         case R.id.btnRadioKG:
-                            scale_unit = 0;
+                            scale_unit = Converters.WeightUnit.KG;
                             break;
                         case R.id.btnRadioLB:
-                            scale_unit = 1;
+                            scale_unit = Converters.WeightUnit.LB;
                             break;
                         case R.id.btnRadioST:
-                            scale_unit = 2;
+                            scale_unit = Converters.WeightUnit.ST;
                             break;
                     }
 
-                    int gender = -1;
+                    Converters.Gender gender = Converters.Gender.MALE;
 
                     switch (checkedGenderId) {
                         case R.id.btnRadioMale:
-                            gender = 0;
+                            gender = Converters.Gender.MALE;
                             break;
                         case R.id.btnRadioWoman:
-                            gender = 1;
+                            gender = Converters.Gender.FEMALE;
                             break;
                     }
 
-                    int id = 0;
-
                     final ScaleUser scaleUser = new ScaleUser();
 
                     scaleUser.setUserName(name);
                     scaleUser.setBirthday(birthday);
                     scaleUser.setBodyHeight(body_height);
-                    scaleUser.setScaleUnit(Converters.fromWeightUnitInt(scale_unit));
-                    scaleUser.setGender(Converters.fromGenderInt(gender));
+                    scaleUser.setScaleUnit(scale_unit);
+                    scaleUser.setGender(gender);
                     scaleUser.setConvertedInitialWeight(initial_weight);
                     scaleUser.setGoalWeight(goal_weight);
                     scaleUser.setGoalDate(goal_date);
 
                     if (getIntent().getExtras().getInt("mode") == EDIT_USER_REQUEST) {
-                        id = getIntent().getExtras().getInt("id");
+                        int id = getIntent().getExtras().getInt("id");
                         scaleUser.setId(id);
                         openScale.updateScaleUser(scaleUser);
                     } else {
-                        id = openScale.addScaleUser(scaleUser);
+                        int id = openScale.addScaleUser(scaleUser);
+                        scaleUser.setId(id);
                     }
 
-                    openScale.selectScaleUser(id);
-
+                    openScale.selectScaleUser(scaleUser.getId());
                     openScale.updateScaleData();
 
                     Intent returnIntent = new Intent();