caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

layout cleanup

Browse source
This commit is contained in:
Milos Kozak 2018-06-06 17:58:59 +02:00
parent d2830d1938
commit 6a4bb8a719
2 changed files with 18 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/res/layout/danar_fragment.xml
View file

@ -701,7 +701,7 @@
android:id="@+id/danar_viewprofile" android:id="@+id/danar_viewprofile"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarprofile" android:drawableTop="@drawable/icon_danarprofile"
android:paddingLeft="0dp" android:paddingLeft="0dp"
@ -713,7 +713,7 @@
android:id="@+id/danar_history" android:id="@+id/danar_history"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarhistory" android:drawableTop="@drawable/icon_danarhistory"
android:paddingLeft="0dp" android:paddingLeft="0dp"
@ -724,17 +724,18 @@
android:id="@+id/danar_stats" android:id="@+id/danar_stats"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danarstats" android:drawableTop="@drawable/icon_danarstats"
android:paddingLeft="0dp" android:paddingLeft="0dp"
android:paddingRight="0dp" android:paddingRight="0dp"
android:text="@string/danar_stats" /> android:text="@string/danar_stats" />
<Button <Button
android:id="@+id/danar_user_options" android:id="@+id/danar_user_options"
style="@style/ButtonSmallFontStyle" style="@style/ButtonSmallFontStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:drawableTop="@drawable/icon_danar_useropt" android:drawableTop="@drawable/icon_danar_useropt"
android:paddingLeft="0dp" android:paddingLeft="0dp"

50
app/src/main/res/layout/danar_user_options.xml
View file

@ -2,7 +2,9 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="info.nightscout.androidaps.plugins.PumpDanaR.DanaRUserOptions"> android:focusable="true"
android:focusableInTouchMode="true"
tools:context="info.nightscout.androidaps.plugins.PumpDanaR.activities.DanaRUserOptionsActivity">
<RelativeLayout <RelativeLayout
@ -22,6 +24,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="10dp"
android:text="@string/danar_pump_settings"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Large" />
<LinearLayout <LinearLayout
android:id="@+id/overview_pumpstatuslayout" android:id="@+id/overview_pumpstatuslayout"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -159,42 +169,28 @@
android:text="@string/danar_pumpalarm" android:text="@string/danar_pumpalarm"
android:textSize="14sp" /> android:textSize="14sp" />
<TextView
android:layout_width="5dp"
android:layout_height="wrap_content"
android:layout_weight="0"
android:gravity="center_horizontal"
android:paddingEnd="2dp"
android:paddingStart="2dp"
android:text=":"
android:textSize="14sp" />
<RadioGroup <RadioGroup
android:id="@+id/danar_pumpalarm" android:id="@+id/danar_pumpalarm"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:checkedButton="@+id/danar_pumpalarm_sound"> android:checkedButton="@+id/danar_pumpalarm_sound">
<RadioButton <RadioButton
android:id="@+id/danar_pumpalarm_sound" android:id="@+id/danar_pumpalarm_sound"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/danar_pumpalarm_sound" /> android:text="@string/danar_pumpalarm_sound" />
<RadioButton <RadioButton
android:id="@+id/danar_pumpalarm_vibrate" android:id="@+id/danar_pumpalarm_vibrate"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/danar_pumpalarm_vibrate" /> android:text="@string/danar_pumpalarm_vibrate" />
<RadioButton <RadioButton
android:id="@+id/danar_pumpalarm_both" android:id="@+id/danar_pumpalarm_both"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/danar_pumpalarm_both" /> android:text="@string/danar_pumpalarm_both" />
</RadioGroup> </RadioGroup>
@ -344,7 +340,6 @@
android:textSize="14sp" /> android:textSize="14sp" />
<info.nightscout.utils.NumberPicker <info.nightscout.utils.NumberPicker
android:id="@+id/danar_shutdown" android:id="@+id/danar_shutdown"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -395,36 +390,17 @@
</LinearLayout> </LinearLayout>
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
<Button <Button
android:id="@+id/save_user_options" android:id="@+id/save_user_options"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/danar_saveuseroptions" /> android:text="@string/danar_saveuseroptions" />
<View
android:layout_width="fill_parent"
android:layout_height="2dip"
android:layout_marginBottom="5dp"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="5dp"
android:background="@color/listdelimiter" />
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
</RelativeLayout> </RelativeLayout>
</FrameLayout> </FrameLayout>