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

Fix indentation

Browse Source
This commit is contained in:
Erik Johansson
2018-02-05 18:01:37 +01:00
parent 7bff693926
commit b44a83939e
1 changed files with 45 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
android:orientation="vertical" android:orientation="vertical"
android:padding="5dp" > 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"
@@ -165,25 +165,25 @@
</TableRow> </TableRow>
<TableRow <TableRow
android:id="@+id/tableRowInitialWeight" android:id="@+id/tableRowInitialWeight"
android:layout_width="wrap_content"
android:layout_height="wrap_content" >
<TextView
android:id="@+id/lblInitialWeight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content" >
android:text="@string/label_initial_weight" />
<EditText <TextView
android:id="@+id/txtInitialWeight" android:id="@+id/lblInitialWeight"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ems="10" android:text="@string/label_initial_weight" />
android:hint="@string/info_enter_initial_weight"
android:inputType="numberDecimal|numberSigned" /> <EditText
</TableRow> android:id="@+id/txtInitialWeight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:hint="@string/info_enter_initial_weight"
android:inputType="numberDecimal|numberSigned" />
</TableRow>
<TableRow <TableRow
android:id="@+id/rowGoalWeight" android:id="@+id/rowGoalWeight"
@@ -229,42 +229,38 @@
</TableLayout> </TableLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<Button
android:id="@+id/btnCancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="5"
android:background="@drawable/flat_selector"
android:text="@string/label_cancel"
android:layout_marginRight="10dp" />
<LinearLayout <Button
android:layout_width="match_parent" android:id="@+id/btnDelete"
android:layout_height="wrap_content" > android:layout_width="wrap_content"
<Button android:layout_height="wrap_content"
android:id="@+id/btnCancel" android:layout_weight="5"
android:layout_width="wrap_content" android:background="@drawable/flat_selector"
android:layout_height="wrap_content" android:text="@string/label_delete"
android:layout_weight="5" android:layout_marginRight="10dp" />
android:background="@drawable/flat_selector"
android:text="@string/label_cancel"
android:layout_marginRight="10dp" />
<Button <Button
android:id="@+id/btnDelete" android:id="@+id/btnOk"
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:layout_weight="5"
android:background="@drawable/flat_selector" android:background="@drawable/flat_selector"
android:text="@string/label_delete" android:text="@string/label_ok" />
android:layout_marginRight="10dp" /> </LinearLayout>
<Button
android:id="@+id/btnOk"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="5"
android:background="@drawable/flat_selector"
android:text="@string/label_ok" />
</LinearLayout> </LinearLayout>
</LinearLayout>
</ScrollView> </ScrollView>
</LinearLayout> </LinearLayout>