From 4fafdb37fb23d12469cc1ac4b23efe9583f87407 Mon Sep 17 00:00:00 2001
From: Javier <dev.git@javispedro.com>
Date: Fri, 26 Mar 2021 15:21:13 +0100
Subject: Add status icons and clearer status messages

---
 app/src/main/res/drawable/ic_baseline_check_24.xml | 10 ++++++
 app/src/main/res/drawable/ic_baseline_error_24.xml | 10 ++++++
 app/src/main/res/layout/activity_main.xml          | 27 ++++++++-------
 app/src/main/res/layout/fragment_device.xml        | 38 ++++++++++++++++++++--
 app/src/main/res/values/strings.xml                |  4 ++-
 5 files changed, 74 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_baseline_check_24.xml
 create mode 100644 app/src/main/res/drawable/ic_baseline_error_24.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_baseline_check_24.xml b/app/src/main/res/drawable/ic_baseline_check_24.xml
new file mode 100644
index 0000000..0432fa6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_check_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_baseline_error_24.xml b/app/src/main/res/drawable/ic_baseline_error_24.xml
new file mode 100644
index 0000000..b915a34
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_error_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fe4da78..aecd8c6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,19 +6,24 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/list"
-        android:name="com.javispedro.rempe.DeviceFragment"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+        android:id="@+id/srlList"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        app:layoutManager="LinearLayoutManager"
-        tools:context=".DeviceFragment"
-        tools:listitem="@layout/fragment_device">
-
-    </androidx.recyclerview.widget.RecyclerView>
+        app:layout_behavior="@string/appbar_scrolling_view_behavior">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/list"
+            android:name="com.javispedro.rempe.DeviceFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="16dp"
+            app:layoutManager="LinearLayoutManager"
+            tools:context=".DeviceFragment"
+            tools:listitem="@layout/fragment_device" />
+
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_device.xml b/app/src/main/res/layout/fragment_device.xml
index 0a39ba4..74e067d 100644
--- a/app/src/main/res/layout/fragment_device.xml
+++ b/app/src/main/res/layout/fragment_device.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:padding="16dp">
 
     <TextView
         android:id="@+id/nameView"
@@ -22,6 +24,25 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/nameView" />
 
+    <ImageView
+        android:id="@+id/statusImageView"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginStart="8dp"
+        android:visibility="invisible"
+        app:layout_constraintStart_toEndOf="@+id/statusView"
+        app:layout_constraintTop_toTopOf="@+id/statusView" />
+
+    <ProgressBar
+        android:id="@+id/statusProgressBar"
+        style="?android:attr/progressBarStyle"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_marginStart="8dp"
+        android:indeterminate="true"
+        app:layout_constraintStart_toEndOf="@+id/statusView"
+        app:layout_constraintTop_toTopOf="@+id/statusView" />
+
     <TextView
         android:id="@+id/temperatureView"
         android:layout_width="wrap_content"
@@ -30,8 +51,19 @@
         android:text="@string/temperature_nothing"
         android:textAppearance="@style/TextAppearance.AppCompat.Large"
         android:textSize="72sp"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/minmaxTemperatureLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="8dp"
+        android:text="@string/last_24h"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/minTemperatureView"
+        app:layout_constraintEnd_toStartOf="@+id/minTemperatureView"
+        app:layout_constraintTop_toTopOf="@+id/minTemperatureView" />
 
     <TextView
         android:id="@+id/maxTemperatureView"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 97e603d..7db9d07 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,12 +13,14 @@
     <string name="temperature_nothing">--</string>
     <string name="temperature_celsius">%1$s °C</string>
 
+    <string name="last_24h">Last 24h:</string>
+
     <string name="signal_level">Signal:</string>
 
     <string name="state_dead">Disconnected</string>
     <string name="state_closed">Disconnected</string>
     <string name="state_searching">Searching</string>
-    <string name="state_tracking">Tracking</string>
+    <string name="state_tracking">Connected</string>
     <string name="state_processing">Processing request</string>
     <string name="state_unrecognized">Unrecognized</string>
     <string name="state_unknown">Unknown state</string>
-- 
cgit v1.2.3