Migrate from context receivers to extension receiver and explicit par…

…am. (#264)
ReactiveCircus · Jan 4, 2025 · c33f6b7 · c33f6b7
1 parent 0f0fd59
commit c33f6b7
Show file tree

Hide file tree

Showing 12 changed files with 115 additions and 109 deletions.
diff --git a/android/app/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/KSActivity.kt b/android/app/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/KSActivity.kt
@@ -77,6 +77,7 @@ class KSActivity : ComponentActivity() {
                         when (it) {
                             is NavDestination.Main -> {
                                 MainScreen(
+                                    animatedVisibilityScope = this@AnimatedContent,
                                     selectedNavItem = selectedNavItem,
                                     onSelectedNavItemChanged = { item -> selectedNavItem = item },
                                     homeListState = homeListState,
@@ -117,6 +118,7 @@ class KSActivity : ComponentActivity() {
 
                             is NavDestination.ContentViewer -> {
                                 ContentViewerScreen(
+                                    animatedVisibilityScope = this@AnimatedContent,
                                     boundsKey = it.boundsKey,
                                     topBarBoundsKey = it.topBarBoundsKey,
                                     saveButtonElementKey = it.saveButtonElementKey,
@@ -129,6 +131,7 @@ class KSActivity : ComponentActivity() {
 
                             is NavDestination.KotlinWeeklyIssue -> {
                                 KotlinWeeklyIssueScreen(
+                                    animatedVisibilityScope = this@AnimatedContent,
                                     boundsKey = it.boundKey,
                                     topBarBoundsKey = it.topBarBoundsKey,
                                     titleElementKey = it.titleElementKey,
@@ -142,6 +145,7 @@ class KSActivity : ComponentActivity() {
 
                             is NavDestination.TalkingKotlinEpisode -> {
                                 TalkingKotlinEpisodeScreen(
+                                    animatedVisibilityScope = this@AnimatedContent,
                                     boundsKey = it.boundsKey,
                                     topBarBoundsKey = it.topBarBoundsKey,
                                     playerElementKey = it.playerElementKey,

diff --git a/android/app/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/MainScreen.kt b/android/app/src/main/kotlin/io/github/reactivecircus/kstreamlined/android/MainScreen.kt
@@ -37,9 +37,9 @@ import io.github.reactivecircus.kstreamlined.android.foundation.designsystem.fou
 import io.github.reactivecircus.kstreamlined.kmp.model.feed.FeedItem
 import kotlin.math.absoluteValue
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-fun MainScreen(
+fun SharedTransitionScope.MainScreen(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     selectedNavItem: NavItemKey,
     onSelectedNavItemChanged: (NavItemKey) -> Unit,
     homeListState: LazyListState,
@@ -61,6 +61,7 @@ fun MainScreen(
             when (it) {
                 NavItemKey.Home.ordinal -> {
                     HomeScreen(
+                        animatedVisibilityScope = animatedVisibilityScope,
                         listState = homeListState,
                         onViewItem = { item -> onViewItem(item, NavItemKey.Home) },
                         modifier = Modifier.pagerScaleTransition(it, pagerState)
@@ -69,6 +70,7 @@ fun MainScreen(
 
                 NavItemKey.Saved.ordinal -> {
                     SavedForLaterScreen(
+                        animatedVisibilityScope = animatedVisibilityScope,
                         listState = savedListState,
                         onViewItem = { item -> onViewItem(item, NavItemKey.Saved) },
                         modifier = Modifier.pagerScaleTransition(it, pagerState)
@@ -87,38 +89,40 @@ fun MainScreen(
             )
         }
 
-        NavigationIsland(
-            modifier = Modifier
-                .navigationBarsPadding()
-                .padding(8.dp)
-                .align(Alignment.BottomCenter)
-                .renderInSharedTransitionScopeOverlay(
-                    zIndexInOverlay = 1f
+        with(animatedVisibilityScope) {
+            NavigationIsland(
+                modifier = Modifier
+                    .navigationBarsPadding()
+                    .padding(8.dp)
+                    .align(Alignment.BottomCenter)
+                    .renderInSharedTransitionScopeOverlay(
+                        zIndexInOverlay = 1f
+                    )
+                    .animateEnterExit(
+                        enter = fadeIn() + slideInVertically(
+                            tween(delayMillis = 200, easing = LinearOutSlowInEasing)
+                        ) { it * 2 },
+                        exit = fadeOut(),
+                    ),
+            ) {
+                NavigationIslandItem(
+                    selected = selectedNavItem == NavItemKey.Home,
+                    icon = KSIcons.Kotlin,
+                    contentDescription = "Home",
+                    onClick = {
+                        onSelectedNavItemChanged(NavItemKey.Home)
+                    },
                 )
-                .animateEnterExit(
-                    enter = fadeIn() + slideInVertically(
-                        tween(delayMillis = 200, easing = LinearOutSlowInEasing)
-                    ) { it * 2 },
-                    exit = fadeOut(),
-                ),
-        ) {
-            NavigationIslandItem(
-                selected = selectedNavItem == NavItemKey.Home,
-                icon = KSIcons.Kotlin,
-                contentDescription = "Home",
-                onClick = {
-                    onSelectedNavItemChanged(NavItemKey.Home)
-                },
-            )
-            NavigationIslandDivider()
-            NavigationIslandItem(
-                selected = selectedNavItem == NavItemKey.Saved,
-                icon = KSIcons.Bookmarks,
-                contentDescription = "Saved",
-                onClick = {
-                    onSelectedNavItemChanged(NavItemKey.Saved)
-                },
-            )
+                NavigationIslandDivider()
+                NavigationIslandItem(
+                    selected = selectedNavItem == NavItemKey.Saved,
+                    icon = KSIcons.Bookmarks,
+                    contentDescription = "Saved",
+                    onClick = {
+                        onSelectedNavItemChanged(NavItemKey.Saved)
+                    },
+                )
+            }
         }
     }
 }

diff --git a/...o/github/reactivecircus/kstreamlined/android/feature/contentviewer/ContentViewerScreen.kt b/...o/github/reactivecircus/kstreamlined/android/feature/contentviewer/ContentViewerScreen.kt
@@ -59,9 +59,9 @@ import io.github.reactivecircus.kstreamlined.kmp.presentation.contentviewer.Cont
 import io.github.reactivecircus.kstreamlined.kmp.presentation.contentviewer.ContentViewerUiState
 import io.github.reactivecircus.kstreamlined.android.feature.common.R as commonR
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-public fun ContentViewerScreen(
+public fun SharedTransitionScope.ContentViewerScreen(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     boundsKey: String,
     topBarBoundsKey: String,
     saveButtonElementKey: String,
@@ -85,12 +85,12 @@ public fun ContentViewerScreen(
             .background(KSTheme.colorScheme.background)
             .sharedBounds(
                 rememberSharedContentState(key = boundsKey),
-                animatedVisibilityScope = this@AnimatedVisibilityScope,
+                animatedVisibilityScope = animatedVisibilityScope,
             ),
     ) {
         val context = LocalContext.current
         TopNavBar(
-            animatedVisibilityScope = this@AnimatedVisibilityScope,
+            animatedVisibilityScope = animatedVisibilityScope,
             boundsKey = topBarBoundsKey,
             title = "",
             contentPadding = WindowInsets.statusBars.asPaddingValues(),
@@ -122,7 +122,7 @@ public fun ContentViewerScreen(
                         onClick = { eventSink(ContentViewerUiEvent.ToggleSavedForLater) },
                         modifier = Modifier.sharedElement(
                             rememberSharedContentState(key = saveButtonElementKey),
-                            animatedVisibilityScope = this@AnimatedVisibilityScope,
+                            animatedVisibilityScope = animatedVisibilityScope,
                             zIndexInOverlay = 1f,
                         ),
                     )

diff --git a/.../src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/home/HomeScreen.kt b/.../src/main/kotlin/io/github/reactivecircus/kstreamlined/android/feature/home/HomeScreen.kt
@@ -66,9 +66,9 @@ import io.github.reactivecircus.kstreamlined.kmp.presentation.home.HomeUiState
 import kotlinx.coroutines.delay
 import io.github.reactivecircus.kstreamlined.android.feature.common.R as commonR
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-public fun HomeScreen(
+public fun SharedTransitionScope.HomeScreen(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     listState: LazyListState,
     onViewItem: (FeedItem) -> Unit,
     modifier: Modifier = Modifier,
@@ -77,6 +77,7 @@ public fun HomeScreen(
     val uiState by viewModel.uiState.collectAsStateWithLifecycle()
     val eventSink = viewModel.eventSink
     HomeScreen(
+        animatedVisibilityScope = animatedVisibilityScope,
         listState = listState,
         onViewItem = onViewItem,
         uiState = uiState,
@@ -86,9 +87,9 @@ public fun HomeScreen(
     ReportDrawnWhen { uiState !is HomeUiState.Loading }
 }
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-internal fun HomeScreen(
+internal fun SharedTransitionScope.HomeScreen(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     listState: LazyListState,
     onViewItem: (FeedItem) -> Unit,
     uiState: HomeUiState,
@@ -102,7 +103,7 @@ internal fun HomeScreen(
             .background(KSTheme.colorScheme.background),
     ) {
         TopNavBar(
-            animatedVisibilityScope = this@AnimatedVisibilityScope,
+            animatedVisibilityScope = animatedVisibilityScope,
             boundsKey = "Bounds/Home/TopBar",
             titleElementKey = "Element/Home/TopBar/Title",
             title = stringResource(id = R.string.title_home),
@@ -147,25 +148,24 @@ internal fun HomeScreen(
                     }
 
                     is HomeUiState.Content -> {
-                        with(this@AnimatedVisibilityScope) {
-                            ContentUi(
-                                listState = listState,
-                                items = state.feedItems,
-                                showTransientError = state.hasTransientError,
-                                onItemClick = onViewItem,
-                                eventSink = eventSink,
-                            )
-                        }
+                        ContentUi(
+                            animatedVisibilityScope = animatedVisibilityScope,
+                            listState = listState,
+                            items = state.feedItems,
+                            showTransientError = state.hasTransientError,
+                            onItemClick = onViewItem,
+                            eventSink = eventSink,
+                        )
                     }
                 }
             }
         }
     }
 }
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-private fun ContentUi(
+private fun SharedTransitionScope.ContentUi(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     listState: LazyListState,
     items: List<HomeFeedItem>,
     showTransientError: Boolean,
@@ -224,9 +224,9 @@ private fun ContentUi(
                                         .animateItem()
                                         .sharedBounds(
                                             rememberSharedContentState(key = "Bounds/Home/${item.id}"),
-                                            animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                            animatedVisibilityScope = animatedVisibilityScope,
                                         ),
-                                    animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                    animatedVisibilityScope = animatedVisibilityScope,
                                     saveButtonElementKey = "Element/Home/${item.id}/saveButton",
                                 )
                             }
@@ -242,7 +242,7 @@ private fun ContentUi(
                                         .animateItem()
                                         .sharedBounds(
                                             rememberSharedContentState(key = "Bounds/Home/${item.id}"),
-                                            animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                            animatedVisibilityScope = animatedVisibilityScope,
                                         ),
                                 )
                             }
@@ -258,9 +258,9 @@ private fun ContentUi(
                                         .animateItem()
                                         .sharedBounds(
                                             rememberSharedContentState(key = "Bounds/Home/${item.id}"),
-                                            animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                            animatedVisibilityScope = animatedVisibilityScope,
                                         ),
-                                    animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                    animatedVisibilityScope = animatedVisibilityScope,
                                     saveButtonElementKey = "Element/Home/${item.id}/saveButton",
                                 )
                             }
@@ -276,9 +276,9 @@ private fun ContentUi(
                                         .animateItem()
                                         .sharedBounds(
                                             rememberSharedContentState(key = "Bounds/Home/${item.id}"),
-                                            animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                            animatedVisibilityScope = animatedVisibilityScope,
                                         ),
-                                    animatedVisibilityScope = this@AnimatedVisibilityScope,
+                                    animatedVisibilityScope = animatedVisibilityScope,
                                     cardElementKey = "Element/Home/${item.id}/player",
                                 )
                             }

diff --git a/.../reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/KotlinWeeklyIssueScreen.kt b/.../reactivecircus/kstreamlined/android/feature/kotlinweeklyissue/KotlinWeeklyIssueScreen.kt
@@ -63,9 +63,9 @@ import io.github.reactivecircus.kstreamlined.kmp.presentation.kotlinweeklyissue.
 import io.github.reactivecircus.kstreamlined.kmp.presentation.kotlinweeklyissue.KotlinWeeklyIssueUiState
 import io.github.reactivecircus.kstreamlined.android.feature.common.R as commonR
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-public fun KotlinWeeklyIssueScreen(
+public fun SharedTransitionScope.KotlinWeeklyIssueScreen(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     boundsKey: String,
     topBarBoundsKey: String,
     titleElementKey: String,
@@ -85,6 +85,7 @@ public fun KotlinWeeklyIssueScreen(
     val context = LocalContext.current
     val title = stringResource(id = R.string.title_kotlin_weekly_issue, issueNumber)
     KotlinWeeklyIssueScreen(
+        animatedVisibilityScope = animatedVisibilityScope,
         topBarBoundsKey = topBarBoundsKey,
         titleElementKey = titleElementKey,
         id = id,
@@ -100,14 +101,14 @@ public fun KotlinWeeklyIssueScreen(
         eventSink = eventSink,
         modifier = modifier.sharedBounds(
             rememberSharedContentState(key = boundsKey),
-            animatedVisibilityScope = this@AnimatedVisibilityScope,
+            animatedVisibilityScope = animatedVisibilityScope,
         ),
     )
 }
 
-context(SharedTransitionScope, AnimatedVisibilityScope)
 @Composable
-internal fun KotlinWeeklyIssueScreen(
+internal fun SharedTransitionScope.KotlinWeeklyIssueScreen(
+    animatedVisibilityScope: AnimatedVisibilityScope,
     topBarBoundsKey: String,
     titleElementKey: String,
     id: String,
@@ -126,7 +127,7 @@ internal fun KotlinWeeklyIssueScreen(
             .background(KSTheme.colorScheme.background),
     ) {
         TopNavBar(
-            animatedVisibilityScope = this@AnimatedVisibilityScope,
+            animatedVisibilityScope = animatedVisibilityScope,
             boundsKey = topBarBoundsKey,
             titleElementKey = titleElementKey,
             title = title,