From 26dcfe02adf44ab428ed9bd31954e532d6f82e94 Mon Sep 17 00:00:00 2001
From: jhengazuki <jhengazuki3@gmail.com>
Date: Wed, 3 Dec 2025 14:12:19 +0800
Subject: [PATCH] Optimize progress ui

---
 .../android/tv/ui/activity/LiveActivity.java  |  2 ++
 .../android/tv/ui/activity/VideoActivity.java |  2 ++
 .../mobile/res/layout/view_widget_live.xml    | 33 +++++++++----------
 app/src/mobile/res/layout/view_widget_vod.xml | 33 +++++++++----------
 4 files changed, 36 insertions(+), 34 deletions(-)

diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
index 6bb48fc48..b1044547b 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/LiveActivity.java
@@ -476,12 +476,14 @@ public class LiveActivity extends BaseActivity implements CustomKeyDown.Listener
 
     private void showProgress() {
         mBinding.widget.progress.setVisibility(View.VISIBLE);
+        mBinding.widget.traffic.setVisibility(View.VISIBLE);
         App.post(mR2, 0);
         hideError();
     }
 
     private void hideProgress() {
         mBinding.widget.progress.setVisibility(View.GONE);
+        mBinding.widget.traffic.setVisibility(View.GONE);
         App.removeCallbacks(mR2);
         Traffic.reset();
     }
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
index c4766c996..07ad3c83e 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/activity/VideoActivity.java
@@ -927,12 +927,14 @@ public class VideoActivity extends BaseActivity implements Clock.Callback, Custo
 
     private void showProgress() {
         mBinding.widget.progress.setVisibility(View.VISIBLE);
+        mBinding.widget.traffic.setVisibility(View.VISIBLE);
         App.post(mR2, 0);
         hideError();
     }
 
     private void hideProgress() {
         mBinding.widget.progress.setVisibility(View.GONE);
+        mBinding.widget.traffic.setVisibility(View.GONE);
         App.removeCallbacks(mR2);
         Traffic.reset();
     }
diff --git a/app/src/mobile/res/layout/view_widget_live.xml b/app/src/mobile/res/layout/view_widget_live.xml
index 0e6b37f40..43ce8ef90 100644
--- a/app/src/mobile/res/layout/view_widget_live.xml
+++ b/app/src/mobile/res/layout/view_widget_live.xml
@@ -33,29 +33,28 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:orientation="vertical"
+        android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible">
-
-        <include layout="@layout/view_progress" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/traffic"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:textColor="@color/white"
-            android:textSize="12sp"
-            android:visibility="gone"
-            tools:text="120KB/s"
-            tools:visibility="visible" />
+        app:indicatorColor="@color/white"
+        app:indicatorSize="56dp"
+        tools:visibility="visible" />
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/traffic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="48dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:visibility="gone"
+        tools:text="120KB/s"
+        tools:visibility="visible" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/seek"
diff --git a/app/src/mobile/res/layout/view_widget_vod.xml b/app/src/mobile/res/layout/view_widget_vod.xml
index 46c7df09c..f8139de60 100644
--- a/app/src/mobile/res/layout/view_widget_vod.xml
+++ b/app/src/mobile/res/layout/view_widget_vod.xml
@@ -33,29 +33,28 @@
 
     </androidx.appcompat.widget.LinearLayoutCompat>
 
-    <androidx.appcompat.widget.LinearLayoutCompat
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:orientation="vertical"
+        android:indeterminate="true"
         android:visibility="gone"
-        tools:visibility="visible">
-
-        <include layout="@layout/view_progress" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/traffic"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:textColor="@color/white"
-            android:textSize="12sp"
-            android:visibility="gone"
-            tools:text="120KB/s"
-            tools:visibility="visible" />
+        app:indicatorColor="@color/white"
+        app:indicatorSize="56dp"
+        tools:visibility="visible" />
 
-    </androidx.appcompat.widget.LinearLayoutCompat>
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/traffic"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="48dp"
+        android:textColor="@color/white"
+        android:textSize="12sp"
+        android:visibility="gone"
+        tools:text="120KB/s"
+        tools:visibility="visible" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:id="@+id/seek"