common screen enter way

stslex · Nov 22, 2023 · 936111d · 936111d
1 parent 8214008
commit 936111d
Show file tree

Hide file tree

Showing 9 changed files with 85 additions and 129 deletions.
diff --git a/core/navigation/src/main/java/st/slex/csplashscreen/core/navigation/AppArguments.kt b/core/navigation/src/main/java/st/slex/csplashscreen/core/navigation/AppArguments.kt
@@ -31,4 +31,4 @@ sealed class AppArguments(
     data class UserScreen(
         val username: String
     ) : AppArguments(username)
-}
+}
diff --git a/core/navigation/src/main/java/st/slex/csplashscreen/core/navigation/AppDestination.kt b/core/navigation/src/main/java/st/slex/csplashscreen/core/navigation/AppDestination.kt
@@ -47,4 +47,4 @@ enum class AppDestination(
             }
         }
     }
-}
+}
diff --git a/core/ui/src/main/java/st/slex/csplashscreen/core/ui/base/DaggerViewModel.kt b/core/ui/src/main/java/st/slex/csplashscreen/core/ui/base/DaggerViewModel.kt
@@ -6,6 +6,9 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import st.slex.csplashscreen.core.navigation.AppDestination
 import st.slex.csplashscreen.core.ui.di.builder.Feature
 import st.slex.csplashscreen.core.ui.di.builder.FeatureBuilder
 import st.slex.csplashscreen.core.ui.di.mainUiApi
@@ -39,4 +42,22 @@ inline fun <reified VM : ViewModel, F : Feature> setupComponent(
             .build(context.mainUiApi)
             .viewModelFactory
     }
+}
+
+inline fun <reified VM : ViewModel, F : Feature> NavGraphBuilder.createScreen(
+    appDestination: AppDestination,
+    featureBuilder: FeatureBuilder<F>,
+    crossinline content: @Composable (VM, List<String>) -> Unit
+) {
+    composable(
+        route = appDestination.navigationRoute,
+        arguments = appDestination.composableArguments
+    ) { navBackStackEntry ->
+        val arguments = appDestination.parseArguments(navBackStackEntry)
+        val viewModel: VM = setupComponent(
+            builder = featureBuilder,
+            key = arguments.hashCode().toString()
+        )
+        content(viewModel, arguments)
+    }
 }
diff --git a/...rc/main/java/st/slex/csplashscreen/feature/collection/navigation/SingleCollectionGraph.kt b/...rc/main/java/st/slex/csplashscreen/feature/collection/navigation/SingleCollectionGraph.kt
@@ -6,11 +6,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import androidx.paging.compose.collectAsLazyPagingItems
 import st.slex.csplashscreen.core.navigation.AppArguments
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.core.ui.base.setupComponent
+import st.slex.csplashscreen.core.ui.base.createScreen
 import st.slex.csplashscreen.core.ui.utils.CollectAsEvent
 import st.slex.csplashscreen.feature.collection.di.SingleCollectionBuilder
 import st.slex.csplashscreen.feature.collection.ui.CollectionScreen
