Update project

michaelbel · Jul 22, 2024 · bec9913 · bec9913
1 parent 38fe54c
commit bec9913
Show file tree

Hide file tree

Showing 62 changed files with 115 additions and 1,111 deletions.
diff --git a/androidApp/build.gradle.kts b/androidApp/build.gradle.kts
@@ -171,7 +171,6 @@ dependencies {
     testImplementation(libs.bundles.junit.android)
     androidTestImplementation(libs.bundles.test.espresso.android)
     androidTestImplementation(libs.bundles.test.ext.junit.android)
-    androidTestImplementation(libs.bundles.compose.ui.test.android)
     androidTestImplementation(libs.bundles.benchmark.android)
     debugImplementation(libs.bundles.leakcanary.android)
     lintChecks(libs.lint.checks)

diff --git a/androidApp/src/main/kotlin/org/michaelbel/sandbox/KotlinSandbox.kt b/androidApp/src/main/kotlin/org/michaelbel/sandbox/KotlinSandbox.kt
diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts
@@ -44,6 +44,7 @@ kotlin {
         jvmMain.dependencies {
             api(compose.desktop.common)
             api(compose.desktop.currentOs)
+            api(libs.bundles.compose.desktop)
         }
     }
 

diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/NotificationBottomSheet.kt
@@ -39,15 +39,13 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.michaelbel.movies.common.theme.AppTheme
+import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.michaelbel.movies.ui.R
 import org.michaelbel.movies.ui.accessibility.MoviesContentDescription
 import org.michaelbel.movies.ui.icons.MoviesIcons
 import org.michaelbel.movies.ui.ktx.appNotificationSettingsIntent
-import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.ui.R
 
 @Composable
 fun NotificationBottomSheet(
@@ -156,8 +154,8 @@ fun NotificationBottomSheet(
     }
 }
 
+@Preview
 @Composable
-@DevicePreviews
 private fun NotificationBottomSheetPreview() {
     MoviesTheme {
         NotificationBottomSheet(
@@ -167,19 +165,4 @@ private fun NotificationBottomSheetPreview() {
             onDismissRequest = {}
         )
     }
-}
-
-@Composable
-@Preview
-private fun NotificationBottomSheetAmoledPreview() {
-    MoviesTheme(
-        theme = AppTheme.Amoled
-    ) {
-        NotificationBottomSheet(
-            modifier = Modifier
-                .fillMaxWidth()
-                .background(MaterialTheme.colorScheme.primaryContainer),
-            onDismissRequest = {}
-        )
-    }
 }
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/VoiceIcon.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/iconbutton/VoiceIcon.kt
@@ -12,11 +12,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.tooling.preview.Preview
-import org.michaelbel.movies.common.theme.AppTheme
+import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.michaelbel.movies.ui.accessibility.MoviesContentDescription
 import org.michaelbel.movies.ui.icons.MoviesIcons
-import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
@@ -61,26 +59,13 @@ fun VoiceIcon(
     }
 }
 
+@Preview
 @Composable
-@DevicePreviews
 private fun VoiceIconPreview() {
     MoviesTheme {
         VoiceIcon(
             onInputText = {},
             modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer)
         )
     }
-}
-
-@Composable
-@Preview
-private fun VoiceIconAmoledPreview() {
-    MoviesTheme(
-        theme = AppTheme.Amoled
-    ) {
-        VoiceIcon(
-            onInputText = {},
-            modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer)
-        )
-    }
 }
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.android.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageFailure.android.kt
@@ -23,14 +23,12 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import org.michaelbel.movies.common.theme.AppTheme
+import org.jetbrains.compose.ui.tooling.preview.Preview
+import org.michaelbel.movies.ui.R
 import org.michaelbel.movies.ui.accessibility.MoviesContentDescription
 import org.michaelbel.movies.ui.icons.MoviesIcons
-import org.michaelbel.movies.ui.preview.DevicePreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
-import org.michaelbel.movies.ui.R
 
 @Composable
 fun PageFailure(
@@ -79,8 +77,8 @@ fun PageFailure(
     }
 }
 
+@Preview
 @Composable
