From ba1bfd1f9c99cc7b75bae5d57a44f35863f475cf Mon Sep 17 00:00:00 2001
From: Thomas <tschneider.ac@gmail.com>
Date: Sun, 4 Oct 2020 17:25:08 +0200
Subject: [PATCH] Change loader

---
 app/build.gradle                                 |  2 +-
 app/src/acad/res/values/styles.xml               |  3 +++
 app/src/full/res/values/styles.xml               |  4 ++++
 .../main/res/layout/activity_all_playlist.xml    | 16 ++++++++++------
 .../main/res/layout/activity_instance_picker.xml |  6 ++++--
 app/src/main/res/layout/activity_peertube.xml    |  5 +++--
 app/src/main/res/layout/activity_playlists.xml   | 16 ++++++++++------
 app/src/main/res/layout/fragment_overview.xml    | 16 ++++++++++------
 app/src/main/res/layout/fragment_playlists.xml   | 16 ++++++++++------
 .../main/res/layout/fragment_recyclerview.xml    | 16 ++++++++++------
 app/src/main/res/layout/fragment_video.xml       | 16 ++++++++++------
 11 files changed, 75 insertions(+), 41 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 3976823..d93137a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -116,7 +116,7 @@ dependencies {
     implementation "net.gotev:uploadservice-okhttp:3.5.2"
     implementation "com.google.code.gson:gson:2.8.6"
     implementation 'androidx.media:media:1.2.0'
-
+    implementation 'com.github.ybq:Android-SpinKit:1.4.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
 
diff --git a/app/src/acad/res/values/styles.xml b/app/src/acad/res/values/styles.xml
index aceb64c..7e44535 100644
--- a/app/src/acad/res/values/styles.xml
+++ b/app/src/acad/res/values/styles.xml
@@ -15,4 +15,7 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+
+    <style name="progress" parent="SpinKitView.Circle" />
+    <style name="progressBottom" parent="SpinKitView.ThreeBounce" />
 </resources>
\ No newline at end of file
diff --git a/app/src/full/res/values/styles.xml b/app/src/full/res/values/styles.xml
index f4807f3..97c4971 100644
--- a/app/src/full/res/values/styles.xml
+++ b/app/src/full/res/values/styles.xml
@@ -14,4 +14,8 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark_full</item>
         <item name="colorAccent">@color/colorAccent_full</item>
     </style>
+
+    <style name="progress" parent="SpinKitView.Circle" />
+
+    <style name="progressBottom" parent="SpinKitView.ThreeBounce" />
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_all_playlist.xml b/app/src/main/res/layout/activity_all_playlist.xml
index 3318606..d00da8c 100644
--- a/app/src/main/res/layout/activity_all_playlist.xml
+++ b/app/src/main/res/layout/activity_all_playlist.xml
@@ -62,10 +62,12 @@
         android:gravity="center"
         android:visibility="gone">
 
-        <ProgressBar
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminate="true" />
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
     </RelativeLayout>
     <!-- Loader for next items -->
     <RelativeLayout
@@ -77,10 +79,12 @@
         android:gravity="bottom|center_horizontal"
         android:visibility="gone">
 
-        <ProgressBar
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:indeterminate="true" />
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progressBottom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
     </RelativeLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_instance_picker.xml b/app/src/main/res/layout/activity_instance_picker.xml
index 692e607..b25b429 100644
--- a/app/src/main/res/layout/activity_instance_picker.xml
+++ b/app/src/main/res/layout/activity_instance_picker.xml
@@ -118,10 +118,12 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/filters_container">
 
-                <ProgressBar
+                <com.github.ybq.android.spinkit.SpinKitView
+                    style="@style/progress"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:indeterminate="true" />
+                    android:layout_gravity="center"
+                    app:SpinKit_Color="?colorAccent" />
             </RelativeLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_peertube.xml b/app/src/main/res/layout/activity_peertube.xml
index 07aaf97..f850452 100644
--- a/app/src/main/res/layout/activity_peertube.xml
+++ b/app/src/main/res/layout/activity_peertube.xml
@@ -67,10 +67,11 @@
                 android:gravity="center"
                 android:visibility="gone">
 
-                <ProgressBar
+                <com.github.ybq.android.spinkit.SpinKitView
+                    style="@style/SpinKitView.DoubleBounce"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:indeterminate="true" />
+                    android:layout_gravity="center" />
             </RelativeLayout>
         </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_playlists.xml b/app/src/main/res/layout/activity_playlists.xml
index 8805665..2090847 100644
--- a/app/src/main/res/layout/activity_playlists.xml
+++ b/app/src/main/res/layout/activity_playlists.xml
@@ -65,10 +65,12 @@
                 android:gravity="center"
                 android:visibility="gone">
 
-                <ProgressBar
+                <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+                    style="@style/progress"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:indeterminate="true" />
+                    android:layout_gravity="center"
+                    app:SpinKit_Color="?colorAccent" />
             </RelativeLayout>
             <!-- Loader for next status -->
             <RelativeLayout
@@ -80,10 +82,12 @@
                 android:gravity="bottom|center_horizontal"
                 android:visibility="gone">
 
-                <ProgressBar
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:indeterminate="true" />
+                <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+                    style="@style/progressBottom"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    app:SpinKit_Color="?colorAccent" />
             </RelativeLayout>
         </RelativeLayout>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_overview.xml b/app/src/main/res/layout/fragment_overview.xml
index 1438a45..9fe94e4 100644
--- a/app/src/main/res/layout/fragment_overview.xml
+++ b/app/src/main/res/layout/fragment_overview.xml
@@ -71,10 +71,12 @@
             android:gravity="center"
             android:visibility="gone">
 
-            <ProgressBar
+            <com.github.ybq.android.spinkit.SpinKitView
+                style="@style/progress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:indeterminate="true" />
+                android:layout_gravity="center"
+                app:SpinKit_Color="?colorAccent" />
         </RelativeLayout>
         <!-- Loader for next videos -->
         <RelativeLayout
@@ -87,10 +89,12 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent">
 
-            <ProgressBar
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:indeterminate="true" />
+            <com.github.ybq.android.spinkit.SpinKitView
+                style="@style/progressBottom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                app:SpinKit_Color="?colorAccent" />
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlists.xml b/app/src/main/res/layout/fragment_playlists.xml
index 7579d2b..5725815 100644
--- a/app/src/main/res/layout/fragment_playlists.xml
+++ b/app/src/main/res/layout/fragment_playlists.xml
@@ -51,10 +51,12 @@
         android:gravity="center"
         android:visibility="gone">
 
-        <ProgressBar
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminate="true" />
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
     </RelativeLayout>
     <!-- Loader for next items -->
     <RelativeLayout
@@ -66,10 +68,12 @@
         android:gravity="bottom|center_horizontal"
         android:visibility="gone">
 
-        <ProgressBar
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:indeterminate="true" />
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progressBottom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
     </RelativeLayout>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
diff --git a/app/src/main/res/layout/fragment_recyclerview.xml b/app/src/main/res/layout/fragment_recyclerview.xml
index 23c200e..7defc88 100644
--- a/app/src/main/res/layout/fragment_recyclerview.xml
+++ b/app/src/main/res/layout/fragment_recyclerview.xml
@@ -57,10 +57,12 @@
         android:gravity="center"
         android:visibility="gone">
 
-        <ProgressBar
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:indeterminate="true" />
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
     </RelativeLayout>
     <!-- Loader for next accounts -->
     <RelativeLayout
@@ -72,10 +74,12 @@
         android:gravity="bottom|center_horizontal"
         android:visibility="gone">
 
-        <ProgressBar
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:indeterminate="true" />
+        <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
+            style="@style/progressBottom"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            app:SpinKit_Color="?colorAccent" />
     </RelativeLayout>
 </RelativeLayout>
 
diff --git a/app/src/main/res/layout/fragment_video.xml b/app/src/main/res/layout/fragment_video.xml
index b49335a..484ec24 100644
--- a/app/src/main/res/layout/fragment_video.xml
+++ b/app/src/main/res/layout/fragment_video.xml
@@ -100,10 +100,12 @@
             android:gravity="center"
             android:visibility="gone">
 
-            <ProgressBar
+            <com.github.ybq.android.spinkit.SpinKitView
+                style="@style/progress"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:indeterminate="true" />
+                android:layout_gravity="center"
+                app:SpinKit_Color="?colorAccent" />
         </RelativeLayout>
         <!-- Loader for next videos -->
         <RelativeLayout
@@ -116,10 +118,12 @@
             android:visibility="gone"
             app:layout_constraintBottom_toBottomOf="parent">
 
-            <ProgressBar
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:indeterminate="true" />
+            <com.github.ybq.android.spinkit.SpinKitView
+                style="@style/progressBottom"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                app:SpinKit_Color="?colorAccent" />
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file