From 277d8773f22e324550a26885323f05acccc5ce11 Mon Sep 17 00:00:00 2001
From: Viktor De Pasquale <info@depasquale.wiki>
Date: Fri, 4 Oct 2019 19:35:22 +0200
Subject: [PATCH] Added automated loading to new compat-based redesign

---
 .../magisk/redesign/compat/CompatActivity.kt       |  6 ++++++
 .../magisk/redesign/compat/CompatDelegate.kt       |  4 ++++
 .../magisk/redesign/compat/CompatFragment.kt       |  6 ++++++
 .../magisk/redesign/compat/CompatViewModel.kt      | 14 ++++++++++++++
 4 files changed, 30 insertions(+)

diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
index f56bcb118..8aef13008 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatActivity.kt
@@ -18,4 +18,10 @@ abstract class CompatActivity<ViewModel : CompatViewModel, Binding : ViewDataBin
         delegate.ensureInsets()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        delegate.onResume()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt
index 6d7a222ee..fe0386fe3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatDelegate.kt
@@ -8,6 +8,10 @@ class CompatDelegate internal constructor(
     private val view: CompatView<*>
 ) {
 
+    fun onResume() {
+        view.viewModel.requestRefresh()
+    }
+
     fun ensureInsets() {
         ViewCompat.setOnApplyWindowInsetsListener(view.viewRoot) { _, insets ->
             insets.asInsets()
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
index 196f37ae2..52bd1c65b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatFragment.kt
@@ -18,4 +18,10 @@ abstract class CompatFragment<ViewModel : CompatViewModel, Binding : ViewDataBin
         delegate.ensureInsets()
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        delegate.onResume()
+    }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt
index 11c1d388b..d19af09d1 100644
--- a/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/redesign/compat/CompatViewModel.kt
@@ -3,9 +3,23 @@ package com.topjohnwu.magisk.redesign.compat
 import android.graphics.Insets
 import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.ui.base.MagiskViewModel
+import io.reactivex.disposables.Disposable
 
 abstract class CompatViewModel : MagiskViewModel() {
 
     val insets = KObservableField(Insets.NONE)
 
+    private var runningTask: Disposable? = null
+
+    /** This should probably never be called manually, it's called manually via delegate. */
+    @Synchronized
+    fun requestRefresh() {
+        if (runningTask?.isDisposed?.not() == true) {
+            return
+        }
+        runningTask = refresh()
+    }
+
+    protected open fun refresh(): Disposable? = null
+
 }
\ No newline at end of file