From 10d27f0b6a259b45e28ffa2b5dbad477ccef30f3 Mon Sep 17 00:00:00 2001
From: AdrianLxM <AdrianLxM@users.noreply.github.com>
Date: Fri, 21 Jul 2017 22:24:06 +0200
Subject: [PATCH 1/7] Picture renaming (#311)

* adding icons
---
 FETCH_HEAD                                    |   0
 .../EventSmsCommunicatorUpdateGui.java        |   0
 app/src/main/res/layout/actions_fragment.xml  |  21 +-
 .../main/res/layout/careportal_fragment.xml   | 299 ++++++++++++------
 .../res/layout/careportal_stats_fragment.xml  |  36 ++-
 app/src/main/res/values/strings.xml           |   9 +-
 git                                           |   0
 7 files changed, 246 insertions(+), 119 deletions(-)
 create mode 100644 FETCH_HEAD
 rename app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/{events => Events}/EventSmsCommunicatorUpdateGui.java (100%)
 create mode 100644 git

diff --git a/FETCH_HEAD b/FETCH_HEAD
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventSmsCommunicatorUpdateGui.java b/app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/Events/EventSmsCommunicatorUpdateGui.java
similarity index 100%
rename from app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/events/EventSmsCommunicatorUpdateGui.java
rename to app/src/main/java/info/nightscout/androidaps/plugins/SmsCommunicator/Events/EventSmsCommunicatorUpdateGui.java
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 5a0faa4099..099e2c6db1 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -23,8 +23,8 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-                android:text="@string/careportal_profileswitch"
-                android:textColor="@color/colorProfileSwitchButton" />
+		android:drawableTop="@drawable/icon_actions_profileswitch"
+                android:text="@string/careportal_profileswitch" />
 
             <Button
                 android:id="@+id/actions_temptarget"
@@ -36,8 +36,8 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-                android:text="@string/careportal_temporarytarget"
-                android:textColor="@color/colorCalculatorButton" />
+		android:drawableTop="@drawable/icon_actions_temptarget"
+                android:text="@string/careportal_temporarytarget" />
 
             <Button
                 android:id="@+id/actions_settempbasal"
@@ -49,8 +49,8 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-                android:text="@string/overview_tempbasal_button"
-                android:textColor="@color/colorSetTempButton" />
+		android:drawableTop="@drawable/icon_actions_starttempbasal"
+                android:text="@string/overview_tempbasal_button" />
 
             <Button
                 android:id="@+id/actions_extendedbolus"
@@ -62,6 +62,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
+				android:drawableTop="@drawable/icon_actions_startextbolus"
                 android:text="@string/overview_extendedbolus_button"
                 android:textColor="@color/colorSetExtendedButton" />
 
@@ -75,8 +76,8 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-                android:text="@string/overview_extendedbolus_cancel_button"
-                android:textColor="@color/colorSetExtendedButton" />
+		android:drawableTop="@drawable/icon_actions_cancelextbolus"
+                android:text="@string/overview_extendedbolus_cancel_button" />
 
             <Button
                 android:id="@+id/actions_fill"
@@ -88,8 +89,8 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-                android:text="@string/primefill"
-                android:textColor="@color/colorTreatmentButton" />
+		android:drawableTop="@drawable/icon_actions_refill"
+                android:text="@string/primefill" />
 
         </LinearLayout>
 
diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 967d148688..8861c729f2 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -21,19 +21,29 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content" />
 
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+				android:paddingStart="15dp"
+                android:text="@string/careportal_activity_label" />
+
             <android.support.v7.widget.GridLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:padding="10dip"
                 app:columnCount="3">
-
                 <Button
                     android:id="@+id/careportal_bgcheck"
                     style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_width="0px"
+                    android:layout_height="fill_parent"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_bgcheck"
+                    android:drawableTop="@drawable/icon_cp_bgcheck"
+
                     app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
@@ -43,7 +53,10 @@
                     android:id="@+id/careportal_exercise"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_exercise"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_exercise"
                     app:layout_column="1"
                     app:layout_columnWeight="1"
@@ -54,130 +67,197 @@
                     android:id="@+id/careportal_note"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_note"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_note"
                     app:layout_column="2"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="0" />
+				</android.support.v7.widget.GridLayout>
+					
+				
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+					android:paddingStart="15dp"
+                    android:text="@string/careportal_carbsandbolus_label" />
 
-                <Button
-                    android:id="@+id/careportal_snackbolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_snackbolus"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+            <android.support.v7.widget.GridLayout
+android:layout_width="fill_parent"
+android:layout_height="wrap_content"
+android:layout_centerHorizontal="true"
+android:padding="10dip"
+app:columnCount="3">
 
-                <Button
-                    android:id="@+id/careportal_mealbolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_mealbolus"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+<Button
+android:id="@+id/careportal_snackbolus"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_bolus_snack"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_snackbolus"
+app:layout_column="0"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="1" />
 
-                <Button
-                    android:id="@+id/careportal_correctionbolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_correctionbolus"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="1" />
+<Button
+android:id="@+id/careportal_mealbolus"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_bolus_meal"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_mealbolus"
+app:layout_column="1"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="1" />
 
-                <Button
-                    android:id="@+id/careportal_carbscorrection"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_carbscorrection"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="2" />
+<Button
+android:id="@+id/careportal_correctionbolus"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_bolus_correction"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_correctionbolus"
+app:layout_column="2"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="1" />
 
-                <Button
-                    android:id="@+id/careportal_combobolus"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_combobolus"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="2" />
+<Button
+android:id="@+id/careportal_carbscorrection"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_bolus_carbs"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_carbscorrection"
+app:layout_column="0"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="2" />
 
-                <Button
-                    android:id="@+id/careportal_tempbasalstart"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_tempbasalstart"
-                    app:layout_column="2"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="2" />
+<Button
+android:id="@+id/careportal_combobolus"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_bolus_correction"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_combobolus"
+app:layout_column="1"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="2" />
 
-                <Button
-                    android:id="@+id/careportal_tempbasalend"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="70dp"
-                    android:text="@string/careportal_tempbasalend"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="3" />
+<Button
+android:id="@+id/careportal_tempbasalstart"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_basal_start"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_tempbasalstart"
+app:layout_column="2"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="2" />
 
+<Button
+android:id="@+id/careportal_tempbasalend"
+style="@style/ButtonSmallFontStyle"
+android:layout_width="0dp"
+android:layout_height="fill_parent"
+android:drawableTop="@drawable/icon_cp_basal_end"
+android:paddingLeft="0dp"
+android:paddingRight="0dp"
+android:text="@string/careportal_tempbasalend"
+app:layout_column="0"
+app:layout_columnWeight="1"
+app:layout_gravity="fill"
+app:layout_row="3" />
+
+            </android.support.v7.widget.GridLayout>
+
+
+            <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+					android:paddingStart="15dp"
+                    android:text="@string/careportal_cgm_label" />
+				<android.support.v7.widget.GridLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:padding="10dip"
+                app:columnCount="3">
                 <Button
                     android:id="@+id/careportal_announcement"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_announcement"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_announcement"
-                    app:layout_column="1"
+                    app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_row="3" />
+                    app:layout_row="1" />
 
                 <Button
                     android:id="@+id/careportal_question"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_question"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_question"
-                    app:layout_column="2"
+                    app:layout_column="1"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_row="3" />
+                    app:layout_row="1" />
 
                 <Button
                     android:id="@+id/careportal_pumpsitechange"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_pump_canula"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_pumpsitechange"
-                    app:layout_column="0"
+                    app:layout_column="2"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_row="4" />
+                    app:layout_row="1" />
 
                 <Button
                     android:id="@+id/careportal_cgmsensorinsert"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_cgm_insert"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_cgmsensorinsert"
-                    app:layout_column="1"
+                    app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="4" />
@@ -186,18 +266,39 @@
                     android:id="@+id/careportal_cgmsensorstart"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_cgm_start"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_cgmsensorstart"
-                    app:layout_column="2"
+                    app:layout_column="1"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="4" />
+					</android.support.v7.widget.GridLayout>
+					
+				
+                <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+					android:paddingStart="15dp"
+                    android:text="@string/careportal_pump_label" />
+				<android.support.v7.widget.GridLayout
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:padding="10dip"
+                app:columnCount="3">
 
                 <Button
                     android:id="@+id/careportal_insulincartridgechange"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_pump_cartridge"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_insulincartridgechange"
                     app:layout_column="0"
                     app:layout_columnWeight="1"
@@ -208,7 +309,10 @@
                     android:id="@+id/careportal_profileswitch"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_cgm_profile"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_profileswitch"
                     app:layout_column="1"
                     app:layout_columnWeight="1"
@@ -219,7 +323,10 @@
                     android:id="@+id/careportal_openapsoffline"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_aaps_offline"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_openapsoffline"
                     app:layout_column="2"
                     app:layout_columnWeight="1"
@@ -230,8 +337,11 @@
                     android:id="@+id/careportal_temporarytarget"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
                     android:text="@string/careportal_temporarytarget"
+                    android:drawableTop="@drawable/icon_cp_cgm_target"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
@@ -241,7 +351,10 @@
                     android:id="@+id/careportal_pumpbatterychange"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
-                    android:layout_height="70dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_pump_battery"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
                     android:text="@string/careportal_pumpbatterychange"
                     app:layout_column="1"
                     app:layout_columnWeight="1"
diff --git a/app/src/main/res/layout/careportal_stats_fragment.xml b/app/src/main/res/layout/careportal_stats_fragment.xml
index c7c8070f54..f7af98bdd3 100644
--- a/app/src/main/res/layout/careportal_stats_fragment.xml
+++ b/app/src/main/res/layout/careportal_stats_fragment.xml
@@ -18,11 +18,13 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
-                android:gravity="end"
+                android:gravity="center_vertical"
+				android:drawableLeft="@drawable/icon_cp_age_sensor"
                 android:paddingRight="5dp"
+                android:paddingStart="15dp"
                 android:text="@string/careportal_sensorage_label"
                 android:textSize="14sp" />
 
@@ -63,11 +65,13 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
-                android:gravity="end"
+                android:gravity="center_vertical"
+                android:drawableLeft="@drawable/icon_cp_age_insulin"
                 android:paddingRight="5dp"
+                android:paddingStart="15dp"
                 android:text="@string/careportal_insulinage_label"
                 android:textSize="14sp" />
 
@@ -108,11 +112,13 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
-                android:gravity="end"
+                android:gravity="center_vertical"
+                android:drawableLeft="@drawable/icon_cp_age_canula"
                 android:paddingRight="5dp"
+                android:paddingStart="15dp"
                 android:text="@string/careportal_canulaage_label"
                 android:textSize="14sp" />
 
@@ -128,8 +134,8 @@
 
             <TextView
                 android:id="@+id/careportal_canulaage"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:gravity="start"
                 android:paddingLeft="5dp"
@@ -153,11 +159,13 @@
             android:orientation="horizontal">
 
             <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="fill_parent"
+                android:layout_height="fill_parent"
                 android:layout_weight="1"
-                android:gravity="end"
+                android:gravity="center_vertical"
+                android:drawableLeft="@drawable/icon_cp_age_battery"
                 android:paddingRight="5dp"
+                android:paddingStart="15dp"
                 android:text="@string/careportal_pbage_label"
                 android:textSize="14sp" />
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cbde9f5520..97eb1dea80 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources>
     <string name="treatmentssafety_title">Tratments safety</string>
     <string name="treatmentssafety_maxbolus_title">Max allowed bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Max allowed carbs [g]</string>
@@ -688,4 +688,9 @@
     <string name="wear_overviewnotifications_summary">Pass the Overview Notifications through as wear confirmation messages.</string>
     <string name="ns_localbroadcasts">Enable loacal broadcasts to other apps (like xDrip).</string>
     <string name="ns_localbroadcasts_title">Enable local Broadcasts.</string>
-</resources>
\ No newline at end of file
+	<string name="careportal_activity_label">ACTIVITY &amp; FEEDBACK</string>
+	<string name="careportal_carbsandbolus_label">CARBS &amp; BOLUS</string>
+	<string name="careportal_cgm_label">CGM &amp; OPENAPS</string>
+	<string name="careportal_pump_label">PUMP</string>
+</resources>
+
diff --git a/git b/git
new file mode 100644
index 0000000000..e69de29bb2

From 3d4fa0cebf19ba28d2332bd4ab3120991d36d5f4 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 22 Jul 2017 02:15:55 +0200
Subject: [PATCH 2/7] remove duplicate IDs and indentation fix

---
 .../main/res/layout/careportal_fragment.xml   | 243 +++++++++---------
 1 file changed, 120 insertions(+), 123 deletions(-)

diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 8861c729f2..88570c1d29 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -22,10 +22,9 @@
                 android:layout_height="wrap_content" />
 
             <TextView
-                android:id="@+id/textView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-				android:paddingStart="15dp"
+                android:paddingStart="15dp"
                 android:text="@string/careportal_activity_label" />
 
             <android.support.v7.widget.GridLayout
@@ -76,131 +75,129 @@
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="0" />
-				</android.support.v7.widget.GridLayout>
-					
-				
-                <TextView
-                    android:id="@+id/textView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-					android:paddingStart="15dp"
-                    android:text="@string/careportal_carbsandbolus_label" />
+            </android.support.v7.widget.GridLayout>
+
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:text="@string/careportal_carbsandbolus_label" />
 
             <android.support.v7.widget.GridLayout
-android:layout_width="fill_parent"
-android:layout_height="wrap_content"
-android:layout_centerHorizontal="true"
-android:padding="10dip"
-app:columnCount="3">
+                android:layout_width="fill_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:padding="10dip"
+                app:columnCount="3">
 
-<Button
-android:id="@+id/careportal_snackbolus"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_bolus_snack"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_snackbolus"
-app:layout_column="0"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="1" />
+                <Button
+                    android:id="@+id/careportal_snackbolus"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_bolus_snack"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_snackbolus"
+                    app:layout_column="0"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="1" />
 
-<Button
-android:id="@+id/careportal_mealbolus"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_bolus_meal"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_mealbolus"
-app:layout_column="1"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="1" />
+                <Button
+                    android:id="@+id/careportal_mealbolus"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_bolus_meal"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_mealbolus"
+                    app:layout_column="1"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="1" />
 
-<Button
-android:id="@+id/careportal_correctionbolus"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_bolus_correction"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_correctionbolus"
-app:layout_column="2"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="1" />
+                <Button
+                    android:id="@+id/careportal_correctionbolus"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_bolus_correction"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_correctionbolus"
+                    app:layout_column="2"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="1" />
 
-<Button
-android:id="@+id/careportal_carbscorrection"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_bolus_carbs"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_carbscorrection"
-app:layout_column="0"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="2" />
+                <Button
+                    android:id="@+id/careportal_carbscorrection"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_bolus_carbs"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_carbscorrection"
+                    app:layout_column="0"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="2" />
 
-<Button
-android:id="@+id/careportal_combobolus"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_bolus_correction"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_combobolus"
-app:layout_column="1"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="2" />
+                <Button
+                    android:id="@+id/careportal_combobolus"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_bolus_correction"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_combobolus"
+                    app:layout_column="1"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="2" />
 
-<Button
-android:id="@+id/careportal_tempbasalstart"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_basal_start"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_tempbasalstart"
-app:layout_column="2"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="2" />
+                <Button
+                    android:id="@+id/careportal_tempbasalstart"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_basal_start"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_tempbasalstart"
+                    app:layout_column="2"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="2" />
 
-<Button
-android:id="@+id/careportal_tempbasalend"
-style="@style/ButtonSmallFontStyle"
-android:layout_width="0dp"
-android:layout_height="fill_parent"
-android:drawableTop="@drawable/icon_cp_basal_end"
-android:paddingLeft="0dp"
-android:paddingRight="0dp"
-android:text="@string/careportal_tempbasalend"
-app:layout_column="0"
-app:layout_columnWeight="1"
-app:layout_gravity="fill"
-app:layout_row="3" />
+                <Button
+                    android:id="@+id/careportal_tempbasalend"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_basal_end"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_tempbasalend"
+                    app:layout_column="0"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="3" />
 
             </android.support.v7.widget.GridLayout>
 
 
             <TextView
-                    android:id="@+id/textView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-					android:paddingStart="15dp"
-                    android:text="@string/careportal_cgm_label" />
-				<android.support.v7.widget.GridLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:text="@string/careportal_cgm_label" />
+            <android.support.v7.widget.GridLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
@@ -275,16 +272,16 @@ app:layout_row="3" />
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="4" />
-					</android.support.v7.widget.GridLayout>
-					
-				
-                <TextView
-                    android:id="@+id/textView"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-					android:paddingStart="15dp"
-                    android:text="@string/careportal_pump_label" />
-				<android.support.v7.widget.GridLayout
+            </android.support.v7.widget.GridLayout>
+
+
+            <TextView
+                android:id="@+id/textView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="15dp"
+                android:text="@string/careportal_pump_label" />
+            <android.support.v7.widget.GridLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"

From baaa83a850343fb56c22fb2bec3270a376727c7b Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 22 Jul 2017 03:40:35 +0200
Subject: [PATCH 3/7] removed empty ghost files

---
 FETCH_HEAD | 0
 git        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 FETCH_HEAD
 delete mode 100644 git

diff --git a/FETCH_HEAD b/FETCH_HEAD
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/git b/git
deleted file mode 100644
index e69de29bb2..0000000000

From 54697df3586e75c54f67e06278501d99be73932e Mon Sep 17 00:00:00 2001
From: Roumen Georgiev <roumen_georgiev@yahoo.com>
Date: Sat, 22 Jul 2017 15:16:03 +0300
Subject: [PATCH 4/7] Moving some buttons to the right categories

---
 .../main/res/layout/careportal_fragment.xml   | 48 ++++++++++---------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 88570c1d29..27ff11c83a 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -189,7 +189,7 @@
                     app:layout_gravity="fill"
                     app:layout_row="3" />
 
-            </android.support.v7.widget.GridLayout>
+</android.support.v7.widget.GridLayout>
 
 
             <TextView
@@ -230,21 +230,22 @@
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="1" />
-
-                <Button
-                    android:id="@+id/careportal_pumpsitechange"
+				<Button
+                    android:id="@+id/careportal_openapsoffline"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_pump_canula"
+                    android:drawableTop="@drawable/icon_cp_aaps_offline"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/careportal_pumpsitechange"
+                    android:text="@string/careportal_openapsoffline"
                     app:layout_column="2"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="1" />
 
+                
+
                 <Button
                     android:id="@+id/careportal_cgmsensorinsert"
                     style="@style/ButtonSmallFontStyle"
@@ -287,6 +288,19 @@
                 android:layout_centerHorizontal="true"
                 android:padding="10dip"
                 app:columnCount="3">
+				<Button
+                    android:id="@+id/careportal_pumpsitechange"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_pump_canula"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_pumpsitechange"
+                    app:layout_column="0"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="0" />
 
                 <Button
                     android:id="@+id/careportal_insulincartridgechange"
@@ -297,10 +311,10 @@
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/careportal_insulincartridgechange"
-                    app:layout_column="0"
+                    app:layout_column="1"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_row="5" />
+                    app:layout_row="0" />
 
                 <Button
                     android:id="@+id/careportal_profileswitch"
@@ -311,24 +325,12 @@
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/careportal_profileswitch"
-                    app:layout_column="1"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="5" />
-
-                <Button
-                    android:id="@+id/careportal_openapsoffline"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_aaps_offline"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_openapsoffline"
                     app:layout_column="2"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
-                    app:layout_row="5" />
+                    app:layout_row="0" />
+
+                
 
                 <Button
                     android:id="@+id/careportal_temporarytarget"

From c187bf15757e650335f01acb9d931187117d0d87 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 22 Jul 2017 14:30:55 +0200
Subject: [PATCH 5/7] layout indentation

---
 .../main/res/layout/careportal_fragment.xml    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 27ff11c83a..6a5d53f703 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -33,15 +33,16 @@
                 android:layout_centerHorizontal="true"
                 android:padding="10dip"
                 app:columnCount="3">
+
                 <Button
                     android:id="@+id/careportal_bgcheck"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0px"
                     android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_bgcheck"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/careportal_bgcheck"
-                    android:drawableTop="@drawable/icon_cp_bgcheck"
 
                     app:layout_column="0"
                     app:layout_columnWeight="1"
@@ -189,7 +190,7 @@
                     app:layout_gravity="fill"
                     app:layout_row="3" />
 
-</android.support.v7.widget.GridLayout>
+            </android.support.v7.widget.GridLayout>
 
 
             <TextView
@@ -197,12 +198,14 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="15dp"
                 android:text="@string/careportal_cgm_label" />
+
             <android.support.v7.widget.GridLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:padding="10dip"
                 app:columnCount="3">
+
                 <Button
                     android:id="@+id/careportal_announcement"
                     style="@style/ButtonSmallFontStyle"
@@ -230,7 +233,8 @@
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="1" />
-				<Button
+
+                <Button
                     android:id="@+id/careportal_openapsoffline"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
@@ -244,7 +248,6 @@
                     app:layout_gravity="fill"
                     app:layout_row="1" />
 
-                
 
                 <Button
                     android:id="@+id/careportal_cgmsensorinsert"
@@ -282,13 +285,15 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="15dp"
                 android:text="@string/careportal_pump_label" />
+
             <android.support.v7.widget.GridLayout
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerHorizontal="true"
                 android:padding="10dip"
                 app:columnCount="3">
-				<Button
+
+                <Button
                     android:id="@+id/careportal_pumpsitechange"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
@@ -330,17 +335,16 @@
                     app:layout_gravity="fill"
                     app:layout_row="0" />
 
-                
 
                 <Button
                     android:id="@+id/careportal_temporarytarget"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:text="@string/careportal_temporarytarget"
                     android:drawableTop="@drawable/icon_cp_cgm_target"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
+                    android:text="@string/careportal_temporarytarget"
                     app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"

From 2e32d12bc00d2c4b9e161590c81c4b6f93c2310b Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 22 Jul 2017 14:34:59 +0200
Subject: [PATCH 6/7] removed unnecessary text colour and fixed indentation

---
 app/src/main/res/layout/actions_fragment.xml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 099e2c6db1..e24f69124d 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -23,7 +23,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-		android:drawableTop="@drawable/icon_actions_profileswitch"
+                android:drawableTop="@drawable/icon_actions_profileswitch"
                 android:text="@string/careportal_profileswitch" />
 
             <Button
@@ -36,7 +36,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-		android:drawableTop="@drawable/icon_actions_temptarget"
+                android:drawableTop="@drawable/icon_actions_temptarget"
                 android:text="@string/careportal_temporarytarget" />
 
             <Button
@@ -49,7 +49,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-		android:drawableTop="@drawable/icon_actions_starttempbasal"
+                android:drawableTop="@drawable/icon_actions_starttempbasal"
                 android:text="@string/overview_tempbasal_button" />
 
             <Button
@@ -62,9 +62,8 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-				android:drawableTop="@drawable/icon_actions_startextbolus"
-                android:text="@string/overview_extendedbolus_button"
-                android:textColor="@color/colorSetExtendedButton" />
+                android:drawableTop="@drawable/icon_actions_startextbolus"
+                android:text="@string/overview_extendedbolus_button" />
 
             <Button
                 android:id="@+id/actions_extendedbolus_cancel"
@@ -76,7 +75,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-		android:drawableTop="@drawable/icon_actions_cancelextbolus"
+                android:drawableTop="@drawable/icon_actions_cancelextbolus"
                 android:text="@string/overview_extendedbolus_cancel_button" />
 
             <Button
@@ -89,7 +88,7 @@
                 android:layout_marginRight="10dp"
                 android:layout_marginTop="3dp"
                 android:layout_weight="0.5"
-		android:drawableTop="@drawable/icon_actions_refill"
+                android:drawableTop="@drawable/icon_actions_refill"
                 android:text="@string/primefill" />
 
         </LinearLayout>

From 1c0e97c175a163f6c2ff1a8621ddabde85170489 Mon Sep 17 00:00:00 2001
From: AdrianLxM <adrian.m@inbox.com>
Date: Sat, 22 Jul 2017 20:57:30 +0200
Subject: [PATCH 7/7] recategorize cp icons

---
 .../main/res/layout/careportal_fragment.xml   | 64 ++++++++++---------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/app/src/main/res/layout/careportal_fragment.xml b/app/src/main/res/layout/careportal_fragment.xml
index 6a5d53f703..9c7d34d6a1 100644
--- a/app/src/main/res/layout/careportal_fragment.xml
+++ b/app/src/main/res/layout/careportal_fragment.xml
@@ -64,18 +64,20 @@
                     app:layout_row="0" />
 
                 <Button
-                    android:id="@+id/careportal_note"
+                    android:id="@+id/careportal_temporarytarget"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_note"
+                    android:drawableTop="@drawable/icon_cp_cgm_target"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/careportal_note"
+                    android:text="@string/careportal_temporarytarget"
                     app:layout_column="2"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="0" />
+
+
             </android.support.v7.widget.GridLayout>
 
 
@@ -207,33 +209,35 @@
                 app:columnCount="3">
 
                 <Button
-                    android:id="@+id/careportal_announcement"
+                    android:id="@+id/careportal_cgmsensorstart"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_announcement"
+                    android:drawableTop="@drawable/icon_cp_cgm_start"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/careportal_announcement"
+                    android:text="@string/careportal_cgmsensorstart"
                     app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="1" />
 
+
                 <Button
-                    android:id="@+id/careportal_question"
+                    android:id="@+id/careportal_cgmsensorinsert"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_question"
+                    android:drawableTop="@drawable/icon_cp_cgm_insert"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/careportal_question"
+                    android:text="@string/careportal_cgmsensorinsert"
                     app:layout_column="1"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="1" />
 
+
                 <Button
                     android:id="@+id/careportal_openapsoffline"
                     style="@style/ButtonSmallFontStyle"
@@ -250,32 +254,46 @@
 
 
                 <Button
-                    android:id="@+id/careportal_cgmsensorinsert"
+                    android:id="@+id/careportal_announcement"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_insert"
+                    android:drawableTop="@drawable/icon_cp_announcement"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/careportal_cgmsensorinsert"
+                    android:text="@string/careportal_announcement"
                     app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="4" />
 
                 <Button
-                    android:id="@+id/careportal_cgmsensorstart"
+                    android:id="@+id/careportal_question"
                     style="@style/ButtonSmallFontStyle"
                     android:layout_width="0dp"
                     android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_start"
+                    android:drawableTop="@drawable/icon_cp_question"
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
-                    android:text="@string/careportal_cgmsensorstart"
+                    android:text="@string/careportal_question"
                     app:layout_column="1"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="4" />
+
+                <Button
+                    android:id="@+id/careportal_note"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="0dp"
+                    android:layout_height="fill_parent"
+                    android:drawableTop="@drawable/icon_cp_note"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/careportal_note"
+                    app:layout_column="2"
+                    app:layout_columnWeight="1"
+                    app:layout_gravity="fill"
+                    app:layout_row="4" />
             </android.support.v7.widget.GridLayout>
 
 
@@ -336,20 +354,6 @@
                     app:layout_row="0" />
 
 
-                <Button
-                    android:id="@+id/careportal_temporarytarget"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="0dp"
-                    android:layout_height="fill_parent"
-                    android:drawableTop="@drawable/icon_cp_cgm_target"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/careportal_temporarytarget"
-                    app:layout_column="0"
-                    app:layout_columnWeight="1"
-                    app:layout_gravity="fill"
-                    app:layout_row="6" />
-
                 <Button
                     android:id="@+id/careportal_pumpbatterychange"
                     style="@style/ButtonSmallFontStyle"
@@ -359,7 +363,7 @@
                     android:paddingLeft="0dp"
                     android:paddingRight="0dp"
                     android:text="@string/careportal_pumpbatterychange"
-                    app:layout_column="1"
+                    app:layout_column="0"
                     app:layout_columnWeight="1"
                     app:layout_gravity="fill"
                     app:layout_row="6" />