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.

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

Update project and dependencies #287

Merged
merged 1 commit into from
Mar 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.animation.shrinkVertically
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.consumedWindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
Expand Down Expand Up @@ -91,7 +91,7 @@ fun CinemaxApp(appState: CinemaxAppState = rememberCinemaxAppState()) {
CinemaxNavHost(
modifier = Modifier
.padding(paddingValues = innerPadding)
.consumedWindowInsets(paddingValues = innerPadding),
.consumeWindowInsets(paddingValues = innerPadding),
navController = appState.navController,
startDestination = appState.startDestination,
onNavigateToDestination = appState::navigate,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package com.maximillianleonov.cinemax.feature.details
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.asPaddingValues
import androidx.compose.foundation.layout.consumedWindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.safeDrawing
import androidx.compose.material3.ExperimentalMaterial3Api
Expand All @@ -30,7 +30,6 @@ import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.maximillianleonov.cinemax.core.designsystem.component.CinemaxSwipeRefresh
import com.maximillianleonov.cinemax.core.designsystem.component.CinemaxTopAppBar
Expand All @@ -45,7 +44,6 @@ import com.maximillianleonov.cinemax.feature.details.components.MovieDetailsItem
import com.maximillianleonov.cinemax.feature.details.components.TvShowDetailsItem
import com.maximillianleonov.cinemax.feature.details.components.TvShowDetailsItemPlaceholder

@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun DetailsRoute(
onBackButtonClick: () -> Unit,
Expand Down Expand Up @@ -142,6 +140,7 @@ private fun DetailsContent(
)
}
}

is MediaType.Details.TvShow -> {
if (uiState.tvShow == null) {
TvShowDetailsItemPlaceholder(
Expand Down Expand Up @@ -182,7 +181,7 @@ private fun ErrorContent(
CinemaxCenteredError(
modifier = Modifier
.padding(innerPadding)
.consumedWindowInsets(innerPadding),
.consumeWindowInsets(innerPadding),
errorMessage = errorMessage,
onRetry = onRetry,
shouldShowOfflineMode = isOfflineModeAvailable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.consumedWindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
Expand Down Expand Up @@ -121,7 +121,7 @@ internal fun DetailsItem(
LazyColumn(
modifier = Modifier
.padding(innerPadding)
.consumedWindowInsets(innerPadding)
.consumeWindowInsets(innerPadding)
.fillMaxSize(),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.spacedBy(CinemaxTheme.spacing.extraMedium)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.maximillianleonov.cinemax.core.designsystem.component.CinemaxSwipeRefresh
import com.maximillianleonov.cinemax.core.designsystem.theme.CinemaxTheme
Expand All @@ -40,7 +39,6 @@ import com.maximillianleonov.cinemax.core.ui.R
import com.maximillianleonov.cinemax.core.ui.mapper.asUserMessage
import com.maximillianleonov.cinemax.feature.home.component.UpcomingMoviesContainer

@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun HomeRoute(
onSeeAllClick: (MediaType.Common) -> Unit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package com.maximillianleonov.cinemax.feature.list
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.consumedWindowInsets
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.padding
Expand All @@ -30,7 +30,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
Expand All @@ -44,7 +43,6 @@ import com.maximillianleonov.cinemax.core.ui.MoviesContainer
import com.maximillianleonov.cinemax.core.ui.TvShowsContainer
import com.maximillianleonov.cinemax.feature.list.util.asTitleResourceId

@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun ListRoute(
onBackButtonClick: () -> Unit,
Expand Down Expand Up @@ -95,16 +93,17 @@ private fun ListScreen(
MoviesContainer(
modifier = Modifier
.padding(innerPadding)
.consumedWindowInsets(innerPadding),
.consumeWindowInsets(innerPadding),
movies = movies,
onClick = onMovieClick
)
}

else -> {
MediaTabPager(
modifier = Modifier
.padding(innerPadding)
.consumedWindowInsets(innerPadding),
.consumeWindowInsets(innerPadding),
moviesTabContent = {
MoviesContainer(movies = movies, onClick = onMovieClick)
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.ImeAction
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
Expand All @@ -65,7 +64,6 @@ import com.maximillianleonov.cinemax.core.ui.R
import com.maximillianleonov.cinemax.core.ui.TvShowsContainer
import com.maximillianleonov.cinemax.core.ui.mapper.asUserMessage

@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun SearchRoute(
onSeeAllClick: (MediaType.Common) -> Unit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,11 @@ import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.maximillianleonov.cinemax.core.designsystem.theme.CinemaxTheme
import com.maximillianleonov.cinemax.feature.settings.components.SettingsGroupItem
import com.maximillianleonov.cinemax.feature.settings.model.PreferenceNames

@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun SettingsRoute(
modifier: Modifier = Modifier,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.ExperimentalLifecycleComposeApi
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.maximillianleonov.cinemax.core.designsystem.component.CinemaxMessage
import com.maximillianleonov.cinemax.core.designsystem.component.CinemaxSwipeRefresh
Expand All @@ -46,7 +45,6 @@ import com.maximillianleonov.cinemax.core.ui.VerticalTvShowItem
import com.maximillianleonov.cinemax.core.ui.VerticalTvShowItemPlaceholder
import com.maximillianleonov.cinemax.core.ui.mapper.asUserMessage

@OptIn(ExperimentalLifecycleComposeApi::class)
@Composable
internal fun WishlistRoute(
onMovieClick: (Int) -> Unit,
Expand Down
24 changes: 12 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ android-compileSdk = "33"
android-minSdk = "21"
android-targetSdk = "33"

kotlin = "1.7.20"
android-gradle-plugin = "7.3.1"
ksp = "1.7.20-1.0.8"
kotlin = "1.8.10"
android-gradle-plugin = "7.4.2"
ksp = "1.8.10-1.0.9"
spotless = "6.17.0"
detekt = "1.22.0"
kode-detekt-rules-compose = "1.2.2"
twitter-compose-rules = "0.0.26"
desugar-jdk-libs = "1.2.2"
desugar-jdk-libs = "2.0.2"

androidx-compose-bom = "2023.01.00"
androidx-compose-compiler = "1.3.2"
androidx-compose-bom = "2023.03.00"
androidx-compose-compiler = "1.4.4"
androidx-benchmark = "1.2.0-alpha12"
androidx-profileinstaller = "1.3.0"
androidx-core = "1.9.0"
androidx-core-splashscreen = "1.0.0"
androidx-activity = "1.6.1"
androidx-annotation = "1.5.0"
androidx-lifecycle = "2.6.0-alpha03"
androidx-activity = "1.7.0"
androidx-annotation = "1.6.0"
androidx-lifecycle = "2.6.1"
androidx-navigation = "2.5.3"
androidx-room = "2.5.1"
androidx-datastore = "1.0.0"
androidx-paging = "3.1.1"
androidx-paging-compose = "1.0.0-alpha17"
androidx-paging-compose = "1.0.0-alpha18"
androidx-hilt = "1.0.0"
androidx-test-ext = "1.1.5"
androidx-test-espresso = "3.5.1"
Expand All @@ -34,7 +34,7 @@ junit = "4.13.2"
mockk = "1.13.4"

kotlinx-coroutines = "1.6.4"
kotlinx-serialization = "1.4.1"
kotlinx-serialization = "1.5.0"
kotlinx-datetime = "0.4.0"

dagger = "2.45"
Expand All @@ -44,7 +44,7 @@ retrofit-kotlinx-serialization-converter = "0.8.0"

javax-inject = "1"

accompanist = "0.28.0"
accompanist = "0.30.0"
coil = "2.2.2"

[libraries]
Expand Down