fix dialog control

close dialog when lifecycle state is DESTROYED
AlexDeww · Nov 2, 2020 · 289d3cc · 289d3cc
1 parent 9b7010d
commit 289d3cc
Showing 1 changed file with 39 additions and 26 deletions.
diff --git a/reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/widget/DialogControl.kt b/reactiveviewmodel/src/main/java/com/alexdeww/reactiveviewmodel/widget/DialogControl.kt
@@ -2,6 +2,7 @@ package com.alexdeww.reactiveviewmodel.widget
 
 import android.app.Dialog
 import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleOwner
 import androidx.lifecycle.MediatorLiveData
 import com.alexdeww.reactiveviewmodel.core.RvmViewComponent
 import io.reactivex.rxjava3.core.Maybe
@@ -74,38 +75,50 @@ fun <T, R> DialogControl<T, R>.bindTo(
     rvmViewComponent: RvmViewComponent,
     createDialog: ActionCreateDialog<T, R>
 ) {
-    val mediator = object : MediatorLiveData<DialogControl.Display>() {
-        private var dialog: Dialog? = null
-
-        init {
-            addSource(displayed.liveData) {
-                value = it
-                when {
-                    it is DialogControl.Display.Displayed<*> -> {
-                        @Suppress("UNCHECKED_CAST")
-                        dialog = createDialog(it.data as T, DialogControlResult(this@bindTo))
-                        dialog?.setOnDismissListener { this@bindTo.dismiss() }
-                        dialog?.show()
-                    }
-                    it === DialogControl.Display.Absent -> closeDialog()
+    val liveData = DialogLiveDataMediator(
+        control = this,
+        createDialog = createDialog,
+        lifecycleOwner = rvmViewComponent.componentLifecycleOwner
+    )
+    rvmViewComponent.run { liveData.observe { /* empty */ } }
+}
+
+private class DialogLiveDataMediator<T, R>(
+    control: DialogControl<T, R>,
+    createDialog: ActionCreateDialog<T, R>,
+    private val lifecycleOwner: LifecycleOwner
+) : MediatorLiveData<DialogControl.Display>() {
+
+    private var dialog: Dialog? = null
+
+    init {
+        addSource(control.displayed.liveData) {
+            value = it
+            when {
+                it is DialogControl.Display.Displayed<*> -> {
+                    @Suppress("UNCHECKED_CAST")
+                    dialog = createDialog(it.data as T, DialogControlResult(control))
+                    dialog?.setOnDismissListener { control.dismiss() }
+                    dialog?.show()
                 }
+                it === DialogControl.Display.Absent -> closeDialog()
             }
         }
+    }
 
-        override fun onInactive() {
-            if (rvmViewComponent.componentLifecycleOwner.lifecycle.currentState == Lifecycle.State.DESTROYED) {
-                closeDialog()
-            }
-            super.onInactive()
+    override fun onInactive() {
+        if (lifecycleOwner.lifecycle.currentState == Lifecycle.State.DESTROYED) {
+            closeDialog()
         }
+        super.onInactive()
+    }
 
-        private fun closeDialog() {
-            dialog?.apply {
-                setOnDismissListener(null)
-                dismiss()
-            }
-            dialog = null
+    private fun closeDialog() {
+        dialog?.apply {
+            setOnDismissListener(null)
+            dismiss()
         }
+        dialog = null
     }
-    rvmViewComponent.run { mediator.observe { /* empty */ } }
+
 }