Skip to content
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 @@ -46,8 +46,8 @@ import com.london.presentation.feature.home.toprated.TopRatedScreen
import com.london.presentation.feature.home.trending.actor.TrendingActorsScreen
import com.london.presentation.feature.home.trending.movie.TrendingMoviesScreen
import com.london.presentation.feature.home.trending.tvshow.TrendingTvShowsScreen
import com.london.presentation.feature.list.savedlist.ListScreen
import com.london.presentation.feature.list.viewitems.ViewListItemsScreen
import com.london.presentation.feature.list.savedlist.ListsScreen
import com.london.presentation.feature.list.details.MovieListDetailsScreen
import com.london.presentation.feature.reviews.ReviewsScreen
import com.london.presentation.feature.search.SearchScreen
import com.london.presentation.navigation.Screen.Account
Expand Down Expand Up @@ -170,13 +170,13 @@ private fun NavGraphBuilder.continueWatchingNavGraph(navController: NavHostContr
private fun NavGraphBuilder.onListNavGraph(navController: NavHostController) =
with(navController) {
appComposable<Lists> {
ListScreen(
ListsScreen(
onNavigateToListDetails = ::navigateToListDetails,
onNavigateToLogin = { navigateToLogin(source = Lists()) },
)
}
appComposable<ViewListItems> {
ViewListItemsScreen(
MovieListDetailsScreen(
onNavigateBack = ::navigateUp,
onNavigateToMovieDetails = ::navigateToMovieDetails,
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.london.presentation.shared
package com.london.designsystem.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,15 @@ import androidx.annotation.DrawableRes
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement.Center
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
import androidx.compose.ui.layout.ContentScale
Expand All @@ -25,31 +27,38 @@ fun EmptyLayout(
modifier: Modifier = Modifier,
@DrawableRes image: Int? = null
) {
Column(
modifier = modifier
.fillMaxSize()
.background(NovixTheme.colors.surface),
horizontalAlignment = CenterHorizontally,
verticalArrangement = Center
) {
image?.let {
Image(
painter = painterResource(id = it),
contentDescription = "Search Icon",
modifier = Modifier
.size(128.dp)
.align(CenterHorizontally),
contentScale = ContentScale.Fit
Box {
BackgroundGradient(
modifier = Modifier
.align(Alignment.TopStart)
)

Column(
modifier = modifier
.fillMaxSize()
.background(NovixTheme.colors.surface),
horizontalAlignment = CenterHorizontally,
verticalArrangement = Center
) {
image?.let {
Image(
painter = painterResource(id = it),
contentDescription = "Search Icon",
modifier = Modifier
.size(128.dp)
.align(CenterHorizontally),
contentScale = ContentScale.Fit
)
}

Text(
text = text,
style = NovixTheme.typography.body.small,
color = NovixTheme.colors.body,
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth()
)
}

Text(
text = text,
style = NovixTheme.typography.body.small,
color = NovixTheme.colors.body,
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth()
)
}
}

Expand All @@ -60,23 +69,30 @@ fun EmptyLayout(
imageContent: (@Composable () -> Unit)? = null,
additionalContent: (@Composable () -> Unit)? = null
) {
Column(
modifier = modifier
.fillMaxWidth()
.background(NovixTheme.colors.surface),
horizontalAlignment = CenterHorizontally,
verticalArrangement = Center
) {
imageContent?.let { it() }

Text(
text = text,
style = NovixTheme.typography.body.small,
color = NovixTheme.colors.body,
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 48.dp, vertical = 12.dp)
Box {
BackgroundGradient(
modifier = Modifier
.align(Alignment.TopStart)
)

additionalContent?.let { it() }
Column(
modifier = modifier
.fillMaxWidth()
.background(NovixTheme.colors.surface),
horizontalAlignment = CenterHorizontally,
verticalArrangement = Center
) {
imageContent?.invoke()

Text(
text = text,
style = NovixTheme.typography.body.small,
color = NovixTheme.colors.body,
textAlign = TextAlign.Center,
modifier = Modifier.padding(horizontal = 48.dp, vertical = 12.dp)
)

additionalContent?.invoke()
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import com.london.presentation.feature.account.bottomsheet.LanguageBottomSheet
import com.london.presentation.feature.account.bottomsheet.LogoutBottomSheet
import com.london.presentation.feature.account.components.LoggedInContent
import com.london.presentation.feature.account.components.NotLoggedInContent
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.utils.Listen
import com.london.presentation.utils.navBarBottomPadding
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.london.designsystem.component.BackgroundGradient
import com.london.designsystem.component.NovixChip
import com.london.designsystem.component.TopBar
import com.london.designsystem.snackbar.SnackBarData
Expand All @@ -28,7 +29,6 @@ import com.london.designsystem.theme.ThemePreviews
import com.london.designsystem.utils.string
import com.london.domain.entity.shared.MediaType
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.MediaLazyVerticalGrid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.london.designsystem.component.BackgroundGradient
import com.london.designsystem.component.Icon
import com.london.designsystem.component.OutlinedTextField
import com.london.designsystem.component.Text
Expand All @@ -42,7 +43,6 @@ import com.london.designsystem.snackbar.rememberSnackBarController
import com.london.designsystem.theme.NovixTheme
import com.london.designsystem.utils.string
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.utils.Listen
import com.london.designsystem.R as dsR
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.ThemePreviews
import com.london.designsystem.utils.string
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.MediaCategory
import com.london.presentation.shared.genre.MovieGenreUi
import com.london.presentation.shared.genre.TvShowGenreUi
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.ThemePreviews
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.MediaLazyVerticalGrid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.ThemePreviews
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.MediaLazyVerticalGrid
import com.london.presentation.utils.Listen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ import com.london.designsystem.component.button.ErrorImage
import com.london.designsystem.theme.NovixTheme
import com.london.domain.entity.actor.ActorMediaItems
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.CustomBackDropImagePager
import com.london.presentation.shared.HomeCard
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import com.london.designsystem.component.TopBar
import com.london.designsystem.component.button.ErrorImage
import com.london.designsystem.theme.NovixTheme
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.item.ImageView
import com.london.presentation.utils.Listen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.london.designsystem.component.TopBar
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
import com.london.presentation.shared.buildscreen.BuildScreen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.london.designsystem.component.TopBar
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.MediaLazyVerticalGrid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ import com.london.presentation.R.drawable
import com.london.presentation.R.string.more_like_this
import com.london.presentation.R.string.overview
import com.london.presentation.R.string.view_reviews
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.CustomBackDropImagePager
import com.london.presentation.shared.HomeCard
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import com.london.designsystem.snackbar.rememberSnackBarController
import com.london.designsystem.theme.NovixTheme
import com.london.designsystem.utils.string
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.CustomBackDropImagePager
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.shared.buildscreen.BuildScreen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ import com.london.designsystem.utils.string
import com.london.domain.entity.shared.MediaType
import com.london.domain.entity.tvshow.cast.TvShowCastMember
import com.london.domain.entity.tvshow.episode.Episodes
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.CustomBackDropImagePager
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.shared.buildscreen.BuildScreen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ import com.london.presentation.feature.home.trending.TrendingSection
import com.london.presentation.feature.home.upcoming.UpcomingMovieItem
import com.london.presentation.feature.home.upcoming.UpcomingSectionTitle
import com.london.presentation.feature.home.upcoming.UpcomingStickyHeader
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
import com.london.presentation.shared.buildscreen.NetworkErrorScreen
import com.london.presentation.shared.shimmer.CarousalShimmerEffect
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,20 @@ import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.NovixTheme
import com.london.domain.entity.movie.Movie
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.MediaCategory
import com.london.presentation.shared.base.ErrorState
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import com.london.designsystem.component.TabLayout
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.NovixTheme
import com.london.designsystem.utils.string
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.HomeCard
import com.london.presentation.shared.MediaCategory
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.NovixTheme
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.ActorLazyVerticalColumn
import com.london.presentation.utils.Listen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.NovixTheme
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.bookmarkSheet.BookmarkBottomSheet
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.MediaLazyVerticalGrid
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import androidx.paging.compose.collectAsLazyPagingItems
import com.london.designsystem.component.TopBar
import com.london.designsystem.theme.NovixTheme
import com.london.presentation.R
import com.london.presentation.shared.BackgroundGradient
import com.london.designsystem.component.BackgroundGradient
import com.london.presentation.shared.buildscreen.BuildScreen
import com.london.presentation.shared.container.MediaLazyVerticalGrid
import com.london.presentation.shared.genre.GenresSection
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ import com.london.designsystem.theme.NovixTheme
import com.london.designsystem.utils.painter
import com.london.designsystem.utils.string
import com.london.presentation.R
import com.london.presentation.feature.list.viewitems.ViewListItemsContract
import com.london.presentation.feature.list.details.MovieListDetailsContract
import kotlinx.coroutines.launch

@Composable
fun DeleteListBottomSheet(
isSheetVisible: Boolean,
contract: ViewListItemsContract,
contract: MovieListDetailsContract,
modifier: Modifier = Modifier,
sheetState: SheetState = rememberModalBottomSheetState(),
) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.london.presentation.feature.list.viewitems
package com.london.presentation.feature.list.details

interface ViewListItemsContract {
interface MovieListDetailsContract {
fun onBackClick()
fun onRetryClick()
fun onDeleteClick()
Expand Down
Loading
Loading