Cleanup duplicate setting of view tree owners

uber · Aug 7, 2023 · 53c718b · 53c718b
1 parent 368da10
commit 53c718b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 39 deletions.
diff --git a/android/demos/compose/src/main/kotlin/com/uber/rib/compose/root/RootScope.kt b/android/demos/compose/src/main/kotlin/com/uber/rib/compose/root/RootScope.kt
@@ -16,8 +16,6 @@
 package com.uber.rib.compose.root
 
 import android.view.ViewGroup
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.uber.rib.compose.root.main.MainScope
 import com.uber.rib.compose.util.AnalyticsClient
 import com.uber.rib.compose.util.AnalyticsClientImpl
@@ -43,11 +41,8 @@ interface RootScope {
 
     abstract fun presenter(): EmptyPresenter
 
-    fun view(parentViewGroup: ViewGroup, activity: RibActivity): RootView {
-      return RootView(parentViewGroup.context).apply {
-        setViewTreeLifecycleOwner(activity)
-        setViewTreeSavedStateRegistryOwner(activity)
-      }
+    fun view(parentViewGroup: ViewGroup): RootView {
+      return RootView(parentViewGroup.context)
     }
 
     @Expose

diff --git a/android/demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/MainScope.kt b/android/demos/compose/src/main/kotlin/com/uber/rib/compose/root/main/MainScope.kt
@@ -19,15 +19,12 @@ import android.view.ViewGroup
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.platform.ComposeView
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.uber.rib.compose.root.main.loggedin.LoggedInScope
 import com.uber.rib.compose.root.main.loggedout.LoggedOutScope
 import com.uber.rib.compose.util.AnalyticsClient
 import com.uber.rib.compose.util.ExperimentClient
 import com.uber.rib.compose.util.LoggerClient
 import com.uber.rib.core.ComposePresenter
-import com.uber.rib.core.RibActivity
 import motif.Expose
 
 @motif.Scope
@@ -55,15 +52,8 @@ interface MainScope {
       }
     }
 
-    fun view(
-      parentViewGroup: ViewGroup,
-      activity: RibActivity,
-      presenter: ComposePresenter,
-    ): ComposeView {
-      return ComposeView(parentViewGroup.context).apply {
-        setViewTreeLifecycleOwner(activity)
-        setViewTreeSavedStateRegistryOwner(activity)
-      }
+    fun view(parentViewGroup: ViewGroup): ComposeView {
+      return ComposeView(parentViewGroup.context)
     }
 
     abstract fun childContent(): MainRouter.ChildContent

diff --git a/android/demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/RootScope.kt b/android/demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/RootScope.kt
@@ -16,10 +16,7 @@
 package com.uber.rib.workers.root
 
 import android.view.ViewGroup
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.uber.rib.core.EmptyPresenter
-import com.uber.rib.core.RibActivity
 import com.uber.rib.workers.root.main.MainScope
 
 @motif.Scope
@@ -36,11 +33,8 @@ interface RootScope {
 
     abstract fun presenter(): EmptyPresenter
 
-    fun view(parentViewGroup: ViewGroup, activity: RibActivity): RootView {
-      return RootView(parentViewGroup.context).apply {
-        setViewTreeLifecycleOwner(activity)
-        setViewTreeSavedStateRegistryOwner(activity)
-      }
+    fun view(parentViewGroup: ViewGroup): RootView {
+      return RootView(parentViewGroup.context)
     }
   }
 }
diff --git a/android/demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/main/MainScope.kt b/android/demos/rib-workers/src/main/kotlin/com/uber/rib/workers/root/main/MainScope.kt
@@ -19,10 +19,7 @@ import android.view.ViewGroup
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState
 import androidx.compose.ui.platform.ComposeView
-import androidx.lifecycle.setViewTreeLifecycleOwner
-import androidx.savedstate.setViewTreeSavedStateRegistryOwner
 import com.uber.rib.core.ComposePresenter
-import com.uber.rib.core.RibActivity
 import com.uber.rib.workers.root.main.ribworkerselection.RibWorkerSelectionScope
 
 @motif.Scope
@@ -45,15 +42,8 @@ interface MainScope {
       }
     }
 
-    fun view(
-      parentViewGroup: ViewGroup,
-      activity: RibActivity,
-      presenter: ComposePresenter,
-    ): ComposeView {
-      return ComposeView(parentViewGroup.context).apply {
-        setViewTreeLifecycleOwner(activity)
-        setViewTreeSavedStateRegistryOwner(activity)
-      }
+    fun view(parentViewGroup: ViewGroup): ComposeView {
+      return ComposeView(parentViewGroup.context)
     }
 
     abstract fun childContent(): MainRouter.ChildContent