FIX: replaceFragment lifecycle bug (#27)

kanyun-inc · Feb 13, 2023 · e692238 · e692238
1 parent a54cc52
commit e692238
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 10 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -23,7 +23,7 @@ kotlin.code.style=official
 android.nonTransitiveRClass=true
 
 KOTLIN_PLUGIN_ID=com.kanyun.kace
-VERSION_NAME=1.8.0-1.0.3-SNAPSHOT
+VERSION_NAME=1.8.0-1.0.4-SNAPSHOT
 
 GROUP=com.kanyun.kace
 

diff --git a/kace-runtime/src/main/java/com/kanyun/kace/AndroidExtensionsComponent.kt b/kace-runtime/src/main/java/com/kanyun/kace/AndroidExtensionsComponent.kt
@@ -27,26 +27,29 @@ sealed interface AndroidExtensionsComponent {
 
 fun AndroidExtensionsComponent(
     owner: AndroidExtensionsBase,
-    onDestroy: () -> Unit
+    onViewDestroy: () -> Unit,
+    onComponentDestroy: () -> Unit
 ): AndroidExtensionsComponent {
     return when (owner) {
-        is Activity -> AndroidExtensionsActivity(owner, onDestroy)
-        is Fragment -> AndroidExtensionsFragment(owner, onDestroy)
+        is Activity -> AndroidExtensionsActivity(owner, onViewDestroy, onComponentDestroy)
+        is Fragment -> AndroidExtensionsFragment(owner, onViewDestroy, onComponentDestroy)
         else -> throw UnsupportedOperationException()
     }
 }
 
 class AndroidExtensionsActivity(
     private val activity: Activity,
-    onDestroy: () -> Unit
+    onViewDestroy: () -> Unit,
+    onComponentDestroy: () -> Unit
 ) : AndroidExtensionsComponent {
 
     init {
         if (activity is LifecycleOwner) {
             activity.lifecycle.addObserver(object : KaceLifecycleObserver() {
                 override fun onDestroy(owner: LifecycleOwner) {
                     super.onDestroy(owner)
-                    onDestroy()
+                    onViewDestroy()
+                    onComponentDestroy()
                 }
             })
         }
@@ -59,18 +62,25 @@ class AndroidExtensionsActivity(
 
 class AndroidExtensionsFragment(
     private val fragment: Fragment,
-    onDestroy: () -> Unit
+    onViewDestroy: () -> Unit,
+    onComponentDestroy: () -> Unit
 ) : AndroidExtensionsComponent {
 
     init {
         fragment.viewLifecycleOwnerLiveData.observe(fragment) {
             it?.lifecycle?.addObserver(object : KaceLifecycleObserver() {
                 override fun onDestroy(owner: LifecycleOwner) {
                     super.onDestroy(owner)
-                    onDestroy()
+                    onViewDestroy()
                 }
             })
         }
+        fragment.lifecycle.addObserver(object : KaceLifecycleObserver() {
+            override fun onDestroy(owner: LifecycleOwner) {
+                super.onDestroy(owner)
+                onComponentDestroy()
+            }
+        })
     }
 
     override fun <V : View?> findViewById(id: Int): V? {

diff --git a/kace-runtime/src/main/java/com/kanyun/kace/AndroidExtensionsImpl.kt b/kace-runtime/src/main/java/com/kanyun/kace/AndroidExtensionsImpl.kt
@@ -26,7 +26,7 @@ class AndroidExtensionsImpl : AndroidExtensions {
 
     private fun initComponent(owner: AndroidExtensionsBase) {
         if (component == null) {
-            component = AndroidExtensionsComponent(owner) { destroy() }
+            component = AndroidExtensionsComponent(owner, this::onViewDestroy, this::onComponentDestroy)
         }
     }
 
@@ -42,7 +42,11 @@ class AndroidExtensionsImpl : AndroidExtensions {
         return cached?.getOrPut(id) { component!!.findViewById(id) } as T
     }
 
-    private fun destroy() {
+    private fun onViewDestroy() {
         cached?.clear()
     }
+
+    private fun onComponentDestroy() {
+        component = null
+    }
 }