@@ -20,27 +19,13 @@ import st.slex.csplashscreen.feature.collection.ui.presenter.SingleCollectionVie
 fun NavGraphBuilder.singleCollectionGraph(
     modifier: Modifier = Modifier,
 ) {
-    composable(
-        route = AppDestination.COLLECTION.navigationRoute,
-        arguments = AppDestination.COLLECTION.composableArguments
-    ) { navBackStackEntry ->
-        val arguments = AppDestination.COLLECTION
-            .parseArguments(navBackStackEntry)
-            .first()
-            .let(AppArguments::CollectionScreen)
-
-        val viewModel: SingleCollectionViewModel = setupComponent(
-            key = arguments.collectionId,
-            builder = SingleCollectionBuilder
-        )
-
-        val state by remember {
-            viewModel.state
-        }.collectAsState()
-
-        val photos = remember {
-            state.photos()
-        }.collectAsLazyPagingItems()
+    createScreen(
+        appDestination = AppDestination.COLLECTION,
+        featureBuilder = SingleCollectionBuilder
+    ) { viewModel: SingleCollectionViewModel, args ->
+        val arguments = args.first().let(AppArguments::CollectionScreen)
+        val state by remember { viewModel.state }.collectAsState()
+        val photos = remember { state.photos() }.collectAsLazyPagingItems()
 
         LaunchedEffect(Unit) {
             viewModel.sendAction(Action.Init(arguments.collectionId))

diff --git a/...ourite/src/main/java/st/slex/csplashscreen/feature/favourite/navigation/FavouriteGraph.kt b/...ourite/src/main/java/st/slex/csplashscreen/feature/favourite/navigation/FavouriteGraph.kt
@@ -5,10 +5,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import androidx.paging.compose.collectAsLazyPagingItems
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.core.ui.base.setupComponent
+import st.slex.csplashscreen.core.ui.base.createScreen
 import st.slex.csplashscreen.core.ui.utils.CollectAsEvent
 import st.slex.csplashscreen.feature.favourite.di.FavouriteComponentBuilder
 import st.slex.csplashscreen.feature.favourite.ui.FavouriteScreen
@@ -18,20 +17,13 @@ import st.slex.csplashscreen.feature.favourite.ui.presenter.FavouriteViewModel
 fun NavGraphBuilder.favouriteGraph(
     modifier: Modifier = Modifier,
 ) {
-    composable(
-        route = AppDestination.FAVOURITE.navigationRoute,
-        arguments = AppDestination.FAVOURITE.composableArguments
-    ) {
+    createScreen(
+        appDestination = AppDestination.FAVOURITE,
+        featureBuilder = FavouriteComponentBuilder
+    ) { viewModel: FavouriteViewModel, _ ->
+        val state by remember { viewModel.state }.collectAsState()
 
-        val viewModel: FavouriteViewModel = setupComponent(FavouriteComponentBuilder)
-
-        val state by remember {
-            viewModel.state
-        }.collectAsState()
-
-        val photos = remember {
-            state.photos()
-        }.collectAsLazyPagingItems()
+        val photos = remember(state.photos).collectAsLazyPagingItems()
 
         viewModel.event.CollectAsEvent { event ->
             // TODO NOT IMPLEMENTED YET

diff --git a/feature/home/src/main/java/st/slex/csplashscreen/feature/home/navigation/HomeGraph.kt b/feature/home/src/main/java/st/slex/csplashscreen/feature/home/navigation/HomeGraph.kt
@@ -5,35 +5,27 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import androidx.paging.compose.collectAsLazyPagingItems
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.core.ui.base.setupComponent
+import st.slex.csplashscreen.core.ui.base.createScreen
 import st.slex.csplashscreen.core.ui.utils.CollectAsEvent
 import st.slex.csplashscreen.feature.home.di.HomeComponentBuilder
+import st.slex.csplashscreen.feature.home.ui.MainScreen
 import st.slex.csplashscreen.feature.home.ui.presenter.HomeStore
 import st.slex.csplashscreen.feature.home.ui.presenter.HomeViewModel
-import st.slex.csplashscreen.feature.home.ui.MainScreen
 
 fun NavGraphBuilder.homeGraph(
     modifier: Modifier = Modifier,
 ) {
-    composable(
-        route = AppDestination.HOME.navigationRoute
-    ) {
-        val viewModel: HomeViewModel = setupComponent(HomeComponentBuilder)
-
-        val state by remember {
-            viewModel.state
-        }.collectAsState()
+    createScreen(
+        appDestination = AppDestination.HOME,
+        featureBuilder = HomeComponentBuilder
+    ) { viewModel: HomeViewModel, _ ->
 
-        val collections = remember {
-            state.collections()
-        }.collectAsLazyPagingItems()
+        val state by remember { viewModel.state }.collectAsState()
 
-        val photos = remember {
-            state.photos()
-        }.collectAsLazyPagingItems()
+        val collections = remember(state.collections).collectAsLazyPagingItems()
+        val photos = remember(state.photos).collectAsLazyPagingItems()
 
         viewModel.event.CollectAsEvent { event ->
             // TODO NOT IMPLEMENTED YET

diff --git a/...in/java/st/slex/csplashscreen/feature/feature_photo_detail/navigation/ImageDetailGraph.kt b/...in/java/st/slex/csplashscreen/feature/feature_photo_detail/navigation/ImageDetailGraph.kt
@@ -13,10 +13,9 @@ import androidx.compose.ui.draw.blur
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import st.slex.csplashscreen.core.navigation.AppArguments
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.core.ui.base.setupComponent
+import st.slex.csplashscreen.core.ui.base.createScreen
 import st.slex.csplashscreen.core.ui.utils.CollectAsEvent
 import st.slex.csplashscreen.feature.feature_photo_detail.di.ImageDetailComponentBuilder
 import st.slex.csplashscreen.feature.feature_photo_detail.ui.ImageDetailScreen
@@ -29,34 +28,28 @@ import st.slex.csplashscreen.feature.feature_photo_detail.ui.presenter.ImageDeta
 fun NavGraphBuilder.imageDetailGraph(
     modifier: Modifier = Modifier,
 ) {
-    composable(
-        route = AppDestination.IMAGE_DETAIL.navigationRoute,
-        arguments = AppDestination.IMAGE_DETAIL.composableArguments
-    ) { navBackStackEntry ->
-        val arguments = AppDestination.IMAGE_DETAIL.parseArguments(navBackStackEntry).let { args ->
-            AppArguments.ImageDetailScreen(args[0])
-        }
-
-        val viewModel: ImageDetailViewModel = setupComponent(
-            key = arguments.imageId,
-            builder = ImageDetailComponentBuilder
-        )
+    createScreen(
+        appDestination = AppDestination.IMAGE_DETAIL,
+        featureBuilder = ImageDetailComponentBuilder
+    ) { viewModel: ImageDetailViewModel, args ->
+        val arguments = args.firstOrNull()
+            .orEmpty()
+            .let(AppArguments::ImageDetailScreen)
 
         LaunchedEffect(arguments) {
             viewModel.sendAction(Action.Init(arguments))
         }
 
-        val state by remember {
-            viewModel.state
-        }.collectAsState()
+        val state by remember { viewModel.state }.collectAsState()
 
         var dialogType by remember {
             mutableStateOf(DialogType.NONE)
         }
 
         val blurBackground by animateDpAsState(
             targetValue = if (dialogType == DialogType.NONE) 0.dp else 16.dp,
-            animationSpec = tween(durationMillis = 600)
+            animationSpec = tween(durationMillis = 600),
+            label = "anim_blur_dialog_background"
         )
 
         viewModel.event.CollectAsEvent { event ->

diff --git a/...search/src/main/java/st/slex/csplashscreen/feature/search/navigation/SearchPhotosGraph.kt b/...search/src/main/java/st/slex/csplashscreen/feature/search/navigation/SearchPhotosGraph.kt
@@ -6,11 +6,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import androidx.paging.compose.collectAsLazyPagingItems
 import st.slex.csplashscreen.core.navigation.AppArguments
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.core.ui.base.setupComponent
+import st.slex.csplashscreen.core.ui.base.createScreen
 import st.slex.csplashscreen.core.ui.utils.CollectAsEvent
 import st.slex.csplashscreen.feature.search.di.SearchPhotosComponentBuilder
 import st.slex.csplashscreen.feature.search.ui.SearchPhotosScreen
@@ -20,18 +19,15 @@ import st.slex.csplashscreen.feature.search.ui.presenter.SearchViewModel
 fun NavGraphBuilder.searchPhotosGraph(
     modifier: Modifier = Modifier,
 ) {
-    composable(
-        route = AppDestination.SEARCH_PHOTOS.navigationRoute,
-        arguments = AppDestination.SEARCH_PHOTOS.composableArguments
-    ) { navBackStackEntry ->
-        val arguments = AppDestination.SEARCH_PHOTOS.parseArguments(navBackStackEntry).let { args ->
-            AppArguments.SearchPhotosScreen(args[0])
-        }
+    createScreen(
+        appDestination = AppDestination.SEARCH_PHOTOS,
+        featureBuilder = SearchPhotosComponentBuilder
+    ) { viewModel: SearchViewModel, args ->
+        val arguments = args.firstOrNull().orEmpty().let(AppArguments::SearchPhotosScreen)
 
-        val viewModel: SearchViewModel = setupComponent(
-            key = arguments.hashCode().toString(),
-            builder = SearchPhotosComponentBuilder
-        )
+        val state by remember { viewModel.state }.collectAsState()
+        val photos = remember(state.searchItems).collectAsLazyPagingItems()
+        val searchHistory = remember(state.historyItems).collectAsLazyPagingItems()
 
         LaunchedEffect(arguments) {
             viewModel.sendAction(Action.Init(arguments))
@@ -41,18 +37,6 @@ fun NavGraphBuilder.searchPhotosGraph(
             // TODO NOT IMPLEMENTED YET
         }
 
-        val state by remember {
-            viewModel.state
-        }.collectAsState()
-
-        val photos = remember {
-            state.searchItems()
-        }.collectAsLazyPagingItems()
-
-        val searchHistory = remember {
-            state.historyItems()
-        }.collectAsLazyPagingItems()
-
         SearchPhotosScreen(
             modifier = modifier,
             photos = photos,

diff --git a/feature/user/src/main/java/st/slex/csplashscreen/feature/user/navigation/UserGraph.kt b/feature/user/src/main/java/st/slex/csplashscreen/feature/user/navigation/UserGraph.kt
@@ -6,11 +6,10 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavGraphBuilder
-import androidx.navigation.compose.composable
 import androidx.paging.compose.collectAsLazyPagingItems
 import st.slex.csplashscreen.core.navigation.AppArguments
 import st.slex.csplashscreen.core.navigation.AppDestination
-import st.slex.csplashscreen.core.ui.base.setupComponent
+import st.slex.csplashscreen.core.ui.base.createScreen
 import st.slex.csplashscreen.core.ui.utils.CollectAsEvent
 import st.slex.csplashscreen.feature.user.di.UserComponentBuilder
 import st.slex.csplashscreen.feature.user.ui.UserScreen
@@ -26,31 +25,15 @@ import st.slex.csplashscreen.feature.user.ui.state.rememberUserSwipeState
 fun NavGraphBuilder.userGraph(
     modifier: Modifier = Modifier,
 ) {
-    composable(
-        route = AppDestination.USER.navigationRoute,
-        arguments = AppDestination.USER.composableArguments
-    ) { navBackStackEntry ->
+    createScreen(
+        appDestination = AppDestination.USER,
+        featureBuilder = UserComponentBuilder
+    ) { viewModel: UserViewModel, args ->
+        val arguments = args.firstOrNull()
+            .orEmpty()
+            .let(AppArguments::UserScreen)
 
-        val arguments = AppDestination.USER.parseArguments(navBackStackEntry).let { args ->
-            AppArguments.UserScreen(args.first())
-        }
-
-        val viewModel: UserViewModel = setupComponent(
-            key = arguments.username,
-            builder = UserComponentBuilder
-        )
-
-        LaunchedEffect(arguments) {
-            viewModel.sendAction(Init(arguments))
-        }
-
-        viewModel.event.CollectAsEvent { event ->
-            // TODO NOT IMPLEMENTED YET
-        }
-
-        val state by remember {
-            viewModel.state
-        }.collectAsState()
+        val state by remember { viewModel.state }.collectAsState()
 
         val photos = remember(arguments) {
             state.photos(arguments.username)
@@ -64,16 +47,22 @@ fun NavGraphBuilder.userGraph(
             state.collections(arguments.username)
         }.collectAsLazyPagingItems()
 
+        LaunchedEffect(arguments) {
+            viewModel.sendAction(Init(arguments))
+        }
+
+        viewModel.event.CollectAsEvent { event ->
+            // TODO NOT IMPLEMENTED YET
+        }
+
         val userPagerState = rememberUserPagerState(
             photos = photos,
             likes = likes,
             collections = collections,
         )
 
         val userSwipeState = rememberUserSwipeState(
-            isOnPreFlingAllow = {
-                userPagerState.isOnPreFlingAllow
-            },
+            isOnPreFlingAllow = { userPagerState.isOnPreFlingAllow },
         )
 
         UserScreen(
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,4 +47,4 @@ enum class AppDestination( @@
                 }
             }
         }
-    }
+    }