From a3757877a3bf93db1be32a42804695c75b643195 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 20 Jun 2017 19:56:25 +0200
Subject: [PATCH 1/2] fix landscape mode

---
 .../plugins/Overview/OverviewFragment.java    |   3 +-
 .../layout/overview_fragment_smallheight.xml  | 742 +++++++++---------
 2 files changed, 360 insertions(+), 385 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
index 26feb54704..a8efff4eb4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Overview/OverviewFragment.java
@@ -211,12 +211,13 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         int screen_height = dm.heightPixels;
         smallWidth = screen_width < Constants.SMALL_WIDTH;
         smallHeight = screen_height < Constants.SMALL_HEIGHT;
+        boolean landscape = screen_height < screen_width;
 
         View view;
 
         if (MainApp.sResources.getBoolean(R.bool.isTablet)) {
             view = inflater.inflate(R.layout.overview_fragment_tablet, container, false);
-        } else if (smallHeight) {
+        } else if (smallHeight || landscape) {
             view = inflater.inflate(R.layout.overview_fragment_smallheight, container, false);
         } else {
             view = inflater.inflate(R.layout.overview_fragment, container, false);
diff --git a/app/src/main/res/layout/overview_fragment_smallheight.xml b/app/src/main/res/layout/overview_fragment_smallheight.xml
index c22bcf5e70..0df556d110 100644
--- a/app/src/main/res/layout/overview_fragment_smallheight.xml
+++ b/app/src/main/res/layout/overview_fragment_smallheight.xml
@@ -5,423 +5,397 @@
     android:layout_height="match_parent"
     tools:context="info.nightscout.androidaps.plugins.Overview.OverviewFragment">
 
-    <RelativeLayout
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent" >
 
-        <ScrollView
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_above="@+id/overview_buttons">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <android.support.v7.widget.RecyclerView
+                android:id="@+id/overview_notifications"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+            </android.support.v7.widget.RecyclerView>
+
+            <LinearLayout
+                android:id="@+id/overview_looplayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingTop="2dp">
+
+                <TextView
+                    android:id="@+id/overview_apsmode"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="5dp"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="Open Loop"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+
+                <TextView
+                    android:id="@+id/overview_activeprofile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:layout_marginRight="5dp"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="Profile"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+                <TextView
+                    android:id="@+id/overview_temptarget"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:layout_weight="1"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="TempTarget"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/mdtp_white" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_pumpstatuslayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:paddingTop="2dp">
+
+                <TextView
+                    android:id="@+id/overview_pumpstatus"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginRight="5dp"
+                    android:gravity="center_vertical|center_horizontal"
+                    android:text="@string/initializing"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+            </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:gravity="center_horizontal"
+                android:orientation="horizontal">
 
-                <android.support.v7.widget.RecyclerView
-                    android:id="@+id/overview_notifications"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                <TextView
+                    android:id="@+id/overview_bg"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|left"
+                    android:gravity="center_vertical"
+                    android:text="00.0"
+                    android:textSize="70dp"
+                    android:textStyle="bold" />
 
-                </android.support.v7.widget.RecyclerView>
-
-                <LinearLayout
-                    android:id="@+id/overview_looplayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
-
-                    <TextView
-                        android:id="@+id/overview_apsmode"
-                        android:layout_width="wrap_content"
-                        android:layout_height="match_parent"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="Open Loop"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-
-                    <TextView
-                        android:id="@+id/overview_activeprofile"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_marginRight="5dp"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="Profile"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                    <TextView
-                        android:id="@+id/overview_temptarget"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:layout_weight="1"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="TempTarget"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/mdtp_white" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_pumpstatuslayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="horizontal"
-                    android:paddingTop="2dp">
-
-                    <TextView
-                        android:id="@+id/overview_pumpstatus"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_marginLeft="5dp"
-                        android:layout_marginRight="5dp"
-                        android:gravity="center_vertical|center_horizontal"
-                        android:text="@string/initializing"
-                        android:textAppearance="?android:attr/textAppearanceSmall" />
-                </LinearLayout>
+                <TextView
+                    android:id="@+id/overview_arrow"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="top|left"
+                    android:layout_marginTop="-15dp"
+                    android:gravity="center_vertical"
+                    android:paddingLeft="-5dp"
+                    android:paddingRight="-5dp"
+                    android:text="→"
+                    android:textSize="70dp"
+                    android:textStyle="bold" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal">
-
-                    <TextView
-                        android:id="@+id/overview_bg"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top|left"
-                        android:gravity="center_vertical"
-                        android:text="00.0"
-                        android:textSize="70dp"
-                        android:textStyle="bold" />
-
-                    <TextView
-                        android:id="@+id/overview_arrow"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top|left"
-                        android:layout_marginTop="-15dp"
-                        android:gravity="center_vertical"
-                        android:paddingLeft="-5dp"
-                        android:paddingRight="-5dp"
-                        android:text="→"
-                        android:textSize="70dp"
-                        android:textStyle="bold" />
+                    android:layout_gravity="top"
+                    android:layout_marginTop="10dp"
+                    android:gravity="top"
+                    android:orientation="vertical">
 
                     <LinearLayout
                         android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="top"
-                        android:layout_marginTop="10dp"
-                        android:gravity="top"
+                        android:layout_height="match_parent"
+                        android:layout_weight="0.5"
                         android:orientation="vertical">
 
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="match_parent"
-                            android:layout_weight="0.5"
-                            android:orientation="vertical">
-
-                            <TextView
-                                android:id="@+id/overview_timeago"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="10dp"
-                                android:layout_weight="0.5"
-                                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                            <TextView
-                                android:id="@+id/overview_delta"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_marginLeft="10dp"
-                                android:layout_weight="0.5"
-                                android:textAppearance="?android:attr/textAppearanceMedium" />
-
-                        </LinearLayout>
-
                         <TextView
-                            android:id="@+id/overview_avgdelta"
-                            android:layout_width="wrap_content"
+                            android:id="@+id/overview_timeago"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="10dp"
-                            android:textAppearance="?android:attr/textAppearanceSmall" />
+                            android:layout_weight="0.5"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
 
+                        <TextView
+                            android:id="@+id/overview_delta"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="10dp"
+                            android:layout_weight="0.5"
+                            android:textAppearance="?android:attr/textAppearanceMedium" />
 
                     </LinearLayout>
 
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_basallayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal">
-
                     <TextView
-                        android:id="@+id/overview_runningtemp"
+                        android:id="@+id/overview_avgdelta"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_gravity="right"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textStyle="normal|bold" />
-
-                    <TextView
-                        android:layout_width="20dp"
-                        android:layout_height="wrap_content" />
-
-                    <TextView
-                        android:id="@+id/overview_basebasal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left"
+                        android:layout_marginLeft="10dp"
                         android:textAppearance="?android:attr/textAppearanceSmall" />
 
-                </LinearLayout>
-
-                <TextView
-                    android:id="@+id/overview_iob"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:textAppearance="?android:attr/textAppearanceSmall" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_horizontal"
-                    android:orientation="horizontal"
-                    android:paddingTop="5dp">
-
-                    <TextView
-                        android:id="@+id/overview_showprediction_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/predictionshortlabel"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/prediction"
-                        android:textStyle="bold" />
-
-                    <CheckBox
-                        android:id="@+id/overview_showprediction"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-9dp"
-                        app:buttonTint="@color/prediction" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/basalshortlabel"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/basal"
-                        android:textStyle="bold" />
-
-                    <CheckBox
-                        android:id="@+id/overview_showbasals"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-9dp"
-                        app:buttonTint="@color/basal" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/iob"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/iob"
-                        android:textStyle="bold" />
-
-                    <CheckBox
-                        android:id="@+id/overview_showiob"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-9dp"
-                        app:buttonTint="@color/iob" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/cob"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/cob"
-                        android:textStyle="bold" />
-
-                    <CheckBox
-                        android:id="@+id/overview_showcob"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-9dp"
-                        app:buttonTint="@color/cob" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/dev"
-                        android:textAppearance="?android:attr/textAppearanceSmall"
-                        android:textColor="@color/deviations"
-                        android:textStyle="bold" />
-
-                    <CheckBox
-                        android:id="@+id/overview_showdeviations"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="-5dp"
-                        android:layout_marginTop="-9dp"
-                        app:buttonTint="@color/deviations" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <com.jjoe64.graphview.GraphView
-                            android:id="@+id/overview_bggraph"
-                            android:layout_width="wrap_content"
-                            android:layout_height="160dip"
-                            android:layout_alignParentStart="true"
-                            android:layout_alignParentTop="true" />
-
-                        <TextView
-                            android:id="@+id/overview_updating"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_centerHorizontal="true"
-                            android:layout_centerInParent="true"
-                            android:layout_centerVertical="true"
-                            android:text="@string/updating"
-                            android:textAppearance="?android:attr/textAppearanceMedium"
-                            android:textColor="@color/updating"
-                            android:textStyle="bold" />
-
-                    </RelativeLayout>
-
-                    <com.jjoe64.graphview.GraphView
-                        android:id="@+id/overview_iobgraph"
-                        android:layout_width="wrap_content"
-                        android:layout_height="100dp" />
-
-                </LinearLayout>
-
-                <LinearLayout
-                    android:id="@+id/overview_accepttemplayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/overview_accepttempbutton"
-                        style="?android:attr/buttonStyle"
-                        android:layout_width="fill_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginBottom="3dp"
-                        android:layout_marginTop="3dp"
-                        android:layout_weight="0.5"
-                        android:text="Accept new temp\n0.25U/h"
-                        android:textColor="@color/colorAcceptTempButton" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <Button
-                        android:id="@+id/overview_treatmentbutton"
-                        style="?android:attr/buttonStyle"
-                        android:layout_width="0px"
-                        android:layout_height="fill_parent"
-                        android:layout_marginRight="-4dp"
-                        android:layout_weight="0.5"
-                        android:drawableTop="@drawable/icon_bolus"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="0dp"
-                        android:text="@string/overview_bolus_label"
-                        android:textColor="@color/colorTreatmentButton"
-                        android:textSize="10sp" />
-
-                    <Button
-                        android:id="@+id/overview_wizardbutton"
-                        style="?android:attr/buttonStyle"
-                        android:layout_width="0px"
-                        android:layout_height="fill_parent"
-                        android:layout_marginRight="-4dp"
-                        android:layout_weight="0.5"
-                        android:drawableTop="@drawable/icon_calculator"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="0dp"
-                        android:text="@string/overview_calculator_label"
-                        android:textColor="@color/colorCalculatorButton"
-                        android:textSize="10sp" />
-
-                    <Button
-                        android:id="@+id/overview_calibrationbutton"
-                        style="?android:attr/buttonStyle"
-                        android:layout_width="0px"
-                        android:layout_height="fill_parent"
-                        android:layout_marginRight="-4dp"
-                        android:layout_weight="0.5"
-                        android:drawableTop="@drawable/icon_calibration"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="0dp"
-                        android:text="@string/overview_calibration"
-                        android:textColor="@color/colorCalibrationButton"
-                        android:textSize="10sp" />
-
-                    <Button
-                        android:id="@+id/overview_quickwizardbutton"
-                        style="?android:attr/buttonStyle"
-                        android:layout_width="0px"
-                        android:layout_height="fill_parent"
-                        android:layout_marginRight="-4dp"
-                        android:layout_weight="0.5"
-                        android:drawableTop="@drawable/icon_quickwizard"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="0dp"
-                        android:text="Quick wizard"
-                        android:textColor="@color/colorQuickWizardButton"
-                        android:textSize="10sp" />
-
-                    <Button
-                        android:id="@+id/overview_canceltempbutton"
-                        style="?android:attr/buttonStyle"
-                        android:layout_width="0px"
-                        android:layout_height="fill_parent"
-                        android:layout_weight="0.5"
-                        android:drawableTop="@drawable/icon_cancelbasal"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="0dp"
-                        android:text="Cancel temp basal"
-                        android:textColor="@color/colorCancelTempButton"
-                        android:textSize="10sp" />
 
                 </LinearLayout>
 
             </LinearLayout>
 
-        </ScrollView>
-    </RelativeLayout>
+            <LinearLayout
+                android:id="@+id/overview_basallayout"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:id="@+id/overview_runningtemp"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="right"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textStyle="normal|bold" />
+
+                <TextView
+                    android:layout_width="20dp"
+                    android:layout_height="wrap_content" />
+
+                <TextView
+                    android:id="@+id/overview_basebasal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"
+                    android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            </LinearLayout>
+
+            <TextView
+                android:id="@+id/overview_iob"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:textAppearance="?android:attr/textAppearanceSmall" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:orientation="horizontal"
+                android:paddingTop="5dp">
+
+                <TextView
+                    android:id="@+id/overview_showprediction_label"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/predictionshortlabel"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/prediction"
+                    android:textStyle="bold" />
+
+                <CheckBox
+                    android:id="@+id/overview_showprediction"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-5dp"
+                    android:layout_marginTop="-9dp"
+                    app:buttonTint="@color/prediction" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/basalshortlabel"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/basal"
+                    android:textStyle="bold" />
+
+                <CheckBox
+                    android:id="@+id/overview_showbasals"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-5dp"
+                    android:layout_marginTop="-9dp"
+                    app:buttonTint="@color/basal" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/iob"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/iob"
+                    android:textStyle="bold" />
+
+                <CheckBox
+                    android:id="@+id/overview_showiob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-5dp"
+                    android:layout_marginTop="-9dp"
+                    app:buttonTint="@color/iob" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/cob"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/cob"
+                    android:textStyle="bold" />
+
+                <CheckBox
+                    android:id="@+id/overview_showcob"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-5dp"
+                    android:layout_marginTop="-9dp"
+                    app:buttonTint="@color/cob" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/dev"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="@color/deviations"
+                    android:textStyle="bold" />
+
+                <CheckBox
+                    android:id="@+id/overview_showdeviations"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-5dp"
+                    android:layout_marginTop="-9dp"
+                    app:buttonTint="@color/deviations" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <com.jjoe64.graphview.GraphView
+                    android:id="@+id/overview_bggraph"
+                    android:layout_width="wrap_content"
+                    android:layout_height="160dip" />
+
+                <com.jjoe64.graphview.GraphView
+                    android:id="@+id/overview_iobgraph"
+                    android:layout_width="wrap_content"
+                    android:layout_height="100dp" />
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/overview_accepttemplayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/overview_accepttempbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="fill_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="3dp"
+                    android:layout_marginTop="3dp"
+                    android:layout_weight="0.5"
+                    android:text="Accept new temp\n0.25U/h"
+                    android:textColor="@color/colorAcceptTempButton" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <Button
+                    android:id="@+id/overview_treatmentbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_bolus"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_bolus_label"
+                    android:textColor="@color/colorTreatmentButton"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/overview_wizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calculator"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_calculator_label"
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/overview_calibrationbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_calibration"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/overview_calibration"
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/overview_quickwizardbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="Quick wizard"
+                    android:textColor="@color/colorQuickWizardButton"
+                    android:textSize="10sp" />
+
+                <Button
+                    android:id="@+id/overview_canceltempbutton"
+                    style="?android:attr/buttonStyle"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_weight="0.5"
+                    android:drawableTop="@drawable/icon_cancelbasal"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="Cancel temp basal"
+                    android:textColor="@color/colorCancelTempButton"
+                    android:textSize="10sp" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </ScrollView>
 </FrameLayout>

From befdbefa499990e0637eb02f0aa484f384bad5c6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Tue, 20 Jun 2017 19:58:43 +0200
Subject: [PATCH 2/2] fix zero parsing error

---
 app/src/main/java/info/nightscout/utils/SafeParse.java | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/src/main/java/info/nightscout/utils/SafeParse.java b/app/src/main/java/info/nightscout/utils/SafeParse.java
index 8697daeebd..ff749f732b 100644
--- a/app/src/main/java/info/nightscout/utils/SafeParse.java
+++ b/app/src/main/java/info/nightscout/utils/SafeParse.java
@@ -11,6 +11,8 @@ public class SafeParse {
     public static Double stringToDouble(String input) {
         Double result = 0d;
         input = input.replace(",", ".");
+        if (input.equals(""))
+            return 0d;
         try {
             result = Double.parseDouble(input);
         } catch (Exception e) {
@@ -22,6 +24,8 @@ public class SafeParse {
     public static Integer stringToInt(String input) {
         Integer result = 0;
         input = input.replace(",", ".");
+        if (input.equals(""))
+            return 0;
         try {
             result = Integer.parseInt(input);
         } catch (Exception e) {
@@ -33,6 +37,8 @@ public class SafeParse {
    public static Long stringToLong(String input) {
         Long result = 0L;
         input = input.replace(",", ".");
+       if (input.equals(""))
+           return 0L;
         try {
             result = Long.parseLong(input);
         } catch (Exception e) {