-@DevicePreviews
 private fun PageFailurePreview() {
     MoviesTheme {
         PageFailure(
@@ -89,18 +87,4 @@ private fun PageFailurePreview() {
                 .background(MaterialTheme.colorScheme.primaryContainer)
         )
     }
-}
-
-@Composable
-@Preview
-private fun PageFailureAmoledPreview() {
-    MoviesTheme(
-        theme = AppTheme.Amoled
-    ) {
-        PageFailure(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.primaryContainer)
-        )
-    }
 }
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.android.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/compose/page/PageLoading.android.kt
@@ -14,10 +14,9 @@ import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.michaelbel.movies.common.appearance.FeedView
-import org.michaelbel.movies.common.theme.AppTheme
 import org.michaelbel.movies.network.model.MovieResponse
 import org.michaelbel.movies.persistence.database.entity.pojo.MoviePojo
 import org.michaelbel.movies.ui.compose.movie.MovieColumn
@@ -27,11 +26,6 @@ import org.michaelbel.movies.ui.ktx.isPortrait
 import org.michaelbel.movies.ui.placeholder.PlaceholderHighlight
 import org.michaelbel.movies.ui.placeholder.material3.fade
 import org.michaelbel.movies.ui.placeholder.placeholder
-import org.michaelbel.movies.ui.preview.DeviceLandscapePreview
-import org.michaelbel.movies.ui.preview.DeviceLandscapePreviews
-import org.michaelbel.movies.ui.preview.DevicePreviews
-import org.michaelbel.movies.ui.preview.DeviceUserLandscapePreviews
-import org.michaelbel.movies.ui.preview.DeviceUserPreviews
 import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
@@ -148,8 +142,8 @@ private fun PageLoadingStaggeredGrid(
     }
 }
 
+@Preview
 @Composable
-@DevicePreviews
 private fun PageLoadingColumnPreview() {
     MoviesTheme {
         PageLoadingColumn(
@@ -160,22 +154,8 @@ private fun PageLoadingColumnPreview() {
     }
 }
 
-@Composable
 @Preview
-private fun PageLoadingColumnAmoledPreview() {
-    MoviesTheme(
-        theme = AppTheme.Amoled
-    ) {
-        PageLoadingColumn(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.primaryContainer)
-        )
-    }
-}
-
 @Composable
-@DeviceLandscapePreviews
 private fun PageLoadingGridPreview() {
     MoviesTheme {
         PageLoadingGrid(
@@ -186,22 +166,8 @@ private fun PageLoadingGridPreview() {
     }
 }
 
+@Preview
 @Composable
-@DeviceLandscapePreview
-private fun PageLoadingGridAmoledPreview() {
-    MoviesTheme(
-        theme = AppTheme.Amoled
-    ) {
-        PageLoadingGrid(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.primaryContainer)
-        )
-    }
-}
-
-@Composable
-@DeviceUserLandscapePreviews
 private fun PageLoadingStaggeredGridPreview() {
     MoviesTheme {
         PageLoadingStaggeredGrid(
@@ -210,18 +176,4 @@ private fun PageLoadingStaggeredGridPreview() {
                 .background(MaterialTheme.colorScheme.primaryContainer)
         )
     }
-}
-
-@Composable
-@DeviceUserPreviews
-private fun PageLoadingStaggeredGridAmoledPreview() {
-    MoviesTheme(
-        theme = AppTheme.Amoled
-    ) {
-        PageLoadingStaggeredGrid(
-            modifier = Modifier
-                .fillMaxSize()
-                .background(MaterialTheme.colorScheme.primaryContainer)
-        )
-    }
 }
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreview.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreview.kt
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceLandscapePreviews.kt
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DevicePreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DevicePreviews.kt
diff --git a/...ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserLandscapePreviews.kt b/...ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserLandscapePreviews.kt
diff --git a/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserPreviews.kt b/core/ui/src/androidMain/kotlin/org/michaelbel/movies/ui/preview/DeviceUserPreviews.kt
diff --git a/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/AccountAvatar.kt b/core/ui/src/commonMain/kotlin/org/michaelbel/movies/ui/compose/AccountAvatar.kt
@@ -18,6 +18,7 @@ import coil3.compose.LocalPlatformContext
 import coil3.request.ImageRequest
 import coil3.request.crossfade
 import org.jetbrains.compose.resources.stringResource
+import org.jetbrains.compose.ui.tooling.preview.Preview
 import org.michaelbel.movies.persistence.database.entity.pojo.AccountPojo
 import org.michaelbel.movies.persistence.database.ktx.letters
 import org.michaelbel.movies.ui.accessibility.MoviesContentDescriptionCommon
@@ -58,8 +59,8 @@ fun AccountAvatar(
     }
 }
 
+@Preview
 @Composable
-/*@DevicePreviews*/
 private fun AccountAvatarPreview(
     /*@PreviewParameter(AccountPreviewParameterProvider::class)*/ account: AccountPojo
 ) {