Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix build error #151

Merged
merged 3 commits into from
Jan 20, 2024
Merged

Fix build error #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81e38ed
Add androidx-compose-ui-tooling to the libs.versions.toml to fix buil…
chikoski Jan 18, 2024
190f832
remove clean task so that we can use the built-in clean task
chikoski Jan 18, 2024
e9de7c2
Fix a build error due to a type error found in DashboardScreen
chikoski Jan 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions JetStreamCompose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,3 @@ plugins {
alias(libs.plugins.hilt) apply(false)
alias(libs.plugins.ksp) apply false
}


tasks.register("clean") {
delete(rootProject.buildDir)
}
19 changes: 10 additions & 9 deletions JetStreamCompose/gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand All @@ -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"

Expand All @@ -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" }
Expand Down
5 changes: 3 additions & 2 deletions ...ream/src/main/java/com/google/jetstream/presentation/screens/dashboard/DashboardScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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(),
Expand Down
Loading