From 294bb286e9fec195d23e57c9f1ed3c0875ce7e5f Mon Sep 17 00:00:00 2001
From: Jobobby04 <jobobby04@users.noreply.github.com>
Date: Sat, 26 Dec 2020 17:02:07 -0500
Subject: [PATCH] Deal with the SY ProgressBars

---
 .../main/res/layout/eh_activity_intercept.xml   |  7 ++++---
 .../main/res/layout/eh_fragment_batch_add.xml   |  3 +--
 app/src/main/res/layout/eh_smart_search.xml     |  9 +++++----
 app/src/main/res/layout/index_adapter.xml       | 10 ++++++----
 app/src/main/res/layout/latest_controller.xml   |  8 +++++---
 .../main/res/layout/latest_controller_card.xml  |  7 ++++---
 .../main/res/layout/migration_manga_card.xml    | 17 ++++++++++-------
 app/src/main/res/values/strings_sy.xml          |  3 +++
 8 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/app/src/main/res/layout/eh_activity_intercept.xml b/app/src/main/res/layout/eh_activity_intercept.xml
index e02e15c33..8cc03b281 100755
--- a/app/src/main/res/layout/eh_activity_intercept.xml
+++ b/app/src/main/res/layout/eh_activity_intercept.xml
@@ -39,12 +39,13 @@
                 android:text="@string/loading_manga"
                 android:textAppearance="@style/TextAppearance.Medium.Title" />
 
-            <ProgressBar
+            <com.google.android.material.progressindicator.CircularProgressIndicator
                 android:id="@+id/intercept_progress"
-                style="?android:attr/progressBarStyleLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center" />
+                android:layout_gravity="center"
+                android:indeterminate="true"
+                app:indicatorSize="56dp"/>
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/eh_fragment_batch_add.xml b/app/src/main/res/layout/eh_fragment_batch_add.xml
index 0b292b88b..21afe66ba 100755
--- a/app/src/main/res/layout/eh_fragment_batch_add.xml
+++ b/app/src/main/res/layout/eh_fragment_batch_add.xml
@@ -66,9 +66,8 @@
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ProgressBar
+            <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/progress_bar"
-                style="?android:attr/progressBarStyleHorizontal"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"
diff --git a/app/src/main/res/layout/eh_smart_search.xml b/app/src/main/res/layout/eh_smart_search.xml
index 6800a05ba..68ff6cc5e 100644
--- a/app/src/main/res/layout/eh_smart_search.xml
+++ b/app/src/main/res/layout/eh_smart_search.xml
@@ -38,15 +38,16 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="8dp"
-                android:text="Searching source..."
+                android:text="@string/searching_source"
                 android:textAppearance="@style/TextAppearance.Medium.Title" />
 
-            <ProgressBar
+            <com.google.android.material.progressindicator.CircularProgressIndicator
                 android:id="@+id/intercept_progress"
-                style="?android:attr/progressBarStyleLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center" />
+                android:layout_gravity="center"
+                android:indeterminate="true"
+                app:indicatorSize="56dp" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/index_adapter.xml b/app/src/main/res/layout/index_adapter.xml
index 935f96761..976380d4e 100644
--- a/app/src/main/res/layout/index_adapter.xml
+++ b/app/src/main/res/layout/index_adapter.xml
@@ -53,12 +53,13 @@
             android:text="@string/no_results_found"
             android:visibility="gone" />
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/latest_progress"
             style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:indeterminate="true" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/latest_recycler"
@@ -117,12 +118,13 @@
             android:text="@string/no_results_found"
             android:visibility="gone" />
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/browse_progress"
             style="?android:attr/progressBarStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:indeterminate="true" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/browse_recycler"
diff --git a/app/src/main/res/layout/latest_controller.xml b/app/src/main/res/layout/latest_controller.xml
index 469d3f779..0f662d7b7 100644
--- a/app/src/main/res/layout/latest_controller.xml
+++ b/app/src/main/res/layout/latest_controller.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -25,11 +26,12 @@
             android:alpha="0.75"
             android:background="?attr/colorSurface" />
 
-        <ProgressBar
-            style="?android:attr/progressBarStyleLarge"
+        <com.google.android.material.progressindicator.CircularProgressIndicator
+            style="@style/Theme.Widget.CircularProgressIndicator.Small"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:indeterminate="true" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/latest_controller_card.xml b/app/src/main/res/layout/latest_controller_card.xml
index cf643268e..0e9b04c34 100644
--- a/app/src/main/res/layout/latest_controller_card.xml
+++ b/app/src/main/res/layout/latest_controller_card.xml
@@ -66,12 +66,13 @@
         android:text="@string/no_results_found"
         android:visibility="gone" />
 
-    <ProgressBar
+    <com.google.android.material.progressindicator.CircularProgressIndicator
         android:id="@+id/progress"
-        style="?android:attr/progressBarStyleSmall"
+        style="@style/Theme.Widget.CircularProgressIndicator.Small"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center" />
+        android:layout_gravity="center"
+        android:indeterminate="true" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler"
diff --git a/app/src/main/res/layout/migration_manga_card.xml b/app/src/main/res/layout/migration_manga_card.xml
index ae9b9936d..2c9e1fb32 100644
--- a/app/src/main/res/layout/migration_manga_card.xml
+++ b/app/src/main/res/layout/migration_manga_card.xml
@@ -34,11 +34,13 @@
             android:layout_gravity="bottom"
             android:background="@drawable/gradient_shape" />
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/loading_group"
-            android:layout_width="56dp"
-            android:layout_height="56dp"
-            android:layout_gravity="center" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            app:indicatorSize="56dp"/>
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -81,13 +83,14 @@
             android:shadowRadius="4"
             tools:text="Sample name" />
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/progress"
-            style="?android:attr/progressBarStyleSmall"
+            style="@style/Theme.Widget.CircularProgressIndicator.Small"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:visibility="gone" />
+            android:visibility="gone"
+            android:indeterminate="true" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/values/strings_sy.xml b/app/src/main/res/values/strings_sy.xml
index a85d7d693..5076dd9f8 100644
--- a/app/src/main/res/values/strings_sy.xml
+++ b/app/src/main/res/values/strings_sy.xml
@@ -273,6 +273,9 @@
     <string name="cover_reset_toast">The cover will be updated when you exit manga info edit</string>
 
     <!-- Browse -->
+    <!-- Smart Search -->
+    <string name="searching_source">Searching source…</string>
+
     <!-- Saved Searches -->
     <string name="saved_searches">Saved Searches</string>
     <string name="save_search">Save current search query?</string>