Use collectAsStateWithLifecycle directly in commonMain where possible

Author: mr3y-the-programmer

shared/build.gradle.kts

@@ -105,6 +105,9 @@ kotlin {
                 implementation(libs.voyager.navigator)
                 implementation(libs.voyager.transitions)
 
+                // lifecycle
+                implementation(libs.androidx.lifecycle.runtime.compose)
+
                 // ViewModel
                 implementation(libs.voyager.screenmodel)
 
@@ -144,8 +147,6 @@ kotlin {
                 implementation(libs.sqldelight.android)
                 // Unbundled sqlite
                 implementation(libs.sqlite.android)
-                // lifecycle
-                implementation(libs.androidx.lifecycle.runtime.compose)
                 // Coil
                 implementation(libs.coil)
                 implementation(libs.androidx.core.ktx)

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/ui/screens/onboarding/OnboardingScreen.android.kt

@@ -13,7 +13,6 @@ import androidx.compose.animation.slideInVertically
 import androidx.compose.animation.slideOutHorizontally
 import androidx.compose.animation.slideOutVertically
 import androidx.compose.animation.togetherWith
-import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -35,7 +34,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.ExperimentalMaterialApi
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowForward
-import androidx.compose.material.icons.filled.ArrowForward
 import androidx.compose.material.pullrefresh.PullRefreshIndicator
 import androidx.compose.material.pullrefresh.pullRefresh
 import androidx.compose.material.pullrefresh.rememberPullRefreshState
@@ -65,6 +63,7 @@ import androidx.compose.ui.semantics.clearAndSetSemantics
 import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import cafe.adriel.lyricist.LocalStrings
 import cafe.adriel.voyager.core.screen.Screen
 import com.mr3y.ludi.shared.core.model.GameGenre
@@ -86,12 +85,30 @@ object OnboardingScreen : Screen {
 }
 
 @Composable
-expect fun OnboardingScreen(
+fun OnboardingScreen(
     modifier: Modifier = Modifier,
     viewModel: OnBoardingViewModel
-)
+) {
+    val onboardingState by viewModel.onboardingState.collectAsStateWithLifecycle()
+    OnboardingScreen(
+        modifier = modifier,
+        searchQuery = viewModel.searchQuery.value,
+        onboardingState = onboardingState,
+        onSkipButtonClicked = viewModel::completeOnboarding,
+        onFinishButtonClicked = viewModel::completeOnboarding,
+        onSelectingNewsDataSource = viewModel::followNewsDataSource,
+        onUnselectNewsDataSource = viewModel::unFollowNewsDataSource,
+        onUpdatingSearchQueryText = viewModel::updateSearchQuery,
+        onAddingGameToFavourites = viewModel::addGameToFavourites,
+        onRemovingGameFromFavourites = viewModel::removeGameFromFavourites,
+        onRefreshingGames = viewModel::refreshGames,
+        onSelectingGenre = viewModel::selectGenre,
+        onUnselectingGenre = viewModel::unselectGenre,
+        onRefreshingGenres = viewModel::refreshGenres
+    )
+}
 
-@OptIn(ExperimentalFoundationApi::class, ExperimentalMaterialApi::class)
+@OptIn(ExperimentalMaterialApi::class)
 @Composable
 fun OnboardingScreen(
     onboardingState: OnboardingState,

shared/src/androidMain/kotlin/com/mr3y/ludi/shared/ui/screens/settings/EditPreferencesScreen.android.kt

@@ -27,6 +27,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -42,6 +43,7 @@ import androidx.compose.ui.semantics.stateDescription
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import cafe.adriel.lyricist.LocalStrings
 import cafe.adriel.voyager.core.annotation.InternalVoyagerApi
 import cafe.adriel.voyager.core.lifecycle.LifecycleEffect
@@ -79,7 +81,23 @@ data class EditPreferencesScreen(val type: PreferencesType) : Screen {
 }
 
 @Composable
-expect fun EditPreferencesScreen(onDoneClick: () -> Unit, modifier: Modifier = Modifier, viewModel: EditPreferencesViewModel)
+fun EditPreferencesScreen(
+    onDoneClick: () -> Unit,
+    viewModel: EditPreferencesViewModel,
+    modifier: Modifier = Modifier,
+) {
+    val editPreferencesState by viewModel.editPreferencesState.collectAsStateWithLifecycle()
+    EditPreferencesScreen(
+        editPreferencesState,
+        onDoneClick = onDoneClick,
+        onFollowingNewsDataSource = viewModel::followNewsDataSource,
+        onUnfollowingNewsDataSource = viewModel::unFollowNewsDataSource,
+        onRemovingGameFromFavourites = viewModel::removeGameFromFavourites,
+        onAddingGenreToFavourites = viewModel::addToSelectedGenres,
+        onRemovingGenreFromFavourites = viewModel::removeFromSelectedGenres,
+        modifier = modifier
+    )
+}
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable