Simplify presenter from iOS

DroidKaigi · May 11, 2024 · db0ea4d · db0ea4d
1 parent b3ae4e4
commit db0ea4d
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 30 deletions.
diff --git a/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/presenterStateFlow.kt b/core/ui/src/iosMain/kotlin/io/github/droidkaigi/confsched/ui/presenterStateFlow.kt
@@ -0,0 +1,43 @@
+package io.github.droidkaigi.confsched.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import app.cash.molecule.RecompositionMode
+import app.cash.molecule.moleculeFlow
+import io.github.droidkaigi.confsched.compose.CompositionLocalProviderWithReturnValue
+import io.github.droidkaigi.confsched.model.compositionlocal.LocalRepositories
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.filterNotNull
+import kotlin.reflect.KClass
+
+@Suppress("unused")
+fun <EVENT, UISTATE> presenterStateFlow(
+    repositories: Map<KClass<*>, Any>,
+    events: Flow<EVENT>,
+    presenter: @Composable (events: Flow<EVENT>) -> UISTATE,
+): Flow<UISTATE> {
+    return moleculeFlow(RecompositionMode.Immediate) {
+        var uiState by remember { mutableStateOf<UISTATE?>(null) }
+        CompositionLocalProviderWithReturnValue(LocalRepositories provides repositories) {
+            NavHost(rememberNavController(), startDestination = "root") {
+                composable("root") {
+                    val newUiState = presenter(events)
+                    LaunchedEffect(Unit) {
+                        uiState = newUiState
+                    }
+                }
+            }
+        }
+        uiState
+    }
+        .filterNotNull()
+}
+
+
diff --git a/...kotlin/io/github/droidkaigi/confsched/contributors/contributorScreenPresenterStateFlow.kt b/...kotlin/io/github/droidkaigi/confsched/contributors/contributorScreenPresenterStateFlow.kt
@@ -1,17 +1,6 @@
 package io.github.droidkaigi.confsched.contributors
 
-import androidx.compose.runtime.remember
-import androidx.compose.ui.platform.LocalLifecycleOwner
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.LifecycleOwner
-import androidx.lifecycle.LifecycleRegistry
-import androidx.lifecycle.ViewModelStore
-import androidx.lifecycle.ViewModelStoreOwner
-import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
-import app.cash.molecule.RecompositionMode
-import app.cash.molecule.moleculeFlow
-import io.github.droidkaigi.confsched.compose.CompositionLocalProviderWithReturnValue
-import io.github.droidkaigi.confsched.model.compositionlocal.LocalRepositories
+import io.github.droidkaigi.confsched.ui.presenterStateFlow
 import kotlinx.coroutines.flow.Flow
 import kotlin.reflect.KClass
 
@@ -20,24 +9,12 @@ fun contributorScreenPresenterStateFlow(
     repositories: Map<KClass<*>, Any>,
     events: Flow<ContributorsScreenEvent>,
 ): Flow<ContributorsUiState> {
-    return moleculeFlow(RecompositionMode.Immediate) {
-        val nestedRegistry = remember {
-            object : ViewModelStoreOwner {
-                override val viewModelStore: ViewModelStore = ViewModelStore()
-            }
+    return presenterStateFlow(
+        events = events,
+        repositories = repositories,
+        presenter = {
+            contributorsScreenPresenter(events)
         }
-        val lifecycleRegistry = remember {
-            object : LifecycleOwner {
-                override val lifecycle: Lifecycle = LifecycleRegistry(this)
-            }
-        }
-        CompositionLocalProviderWithReturnValue(LocalViewModelStoreOwner provides nestedRegistry) {
-            CompositionLocalProviderWithReturnValue(LocalLifecycleOwner provides lifecycleRegistry) {
-                CompositionLocalProviderWithReturnValue(LocalRepositories provides repositories) {
-                    contributorsScreenPresenter(events = events)
-                }
-            }
-        }
-    }
+    )
 }