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

Add some space to user settings layout

Browse Source 
Also reorder the fields a bit, putting birthday and activity level
earlier. The order is now: personal info, units, height and weight,
and finally goal.
This commit is contained in:
Erik Johansson
2018-05-20 22:43:47 +02:00
parent d0245adedb
commit 7b76d6dab7
2 changed files with 205 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android_app/app/src/androidTest/java/com/health/openscale/gui/UserAddTest.java
View File

@@ -139,7 +139,7 @@ public class UserAddTest {
allOf(withId(R.id.rowBodyHeight), allOf(withId(R.id.rowBodyHeight),
childAtPosition( childAtPosition(
withId(R.id.tableUserData), withId(R.id.tableUserData),
5)), 6)),
1))); 1)));
editText3.perform(scrollTo(), replaceText("180"), closeSoftKeyboard()); editText3.perform(scrollTo(), replaceText("180"), closeSoftKeyboard());

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

@@ -15,27 +15,21 @@
app:popupTheme="@style/ThemeOverlay.AppCompat.Light" /> app:popupTheme="@style/ThemeOverlay.AppCompat.Light" />
<ScrollView <ScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/scrollViewUserData" >
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content">
android:orientation="vertical"
android:padding="5dp" >
<TableLayout <TableLayout
android:id="@+id/tableUserData" android:id="@+id/tableUserData"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:measureWithLargestChild="true"
android:padding="5dp" android:padding="5dp"
android:stretchColumns="*"> android:stretchColumns="*">
<TableRow <TableRow
android:id="@+id/rowUserName" android:id="@+id/rowUserName"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblUserName" android:id="@+id/lblUserName"
@@ -45,7 +39,6 @@
<EditText <EditText
android:id="@+id/txtUserName" android:id="@+id/txtUserName"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="text" android:inputType="text"
@@ -53,61 +46,92 @@
<requestFocus /> <requestFocus />
</EditText> </EditText>
</TableRow>
<TableRow
android:id="@+id/rowBirthday"
android:layout_weight="1"
android:gravity="center_vertical">
<TextView
android:id="@+id/lblBirthday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:labelFor="@id/txtBirthday"
android:text="@string/label_birthday" />
<EditText
android:id="@+id/txtBirthday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:focusable="false"
android:inputType="date" />
</TableRow>
<TableRow
android:id="@+id/rowActivityLevel"
android:layout_weight="1"
android:gravity="center_vertical">
<TextView
android:id="@+id/lblActivityLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_activity_level" />
<Spinner
android:id="@+id/spinnerActivityLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/activity_level_entries" />
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/rowGender" android:id="@+id/rowGender"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblGender" android:id="@+id/lblGender"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_gender" /> android:text="@string/label_gender" />
<RadioGroup <RadioGroup
android:layout_width="wrap_content" android:id="@+id/groupGender"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_column="1" android:orientation="horizontal">
android:orientation="horizontal"
android:id="@+id/groupGender">
<RadioButton <RadioButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_male"
android:id="@+id/btnRadioMale" android:id="@+id/btnRadioMale"
android:checked="true" />
<RadioButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/label_female" android:checked="true"
android:id="@+id/btnRadioWoman" /> android:text="@string/label_male" />
<RadioButton
android:id="@+id/btnRadioWoman"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/label_female" />
</RadioGroup> </RadioGroup>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/rowMeasureUnit" android:id="@+id/rowMeasureUnit"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/measureUnit" android:id="@+id/measureUnit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_measure_unit" /> android:text="@string/label_measure_unit" />
<RadioGroup <RadioGroup
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_column="1"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/groupMeasureUnit"> android:id="@+id/groupMeasureUnit">
@@ -124,25 +148,22 @@
android:text="in" android:text="in"
android:id="@+id/btnRadioINCH" /> android:id="@+id/btnRadioINCH" />
</RadioGroup> </RadioGroup>
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/rowUnit" android:id="@+id/rowUnit"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblUnit" android:id="@+id/lblUnit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_scale_unit" /> android:text="@string/label_scale_unit" />
<RadioGroup <RadioGroup
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_column="1"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/groupScaleUnit"> android:id="@+id/groupScaleUnit">
@@ -165,32 +186,12 @@
android:text="st" android:text="st"
android:id="@+id/btnRadioST" /> android:id="@+id/btnRadioST" />
</RadioGroup> </RadioGroup>
</TableRow>
<TableRow
android:id="@+id/rowActivityLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/lblActivityLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:text="@string/label_activity_level" />
<Spinner
android:id="@+id/spinnerActivityLevel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:entries="@array/activity_level_entries" />
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/rowBodyHeight" android:id="@+id/rowBodyHeight"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblBodyHeight" android:id="@+id/lblBodyHeight"
@@ -204,36 +205,12 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:ems="10"
android:inputType="numberDecimal|numberSigned" /> android:inputType="numberDecimal|numberSigned" />
</TableRow>
<TableRow
android:id="@+id/rowBirthday"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/lblBirthday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:labelFor="@id/txtBirthday"
android:text="@string/label_birthday" />
<EditText
android:id="@+id/txtBirthday"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="5"
android:ems="10"
android:focusable="false"
android:inputType="date" />
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/tableRowInitialWeight" android:id="@+id/tableRowInitialWeight"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblInitialWeight" android:id="@+id/lblInitialWeight"
@@ -251,8 +228,8 @@
<TableRow <TableRow
android:id="@+id/rowGoalWeight" android:id="@+id/rowGoalWeight"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblGoalWeight" android:id="@+id/lblGoalWeight"
@@ -270,8 +247,8 @@
<TableRow <TableRow
android:id="@+id/rowGoalDate" android:id="@+id/rowGoalDate"
android:layout_width="wrap_content" android:layout_weight="1"
android:layout_height="wrap_content" > android:gravity="center_vertical">
<TextView <TextView
android:id="@+id/lblGoalDate" android:id="@+id/lblGoalDate"
@@ -284,15 +261,10 @@
android:id="@+id/txtGoalDate" android:id="@+id/txtGoalDate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="5"
android:ems="10" android:ems="10"
android:focusable="false" android:focusable="false"
android:inputType="date" /> android:inputType="date" />
</TableRow> </TableRow>
</TableLayout> </TableLayout>
</LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>