Merge pull request #151 from chikoski/main

Fix build error
android · Jan 20, 2024 · 2dfb83c · 2dfb83c
2 parents d967671 + e9de7c2
commit 2dfb83c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/JetStreamCompose/build.gradle.kts b/JetStreamCompose/build.gradle.kts
@@ -30,8 +30,3 @@ plugins {
     alias(libs.plugins.hilt) apply(false)
     alias(libs.plugins.ksp) apply false
 }
-
-
-tasks.register("clean") {
-    delete(rootProject.buildDir)
-}
diff --git a/JetStreamCompose/gradle/libs.versions.toml b/JetStreamCompose/gradle/libs.versions.toml
@@ -1,12 +1,12 @@
 [versions]
-activity-compose = "1.8.1"
-android-gradle-plugin = "8.2.0"
-android-test-plugin = "8.2.0"
-benchmark-macro-junit4 = "1.2.1"
+activity-compose = "1.8.2"
+android-gradle-plugin = "8.2.1"
+android-test-plugin = "8.2.1"
+benchmark-macro-junit4 = "1.2.2"
 coil-compose = "2.5.0"
 compose-bom = "2023.10.01"
 compose-for-tv = "1.0.0-alpha10"
-compose-ui = "1.6.0-beta02"
+compose-ui = "1.6.0-rc01"
 core-ktx = "1.12.0"
 core-splashscreen = "1.0.1"
 hilt-navigation-compose = "1.1.0"
@@ -15,10 +15,10 @@ junit = "1.1.5"
 kotlin-android = "1.9.0"
 kotlinx-serialization = "1.6.0"
 ksp = "1.9.0-1.0.13"
-lifecycle-runtime-ktx = "2.6.2"
-media3-ui = "1.2.0"
-media3-exoplayer = "1.2.0"
-navigation-compose = "2.7.5"
+lifecycle-runtime-ktx = "2.7.0"
+media3-ui = "1.2.1"
+media3-exoplayer = "1.2.1"
+navigation-compose = "2.7.6"
 profileinstaller = "1.3.1"
 uiautomator = "2.2.0"
 
@@ -27,6 +27,7 @@ androidx-activity-compose = { module = "androidx.activity:activity-compose", ver
 androidx-benchmark-macro-junit4 = { module = "androidx.benchmark:benchmark-macro-junit4", version.ref = "benchmark-macro-junit4" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
 androidx-compose-ui-base = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" }
+androidx-compose-ui-tooling = { module = "androidx.compose.ui:ui-tooling" }
 androidx-compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview", version.ref = "compose-ui" }
 androidx-core-ktx = { module = "androidx.core:core-ktx", version.ref = "core-ktx" }
 androidx-core-splashscreen = { module = "androidx.core:core-splashscreen", version.ref = "core-splashscreen" }

diff --git a/...ream/src/main/java/com/google/jetstream/presentation/screens/dashboard/DashboardScreen.kt b/...ream/src/main/java/com/google/jetstream/presentation/screens/dashboard/DashboardScreen.kt
@@ -56,6 +56,7 @@ import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
+import com.google.jetstream.data.entities.Movie
 import com.google.jetstream.presentation.screens.Screens
 import com.google.jetstream.presentation.screens.categories.CategoriesScreen
 import com.google.jetstream.presentation.screens.favourites.FavouritesScreen
@@ -84,7 +85,7 @@ fun rememberChildPadding(direction: LayoutDirection = LocalLayoutDirection.curre
 fun DashboardScreen(
     openCategoryMovieList: (categoryId: String) -> Unit,
     openMovieDetailsScreen: (movieId: String) -> Unit,
-    openVideoPlayer: () -> Unit,
+    openVideoPlayer: (Movie) -> Unit,
     isComingBackFromDifferentScreen: Boolean,
     resetIsComingBackFromDifferentScreen: () -> Unit,
     onBackPressed: () -> Unit
@@ -221,7 +222,7 @@ private fun BackPressHandledArea(
 private fun Body(
     openCategoryMovieList: (categoryId: String) -> Unit,
     openMovieDetailsScreen: (movieId: String) -> Unit,
-    openVideoPlayer: () -> Unit,
+    openVideoPlayer: (Movie) -> Unit,
     updateTopBarVisibility: (Boolean) -> Unit,
     modifier: Modifier = Modifier,
     navController: NavHostController = rememberNavController(),