From 333b131c1e10bd9f916ee8ca42853955e64258cc Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 6 Oct 2017 13:53:55 +0200
Subject: [PATCH 1/2] overview checkboxes cutoff fix

---
 app/src/main/res/layout/overview_fragment.xml | 30 +++++++++++--------
 .../layout/overview_fragment_smallheight.xml  | 30 +++++++++++--------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 413350d6eb..c5bfe15319 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -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>
 
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
index e1d2338959..c45ca863e2 100644
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ b/app/src/main/res/layout/overview_fragment_smallheight.xml
@@ -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>
 

From 10d273dac881832c452c432130a3aae80a6e01c4 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 6 Oct 2017 15:48:32 +0200
Subject: [PATCH 2/2] checkboxes for NS-Client layouts

---
 .../res/layout/overview_fragment_nsclient.xml | 30 +++++++++++--------
 .../overview_fragment_nsclient_tablet.xml     | 30 +++++++++++--------
 2 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/app/src/main/res/layout/overview_fragment_nsclient.xml b/app/src/main/res/layout/overview_fragment_nsclient.xml
index f42809b4be..1a5771c26e 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient.xml
@@ -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>
 
diff --git a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
index 10148057bb..e7ddd35913 100644
--- a/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
+++ b/app/src/main/res/layout/overview_fragment_nsclient_tablet.xml
@@ -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>