Update project

michaelbel · michaelbel · commit a999507c10bb · 2023-10-29T14:30:55.000+03:00
diff --git a/core/common/src/main/kotlin/org/michaelbel/movies/common/appearance/FeedView.kt b/core/common/src/main/kotlin/org/michaelbel/movies/common/appearance/FeedView.kt
@@ -4,15 +4,20 @@ import org.michaelbel.movies.common.appearance.exceptions.InvalidFeedViewExcepti
 
 sealed interface FeedView {
 
-    data object List: FeedView
+    data object FeedList: FeedView
 
-    data object Grid: FeedView
+    data object FeedGrid: FeedView
 
     companion object {
+        val VALUES: List<FeedView> = listOf(
+            FeedList,
+            FeedGrid
+        )
+
         fun transform(name: String): FeedView {
             return when (name) {
-                List.toString() -> List
-                Grid.toString() -> Grid
+                FeedList.toString() -> FeedList
+                FeedGrid.toString() -> FeedGrid
                 else -> throw InvalidFeedViewException
             }
         }
diff --git a/core/common/src/main/kotlin/org/michaelbel/movies/common/list/MovieList.kt b/core/common/src/main/kotlin/org/michaelbel/movies/common/list/MovieList.kt
@@ -14,6 +14,13 @@ sealed class MovieList(
     data object Upcoming: MovieList("upcoming")
 
     companion object {
+        val VALUES: List<MovieList> = listOf(
+            NowPlaying,
+            Popular,
+            TopRated,
+            Upcoming
+        )
+
         fun transform(name: String): MovieList {
             return when (name) {
                 NowPlaying.toString() -> NowPlaying
diff --git a/core/common/src/main/kotlin/org/michaelbel/movies/common/localization/model/AppLanguage.kt b/core/common/src/main/kotlin/org/michaelbel/movies/common/localization/model/AppLanguage.kt
@@ -10,6 +10,11 @@ sealed class AppLanguage(
     data object Russian: AppLanguage("ru")
 
     companion object {
+        val VALUES: List<AppLanguage> = listOf(
+            English,
+            Russian
+        )
+
         fun transform(code: String): AppLanguage {
             return when (code) {
                 "en" -> English
diff --git a/core/common/src/main/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt b/core/common/src/main/kotlin/org/michaelbel/movies/common/theme/AppTheme.kt
@@ -2,7 +2,7 @@ package org.michaelbel.movies.common.theme
 
 import org.michaelbel.movies.common.theme.exceptions.InvalidThemeException
 
-sealed interface AppTheme{
+sealed interface AppTheme {
 
     data object NightNo: AppTheme
 
@@ -11,6 +11,12 @@ sealed interface AppTheme{
     data object FollowSystem: AppTheme
 
     companion object {
+        val VALUES: List<AppTheme> = listOf(
+            NightNo,
+            NightYes,
+            FollowSystem
+        )
+
         fun transform(name: String): AppTheme {
             return when (name) {
                 NightNo.toString() -> NightNo
diff --git a/core/repository-impl/src/main/kotlin/org/michaelbel/movies/repository/SettingsRepositoryImpl.kt b/core/repository-impl/src/main/kotlin/org/michaelbel/movies/repository/SettingsRepositoryImpl.kt
@@ -29,7 +29,7 @@ internal class SettingsRepositoryImpl @Inject constructor(
     }
 
     override val currentFeedView: Flow<FeedView> = preferences.feedViewFlow.map { name ->
-        FeedView.transform(name ?: FeedView.List.toString())
+        FeedView.transform(name ?: FeedView.FeedList.toString())
     }
 
     override val currentMovieList: Flow<MovieList> = preferences.movieListFlow.map { name ->
diff --git a/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/AppearancePreviewParameterProvider.kt b/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/AppearancePreviewParameterProvider.kt
@@ -4,8 +4,5 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import org.michaelbel.movies.common.appearance.FeedView
 
 class AppearancePreviewParameterProvider: PreviewParameterProvider<FeedView> {
-    override val values: Sequence<FeedView> = sequenceOf(
-        FeedView.List,
-        FeedView.Grid
-    )
+    override val values: Sequence<FeedView> = FeedView.VALUES.asSequence()
 }
diff --git a/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/LanguagePreviewParameterProvider.kt b/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/LanguagePreviewParameterProvider.kt
@@ -4,8 +4,5 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import org.michaelbel.movies.common.localization.model.AppLanguage
 
 class LanguagePreviewParameterProvider: PreviewParameterProvider<AppLanguage> {
-    override val values: Sequence<AppLanguage> = sequenceOf(
-        AppLanguage.English,
-        AppLanguage.Russian
-    )
+    override val values: Sequence<AppLanguage> = AppLanguage.VALUES.asSequence()
 }
diff --git a/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/MovieListPreviewParameterProvider.kt b/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/MovieListPreviewParameterProvider.kt
@@ -4,10 +4,5 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import org.michaelbel.movies.common.list.MovieList
 
 class MovieListPreviewParameterProvider: PreviewParameterProvider<MovieList> {
-    override val values: Sequence<MovieList> = sequenceOf(
-        MovieList.NowPlaying,
-        MovieList.Popular,
-        MovieList.TopRated,
-        MovieList.Upcoming
-    )
+    override val values: Sequence<MovieList> = MovieList.VALUES.asSequence()
 }
diff --git a/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/ThemePreviewParameterProvider.kt b/core/ui/src/main/kotlin/org/michaelbel/movies/ui/preview/provider/ThemePreviewParameterProvider.kt
@@ -4,9 +4,5 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import org.michaelbel.movies.common.theme.AppTheme
 
 class ThemePreviewParameterProvider: PreviewParameterProvider<AppTheme> {
-    override val values: Sequence<AppTheme> = sequenceOf(
-        AppTheme.FollowSystem,
-        AppTheme.NightNo,
-        AppTheme.NightYes
-    )
+    override val values: Sequence<AppTheme> = AppTheme.VALUES.asSequence()
 }
diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedContent.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedContent.kt
@@ -38,7 +38,7 @@ fun FeedContent(
     modifier: Modifier = Modifier,
 ) {
     when (currentFeedView) {
-        is FeedView.List -> {
+        is FeedView.FeedList -> {
             LazyColumn(
                 modifier = modifier.padding(top = 4.dp),
                 state = lazyListState,
@@ -103,7 +103,7 @@ fun FeedContent(
                 }
             }
         }
-        is FeedView.Grid -> {
+        is FeedView.FeedGrid -> {
             LazyVerticalStaggeredGrid(
                 columns = StaggeredGridCells.Fixed(2),
                 modifier = modifier.padding(start = 8.dp, top = 8.dp, end = 8.dp),
diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedScreenContent.kt
@@ -218,13 +218,13 @@ private fun FeedScreenContent(
             when {
                 pagingItems.isLoading -> {
                     when (currentFeedView) {
-                        is FeedView.List -> {
+                        is FeedView.FeedList -> {
                             FeedCellLoading(
                                 modifier = Modifier.fillMaxSize().padding(top = 4.dp),
                                 paddingValues = paddingValues
                             )
                         }
-                        is FeedView.Grid -> {
+                        is FeedView.FeedGrid -> {
                             FeedGridLoading(
                                 modifier = Modifier
                                     .fillMaxSize()
diff --git a/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageBoxTest.kt b/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageBoxTest.kt
@@ -25,7 +25,6 @@ internal class SettingsLanguageBoxTest {
         composeTestRule.setContent {
             MoviesTheme {
                 SettingsLanguageBox(
-                    languages = LANGUAGES,
                     currentLanguage = CURRENT_LANGUAGE,
                     onLanguageSelect = {},
                     modifier = Modifier
@@ -52,10 +51,6 @@ internal class SettingsLanguageBoxTest {
     }
 
     private companion object {
-        private val LANGUAGES: List<AppLanguage> = listOf(
-            AppLanguage.English,
-            AppLanguage.Russian
-        )
         private val CURRENT_LANGUAGE: AppLanguage = AppLanguage.English
     }
 }
diff --git a/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageDialogTest.kt b/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageDialogTest.kt
@@ -21,7 +21,6 @@ internal class SettingsLanguageDialogTest {
         composeTestRule.setContent {
             MoviesTheme {
                 SettingLanguageDialog(
-                    languages = LANGUAGES,
                     currentLanguage = CURRENT_LANGUAGE,
                     onLanguageSelect = {},
                     onDismissRequest = {}
@@ -55,10 +54,6 @@ internal class SettingsLanguageDialogTest {
     }
 
     private companion object {
-        private val LANGUAGES: List<AppLanguage> = listOf(
-            AppLanguage.English,
-            AppLanguage.Russian
-        )
         private val CURRENT_LANGUAGE: AppLanguage = AppLanguage.English
     }
 }
diff --git a/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeBoxTest.kt b/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeBoxTest.kt
@@ -25,7 +25,6 @@ internal class SettingsThemeBoxTest {
         composeTestRule.setContent {
             MoviesTheme {
                 SettingsThemeBox(
-                    themes = THEMES,
                     currentTheme = CURRENT_THEME,
                     onThemeSelect = {},
                     modifier = Modifier
@@ -52,11 +51,6 @@ internal class SettingsThemeBoxTest {
     }
 
     private companion object {
-        private val THEMES: List<AppTheme> = listOf(
-            AppTheme.NightNo,
-            AppTheme.NightYes,
-            AppTheme.FollowSystem
-        )
         private val CURRENT_THEME = AppTheme.FollowSystem
     }
 }
diff --git a/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeDialogTest.kt b/feature/settings-impl/src/androidTest/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeDialogTest.kt
@@ -21,7 +21,6 @@ internal class SettingsThemeDialogTest {
         composeTestRule.setContent {
             MoviesTheme {
                 SettingThemeDialog(
-                    themes = THEMES,
                     currentTheme = CURRENT_THEME,
                     onThemeSelect = {},
                     onDismissRequest = {}
@@ -55,11 +54,6 @@ internal class SettingsThemeDialogTest {
     }
 
     private companion object {
-        private val THEMES: List<AppTheme> = listOf(
-            AppTheme.NightNo,
-            AppTheme.NightYes,
-            AppTheme.FollowSystem
-        )
         private val CURRENT_THEME = AppTheme.FollowSystem
     }
 }
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/SettingsViewModel.kt
@@ -38,29 +38,6 @@ class SettingsViewModel @Inject constructor(
 
     val isPostNotificationsFeatureEnabled: Boolean = Build.VERSION.SDK_INT >= 33
 
-    val languages: List<AppLanguage> = listOf(
-        AppLanguage.English,
-        AppLanguage.Russian
-    )
-
-    val themes: List<AppTheme> = listOf(
-        AppTheme.NightNo,
-        AppTheme.NightYes,
-        AppTheme.FollowSystem
-    )
-
-    val feedViews: List<FeedView> = listOf(
-        FeedView.List,
-        FeedView.Grid
-    )
-
-    val movieLists: List<MovieList> = listOf(
-        MovieList.NowPlaying,
-        MovieList.Popular,
-        MovieList.TopRated,
-        MovieList.Upcoming
-    )
-
     val currentTheme: StateFlow<AppTheme> = interactor.currentTheme
         .stateIn(
             scope = this,
@@ -72,7 +49,7 @@ class SettingsViewModel @Inject constructor(
         .stateIn(
             scope = this,
             started = SharingStarted.Lazily,
-            initialValue = FeedView.List
+            initialValue = FeedView.FeedList
         )
 
     val currentMovieList: StateFlow<MovieList> = interactor.currentMovieList
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ktx/FeedViewKtx.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ktx/FeedViewKtx.kt
@@ -7,6 +7,6 @@ import org.michaelbel.movies.settings_impl.R
 
 internal val FeedView.feedViewText: String
     @Composable get() = when (this) {
-        is FeedView.List -> stringResource(R.string.settings_appearance_list)
-        is FeedView.Grid -> stringResource(R.string.settings_appearance_grid)
+        is FeedView.FeedList -> stringResource(R.string.settings_appearance_list)
+        is FeedView.FeedGrid -> stringResource(R.string.settings_appearance_grid)
     }
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ktx/MovieListKtx.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ktx/MovieListKtx.kt
@@ -5,7 +5,7 @@ import androidx.compose.ui.res.stringResource
 import org.michaelbel.movies.common.list.MovieList
 import org.michaelbel.movies.settings_impl.R
 
-internal val MovieList.title: String
+internal val MovieList.listText: String
     @Composable get() = when (this) {
         is MovieList.NowPlaying -> stringResource(R.string.settings_movie_list_now_playing)
         is MovieList.Popular -> stringResource(R.string.settings_movie_list_popular)
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsAppearanceBox.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsAppearanceBox.kt
@@ -27,7 +27,6 @@ import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
 fun SettingsAppearanceBox(
-    feedViews: List<FeedView>,
     currentFeedView: FeedView,
     onFeedViewSelect: (FeedView) -> Unit,
     modifier: Modifier = Modifier,
@@ -36,7 +35,6 @@ fun SettingsAppearanceBox(
 
     if (feedViewDialog) {
         SettingsAppearanceDialog(
-            feedViews = feedViews,
             currentFeedView = currentFeedView,
             onFeedViewSelect = onFeedViewSelect,
             onDismissRequest = {
@@ -95,7 +93,6 @@ private fun SettingsAppearanceBoxPreview(
 ) {
     MoviesTheme {
         SettingsAppearanceBox(
-            feedViews = listOf(FeedView.List, FeedView.Grid),
             currentFeedView = feedView,
             onFeedViewSelect = {},
             modifier = Modifier
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsAppearanceDialog.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsAppearanceDialog.kt
@@ -32,7 +32,6 @@ import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
 fun SettingsAppearanceDialog(
-    feedViews: List<FeedView>,
     currentFeedView: FeedView,
     onFeedViewSelect: (FeedView) -> Unit,
     onDismissRequest: () -> Unit
@@ -71,7 +70,6 @@ fun SettingsAppearanceDialog(
         },
         text = {
             SettingAppearanceDialogContent(
-                feedViews = feedViews,
                 currentFeedView = currentFeedView,
                 onFeedViewSelect = { feedView ->
                     onFeedViewSelect(feedView)
@@ -93,15 +91,14 @@ fun SettingsAppearanceDialog(
 
 @Composable
 private fun SettingAppearanceDialogContent(
-    feedViews: List<FeedView>,
     currentFeedView: FeedView,
     onFeedViewSelect: (FeedView) -> Unit,
     modifier: Modifier = Modifier
 ) {
     Column(
         modifier = modifier
     ) {
-        feedViews.forEach { feedView: FeedView ->
+        FeedView.VALUES.forEach { feedView: FeedView ->
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
@@ -140,10 +137,6 @@ private fun SettingsAppearanceDialogPreview(
 ) {
     MoviesTheme {
         SettingsAppearanceDialog(
-            feedViews = listOf(
-                FeedView.List,
-                FeedView.Grid
-            ),
             currentFeedView = feeView,
             onFeedViewSelect = {},
             onDismissRequest = {}
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageBox.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageBox.kt
@@ -27,7 +27,6 @@ import org.michaelbel.movies.ui.theme.MoviesTheme
 
 @Composable
 fun SettingsLanguageBox(
-    languages: List<AppLanguage>,
     currentLanguage: AppLanguage,
     onLanguageSelect: (AppLanguage) -> Unit,
     modifier: Modifier = Modifier,
@@ -36,7 +35,6 @@ fun SettingsLanguageBox(
 
     if (languageDialog) {
         SettingLanguageDialog(
-            languages = languages,
             currentLanguage = currentLanguage,
             onLanguageSelect = onLanguageSelect,
             onDismissRequest = {
@@ -95,7 +93,6 @@ private fun SettingsLanguageBoxPreview(
 ) {
     MoviesTheme {
         SettingsLanguageBox(
-            languages = listOf(AppLanguage.English, AppLanguage.Russian),
             currentLanguage = language,
             onLanguageSelect = {},
             modifier = Modifier
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageDialog.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsLanguageDialog.kt
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsMovieListBox.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsMovieListBox.kt
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsMovieListDialog.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsMovieListDialog.kt
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsScreenContent.kt
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeBox.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeBox.kt
diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeDialog.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsThemeDialog.kt

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ internal class SettingsRepositoryImpl @Inject constructor(`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`override val currentFeedView: Flow<FeedView> = preferences.feedViewFlow.map { name ->`
`32`		`- FeedView.transform(name ?: FeedView.List.toString())`
	`32`	`+ FeedView.transform(name ?: FeedView.FeedList.toString())`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`override val currentMovieList: Flow<MovieList> = preferences.movieListFlow.map { name ->`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,5 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider`
`4`	`4`	`import org.michaelbel.movies.common.appearance.FeedView`
`5`	`5`
`6`	`6`	`class AppearancePreviewParameterProvider: PreviewParameterProvider<FeedView> {`
`7`		`- override val values: Sequence<FeedView> = sequenceOf(`
`8`		`- FeedView.List,`
`9`		`- FeedView.Grid`
`10`		`- )`
	`7`	`+ override val values: Sequence<FeedView> = FeedView.VALUES.asSequence()`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,5 @@ import androidx.compose.ui.tooling.preview.PreviewParameterProvider`
`4`	`4`	`import org.michaelbel.movies.common.localization.model.AppLanguage`
`5`	`5`
`6`	`6`	`class LanguagePreviewParameterProvider: PreviewParameterProvider<AppLanguage> {`
`7`		`- override val values: Sequence<AppLanguage> = sequenceOf(`
`8`		`- AppLanguage.English,`
`9`		`- AppLanguage.Russian`
`10`		`- )`
	`7`	`+ override val values: Sequence<AppLanguage> = AppLanguage.VALUES.asSequence()`
`11`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ fun FeedContent(`
`38`	`38`	`modifier: Modifier = Modifier,`
`39`	`39`	`) {`
`40`	`40`	`when (currentFeedView) {`
`41`		`- is FeedView.List -> {`
	`41`	`+ is FeedView.FeedList -> {`
`42`	`42`	`LazyColumn(`
`43`	`43`	`modifier = modifier.padding(top = 4.dp),`
`44`	`44`	`state = lazyListState,`
`@@ -103,7 +103,7 @@ fun FeedContent(`
`103`	`103`	`}`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`- is FeedView.Grid -> {`
	`106`	`+ is FeedView.FeedGrid -> {`
`107`	`107`	`LazyVerticalStaggeredGrid(`
`108`	`108`	`columns = StaggeredGridCells.Fixed(2),`
`109`	`109`	`modifier = modifier.padding(start = 8.dp, top = 8.dp, end = 8.dp),`