Merge Teanity into sources

app/src/main/java/com/topjohnwu/magisk/model/binding/BindingAdapter.kt

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.model.binding
 
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
-import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.model.entity.recycler.LenientRvItem
 import me.tatarka.bindingcollectionadapter2.BindingRecyclerViewAdapter
 

app/src/main/java/com/topjohnwu/magisk/model/download/RemoteFileService.kt

@@ -3,11 +3,11 @@ package com.topjohnwu.magisk.model.download
 import android.app.Activity
 import android.content.Intent
 import androidx.core.app.NotificationCompat
-import com.skoumal.teanity.extensions.subscribeK
 import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.data.network.GithubRawServices
 import com.topjohnwu.magisk.di.NullActivity
 import com.topjohnwu.magisk.extensions.get
+import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject.*

app/src/main/java/com/topjohnwu/magisk/model/entity/Version.kt

@@ -1,3 +0,0 @@
-package com.topjohnwu.magisk.model.entity
-
-data class Version(val version: String, val versionCode: Int)

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/HideRvItem.kt

@@ -1,17 +1,17 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.rxbus.RxBus
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.utils.RxBus
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.HideAppInfo
 import com.topjohnwu.magisk.model.entity.HideTarget
 import com.topjohnwu.magisk.model.entity.state.IndeterminateState
 import com.topjohnwu.magisk.model.events.HideProcessEvent
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
 
 class HideRvItem(val item: HideAppInfo, targets: List<HideTarget>) :
     ComparableRvItem<HideRvItem>() {

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LenientRvItem.kt

@@ -2,7 +2,7 @@ package com.topjohnwu.magisk.model.entity.recycler
 
 import androidx.databinding.ViewDataBinding
 import androidx.recyclerview.widget.RecyclerView
-import com.skoumal.teanity.databinding.ComparableRvItem
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 
 /**
  * This item addresses issues where enclosing recycler has to be invalidated or generally

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/LogRvItem.kt

@@ -1,14 +1,14 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.util.DiffObservableList
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 import com.topjohnwu.magisk.extensions.timeFormatMedium
 import com.topjohnwu.magisk.extensions.toTime
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskLog
 import com.topjohnwu.magisk.model.entity.WrappedMagiskLog
+import com.topjohnwu.magisk.utils.DiffObservableList
+import com.topjohnwu.magisk.utils.KObservableField
 
 class LogRvItem : ComparableRvItem<LogRvItem>() {
     override val layoutRes: Int = R.layout.item_page_log

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/ModuleRvItem.kt

@@ -2,14 +2,14 @@ package com.topjohnwu.magisk.model.entity.recycler
 
 import android.content.res.Resources
 import androidx.annotation.StringRes
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.util.KObservableField
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.get
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.module.Module
 import com.topjohnwu.magisk.model.entity.module.Repo
+import com.topjohnwu.magisk.utils.KObservableField
 
 class ModuleRvItem(val item: Module) : ComparableRvItem<ModuleRvItem>() {
 

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/PolicyRvItem.kt

@@ -1,16 +1,16 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
 import android.graphics.drawable.Drawable
-import com.skoumal.teanity.databinding.ComparableRvItem
-import com.skoumal.teanity.extensions.addOnPropertyChangedCallback
-import com.skoumal.teanity.rxbus.RxBus
-import com.skoumal.teanity.util.KObservableField
+import com.topjohnwu.magisk.utils.RxBus
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
+import com.topjohnwu.magisk.extensions.addOnPropertyChangedCallback
 import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.toggle
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.events.PolicyEnableEvent
 import com.topjohnwu.magisk.model.events.PolicyUpdateEvent
+import com.topjohnwu.magisk.utils.KObservableField
 
 class PolicyRvItem(val item: MagiskPolicy, val icon: Drawable) : ComparableRvItem<PolicyRvItem>() {
 

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/SectionRvItem.kt

@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 
 class SectionRvItem(val text: String) : ComparableRvItem<SectionRvItem>() {
     override val layoutRes: Int = R.layout.item_section

app/src/main/java/com/topjohnwu/magisk/model/entity/recycler/SpinnerRvItem.kt

@@ -1,7 +1,7 @@
 package com.topjohnwu.magisk.model.entity.recycler
 
-import com.skoumal.teanity.databinding.ComparableRvItem
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.databinding.ComparableRvItem
 
 class SpinnerRvItem(val item: String) : ComparableRvItem<SpinnerRvItem>() {
 

app/src/main/java/com/topjohnwu/magisk/model/events/EventHandler.kt

@@ -0,0 +1,18 @@
+package com.topjohnwu.magisk.model.events
+
+internal interface EventHandler {
+
+    /**
+     * Called for all [ViewEvent]s published by associated viewModel.
+     * For [SimpleViewEvent]s, both this and [onSimpleEventDispatched]
+     * methods are called - you can choose the way how you handle them.
+     */
+    fun onEventDispatched(event: ViewEvent) {}
+
+    /**
+     * Called for all [SimpleViewEvent]s published by associated viewModel.
+     * Both this and [onEventDispatched] methods are called - you can choose
+     * the way how you handle them.
+     */
+    fun onSimpleEventDispatched(event: Int) {}
+}

