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

Use unit and gender enum directly

Browse Source
This commit is contained in:
Erik Johansson
2018-01-24 22:53:00 +01:00
parent c463efe521
commit 17887c8663
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
android_app/app/src/main/java/com/health/openscale/gui/activities/UserSettingsActivity.java
View File

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