From 6c845743667e108d901f60106756fdf45d30f48e Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Mon, 11 Nov 2019 16:22:33 +0100
Subject: [PATCH] Added loading item to modules

---
 .../model/entity/recycler/ModuleRvItem.kt     | 13 +++++++
 .../magisk/redesign/module/ModuleViewModel.kt |  9 ++++-
 app/src/main/res/layout/item_loading.xml      | 38 +++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/res/layout/item_loading.xml

diff --git a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
index 941f356a0..a261e002d 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt
@@ -146,6 +146,19 @@ class ModuleItem(val item: Module) : ObservableItem<ModuleItem>(), Observable {
 
 }
 
+object LoadingItem : ComparableRvItem<LoadingItem>() {
+    override val layoutRes = R.layout.item_loading
+
+    override fun onBindingBound(binding: ViewDataBinding) {
+        super.onBindingBound(binding)
+        val params = binding.root.layoutParams as? StaggeredGridLayoutManager.LayoutParams ?: return
+        params.isFullSpan = true
+    }
+
+    override fun contentSameAs(other: LoadingItem) = this == other
+    override fun itemSameAs(other: LoadingItem) = this === other
+}
+
 abstract class ObservableItem<T> : ComparableRvItem<T>(), Observable {
 
     private val list = PropertyChangeRegistry()
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
index 8397c1ec4..6a290bc30 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/module/ModuleViewModel.kt
@@ -12,6 +12,7 @@ import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.model.entity.module.Module
 import com.topjohnwu.magisk.model.entity.module.Repo
+import com.topjohnwu.magisk.model.entity.recycler.LoadingItem
 import com.topjohnwu.magisk.model.entity.recycler.ModuleItem
 import com.topjohnwu.magisk.model.entity.recycler.RepoItem
 import com.topjohnwu.magisk.model.entity.recycler.SectionTitle
@@ -25,6 +26,7 @@ import io.reactivex.Single
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
 import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
+import timber.log.Timber
 
 class ModuleViewModel(
     private val repoName: RepoByNameDao,
@@ -96,12 +98,17 @@ class ModuleViewModel(
         remoteJob = loadRepos(offset = size)
             .map { it.map { RepoItem(it) } }
             .applyViewModel(this)
-            .subscribeK {
+            .subscribeK(onError = {
+                Timber.e(it)
+                items.remove(LoadingItem)
+            }) {
+                items.remove(LoadingItem)
                 if (!items.contains(sectionRemote)) {
                     items.add(sectionRemote)
                 }
                 items.addAll(it)
             }
+        items.add(LoadingItem)
     }
 
     private fun loadRepos(
diff --git a/app/src/main/res/layout/item_loading.xml b/app/src/main/res/layout/item_loading.xml
new file mode 100644
index 000000000..c10346364
--- /dev/null
+++ b/app/src/main/res/layout/item_loading.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <data>
+
+        <variable
+            name="item"
+            type="com.topjohnwu.magisk.model.entity.recycler.LoadingItem" />
+
+        <variable
+            name="viewModel"
+            type="com.topjohnwu.magisk.base.viewmodel.LoadingViewModel" />
+
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?listPreferredItemHeightSmall"
+        android:orientation="vertical"
+        android:padding="@dimen/l1">
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:text="@string/safetynet_attest_loading"
+            android:textAppearance="?appearanceTextTitleNormal" />
+
+        <ProgressBar
+            style="?styleProgressIndeterminate"
+            android:layout_gravity="center"
+            android:layout_marginTop="@dimen/l1" />
+
+
+    </LinearLayout>
+
+</layout>
\ No newline at end of file