caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #446 from AdrianLxM/numberpicker-update

Browse source 
overview checkboxes cutoff fix
This commit is contained in:
Milos Kozak 2017-10-07 18:29:56 +02:00 committed by GitHub
parent c56ecfced6 10d273dac8
commit a54b9e52d8
4 changed files with 72 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -244,14 +244,15 @@
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showprediction"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/prediction" />
<TextView
@ -261,14 +262,15 @@
android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showbasals"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/basal" />
<TextView
@ -278,14 +280,15 @@
android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showiob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/iob" />
<TextView
@ -295,14 +298,15 @@
android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showcob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/cob" />
<TextView
@ -312,14 +316,15 @@
android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showdeviations"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/deviations" />
<TextView
@ -328,14 +333,15 @@
android:layout_gravity="center_horizontal"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showratios"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp" />
android:layout_marginTop="-5dp" />
</LinearLayout>

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

@ -482,14 +482,15 @@
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showprediction"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/prediction" />
<TextView
@ -499,14 +500,15 @@
android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showbasals"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/basal" />
<TextView
@ -516,14 +518,15 @@
android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showiob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/iob" />
<TextView
@ -533,14 +536,15 @@
android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showcob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/cob" />
<TextView
@ -550,14 +554,15 @@
android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showdeviations"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/deviations" />
<TextView
@ -566,14 +571,15 @@
android:layout_gravity="center_horizontal"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showratios"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp" />
android:layout_marginTop="-5dp" />
</LinearLayout>

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

@ -566,14 +566,15 @@
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showprediction"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/prediction" />
<TextView
@ -583,14 +584,15 @@
android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showbasals"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/basal" />
<TextView
@ -600,14 +602,15 @@
android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showiob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/iob" />
<TextView
@ -617,14 +620,15 @@
android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showcob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/cob" />
<TextView
@ -634,14 +638,15 @@
android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showdeviations"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/deviations" />
<TextView
@ -650,14 +655,15 @@
android:layout_gravity="center_horizontal"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showratios"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp" />
android:layout_marginTop="-5dp" />
</LinearLayout>

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

@ -239,14 +239,15 @@
android:text="@string/predictionshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/prediction"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showprediction"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/prediction" />
<TextView
@ -256,14 +257,15 @@
android:text="@string/basalshortlabel"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/basal"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showbasals"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/basal" />
<TextView
@ -273,14 +275,15 @@
android:text="@string/iob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/iob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showiob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/iob" />
<TextView
@ -290,14 +293,15 @@
android:text="@string/cob"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/cob"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showcob"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/cob" />
<TextView
@ -307,14 +311,15 @@
android:text="@string/dev"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/deviations"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showdeviations"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp"
android:layout_marginTop="-5dp"
app:buttonTint="@color/deviations" />
<TextView
@ -323,14 +328,15 @@
android:layout_gravity="center_horizontal"
android:text="@string/ratio_short"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textStyle="bold" />
android:textStyle="bold"
android:paddingTop="4dp"/>
<CheckBox
android:id="@+id/overview_showratios"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="-5dp"
android:layout_marginTop="-9dp" />
android:layout_marginTop="-5dp" />
</LinearLayout>