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 ac99cc9a..d434617a 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 @@ -29,6 +29,7 @@ import android.widget.Button; import android.widget.DatePicker; import android.widget.EditText; import android.widget.RadioGroup; +import android.widget.Toast; import com.health.openscale.R; import com.health.openscale.core.OpenScale; @@ -253,67 +254,68 @@ public class UserSettingsActivity extends Activity { private class onClickListenerOk implements View.OnClickListener { @Override public void onClick(View v) { - if (validateInput()) - { - OpenScale openScale = OpenScale.getInstance(getApplicationContext()); + try { + if (validateInput()) { + OpenScale openScale = OpenScale.getInstance(getApplicationContext()); - String name = txtUserName.getText().toString(); - int body_height = Integer.valueOf(txtBodyHeight.getText().toString()); - int checkedRadioButtonId = radioScaleUnit.getCheckedRadioButtonId(); - int checkedGenderId = radioGender.getCheckedRadioButtonId(); - float initial_weight = Float.valueOf(txtInitialWeight.getText().toString()); - float goal_weight = Float.valueOf(txtGoalWeight.getText().toString()); + String name = txtUserName.getText().toString(); + int body_height = Integer.valueOf(txtBodyHeight.getText().toString()); + int checkedRadioButtonId = radioScaleUnit.getCheckedRadioButtonId(); + int checkedGenderId = radioGender.getCheckedRadioButtonId(); + float initial_weight = Float.valueOf(txtInitialWeight.getText().toString()); + float goal_weight = Float.valueOf(txtGoalWeight.getText().toString()); - int scale_unit = -1; + int scale_unit = -1; - switch (checkedRadioButtonId) { - case R.id.btnRadioKG: - scale_unit = 0; - break; - case R.id.btnRadioLB: - scale_unit = 1; - break; - case R.id.btnRadioST: - scale_unit = 2; - break; + switch (checkedRadioButtonId) { + case R.id.btnRadioKG: + scale_unit = 0; + break; + case R.id.btnRadioLB: + scale_unit = 1; + break; + case R.id.btnRadioST: + scale_unit = 2; + break; + } + + int gender = -1; + + switch (checkedGenderId) { + case R.id.btnRadioMale: + gender = 0; + break; + case R.id.btnRadioWoman: + gender = 1; + break; + } + + String date = txtBirthday.getText().toString(); + String goal_date = txtGoalDate.getText().toString(); + + int id = 0; + + if (getIntent().getExtras().getInt("mode") == EDIT_USER_REQUEST) { + id = getIntent().getExtras().getInt("id"); + openScale.updateScaleUser(id, name, date, body_height, scale_unit, gender, initial_weight, goal_weight, goal_date); + } else { + openScale.addScaleUser(name, date, body_height, scale_unit, gender, initial_weight, goal_weight, goal_date); + + id = openScale.getScaleUserList().get(openScale.getScaleUserList().size() - 1).id; + } + + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + prefs.edit().putInt("selectedUserId", id).commit(); + + openScale.updateScaleData(); + + Intent returnIntent = new Intent(); + setResult(RESULT_OK, returnIntent); + + finish(); } - - int gender = -1; - - switch (checkedGenderId) { - case R.id.btnRadioMale: - gender = 0; - break; - case R.id.btnRadioWoman: - gender = 1; - break; - } - - String date = txtBirthday.getText().toString(); - String goal_date = txtGoalDate.getText().toString(); - - int id = 0; - - if (getIntent().getExtras().getInt("mode") == EDIT_USER_REQUEST) - { - id = getIntent().getExtras().getInt("id"); - openScale.updateScaleUser(id, name, date, body_height, scale_unit, gender, initial_weight, goal_weight, goal_date); - } else - { - openScale.addScaleUser(name, date, body_height, scale_unit, gender, initial_weight, goal_weight, goal_date); - - id = openScale.getScaleUserList().get(openScale.getScaleUserList().size() - 1).id; - } - - SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - prefs.edit().putInt("selectedUserId", id).commit(); - - openScale.updateScaleData(); - - Intent returnIntent = new Intent(); - setResult(RESULT_OK, returnIntent); - - finish(); + } catch (NumberFormatException ex) { + Toast.makeText(context, getResources().getString(R.string.error_value_range) + "(" + ex.getMessage() + ")", Toast.LENGTH_SHORT).show(); } } } diff --git a/android_app/app/src/main/res/drawable-hdpi/ic_lbw.png b/android_app/app/src/main/res/drawable-hdpi/ic_lbw.png new file mode 100644 index 00000000..6e19b30c Binary files /dev/null and b/android_app/app/src/main/res/drawable-hdpi/ic_lbw.png differ diff --git a/android_app/app/src/main/res/drawable-ldpi/ic_lbw.png b/android_app/app/src/main/res/drawable-ldpi/ic_lbw.png new file mode 100644 index 00000000..e6726f21 Binary files /dev/null and b/android_app/app/src/main/res/drawable-ldpi/ic_lbw.png differ diff --git a/android_app/app/src/main/res/drawable-mdpi/ic_lbw.png b/android_app/app/src/main/res/drawable-mdpi/ic_lbw.png new file mode 100644 index 00000000..3cd3ef1a Binary files /dev/null and b/android_app/app/src/main/res/drawable-mdpi/ic_lbw.png differ diff --git a/android_app/app/src/main/res/drawable-xhdpi/ic_lbw.png b/android_app/app/src/main/res/drawable-xhdpi/ic_lbw.png new file mode 100644 index 00000000..0d21f723 Binary files /dev/null and b/android_app/app/src/main/res/drawable-xhdpi/ic_lbw.png differ diff --git a/android_app/app/src/main/res/drawable-xxhdpi/ic_lbw.png b/android_app/app/src/main/res/drawable-xxhdpi/ic_lbw.png new file mode 100644 index 00000000..ce567700 Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxhdpi/ic_lbw.png differ diff --git a/android_app/app/src/main/res/drawable-xxxhdpi/ic_lbw.png b/android_app/app/src/main/res/drawable-xxxhdpi/ic_lbw.png new file mode 100644 index 00000000..3d12dbd5 Binary files /dev/null and b/android_app/app/src/main/res/drawable-xxxhdpi/ic_lbw.png differ