From 7517ee4930fa6f0283c09fd3218e3c788d5dd392 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Fri, 12 May 2017 03:54:24 +0200
Subject: [PATCH 1/2] No permission to read statusline

---
 app/src/main/AndroidManifest.xml                                | 2 --
 .../androidaps/plugins/XDripStatusline/StatuslinePlugin.java    | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 4b604b2799..ab45d3d4f5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="info.nightscout.androidaps">
 
-    <permission android:name="com.eveningoutpost.dexdrip.permissions.RECEIVE_EXTERNAL_STATUSLINE"/>
-
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
index 3bac27c168..a0555682e0 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java
@@ -140,7 +140,7 @@ public class StatuslinePlugin implements PluginBase {
         Intent intent = new Intent(ACTION_NEW_EXTERNAL_STATUSLINE);
         intent.putExtras(bundle);
         intent.addFlags(Intent.FLAG_INCLUDE_STOPPED_PACKAGES);
-        ctx.sendBroadcast(intent, RECEIVER_PERMISSION);
+        ctx.sendBroadcast(intent, null);
     }
 
     @NonNull

From df424ea5ff6efa38707a787a4ddff2b101c08304 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Fri, 12 May 2017 11:06:33 +0200
Subject: [PATCH 2/2] overview buttons

---
 .../plugins/Overview/OverviewFragment.java    |  10 +-
 app/src/main/res/drawable/bread.png           | Bin 2060 -> 0 bytes
 app/src/main/res/drawable/icon_bolus.png      | Bin 0 -> 27747 bytes
 app/src/main/res/drawable/icon_calculator.png | Bin 0 -> 27747 bytes
 .../main/res/drawable/icon_calibration.png    | Bin 0 -> 27747 bytes
 .../main/res/drawable/icon_cancelbasal.png    | Bin 0 -> 27747 bytes
 .../main/res/drawable/icon_quickwizard.png    | Bin 0 -> 27747 bytes
 app/src/main/res/layout/actions_fragment.xml  |   2 +-
 app/src/main/res/layout/overview_fragment.xml | 108 ++++++++----------
 .../layout/overview_quickwizardlist_item.xml  |   6 +-
 app/src/main/res/values/colors.xml            |   9 +-
 11 files changed, 61 insertions(+), 74 deletions(-)
 delete mode 100644 app/src/main/res/drawable/bread.png
 create mode 100644 app/src/main/res/drawable/icon_bolus.png
 create mode 100644 app/src/main/res/drawable/icon_calculator.png
 create mode 100644 app/src/main/res/drawable/icon_calibration.png
 create mode 100644 app/src/main/res/drawable/icon_cancelbasal.png
 create mode 100644 app/src/main/res/drawable/icon_quickwizard.png

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 05b8d272a1..ba57435c7c 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
@@ -159,7 +159,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
     RecyclerView notificationsView;
     LinearLayoutManager llm;
 
-    LinearLayout cancelTempLayout;
     LinearLayout acceptTempLayout;
     Button cancelTempButton;
     Button treatmentButton;
@@ -242,7 +241,6 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         calibrationButton = (Button) view.findViewById(R.id.overview_calibrationbutton);
         calibrationButton.setOnClickListener(this);
 
-        cancelTempLayout = (LinearLayout) view.findViewById(R.id.overview_canceltemplayout);
         acceptTempLayout = (LinearLayout) view.findViewById(R.id.overview_accepttemplayout);
 
         showPredictionView = (CheckBox) view.findViewById(R.id.overview_showprediction);
@@ -896,12 +894,12 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
 
         TempBasal activeTemp = pump.getTempBasal();
         if (pump.isTempBasalInProgress()) {
-            cancelTempLayout.setVisibility(View.VISIBLE);
-            cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + ": " + activeTemp.toString());
+            cancelTempButton.setVisibility(View.VISIBLE);
+            cancelTempButton.setText(MainApp.instance().getString(R.string.cancel) + "\n" + activeTemp.toStringShort());
             runningTempView.setVisibility(View.VISIBLE);
             runningTempView.setText(activeTemp.toString());
         } else {
-            cancelTempLayout.setVisibility(View.GONE);
+            cancelTempButton.setVisibility(View.GONE);
             runningTempView.setVisibility(View.GONE);
         }
 
