From 2e687fe68725c5589747ce9743376f9cc9d467e6 Mon Sep 17 00:00:00 2001
From: Milos Kozak <m.kozak@sysop.cz>
Date: Sat, 21 Dec 2019 15:26:41 +0100
Subject: [PATCH] DanaRHistoryActivity layout refactor

---
 .../activities/DanaRHistoryActivity.java      |  6 +-
 .../main/res/layout/danar_historyactivity.xml | 88 +++++++++++--------
 .../main/res/layout/dialog_bolusprogress.xml  |  2 +-
 .../main/res/layout/dialog_calibration.xml    |  2 +-
 app/src/main/res/layout/dialog_carbs.xml      |  2 +-
 app/src/main/res/layout/dialog_care.xml       |  2 +-
 app/src/main/res/layout/dialog_error.xml      |  2 +-
 .../main/res/layout/dialog_extendedbolus.xml  |  2 +-
 app/src/main/res/layout/dialog_fill.xml       |  2 +-
 app/src/main/res/layout/dialog_insulin.xml    |  2 +-
 .../main/res/layout/dialog_profileswitch.xml  |  2 +-
 .../main/res/layout/dialog_profileviewer.xml  |  2 +-
 app/src/main/res/layout/dialog_tempbasal.xml  |  2 +-
 app/src/main/res/layout/dialog_temptarget.xml |  2 +-
 app/src/main/res/layout/dialog_treatment.xml  |  2 +-
 app/src/main/res/layout/dialog_wizard.xml     |  2 +-
 app/src/main/res/values/colors.xml            |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 18 files changed, 71 insertions(+), 55 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
index 97f029bd8c..30e3cc4851 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/pump/danaR/activities/DanaRHistoryActivity.java
@@ -108,9 +108,9 @@ public class DanaRHistoryActivity extends NoSplashAppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.danar_historyactivity);
 
-        historyTypeSpinner = findViewById(R.id.danar_historytype);
-        statusView = findViewById(R.id.danar_historystatus);
-        reloadButton = findViewById(R.id.danar_historyreload);
+        historyTypeSpinner = findViewById(R.id.danar_history_spinner);
+        statusView = findViewById(R.id.danar_history_status);
+        reloadButton = findViewById(R.id.danar_history_reload);
         recyclerView = findViewById(R.id.danar_history_recyclerview);
 
         recyclerView.setHasFixedSize(true);
diff --git a/app/src/main/res/layout/danar_historyactivity.xml b/app/src/main/res/layout/danar_historyactivity.xml
index 3324a98029..d879b011cb 100644
--- a/app/src/main/res/layout/danar_historyactivity.xml
+++ b/app/src/main/res/layout/danar_historyactivity.xml
@@ -3,50 +3,74 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".plugins.pump.danaR.activities.DanaRHistoryActivity">
 
 
-    <LinearLayout
-        android:id="@+id/danar_historytop"
+    <RelativeLayout
+        android:id="@+id/danar_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentTop="true"
+        android:layout_gravity="center"
+        android:background="@color/cardColorBackground"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/carbs"
+            android:src="@drawable/icon_danarhistory" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/danar_history"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/spacer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/danar_header"
+        android:orientation="horizontal"
+        android:padding="5dp" />
+
+    <LinearLayout
+        android:id="@+id/danar_history_spinner_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/spacer"
         android:orientation="horizontal">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="20dp"
-            android:text="Type:"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="20dp"
+            android:text="@string/careportal_newnstreatment_eventtype"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
         <Spinner
-            android:id="@+id/danar_historytype"
+            android:id="@+id/danar_history_spinner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="20dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="right"
-            android:layout_marginRight="5dp"
-            android:layout_weight="1"
-            android:background="@drawable/pillborder"
-            android:gravity="center_horizontal"
-            android:text="DanaR History" />
-
+            android:layout_marginEnd="20dp" />
 
     </LinearLayout>
 
     <TextView
-        android:id="@+id/danar_historystatus"
+        android:id="@+id/danar_history_status"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_below="@id/danar_historytop"
+        android:layout_below="@id/danar_history_spinner_layout"
         android:layout_gravity="center_horizontal"
         android:gravity="center_horizontal" />
 
@@ -54,23 +78,15 @@
         android:id="@+id/danar_history_recyclerview"
         android:layout_width="match_parent"
         android:layout_height="fill_parent"
-        android:layout_above="@+id/danar_historybuttons"
-        android:layout_below="@+id/danar_historystatus" />
+        android:layout_below="@+id/danar_history_status" />
 
