From 18be725cf30d7000c151310b9349792137b8239f Mon Sep 17 00:00:00 2001
From: adolfintel <dosse91@paranoici.org>
Date: Fri, 15 Mar 2019 19:31:09 +0100
Subject: [PATCH] Improved looks of notification

---
 .../java/com/dosse/airpods/PodsService.java   | 31 +++++++++++++++----
 .../app/src/main/res/layout/status_big.xml    | 30 ++++++++++++++++++
 .../app/src/main/res/layout/status_small.xml  | 27 ++++++++++++++++
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java
index 85b056b..a31e41e 100644
--- a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java
+++ b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java
@@ -19,6 +19,7 @@ import android.os.ParcelUuid;
 import android.os.SystemClock;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
+import android.view.View;
 import android.widget.RemoteViews;
 
 import java.util.ArrayList;
@@ -197,6 +198,18 @@ public class PodsService extends Service {
                     notificationBig.setImageViewResource(R.id.rightPodImg,rightStatus<=10?R.drawable.right_pod:R.drawable.right_pod_disconnected);
                     notificationBig.setImageViewResource(R.id.podCaseImg,caseStatus<=10?R.drawable.pod_case:R.drawable.pod_case_disconnected);
                     if(System.currentTimeMillis()-lastSeenConnected<TIMEOUT_CONNECTED) {
+                        notificationBig.setViewVisibility(R.id.leftPodText, View.VISIBLE);
+                        notificationBig.setViewVisibility(R.id.rightPodText, View.VISIBLE);
+                        notificationBig.setViewVisibility(R.id.podCaseText, View.VISIBLE);
+                        notificationBig.setViewVisibility(R.id.leftPodUpdating, View.INVISIBLE);
+                        notificationBig.setViewVisibility(R.id.rightPodUpdating, View.INVISIBLE);
+                        notificationBig.setViewVisibility(R.id.podCaseUpdating, View.INVISIBLE);
+                        notificationSmall.setViewVisibility(R.id.leftPodText, View.VISIBLE);
+                        notificationSmall.setViewVisibility(R.id.rightPodText, View.VISIBLE);
+                        notificationSmall.setViewVisibility(R.id.podCaseText, View.VISIBLE);
+                        notificationSmall.setViewVisibility(R.id.leftPodUpdating, View.INVISIBLE);
+                        notificationSmall.setViewVisibility(R.id.rightPodUpdating, View.INVISIBLE);
+                        notificationSmall.setViewVisibility(R.id.podCaseUpdating, View.INVISIBLE);
                         notificationBig.setTextViewText(R.id.leftPodText, (leftStatus <= 10 ? (leftStatus * 10) + "%" : "") + ((chargeL && leftStatus < 10) ? "+" : ""));
                         notificationBig.setTextViewText(R.id.rightPodText, (rightStatus <= 10 ? (rightStatus * 10) + "%" : "") + ((chargeR && rightStatus < 10) ? "+" : ""));
                         notificationBig.setTextViewText(R.id.podCaseText, (caseStatus <= 10 ? (caseStatus * 10) + "%" : "") + (chargeCase ? "+" : ""));
@@ -204,12 +217,18 @@ public class PodsService extends Service {
                         notificationSmall.setTextViewText(R.id.rightPodText, (rightStatus <= 10 ? (rightStatus * 10) + "%" : "") + (chargeR ? "+" : ""));
                         notificationSmall.setTextViewText(R.id.podCaseText, (caseStatus <= 10 ? (caseStatus * 10) + "%" : "") + (chargeCase ? "+" : ""));
                     }else{
-                        notificationBig.setTextViewText(R.id.leftPodText, "");
-                        notificationBig.setTextViewText(R.id.rightPodText, "");
-                        notificationBig.setTextViewText(R.id.podCaseText, "");
-                        notificationSmall.setTextViewText(R.id.leftPodText, "");
-                        notificationSmall.setTextViewText(R.id.rightPodText, "");
-                        notificationSmall.setTextViewText(R.id.podCaseText, "");
+                        notificationBig.setViewVisibility(R.id.leftPodText, View.INVISIBLE);
+                        notificationBig.setViewVisibility(R.id.rightPodText, View.INVISIBLE);
+                        notificationBig.setViewVisibility(R.id.podCaseText, View.INVISIBLE);
+                        notificationBig.setViewVisibility(R.id.leftPodUpdating, View.VISIBLE);
+                        notificationBig.setViewVisibility(R.id.rightPodUpdating, View.VISIBLE);
+                        notificationBig.setViewVisibility(R.id.podCaseUpdating, View.VISIBLE);
+                        notificationSmall.setViewVisibility(R.id.leftPodText, View.INVISIBLE);
+                        notificationSmall.setViewVisibility(R.id.rightPodText, View.INVISIBLE);
+                        notificationSmall.setViewVisibility(R.id.podCaseText, View.INVISIBLE);
+                        notificationSmall.setViewVisibility(R.id.leftPodUpdating, View.VISIBLE);
+                        notificationSmall.setViewVisibility(R.id.rightPodUpdating, View.VISIBLE);
+                        notificationSmall.setViewVisibility(R.id.podCaseUpdating, View.VISIBLE);
                     }
                     mNotifyManager.notify(1,mBuilder.build());
                 }
diff --git a/OpenPods/app/src/main/res/layout/status_big.xml b/OpenPods/app/src/main/res/layout/status_big.xml
index 6d1486d..832ea61 100644
--- a/OpenPods/app/src/main/res/layout/status_big.xml
+++ b/OpenPods/app/src/main/res/layout/status_big.xml
@@ -31,6 +31,16 @@
             android:id="@+id/leftPodText"
             />
 
+        <ProgressBar
+            android:id="@+id/leftPodUpdating"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="18dp"
+            android:layout_below="@id/leftPodImg"
+            android:gravity="center"
+            android:indeterminate="true"
+             />
+
     </RelativeLayout>
 
     <RelativeLayout
@@ -56,6 +66,16 @@
             android:id="@+id/rightPodText"
             />
 
+        <ProgressBar
+            android:id="@+id/rightPodUpdating"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="18dp"
+            android:layout_below="@id/rightPodImg"
+            android:gravity="center"
+            android:indeterminate="true"
+            />
+
     </RelativeLayout>
 
     <RelativeLayout
@@ -81,6 +101,16 @@
             android:id="@+id/podCaseText"
             />
 
+        <ProgressBar
+            android:id="@+id/podCaseUpdating"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="match_parent"
+            android:layout_height="18dp"
+            android:layout_below="@id/podCaseImg"
+            android:gravity="center"
+            android:indeterminate="true"
+            />
+
     </RelativeLayout>
 
 </RelativeLayout>
diff --git a/OpenPods/app/src/main/res/layout/status_small.xml b/OpenPods/app/src/main/res/layout/status_small.xml
index 970413d..94e62f0 100644
--- a/OpenPods/app/src/main/res/layout/status_small.xml
+++ b/OpenPods/app/src/main/res/layout/status_small.xml
@@ -31,6 +31,15 @@
             android:id="@+id/leftPodText"
             />
 
+        <ProgressBar
+            android:id="@+id/leftPodUpdating"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="18dp"
+            android:layout_height="30dp"
+            android:layout_toRightOf="@id/leftPodImg"
+            android:indeterminate="true"
+            />
+
     </RelativeLayout>
 
     <RelativeLayout
@@ -58,6 +67,15 @@
             android:id="@+id/rightPodText"
             />
 
+        <ProgressBar
+            android:id="@+id/rightPodUpdating"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="18dp"
+            android:layout_height="30dp"
+            android:layout_toRightOf="@id/rightPodImg"
+            android:indeterminate="true"
+            />
+
     </RelativeLayout>
 
     <RelativeLayout
@@ -85,6 +103,15 @@
             android:id="@+id/podCaseText"
             />
 
+        <ProgressBar
+            android:id="@+id/podCaseUpdating"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="18dp"
+            android:layout_height="30dp"
+            android:layout_toRightOf="@id/podCaseImg"
+            android:indeterminate="true"
+            />
+
     </RelativeLayout>