mirror/openscale
1
0
Fork 0
mirror of https://github.com/oliexdev/openScale.git synced 2025-08-20 07:21:40 +02:00
Code Issues Releases Wiki Activity

Make activity level be a spinner

Browse Source 
See #266
This commit is contained in:
Erik Johansson
2018-05-20 21:32:11 +02:00
parent e13119aee3
commit 858495ab02
4 changed files with 23 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,7 @@ import android.view.View;
import android.widget.DatePicker;
import android.widget.EditText;
import android.widget.RadioGroup;
import android.widget.Spinner;
import android.widget.Toast;
import com.health.openscale.R;
@@ -63,7 +64,7 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
private RadioGroup radioScaleUnit;
private RadioGroup radioGender;
private RadioGroup radioMeasurementUnit;
private RadioGroup radioActivityLevel;
private Spinner spinnerActivityLevel;
private final DateFormat dateFormat = DateFormat.getDateInstance();
@@ -87,7 +88,7 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
radioScaleUnit = findViewById(R.id.groupScaleUnit);
radioGender = findViewById(R.id.groupGender);
radioMeasurementUnit = findViewById(R.id.groupMeasureUnit);
radioActivityLevel = findViewById(R.id.groupActivityLevel);
spinnerActivityLevel = findViewById(R.id.spinnerActivityLevel);
txtInitialWeight = findViewById(R.id.txtInitialWeight);
txtGoalWeight = findViewById(R.id.txtGoalWeight);
@@ -294,23 +295,7 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
break;
}
switch (scaleUser.getActivityLevel()) {
case SEDENTARY:
radioActivityLevel.check(R.id.btnRadioSedentary);
break;
case MILD:
radioActivityLevel.check(R.id.btnRadioMild);
break;
case MODERATE:
radioActivityLevel.check(R.id.btnRadioModerate);
break;
case HEAVY:
radioActivityLevel.check(R.id.btnRadioHeavy);
break;
case EXTREME:
radioActivityLevel.check(R.id.btnRadioExtreme);
break;
}
spinnerActivityLevel.setSelection(scaleUser.getActivityLevel().toInt());
}
private boolean validateInput()
@@ -456,26 +441,6 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
break;
}
Converters.ActivityLevel activity_level = Converters.ActivityLevel.SEDENTARY;
switch (radioActivityLevel.getCheckedRadioButtonId()) {
case R.id.btnRadioSedentary:
activity_level = Converters.ActivityLevel.SEDENTARY;
break;
case R.id.btnRadioMild:
activity_level = Converters.ActivityLevel.MILD;
break;
case R.id.btnRadioModerate:
activity_level = Converters.ActivityLevel.MODERATE;
break;
case R.id.btnRadioHeavy:
activity_level = Converters.ActivityLevel.HEAVY;
break;
case R.id.btnRadioExtreme:
activity_level = Converters.ActivityLevel.EXTREME;
break;
}
final ScaleUser scaleUser = new ScaleUser();
scaleUser.setUserName(name);
@@ -483,7 +448,8 @@ public class UserSettingsActivity extends BaseAppCompatActivity {
scaleUser.setBodyHeight(Converters.toCentimeter(body_height, measure_unit));
scaleUser.setScaleUnit(scale_unit);
scaleUser.setMeasureUnit(measure_unit);
scaleUser.setActivityLevel(activity_level);
scaleUser.setActivityLevel(Converters.fromActivityLevelInt(
spinnerActivityLevel.getSelectedItemPosition()));
scaleUser.setGender(gender);
scaleUser.setInitialWeight(Converters.toKilogram(initial_weight, scale_unit));
scaleUser.setGoalWeight(Converters.toKilogram(goal_weight, scale_unit));

40
android_app/app/src/main/res/layout/activity_usersettings.xml
View File

@@ -180,45 +180,11 @@
android:layout_gravity="center_vertical"
android:text="@string/label_activity_level" />
<RadioGroup
<Spinner
android:id="@+id/spinnerActivityLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_column="1"
android:orientation="horizontal"
android:id="@+id/groupActivityLevel">
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
android:id="@+id/btnRadioSedentary"
android:checked="true" />
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="1"
android:id="@+id/btnRadioMild" />
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2"
android:id="@+id/btnRadioModerate" />
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="3"
android:id="@+id/btnRadioHeavy" />
<RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="4"
android:id="@+id/btnRadioExtreme" />
</RadioGroup>
android:entries="@array/activity_level_entries" />
</TableRow>
<TableRow

9
android_app/app/src/main/res/values/arrays.xml
View File

@@ -58,4 +58,13 @@
<item>Light</item>
<item>Dark</item>
</string-array>
<string-array name="activity_level_entries">
<item>@string/activity_level_sedentary</item>
<item>@string/activity_level_mild</item>
<item>@string/activity_level_moderate</item>
<item>@string/activity_level_heavy</item>
<item>@string/activity_level_extreme</item>
</string-array>
</resources>

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

@@ -237,4 +237,9 @@
<string name="label_caliper3_female">Hip skinfold</string>
<string name="label_measure_unit">Measurement unit</string>
<string name="label_activity_level">Activity level</string>
<string name="activity_level_sedentary">Sedentary</string>
<string name="activity_level_mild">Mild</string>
<string name="activity_level_moderate">Moderate</string>
<string name="activity_level_heavy">Heavy</string>
<string name="activity_level_extreme">Extreme</string>
</resources>