From 1920a52829a4bf720bfc033e1155960331378458 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Sun, 29 Mar 2020 12:38:41 +0200
Subject: [PATCH] Added progressbar indicating content loading on modules
 screen

---
 .../magisk/ui/module/ModuleViewModel.kt       | 17 +++++++++++---
 .../main/res/layout/fragment_module_md2.xml   | 22 +++++++++++++++++++
 2 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
index d952cf994..454492b50 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/module/ModuleViewModel.kt
@@ -85,6 +85,13 @@ class ModuleViewModel(
     private val itemsUpdatable = diffListOf<RepoItem.Update>()
     private val itemsRemote = diffListOf<RepoItem.Remote>()
 
+    var isRemoteLoading = false
+        @Bindable get
+        private set(value) {
+            field = value
+            notifyPropertyChanged(BR.remoteLoading)
+        }
+
     val adapter = adapterOf<ComparableRvItem<*>>()
     val items = MergeObservableList<ComparableRvItem<*>>()
         .insertList(itemsCoreOnly)
@@ -215,9 +222,13 @@ class ModuleViewModel(
             repoUpdater(refetch).andThen(loadRemoteDB(0))
         } else {
             loadRemoteDB(itemsRemote.size)
-        }.subscribeK(onError = Timber::e) {
-            itemsRemote.addAll(it)
-        }
+        }.observeOn(AndroidSchedulers.mainThread())
+            .doOnSubscribe { isRemoteLoading = true }
+            .doOnSuccess { isRemoteLoading = false }
+            .doOnError { isRemoteLoading = false }
+            .subscribeK(onError = Timber::e) {
+                itemsRemote.addAll(it)
+            }
 
         refetch = false
     }
diff --git a/app/src/main/res/layout/fragment_module_md2.xml b/app/src/main/res/layout/fragment_module_md2.xml
index 5ec69f449..4baa39d40 100644
--- a/app/src/main/res/layout/fragment_module_md2.xml
+++ b/app/src/main/res/layout/fragment_module_md2.xml
@@ -90,6 +90,28 @@
 
         </LinearLayout>
 
+        <FrameLayout
+            goneUnless="@{viewModel.remoteLoading}"
+            android:layout_width="match_parent"
+            android:layout_height="4dp"
+            android:layout_gravity="bottom">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="16dp"
+                android:layout_gravity="center"
+                tools:ignore="UselessParent">
+
+                <ProgressBar
+                    style="@style/WidgetFoundation.ProgressBar.Indeterminate"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center" />
+
+            </FrameLayout>
+
+        </FrameLayout>
+
     </FrameLayout>