app/src/main/java/com/topjohnwu/magisk/model/events/RxEvents.kt

@@ -1,6 +1,6 @@
 package com.topjohnwu.magisk.model.events
 
-import com.skoumal.teanity.rxbus.RxBus
+import com.topjohnwu.magisk.utils.RxBus
 import com.topjohnwu.magisk.model.entity.MagiskPolicy
 import com.topjohnwu.magisk.model.entity.recycler.HideProcessRvItem
 import com.topjohnwu.magisk.model.entity.recycler.ModuleRvItem

app/src/main/java/com/topjohnwu/magisk/model/events/SimpleViewEvent.kt

@@ -0,0 +1,7 @@
+package com.topjohnwu.magisk.model.events
+
+import com.topjohnwu.magisk.model.events.ViewEvent
+
+class SimpleViewEvent(
+    val event: Int
+) : ViewEvent()

app/src/main/java/com/topjohnwu/magisk/model/events/SnackbarEvent.kt

@@ -0,0 +1,28 @@
+package com.topjohnwu.magisk.model.events
+
+import android.content.Context
+import androidx.annotation.StringRes
+import com.google.android.material.snackbar.Snackbar
+import com.topjohnwu.magisk.model.events.ViewEvent
+
+class SnackbarEvent private constructor(
+    @StringRes private val messageRes: Int,
+    private val messageString: String?,
+    val length: Int,
+    val f: Snackbar.() -> Unit
+) : ViewEvent() {
+
+    constructor(
+        @StringRes messageRes: Int,
+        length: Int = Snackbar.LENGTH_SHORT,
+        f: Snackbar.() -> Unit = {}
+    ) : this(messageRes, null, length, f)
+
+    constructor(
+        message: String,
+        length: Int = Snackbar.LENGTH_SHORT,
+        f: Snackbar.() -> Unit = {}
+    ) : this(-1, message, length, f)
+
+    fun message(context: Context): String = messageString ?: context.getString(messageRes)
+}

app/src/main/java/com/topjohnwu/magisk/model/events/ViewEventObserver.kt

@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.model.events
+
+import androidx.lifecycle.Observer
+
+/**
+ * Observer for [ViewEvent]s, which automatically checks if event was handled
+ */
+class ViewEventObserver(private val onEventUnhandled: (ViewEvent) -> Unit) : Observer<ViewEvent> {
+    override fun onChanged(event: ViewEvent?) {
+        event?.let {
+            if (!it.handled) {
+                it.handled = true
+                onEventUnhandled(it)
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/events/ViewEvents.kt

@@ -1,10 +1,19 @@
 package com.topjohnwu.magisk.model.events
 
 import android.app.Activity
-import com.skoumal.teanity.viewevents.ViewEvent
 import com.topjohnwu.magisk.model.entity.module.Repo
 import io.reactivex.subjects.PublishSubject
 
+/**
+ * Class for passing events from ViewModels to Activities/Fragments
+ * Variable [handled] used so each event is handled only once
+ * (see https://medium.com/google-developers/livedata-with-snackbar-navigation-and-other-events-the-singleliveevent-case-ac2622673150)
+ * Use [ViewEventObserver] for observing these events
+ */
+abstract class ViewEvent {
+
+    var handled = false
+}
 
 data class OpenLinkEvent(val url: String) : ViewEvent()
 
@@ -35,4 +44,4 @@ class PermissionEvent(
 
 class BackPressEvent : ViewEvent()
 
-class DieEvent : ViewEvent()
+class DieEvent : ViewEvent()

app/src/main/java/com/topjohnwu/magisk/model/navigation/MagiskNavigationEvent.kt

@@ -4,10 +4,12 @@ import android.os.Bundle
 import androidx.annotation.AnimRes
 import androidx.annotation.AnimatorRes
 import androidx.fragment.app.Fragment
-import com.skoumal.teanity.viewevents.NavigationDslMarker
-import com.skoumal.teanity.viewevents.ViewEvent
+import com.topjohnwu.magisk.model.events.ViewEvent
 import kotlin.reflect.KClass
 
+@DslMarker
+annotation class NavigationDslMarker
+
 class MagiskNavigationEvent(
     val navDirections: MagiskNavDirectionsBuilder,
     val navOptions: MagiskNavOptions,