caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Overview: move checkboxes before label.

Browse source 
(cherry picked from commit 4825e16)
This commit is contained in:
Johannes Mockenhaupt 2018-01-19 20:11:51 +01:00
parent 97e0aaa380
commit 8109900e9b
No known key found for this signature in database
GPG key ID: 9E1EA6AF7BBBB0D1
4 changed files with 96 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
app/src/main/res/layout/overview_fragment.xml
View file

@ -245,16 +245,6 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="5dp"> android:paddingTop="5dp">
<TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold"/>
<CheckBox <CheckBox
android:id="@+id/overview_showprediction" android:id="@+id/overview_showprediction"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -263,12 +253,13 @@
app:buttonTint="@color/prediction" /> app:buttonTint="@color/prediction" />
<TextView <TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/basalshortlabel" android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal" android:textColor="@color/prediction"
android:textStyle="bold"/> android:textStyle="bold"/>
<CheckBox <CheckBox
@ -282,9 +273,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/iob" android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob" android:textColor="@color/basal"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -298,11 +289,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/cob" android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob" android:textColor="@color/iob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
android:id="@+id/overview_showcob" android:id="@+id/overview_showcob"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -314,9 +306,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/dev" android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations" android:textColor="@color/cob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -330,8 +322,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/ratio_short" android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -340,6 +333,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

39
app/src/main/res/layout/overview_fragment_nsclient.xml
View file

@ -474,16 +474,6 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="5dp"> android:paddingTop="5dp">
<TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold"/>
<CheckBox <CheckBox
android:id="@+id/overview_showprediction" android:id="@+id/overview_showprediction"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -492,12 +482,13 @@
app:buttonTint="@color/prediction" /> app:buttonTint="@color/prediction" />
<TextView <TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/basalshortlabel" android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal" android:textColor="@color/prediction"
android:textStyle="bold"/> android:textStyle="bold"/>
<CheckBox <CheckBox
@ -511,9 +502,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/iob" android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob" android:textColor="@color/basal"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -527,11 +518,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/cob" android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob" android:textColor="@color/iob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
android:id="@+id/overview_showcob" android:id="@+id/overview_showcob"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -543,9 +535,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/dev" android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations" android:textColor="@color/cob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -559,8 +551,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/ratio_short" android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -569,6 +562,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

39
app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
View file

@ -558,16 +558,6 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="5dp"> android:paddingTop="5dp">
<TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold"/>
<CheckBox <CheckBox
android:id="@+id/overview_showprediction" android:id="@+id/overview_showprediction"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -576,12 +566,13 @@
app:buttonTint="@color/prediction" /> app:buttonTint="@color/prediction" />
<TextView <TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/basalshortlabel" android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal" android:textColor="@color/prediction"
android:textStyle="bold"/> android:textStyle="bold"/>
<CheckBox <CheckBox
@ -595,9 +586,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/iob" android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob" android:textColor="@color/basal"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -611,11 +602,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/cob" android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob" android:textColor="@color/iob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
android:id="@+id/overview_showcob" android:id="@+id/overview_showcob"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -627,9 +619,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/dev" android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations" android:textColor="@color/cob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -643,8 +635,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/ratio_short" android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -653,6 +646,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

39
app/src/main/res/layout/overview_fragment_smallheight.xml
View file

@ -240,16 +240,6 @@
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="5dp"> android:paddingTop="5dp">
<TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold"/>
<CheckBox <CheckBox
android:id="@+id/overview_showprediction" android:id="@+id/overview_showprediction"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -258,12 +248,13 @@
app:buttonTint="@color/prediction" /> app:buttonTint="@color/prediction" />
<TextView <TextView
android:id="@+id/overview_showprediction_label"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/basalshortlabel" android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal" android:textColor="@color/prediction"
android:textStyle="bold"/> android:textStyle="bold"/>
<CheckBox <CheckBox
@ -277,9 +268,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/iob" android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob" android:textColor="@color/basal"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -293,11 +284,12 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/cob" android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob" android:textColor="@color/iob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
android:id="@+id/overview_showcob" android:id="@+id/overview_showcob"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -309,9 +301,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/dev" android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations" android:textColor="@color/cob"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -325,8 +317,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/ratio_short" android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" /> android:textStyle="bold" />
<CheckBox <CheckBox
@ -335,6 +328,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" /> android:layout_gravity="center" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout