Update project

michaelbel · Jul 21, 2023 · 1e9c1e7 · 1e9c1e7
1 parent b5689c6
commit 1e9c1e7
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 31 deletions.
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
@@ -5,13 +5,9 @@ import org.michaelbel.movies.common.localization.exceptions.InvalidLocaleExcepti
 sealed class AppLanguage(
     val code: String
 ) {
-    object English: AppLanguage("en") {
-        override fun toString(): String = "English"
-    }
+    data object English: AppLanguage("en")
 
-    object Russian: AppLanguage("ru") {
-        override fun toString(): String = "Russian"
-    }
+    data object Russian: AppLanguage("ru")
 
     companion object {
         fun transform(code: String): AppLanguage {

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
@@ -6,17 +6,11 @@ import org.michaelbel.movies.common.theme.exceptions.InvalidThemeException
 sealed class AppTheme(
     val theme: Int
 ) {
-    object NightNo: AppTheme(AppCompatDelegate.MODE_NIGHT_NO) {
-        override fun toString(): String = "NightNo"
-    }
+    data object NightNo: AppTheme(AppCompatDelegate.MODE_NIGHT_NO)
 
-    object NightYes: AppTheme(AppCompatDelegate.MODE_NIGHT_YES) {
-        override fun toString(): String = "NightYes"
-    }
+    data object NightYes: AppTheme(AppCompatDelegate.MODE_NIGHT_YES)
 
-    object FollowSystem: AppTheme(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
-        override fun toString(): String = "FollowSystem"
-    }
+    data object FollowSystem: AppTheme(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
 
     companion object {
         fun transform(theme: Int): AppTheme {

diff --git a/...ure/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt b/...ure/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountScreenContent.kt
@@ -169,8 +169,7 @@ internal fun AccountScreenContent(
         ) {
             if (loading) {
                 CircularProgressIndicator(
-                    modifier = Modifier
-                        .size(24.dp),
+                    modifier = Modifier.size(24.dp),
                     strokeWidth = 2.dp
                 )
             } else {

diff --git a/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt b/feature/account-impl/src/main/kotlin/org/michaelbel/movies/account/ui/AccountToolbar.kt
@@ -57,8 +57,7 @@ fun AccountToolbar(
 private fun AccountToolbarPreview() {
     MoviesTheme {
         AccountToolbar(
-            modifier = Modifier
-                .background(MaterialTheme.colorScheme.primaryContainer),
+            modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer),
             onNavigationIconClick = {}
         )
     }

diff --git a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthLinksBox.kt
@@ -87,8 +87,7 @@ private fun AuthLinksBoxPreview() {
         AuthLinksBox(
             onTermsOfUseClick = {},
             onPrivacyPolicyClick = {},
-            modifier = Modifier
-                .background(MaterialTheme.colorScheme.primaryContainer)
+            modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer)
         )
     }
 }
diff --git a/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt b/feature/auth-impl/src/main/kotlin/org/michaelbel/movies/auth/ui/AuthToolbar.kt
@@ -57,8 +57,7 @@ fun AuthToolbar(
 private fun AuthToolbarPreview() {
     MoviesTheme {
         AuthToolbar(
-            modifier = Modifier
-                .background(MaterialTheme.colorScheme.primaryContainer),
+            modifier = Modifier.background(MaterialTheme.colorScheme.primaryContainer),
             onNavigationIconClick = {}
         )
     }

diff --git a/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt b/feature/details-impl/src/main/kotlin/org/michaelbel/movies/details/ui/DetailsToolbar.kt
@@ -64,7 +64,7 @@ fun DetailsToolbar(
                 )
             }
         },
-        colors = TopAppBarDefaults.smallTopAppBarColors(
+        colors = TopAppBarDefaults.topAppBarColors(
             containerColor = Color.Transparent
         )
     )

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
@@ -14,7 +14,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.unit.dp
 import androidx.paging.compose.LazyPagingItems
-import androidx.paging.compose.items
+import androidx.paging.compose.itemContentType
+import androidx.paging.compose.itemKey
 import org.michaelbel.movies.domain.data.entity.MovieDb
 import org.michaelbel.movies.entities.isTmdbApiKeyEmpty
 import org.michaelbel.movies.ui.ktx.isNotEmpty
@@ -34,10 +35,15 @@ fun FeedContent(
         state = listState,
         contentPadding = contentPadding
     ) {
-        items(pagingItems) { movieItem ->
-            movieItem?.let { movie ->
+        items(
+            count = pagingItems.itemCount,
+            key = pagingItems.itemKey(),
+            contentType = pagingItems.itemContentType()
+        ) { index ->
+            val movieDb: MovieDb? = pagingItems[index]
+            if (movieDb != null) {
                 FeedMovieBox(
-                    movie = movie,
+                    movie = movieDb,
                     modifier = Modifier
                         .fillMaxWidth()
                         .padding(
@@ -47,7 +53,7 @@ fun FeedContent(
                         .clip(MaterialTheme.shapes.small)
                         .background(MaterialTheme.colorScheme.inversePrimary)
                         .clickable {
-                            onMovieClick(movie.movieId)
+                            onMovieClick(movieDb.movieId)
                         }
                 )
             }

diff --git a/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt b/feature/feed-impl/src/main/kotlin/org/michaelbel/movies/feed/ui/FeedToolbar.kt
@@ -77,7 +77,7 @@ fun FeedToolbar(
                 }
             }
         },
-        colors = TopAppBarDefaults.smallTopAppBarColors(
+        colors = TopAppBarDefaults.topAppBarColors(
             containerColor = MaterialTheme.colorScheme.inversePrimary
         )
     )

diff --git a/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt b/feature/settings-impl/src/main/kotlin/org/michaelbel/movies/settings/ui/SettingsToolbar.kt
@@ -50,7 +50,7 @@ internal fun SettingsToolbar(
                 )
             }
         },
-        colors = TopAppBarDefaults.smallTopAppBarColors(
+        colors = TopAppBarDefaults.topAppBarColors(
             containerColor = Color.Transparent
         )
     )
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,7 +64,7 @@ fun DetailsToolbar( @@
                     )
                 }
             },
-            colors = TopAppBarDefaults.smallTopAppBarColors(
+            colors = TopAppBarDefaults.topAppBarColors(
                 containerColor = Color.Transparent
             )
         )
@@ Expand Down @@