-    <LinearLayout
-        android:id="@+id/danar_historybuttons"
+    <Button
+        android:id="@+id/danar_history_reload"
+        style="@style/Widget.AppCompat.Button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/danar_historyreload"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/danar_historyreload" />
-
-    </LinearLayout>
+        android:drawableStart="@drawable/icon_actions_refill"
+        android:text="@string/danar_historyreload" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/dialog_bolusprogress.xml b/app/src/main/res/layout/dialog_bolusprogress.xml
index f9a8f242bd..b8e8377827 100644
--- a/app/src/main/res/layout/dialog_bolusprogress.xml
+++ b/app/src/main/res/layout/dialog_bolusprogress.xml
@@ -10,7 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@color/dialog_title_backround"
+        android:background="@color/dialog_title_background"
         android:orientation="horizontal"
         android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_calibration.xml b/app/src/main/res/layout/dialog_calibration.xml
index 5ffe161480..ddab7cc285 100644
--- a/app/src/main/res/layout/dialog_calibration.xml
+++ b/app/src/main/res/layout/dialog_calibration.xml
@@ -18,7 +18,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_carbs.xml b/app/src/main/res/layout/dialog_carbs.xml
index cdcce19dd0..9a95d19144 100644
--- a/app/src/main/res/layout/dialog_carbs.xml
+++ b/app/src/main/res/layout/dialog_carbs.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_care.xml b/app/src/main/res/layout/dialog_care.xml
index 4ffa592b5c..8376b2c776 100644
--- a/app/src/main/res/layout/dialog_care.xml
+++ b/app/src/main/res/layout/dialog_care.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_error.xml b/app/src/main/res/layout/dialog_error.xml
index bd486883de..42ad93318d 100644
--- a/app/src/main/res/layout/dialog_error.xml
+++ b/app/src/main/res/layout/dialog_error.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:background="@color/dialog_title_backround"
+        android:background="@color/dialog_title_background"
         android:orientation="horizontal"
         android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_extendedbolus.xml b/app/src/main/res/layout/dialog_extendedbolus.xml
index 624f4a03b4..26c15117a7 100644
--- a/app/src/main/res/layout/dialog_extendedbolus.xml
+++ b/app/src/main/res/layout/dialog_extendedbolus.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_fill.xml b/app/src/main/res/layout/dialog_fill.xml
index cf0aa0fb43..3e0bed7478 100644
--- a/app/src/main/res/layout/dialog_fill.xml
+++ b/app/src/main/res/layout/dialog_fill.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_insulin.xml b/app/src/main/res/layout/dialog_insulin.xml
index ae5935673d..9ed84e4779 100644
--- a/app/src/main/res/layout/dialog_insulin.xml
+++ b/app/src/main/res/layout/dialog_insulin.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_profileswitch.xml b/app/src/main/res/layout/dialog_profileswitch.xml
index 3ad81fc365..e726097369 100644
--- a/app/src/main/res/layout/dialog_profileswitch.xml
+++ b/app/src/main/res/layout/dialog_profileswitch.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_profileviewer.xml b/app/src/main/res/layout/dialog_profileviewer.xml
index 0bcd6b3d5a..c55ea7027c 100644
--- a/app/src/main/res/layout/dialog_profileviewer.xml
+++ b/app/src/main/res/layout/dialog_profileviewer.xml
@@ -16,7 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_tempbasal.xml b/app/src/main/res/layout/dialog_tempbasal.xml
index 6753c5a549..c748960c33 100644
--- a/app/src/main/res/layout/dialog_tempbasal.xml
+++ b/app/src/main/res/layout/dialog_tempbasal.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_temptarget.xml b/app/src/main/res/layout/dialog_temptarget.xml
index 2bc65a9277..be4258ec5c 100644
--- a/app/src/main/res/layout/dialog_temptarget.xml
+++ b/app/src/main/res/layout/dialog_temptarget.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_treatment.xml b/app/src/main/res/layout/dialog_treatment.xml
index b95172883c..47c406a0fd 100644
--- a/app/src/main/res/layout/dialog_treatment.xml
+++ b/app/src/main/res/layout/dialog_treatment.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index ecc58c2aa3..e7074ecb45 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -17,7 +17,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:background="@color/dialog_title_backround"
+            android:background="@color/dialog_title_background"
             android:orientation="horizontal"
             android:padding="5dp">
 
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 100cfbec9a..86e3103382 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -44,7 +44,7 @@
     <color name="mdtp_accent_color">#40bbaa</color>
     <color name="colorInitializingBorder">#00695c</color>
 
-    <color name="dialog_title_backround">#303030</color>
+    <color name="dialog_title_background">#303030</color>
 
     <color name="cardColorBackground">#121212</color>
     <color name="cardObjectiveText">#779ECB</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 363f456e50..4da9504129 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -877,7 +877,7 @@
     <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last two minutes. To prevent accidental double boluses and to guard against bugs this is disallowed.</string>
     <string name="combo_pump_connected_now">Now</string>
     <string name="combo_activity_reading_pump_history">Reading pump history</string>
-    <string name="danar_history">pump history</string>
+    <string name="danar_history">Pump history</string>
     <string name="combo_activity_setting_basal_profile">Setting basal profile</string>
     <string name="combo_pump_cartridge_low_warrning">Pump cartridge level is low</string>
     <string name="combo_pump_battery_low_warrning">Pump battery is low</string>