@@ -950,7 +948,7 @@ public class OverviewFragment extends Fragment implements View.OnClickListener,
         QuickWizard.QuickWizardEntry quickWizardEntry = getPlugin().quickWizard.getActive();
         if (quickWizardEntry != null && lastBG != null && pump.isInitialized() && !pump.isSuspended()) {
             quickWizardButton.setVisibility(View.VISIBLE);
-            String text = MainApp.sResources.getString(R.string.bolus) + ": " + quickWizardEntry.buttonText() + " " + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
+            String text = quickWizardEntry.buttonText() + "\n" + DecimalFormatter.to0Decimal(quickWizardEntry.carbs()) + "g";
             BolusWizard wizard = new BolusWizard();
             wizard.doCalc(profile.getDefaultProfile(), quickWizardEntry.carbs(), 0d, lastBG.valueToUnits(profile.getUnits()), 0d, true, true, false, false);
             text += " " + DecimalFormatter.to2Decimal(wizard.calculatedTotalInsulin) + "U";
diff --git a/app/src/main/res/drawable/bread.png b/app/src/main/res/drawable/bread.png
deleted file mode 100644
index aa18f4f1d928fd118c6fa5dc0c086ab80c3b6f20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2060
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

diff --git a/app/src/main/res/drawable/icon_bolus.png b/app/src/main/res/drawable/icon_bolus.png
new file mode 100644
index 0000000000000000000000000000000000000000..e0d0204a22f381e6645897e675d038c27d1ee836
GIT binary patch
literal 27747
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
ba7?#cUUqtJi^}`fw>WEy8RnU$3s(F;UIYh8

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_calculator.png b/app/src/main/res/drawable/icon_calculator.png
new file mode 100644
index 0000000000000000000000000000000000000000..b327e693271abb36d504593cdcb1b815d7d22abc
GIT binary patch
literal 27747
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_calibration.png b/app/src/main/res/drawable/icon_calibration.png
new file mode 100644
index 0000000000000000000000000000000000000000..8a6db6f8d1a6a2d7776d3b52c20c6ed710662883
GIT binary patch
literal 27747
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
V2AFf_xgnU^SxvXhuvoC-{{Tq>v*G{%

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_cancelbasal.png b/app/src/main/res/drawable/icon_cancelbasal.png
new file mode 100644
index 0000000000000000000000000000000000000000..55a39b40e5b81b3249a1973cac0b44cbd1cbc0de
GIT binary patch
literal 27747
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/icon_quickwizard.png b/app/src/main/res/drawable/icon_quickwizard.png
new file mode 100644
index 0000000000000000000000000000000000000000..0487ee2ac10fbb8b60d2a74a6e53b262d08118ac
GIT binary patch
literal 27747
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
XZL4OztuPt=;D9;U%(Bk5@>%(R4W?X<

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 45c57e0107..7fc4661be5 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -37,7 +37,7 @@
             android:layout_marginTop="3dp"
             android:layout_weight="0.5"
             android:text="@string/careportal_temporarytarget"
-            android:textColor="@color/colorWizardButton" />
+            android:textColor="@color/colorCalculatorButton" />
 
         <Button
             android:id="@+id/actions_settempbasal"
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 03e768c382..2f56efeda4 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -314,8 +314,8 @@
             android:id="@+id/overview_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:layout_alignParentBottom="true">
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical">
 
             <LinearLayout
                 android:id="@+id/overview_accepttemplayout"
@@ -329,35 +329,12 @@
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
                     android:layout_marginTop="3dp"
                     android:layout_weight="0.5"
                     android:text="Accept new temp\n0.25U/h"
                     android:textColor="@color/colorAcceptTempButton" />
             </LinearLayout>
 
-            <LinearLayout
-                android:id="@+id/overview_canceltemplayout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/overview_canceltempbutton"
-                    style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
-                    android:layout_weight="0.5"
-                    android:text="Cancel temp basal"
-                    android:textColor="@color/colorCancelTempButton" />
-
-            </LinearLayout>
-
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -366,63 +343,74 @@
                 <Button
                     android:id="@+id/overview_treatmentbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    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:textColor="@color/colorTreatmentButton"
+                    android:textSize="10sp" />
 
                 <Button
                     android:id="@+id/overview_wizardbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="0dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    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/colorWizardButton" />
+                    android:textColor="@color/colorCalculatorButton"
+                    android:textSize="10sp" />
 
                 <Button
                     android:id="@+id/overview_calibrationbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="0dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    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" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
+                    android:textColor="@color/colorCalibrationButton"
+                    android:textSize="10sp" />
 
                 <Button
                     android:id="@+id/overview_quickwizardbutton"
                     style="?android:attr/buttonStyle"
-                    android:layout_width="fill_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="3dp"
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginRight="5dp"
-                    android:layout_marginTop="3dp"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:layout_marginRight="-4dp"
                     android:layout_weight="0.5"
-                    android:drawableLeft="@drawable/bread"
+                    android:drawableTop="@drawable/icon_quickwizard"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="Quick wizard"
-                    android:textColor="@color/colorCancelTempButton" />
+                    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>
     </RelativeLayout>
 </FrameLayout>
diff --git a/app/src/main/res/layout/overview_quickwizardlist_item.xml b/app/src/main/res/layout/overview_quickwizardlist_item.xml
index dbcf6bca9d..37e42d1e6b 100644
--- a/app/src/main/res/layout/overview_quickwizardlist_item.xml
+++ b/app/src/main/res/layout/overview_quickwizardlist_item.xml
@@ -24,10 +24,10 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                card_view:srcCompat="@drawable/bread"
-                android:scaleType="fitStart"
+                android:adjustViewBounds="false"
                 android:cropToPadding="false"
-                android:adjustViewBounds="false" />
+                android:scaleType="fitStart"
+                card_view:srcCompat="@drawable/icon_quickwizard" />
 
             <LinearLayout
                 android:orientation="vertical"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 553d7b1593..c6edf50845 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -26,14 +26,15 @@
     <color name="linearBlockBackground">#3e3d3d</color>
 
     <color name="colorAcceptTempButton">#f4d700</color>
-    <color name="colorTreatmentButton">#FFB347</color>
-    <color name="colorWizardButton">#77dd77</color>
-    <color name="colorCancelTempButton">#47c8ff</color>
+    <color name="colorTreatmentButton">#67dfe8</color>
+    <color name="colorCalibrationButton">#e93057</color>
+    <color name="colorCalculatorButton">#67e86a</color>
+    <color name="colorQuickWizardButton">#ffae01</color>
+    <color name="colorCancelTempButton">#d08cff</color>
     <color name="colorSetTempButton">#FF478EFF</color>
     <color name="colorSetExtendedButton">#FFDD7792</color>
     <color name="colorProfileSwitchButton">#ca77dd</color>
     <color name="colorTempTargetButton">#d43429</color>
-    <color name="colorCalibrationButton">#ceb812</color>
 
     <color name="colorInProgress">#c45026</color>
     <color name="colorAffectingIOB">#830400</color>