diff --git a/designSystem/src/main/res/drawable/frame1597883073.png b/designSystem/src/main/res/drawable/frame1597883073.png deleted file mode 100644 index dbc8642ba..000000000 Binary files a/designSystem/src/main/res/drawable/frame1597883073.png and /dev/null differ diff --git a/designSystem/src/main/res/drawable/user.webp b/designSystem/src/main/res/drawable/user.webp deleted file mode 100644 index 51baa05a8..000000000 Binary files a/designSystem/src/main/res/drawable/user.webp and /dev/null differ diff --git a/designSystem/src/main/res/values-ar/strings.xml b/designSystem/src/main/res/values-ar/strings.xml index 184741662..ee024d955 100644 --- a/designSystem/src/main/res/values-ar/strings.xml +++ b/designSystem/src/main/res/values-ar/strings.xml @@ -24,9 +24,6 @@ موسم ايقونه محتوي غير لائق صوره غير مناسبه - صوره لا يوجد انترنت - يبدو انك غير متصل بالانترنت - تحقق من اتصالك وحاول مرة أخرى، سننتظرك مع أفلامك والفشار أفلام مسلسلات كلمة المرور غير صحيحة @@ -41,4 +38,4 @@ تسجيل الدخول تم التقييم بنجاح حدث خطأ اثناء التقييم - \ No newline at end of file + diff --git a/designSystem/src/main/res/values/font_certs.xml b/designSystem/src/main/res/values/font_certs.xml deleted file mode 100644 index 207b62f13..000000000 --- a/designSystem/src/main/res/values/font_certs.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - @array/com_google_android_gms_fonts_certs_dev - @array/com_google_android_gms_fonts_certs_prod - - - - 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 - - - diff --git a/designSystem/src/main/res/values/strings.xml b/designSystem/src/main/res/values/strings.xml index 5561b2330..7cdcc8e22 100644 --- a/designSystem/src/main/res/values/strings.xml +++ b/designSystem/src/main/res/values/strings.xml @@ -24,9 +24,6 @@ Season Unsuitable Eye Icon Unsuitable image - NO internet image - Oops! It looks like you’re offline. - Check your connection and try again, we’ll be \n waiting with your movies and popcorn Movies TV shows Incorrect password @@ -42,4 +39,4 @@ login Item rated successfully Failed to rate the item - \ No newline at end of file + diff --git a/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/ContentRestrictionBottomSheet.kt b/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/ContentRestrictionBottomSheet.kt index c3e7871e9..33d09cc1a 100644 --- a/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/ContentRestrictionBottomSheet.kt +++ b/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/ContentRestrictionBottomSheet.kt @@ -47,7 +47,7 @@ fun ContentRestrictionBottomSheet( ContentRestrictionOption( level = ContentRestrictionLevel.STRICT, title = stringResource(R.string.strict), - description = stringResource(R.string.blurs_all_sensitive_content), + description = stringResource(R.string.strict_description), isSelected = selectedLevel == ContentRestrictionLevel.STRICT, onSelected = { selectedLevel = it }, modifier = Modifier.padding(top = 24.dp) @@ -56,7 +56,7 @@ fun ContentRestrictionBottomSheet( ContentRestrictionOption( level = ContentRestrictionLevel.MODERATE, title = stringResource(R.string.moderate), - description = stringResource(R.string.blurs_explicit_scenes_only), + description = stringResource(R.string.moderate_description), isSelected = selectedLevel == ContentRestrictionLevel.MODERATE, onSelected = { selectedLevel = it }, modifier = Modifier.padding(top = 16.dp) @@ -65,7 +65,7 @@ fun ContentRestrictionBottomSheet( ContentRestrictionOption( level = ContentRestrictionLevel.OFF, title = stringResource(R.string.off), - description = stringResource(R.string.no_content_is_blurred), + description = stringResource(R.string.off_description), isSelected = selectedLevel == ContentRestrictionLevel.OFF, onSelected = { selectedLevel = it }, modifier = Modifier.padding(top = 16.dp, bottom = 32.dp) diff --git a/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/LogoutBottomSheet.kt b/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/LogoutBottomSheet.kt index 60ad1592b..4253fcf09 100644 --- a/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/LogoutBottomSheet.kt +++ b/presentation/src/main/java/com/london/presentation/feature/account/bottomsheet/LogoutBottomSheet.kt @@ -31,7 +31,7 @@ fun LogoutBottomSheet( ) ) { Text( - text = stringResource(R.string.are_you_sure_to_continue), + text = stringResource(R.string.confirm_action), style = NovixTheme.typography.body.medium, color = NovixTheme.colors.body, modifier = Modifier.padding(top = 24.dp, bottom = 24.dp) diff --git a/presentation/src/main/java/com/london/presentation/feature/account/components/LoggedInContent.kt b/presentation/src/main/java/com/london/presentation/feature/account/components/LoggedInContent.kt index 921b23d78..aeb0d0410 100644 --- a/presentation/src/main/java/com/london/presentation/feature/account/components/LoggedInContent.kt +++ b/presentation/src/main/java/com/london/presentation/feature/account/components/LoggedInContent.kt @@ -15,7 +15,6 @@ import com.london.designsystem.theme.NovixTheme import com.london.presentation.R import com.london.presentation.feature.account.AccountContract import com.london.presentation.feature.account.AccountUiState -import com.london.designsystem.R as dsR @Composable fun LoggedInContent( @@ -46,15 +45,15 @@ fun LoggedInContent( AccountMenuDivider() AccountMenuItem( - icon = painterResource(dsR.drawable.star_square), - title = stringResource(R.string.my_rating), + icon = painterResource(R.drawable.star_square), + title = stringResource(R.string.my_ratings), onClick = accountContract::onMyRatingClick, ) AccountMenuDivider() AccountMenuItem( - icon = painterResource(dsR.drawable.shield_energy), + icon = painterResource(R.drawable.shield_energy), title = stringResource(R.string.content_restriction), onClick = accountContract::onContentRestrictionClick ) @@ -62,7 +61,7 @@ fun LoggedInContent( AccountMenuDivider() AccountMenuItem( - icon = painterResource(dsR.drawable.lock_key), + icon = painterResource(R.drawable.lock_key), title = stringResource(R.string.change_password), onClick = accountContract::onChangePasswordClick ) @@ -70,7 +69,7 @@ fun LoggedInContent( AccountMenuDivider() AccountMenuItem( - icon = painterResource(dsR.drawable.moon), + icon = painterResource(R.drawable.moon), title = stringResource(R.string.appearance), endText = uiState.currentAppearance, onClick = accountContract::onAppearanceClick @@ -79,7 +78,7 @@ fun LoggedInContent( AccountMenuDivider() AccountMenuItem( - icon = painterResource(dsR.drawable.language_circle), + icon = painterResource(R.drawable.language_circle), title = stringResource(R.string.language), endText = uiState.currentLanguage, onClick = accountContract::onLanguageClick diff --git a/presentation/src/main/java/com/london/presentation/feature/account/components/UserProfileSection.kt b/presentation/src/main/java/com/london/presentation/feature/account/components/UserProfileSection.kt index eee99623e..f79b00234 100644 --- a/presentation/src/main/java/com/london/presentation/feature/account/components/UserProfileSection.kt +++ b/presentation/src/main/java/com/london/presentation/feature/account/components/UserProfileSection.kt @@ -94,7 +94,7 @@ private fun UserProfileIcon(avatarPath: String? = null) { contentRestrictionLevel = ContentRestrictionLevel.OFF, loadingContent = { Icon( - painter = painterResource(dsR.drawable.user), + painter = painterResource(R.drawable.user), contentDescription = stringResource(R.string.user_profile), modifier = Modifier.size(28.dp), tint = NovixTheme.colors.title @@ -102,7 +102,7 @@ private fun UserProfileIcon(avatarPath: String? = null) { }, errorContent = { Icon( - painter = painterResource(dsR.drawable.user), + painter = painterResource(R.drawable.user), contentDescription = stringResource(R.string.user_profile), modifier = Modifier.size(28.dp), tint = NovixTheme.colors.title @@ -111,7 +111,7 @@ private fun UserProfileIcon(avatarPath: String? = null) { ) } else { Icon( - painter = painterResource(dsR.drawable.user), + painter = painterResource(R.drawable.user), contentDescription = stringResource(R.string.user_profile), modifier = Modifier.size(28.dp), tint = NovixTheme.colors.title diff --git a/presentation/src/main/java/com/london/presentation/feature/account/rating/MyRatingScreen.kt b/presentation/src/main/java/com/london/presentation/feature/account/rating/MyRatingScreen.kt index 889b94ed3..e524cf527 100644 --- a/presentation/src/main/java/com/london/presentation/feature/account/rating/MyRatingScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/account/rating/MyRatingScreen.kt @@ -98,7 +98,7 @@ private fun Content( ) { TopBar( modifier = Modifier.detailsTopBar(1f), - title = stringResource(R.string.my_rating), + title = stringResource(R.string.my_ratings), onBackClick = contract::onBackClick ) @@ -110,7 +110,7 @@ private fun Content( if (items.isEmpty()) { EmptyGenreLayout( - message = stringResource(R.string.there_is_no_items), + message = stringResource(R.string.no_ratings), modifier = Modifier.fillMaxSize() ) } else { diff --git a/presentation/src/main/java/com/london/presentation/feature/account/rating/RatingCategory.kt b/presentation/src/main/java/com/london/presentation/feature/account/rating/RatingCategory.kt index a3409b758..8c9e0c326 100644 --- a/presentation/src/main/java/com/london/presentation/feature/account/rating/RatingCategory.kt +++ b/presentation/src/main/java/com/london/presentation/feature/account/rating/RatingCategory.kt @@ -5,6 +5,6 @@ import com.london.presentation.R enum class RatingCategory(@StringRes val title: Int) { All(R.string.all), - Movies(R.string.Movies), - TvShows(R.string.TV_Shows) + Movies(R.string.movies), + TvShows(R.string.tv_shows) } diff --git a/presentation/src/main/java/com/london/presentation/feature/authentication/login/LoginScreen.kt b/presentation/src/main/java/com/london/presentation/feature/authentication/login/LoginScreen.kt index 271339bbd..1d2e82c00 100644 --- a/presentation/src/main/java/com/london/presentation/feature/authentication/login/LoginScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/authentication/login/LoginScreen.kt @@ -1,6 +1,5 @@ package com.london.presentation.feature.authentication.login -import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -14,7 +13,6 @@ import androidx.compose.foundation.layout.asPaddingValues import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.navigationBars -import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.rememberScrollState @@ -145,7 +143,7 @@ private fun Content( passwordHiddenIcon = painterResource(id = dsR.drawable.icon_hide_password), interactionSource = interactionSourcePassword, leadingIcon = if (uiState.password.text.isNotEmpty()) { - painterResource(dsR.drawable.lock_key) + painterResource(R.drawable.lock_key) } else { painterResource(dsR.drawable.light_lock_key) }, @@ -187,7 +185,7 @@ private fun Content( verticalAlignment = Alignment.CenterVertically ) { Text( - stringResource(R.string.don_t_have_an_account), + stringResource(R.string.no_account), style = NovixTheme.typography.body.small, color = NovixTheme.colors.body, modifier = Modifier.padding(end = 4.dp) diff --git a/presentation/src/main/java/com/london/presentation/feature/category/movie/MovieCategoryScreen.kt b/presentation/src/main/java/com/london/presentation/feature/category/movie/MovieCategoryScreen.kt index e5c160e0e..3a0c7b8dc 100644 --- a/presentation/src/main/java/com/london/presentation/feature/category/movie/MovieCategoryScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/category/movie/MovieCategoryScreen.kt @@ -64,7 +64,7 @@ private fun Content( isLoading = moviesLazyList.isLoading(), isError = moviesLazyList.loadState.refresh is LoadState.Error, onRetry = moviesLazyList::refresh, - emptyLayoutMessage = R.string.there_is_no_items_for_this_genre, + emptyLayoutMessage = R.string.no_movies_in_genre, emptyLayoutImage = R.drawable.empty ) { Box( diff --git a/presentation/src/main/java/com/london/presentation/feature/category/tvshow/TvShowCategoryScreen.kt b/presentation/src/main/java/com/london/presentation/feature/category/tvshow/TvShowCategoryScreen.kt index 7e699bf19..2831224bb 100644 --- a/presentation/src/main/java/com/london/presentation/feature/category/tvshow/TvShowCategoryScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/category/tvshow/TvShowCategoryScreen.kt @@ -62,7 +62,7 @@ private fun Content( isLoading = tvShowLazyList.isLoading(), isError = tvShowLazyList.loadState.refresh is LoadState.Error, onRetry = tvShowLazyList::refresh, - emptyLayoutMessage = R.string.there_is_no_items_for_this_genre, + emptyLayoutMessage = R.string.no_shows_in_genre, emptyLayoutImage = R.drawable.empty ) { Box( diff --git a/presentation/src/main/java/com/london/presentation/feature/details/actor/info/gallery/ActorsGalleryScreen.kt b/presentation/src/main/java/com/london/presentation/feature/details/actor/info/gallery/ActorsGalleryScreen.kt index 0c44fdd91..128fde706 100644 --- a/presentation/src/main/java/com/london/presentation/feature/details/actor/info/gallery/ActorsGalleryScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/details/actor/info/gallery/ActorsGalleryScreen.kt @@ -113,7 +113,7 @@ private fun GalleryContent( items(uiState.images) { imageUrl -> ImageView( model = imageUrl, - contentDescription = stringResource(R.string.actor_photos), + contentDescription = stringResource(R.string.actor_images), modifier = Modifier .size(width = 104.dp, height = 101.dp) .border( diff --git a/presentation/src/main/java/com/london/presentation/feature/details/tvshow/episode/EpisodeDetailScreen.kt b/presentation/src/main/java/com/london/presentation/feature/details/tvshow/episode/EpisodeDetailScreen.kt index 6c85942db..a71b0544d 100644 --- a/presentation/src/main/java/com/london/presentation/feature/details/tvshow/episode/EpisodeDetailScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/details/tvshow/episode/EpisodeDetailScreen.kt @@ -156,7 +156,7 @@ private fun Content( if (guestStars.isNotEmpty()) { item { Text( - text = stringResource(R.string.guests_of_honor), + text = stringResource(R.string.featured_guests), style = NovixTheme.typography.title.medium, color = NovixTheme.colors.title, modifier = Modifier diff --git a/presentation/src/main/java/com/london/presentation/feature/home/trending/TrendingCategories.kt b/presentation/src/main/java/com/london/presentation/feature/home/trending/TrendingCategories.kt index c18c5a1d9..1c1123e43 100644 --- a/presentation/src/main/java/com/london/presentation/feature/home/trending/TrendingCategories.kt +++ b/presentation/src/main/java/com/london/presentation/feature/home/trending/TrendingCategories.kt @@ -53,7 +53,7 @@ fun TrendingSection( ) { if (!isLoading) Text( - text = stringResource(R.string.What_you_want_to_watch), + text = stringResource(R.string.what_to_watch), style = NovixTheme.typography.headline.small, color = NovixTheme.colors.title, modifier = Modifier @@ -80,7 +80,7 @@ fun TrendingSection( verticalAlignment = Alignment.Bottom ) { CategoryCard( - title = stringResource(R.string.Movies), + title = stringResource(R.string.movies), icon = painterResource(id = R.drawable.icon_movie), startColor = NovixTheme.colors.primary, endColor = NovixTheme.colors.darkCocoa, @@ -91,7 +91,7 @@ fun TrendingSection( ) CategoryCard( - title = stringResource(R.string.TV_Shows), + title = stringResource(R.string.tv_shows), icon = painterResource(id = R.drawable.icon_tvshow), startColor = NovixTheme.colors.secondary, endColor = NovixTheme.colors.deepCrimson, @@ -102,7 +102,7 @@ fun TrendingSection( ) CategoryCard( - title = stringResource(R.string.actors), + title = stringResource(R.string.celebrities), icon = painterResource(id = R.drawable.icon_actor), startColor = NovixTheme.colors.tealBlue, endColor = NovixTheme.colors.oceanDark, diff --git a/presentation/src/main/java/com/london/presentation/feature/home/trending/actor/TrendingActorsScreen.kt b/presentation/src/main/java/com/london/presentation/feature/home/trending/actor/TrendingActorsScreen.kt index e3f7b5c30..3843eb0f4 100644 --- a/presentation/src/main/java/com/london/presentation/feature/home/trending/actor/TrendingActorsScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/home/trending/actor/TrendingActorsScreen.kt @@ -3,11 +3,7 @@ package com.london.presentation.feature.home.trending.actor import androidx.compose.foundation.background import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.PaddingValues -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.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue @@ -15,7 +11,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import androidx.hilt.navigation.compose.hiltViewModel import androidx.lifecycle.compose.collectAsStateWithLifecycle @@ -68,7 +63,7 @@ private fun Content( isError = actorsLazyItems.loadState.refresh is LoadState.Error, onBack = contract::onBackClick, onRetry = contract::onRetryClick, - emptyLayoutMessage = R.string.no_trending_actors_in_genre, + emptyLayoutMessage = R.string.no_trending_people, emptyLayoutImage = R.drawable.img_no_result, pagingFlow = actorsLazyItems ) { diff --git a/presentation/src/main/java/com/london/presentation/feature/home/trending/movie/TrendingMoviesScreen.kt b/presentation/src/main/java/com/london/presentation/feature/home/trending/movie/TrendingMoviesScreen.kt index 72863d173..b46a50ecd 100644 --- a/presentation/src/main/java/com/london/presentation/feature/home/trending/movie/TrendingMoviesScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/home/trending/movie/TrendingMoviesScreen.kt @@ -69,7 +69,7 @@ private fun Content( isError = state.moviesFlow.collectAsLazyPagingItems().loadState.refresh is LoadState.Error, onBack = contract::onBackClick, onRetry = contract::onRetryClick, - emptyLayoutMessage = R.string.no_trending_movies_in_genre, + emptyLayoutMessage = R.string.no_movies_in_genre, emptyLayoutImage = R.drawable.img_no_result, ) { Box( diff --git a/presentation/src/main/java/com/london/presentation/feature/home/trending/tvshow/TrendingTvShowsScreen.kt b/presentation/src/main/java/com/london/presentation/feature/home/trending/tvshow/TrendingTvShowsScreen.kt index 03720afe3..111ccca91 100644 --- a/presentation/src/main/java/com/london/presentation/feature/home/trending/tvshow/TrendingTvShowsScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/home/trending/tvshow/TrendingTvShowsScreen.kt @@ -68,7 +68,7 @@ private fun Content( isLoading = state.isLoading, isError = state.tvShowsFlow.collectAsLazyPagingItems().loadState.refresh is LoadState.Error, onBack = contract::onBackClick, - emptyLayoutMessage = R.string.no_trending_shows_in_genre, + emptyLayoutMessage = R.string.no_shows_in_genre, emptyLayoutImage = R.drawable.img_no_result, ) { Box( diff --git a/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/AddListBottomSheet.kt b/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/AddListBottomSheet.kt index 41028f11c..dc6d11324 100644 --- a/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/AddListBottomSheet.kt +++ b/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/AddListBottomSheet.kt @@ -108,7 +108,7 @@ private fun Content( horizontalArrangement = Arrangement.SpaceBetween ) { Text( - text = stringResource(R.string.add_new_list), + text = stringResource(R.string.list_add_new), style = NovixTheme.typography.title.large, color = NovixTheme.colors.title, ) @@ -129,7 +129,7 @@ private fun Content( ) .padding(8.dp), painter = com.london.designsystem.R.drawable.cancel.painter, - contentDescription = R.string.cancel_addition_to_list.string, + contentDescription = R.string.cancel.string, tint = NovixTheme.colors.title ) } diff --git a/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/DeleteListBottomSheet.kt b/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/DeleteListBottomSheet.kt index b870a09f0..79ae15c04 100644 --- a/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/DeleteListBottomSheet.kt +++ b/presentation/src/main/java/com/london/presentation/feature/list/bottomsheets/DeleteListBottomSheet.kt @@ -90,7 +90,7 @@ private fun Content( ) { Text( - text = R.string.delete_list.string, + text = R.string.list_delete.string, style = NovixTheme.typography.title.large, color = NovixTheme.colors.title, ) @@ -112,7 +112,7 @@ private fun Content( .padding(8.dp) .size(16.dp), painter = com.london.designsystem.R.drawable.cancel.painter, - contentDescription = R.string.cancel_list_deletion.string, + contentDescription = R.string.cancel.string, tint = NovixTheme.colors.title ) } @@ -126,11 +126,11 @@ private fun Content( Image( modifier = Modifier.size(100.dp), painter = if (NovixTheme.isThemeDark) R.drawable.ic_trash_dark.painter else R.drawable.ic_trash_light.painter, - contentDescription = R.string.delete_list.string, + contentDescription = R.string.list_delete.string, ) Text( - text = R.string.cancel_list_deletion.string, + text = R.string.list_delete_confirm.string, style = NovixTheme.typography.body.medium, color = NovixTheme.colors.body, textAlign = TextAlign.Center @@ -139,7 +139,7 @@ private fun Content( PrimaryButton( modifier = Modifier.fillMaxWidth(), - text = R.string.btn_delete.string, + text = R.string.delete.string, hasLabel = true, hasIcon = false, isLoading = false, diff --git a/presentation/src/main/java/com/london/presentation/feature/list/savedlist/ListScreen.kt b/presentation/src/main/java/com/london/presentation/feature/list/savedlist/ListScreen.kt index ecd8e4286..e064b74b4 100644 --- a/presentation/src/main/java/com/london/presentation/feature/list/savedlist/ListScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/list/savedlist/ListScreen.kt @@ -122,7 +122,7 @@ private fun Content( stickyHeader { TopBar( - title = stringResource(R.string.saved_list_title), + title = stringResource(R.string.my_saved_lists), modifier = Modifier.padding(vertical = 12.dp) ) } @@ -148,7 +148,7 @@ private fun Content( if (state.error != null) { snackBarController.showMessage( - message = R.string.list_added_fail.string, + message = R.string.list_add_fail.string, snackBarType = SnackBarType.Error, onComplete = contract::resetSnackBarErrorState, icon = null, @@ -157,7 +157,7 @@ private fun Content( if (state.isSnackBarSuccessVisible) { snackBarController.showMessage( - message = R.string.list_added_success.string, + message = R.string.list_add_success.string, snackBarType = SnackBarType.Success, onComplete = contract::resetSnackBarSuccessState, icon = com.london.designsystem.R.drawable.ic_success, @@ -268,7 +268,7 @@ private fun EmptyList( modifier = Modifier .padding(horizontal = 16.dp) .align(Alignment.Center), - text = stringResource(R.string.no_saved_list), + text = stringResource(R.string.no_lists), imageContent = { BlurredImage(imageId = R.drawable.ic_no_saved_list_yet) }, diff --git a/presentation/src/main/java/com/london/presentation/feature/list/viewitems/ViewItemsScreen.kt b/presentation/src/main/java/com/london/presentation/feature/list/viewitems/ViewItemsScreen.kt index 2164086bb..7d240ce56 100644 --- a/presentation/src/main/java/com/london/presentation/feature/list/viewitems/ViewItemsScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/list/viewitems/ViewItemsScreen.kt @@ -84,7 +84,7 @@ private fun Content( onRetry = listItems::refresh, isLoading = state.isLoading, isError = state.error == ErrorState.NoInternet, - emptyLayoutMessage = R.string.no_items_found, + emptyLayoutMessage = R.string.list_empty, emptyLayoutImage = R.drawable.img_no_result, pagingFlow = listItems, ) { @@ -112,7 +112,7 @@ private fun Content( if (state.isSnackBarErrorVisible) { snackBarController.showMessage( - message = R.string.deletion_failed.string, + message = R.string.item_delete_fail.string, snackBarType = SnackBarType.Error, onComplete = contract::resetSnackBarErrorState, icon = null, @@ -121,7 +121,7 @@ private fun Content( if (state.isMovieSnackBarSuccessVisible) { snackBarController.showMessage( - message = R.string.movie_removed_successfully.string, + message = R.string.item_delete_success.string, snackBarType = SnackBarType.Success, onComplete = contract::resetMovieSnackBarSuccessState, icon = com.london.designsystem.R.drawable.ic_success, @@ -130,7 +130,7 @@ private fun Content( if (state.isListSnackBarSuccess) { snackBarController.showMessage( - message = R.string.list_removed_successfully.string, + message = R.string.list_delete_success.string, snackBarType = SnackBarType.Success, onComplete = contract::resetListSnackBarSuccessState, icon = com.london.designsystem.R.drawable.ic_success, diff --git a/presentation/src/main/java/com/london/presentation/feature/reviews/ReviewsScreen.kt b/presentation/src/main/java/com/london/presentation/feature/reviews/ReviewsScreen.kt index 82c10c272..ba4fd7f11 100644 --- a/presentation/src/main/java/com/london/presentation/feature/reviews/ReviewsScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/reviews/ReviewsScreen.kt @@ -305,7 +305,7 @@ private fun AuthorProfileImage( ) { ImageView( model = profileUrl, - contentDescription = stringResource(R.string.author_profile), + contentDescription = stringResource(R.string.reviewer_avatar), contentScale = ContentScale.Crop, loadingContent = { CircularLoading() }, errorContent = { ErrorImage() }, diff --git a/presentation/src/main/java/com/london/presentation/feature/search/SearchCategory.kt b/presentation/src/main/java/com/london/presentation/feature/search/SearchCategory.kt index 288d8e9f7..87de093e4 100644 --- a/presentation/src/main/java/com/london/presentation/feature/search/SearchCategory.kt +++ b/presentation/src/main/java/com/london/presentation/feature/search/SearchCategory.kt @@ -4,7 +4,7 @@ import androidx.annotation.StringRes import com.london.presentation.R enum class SearchCategory(@StringRes val title: Int) { - Movies(R.string.Movies), - TvShows(R.string.TV_Shows), - Actors(R.string.Actors), + Movies(R.string.movies), + TvShows(R.string.tv_shows), + Actors(R.string.actors), } diff --git a/presentation/src/main/java/com/london/presentation/feature/search/SearchScreen.kt b/presentation/src/main/java/com/london/presentation/feature/search/SearchScreen.kt index 825f4834f..28456a83e 100644 --- a/presentation/src/main/java/com/london/presentation/feature/search/SearchScreen.kt +++ b/presentation/src/main/java/com/london/presentation/feature/search/SearchScreen.kt @@ -305,7 +305,7 @@ private fun ActorSearchContent(state: SearchUiState, contract: SearchContract) { emptyContent = { if (!isLoading) { EmptyLayout( - text = stringResource(R.string.no_search_result_msg), + text = stringResource(R.string.no_search_result), image = R.drawable.img_no_search_result, modifier = Modifier .fillMaxSize() @@ -341,7 +341,7 @@ private fun MediaSearchContent( emptyContent = { if (!isLoading) { EmptyLayout( - text = stringResource(R.string.no_search_result_msg), + text = stringResource(R.string.no_search_result), image = R.drawable.img_no_search_result, modifier = Modifier .fillMaxSize() @@ -480,7 +480,7 @@ private fun RecentSection( otherItems = state.recentViewed, emptyContent = { EmptyLayout( - text = stringResource(R.string.start_exploring_msg), + text = stringResource(R.string.start_exploring), image = R.drawable.imge_explore, modifier = modifier.padding(horizontal = 16.dp) ) @@ -588,7 +588,7 @@ private fun RecentSearchSection( onRemoveClick: (RecentSearch) -> Unit ) { SectionHeader( - text = stringResource(R.string.recent_search), + text = stringResource(R.string.recent_searches), hasGetAll = true, hasIcon = false, getAllText = stringResource(R.string.clear_all), diff --git a/presentation/src/main/java/com/london/presentation/shared/MediaCategory.kt b/presentation/src/main/java/com/london/presentation/shared/MediaCategory.kt index 066ab3241..794e43191 100644 --- a/presentation/src/main/java/com/london/presentation/shared/MediaCategory.kt +++ b/presentation/src/main/java/com/london/presentation/shared/MediaCategory.kt @@ -6,10 +6,10 @@ import com.london.presentation.R enum class MediaCategory : Tabbable { Movies { override val tabTextResId: Int - get() = R.string.Movies + get() = R.string.movies }, TvShows { override val tabTextResId: Int - get() = R.string.TV_Shows + get() = R.string.tv_shows } } diff --git a/presentation/src/main/java/com/london/presentation/shared/bookmarkSheet/BookmarkSheet.kt b/presentation/src/main/java/com/london/presentation/shared/bookmarkSheet/BookmarkSheet.kt index 63d743a94..47c3e2327 100644 --- a/presentation/src/main/java/com/london/presentation/shared/bookmarkSheet/BookmarkSheet.kt +++ b/presentation/src/main/java/com/london/presentation/shared/bookmarkSheet/BookmarkSheet.kt @@ -171,7 +171,7 @@ private fun BookmarkBottomSheetContent( if (state.isSuccessSnackBarVisible) { snackBarController.showMessage( - message = R.string.item_added_success.string, + message = R.string.item_add_success.string, icon = com.london.designsystem.R.drawable.ic_success, snackBarType = SnackBarType.Success, onComplete = contract::onSnackBarShown @@ -180,7 +180,7 @@ private fun BookmarkBottomSheetContent( if (state.isErrorSnackBarVisible) { snackBarController.showMessage( - message = R.string.item_added_fail.string, + message = R.string.item_add_fail.string, icon = com.london.designsystem.R.drawable.ic_failed, snackBarType = SnackBarType.Error, onComplete = contract::onSnackBarShown @@ -217,7 +217,7 @@ private fun SheetHeader( .clickable(onClick = hideSheet) .padding(8.dp), painter = com.london.designsystem.R.drawable.cancel.painter, - contentDescription = R.string.cancel_addition_to_list.string, + contentDescription = R.string.cancel.string, tint = NovixTheme.colors.title ) } @@ -307,7 +307,7 @@ private fun UserActions( modifier = Modifier .fillMaxWidth() .requiredHeight(48.dp), - text = R.string.create_new_list.string, + text = R.string.list_create_new.string, onClick = contract::onCreateNewList, hasLabel = true, icon = null, diff --git a/presentation/src/main/java/com/london/presentation/shared/buildscreen/NetworkErrorScreen.kt b/presentation/src/main/java/com/london/presentation/shared/buildscreen/NetworkErrorScreen.kt index ab9f714fb..6a51293a2 100644 --- a/presentation/src/main/java/com/london/presentation/shared/buildscreen/NetworkErrorScreen.kt +++ b/presentation/src/main/java/com/london/presentation/shared/buildscreen/NetworkErrorScreen.kt @@ -14,11 +14,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import com.london.designsystem.R import com.london.designsystem.component.Text import com.london.designsystem.component.TopBar import com.london.designsystem.component.button.OutlineButton import com.london.designsystem.theme.NovixTheme +import com.london.presentation.R @Composable fun NetworkErrorScreen( @@ -51,7 +51,7 @@ fun NetworkErrorScreen( ) Text( - text = stringResource(R.string.you_are_offline), + text = stringResource(R.string.offline_title), style = NovixTheme.typography.title.medium, color = NovixTheme.colors.title, textAlign = TextAlign.Center, @@ -59,7 +59,7 @@ fun NetworkErrorScreen( ) Text( - text = stringResource(R.string.check_your_connection), + text = stringResource(R.string.offline_description), style = NovixTheme.typography.body.small, color = NovixTheme.colors.body, textAlign = TextAlign.Center diff --git a/presentation/src/main/java/com/london/presentation/shared/container/MediaLazyGridWithTabs.kt b/presentation/src/main/java/com/london/presentation/shared/container/MediaLazyGridWithTabs.kt index 589f5eddc..f32bab45b 100644 --- a/presentation/src/main/java/com/london/presentation/shared/container/MediaLazyGridWithTabs.kt +++ b/presentation/src/main/java/com/london/presentation/shared/container/MediaLazyGridWithTabs.kt @@ -37,8 +37,8 @@ fun MediaLazyGridWithTabs( ) { val tabs = listOf( - TabbableItem(R.string.Movies), - TabbableItem(R.string.TV_Shows) + TabbableItem(R.string.movies), + TabbableItem(R.string.tv_shows) ) val selectedTab = tabs.getOrNull(tabSelected) @@ -87,8 +87,8 @@ fun MediaLazyGridWithTabs( topBar: @Composable (() -> Unit)? = null, ) { val tabs = listOf( - TabbableItem(R.string.Movies), - TabbableItem(R.string.TV_Shows) + TabbableItem(R.string.movies), + TabbableItem(R.string.tv_shows) ) val selectedTab = tabs.getOrNull(tabSelected) diff --git a/presentation/src/main/java/com/london/presentation/shared/genre/TvShowGenreUi.kt b/presentation/src/main/java/com/london/presentation/shared/genre/TvShowGenreUi.kt index 8382f09f2..7d86952b0 100644 --- a/presentation/src/main/java/com/london/presentation/shared/genre/TvShowGenreUi.kt +++ b/presentation/src/main/java/com/london/presentation/shared/genre/TvShowGenreUi.kt @@ -47,7 +47,7 @@ enum class TvShowGenreUi( backgroundResId = R.drawable.img_fantasy_background ), Soap(stringResId = R.string.soap, backgroundResId = R.drawable.img_soap_background), - Talk(stringResId = R.string.talk, backgroundResId = R.drawable.img_talk_background), + Talk(stringResId = R.string.talk_show, backgroundResId = R.drawable.img_talk_background), WarPolitics( stringResId = R.string.war_politics, backgroundResId = R.drawable.img_war_background diff --git a/presentation/src/main/java/com/london/presentation/shared/item/ActorItem.kt b/presentation/src/main/java/com/london/presentation/shared/item/ActorItem.kt index c47ecdbca..b2fc415c6 100644 --- a/presentation/src/main/java/com/london/presentation/shared/item/ActorItem.kt +++ b/presentation/src/main/java/com/london/presentation/shared/item/ActorItem.kt @@ -25,7 +25,6 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp -import com.london.designsystem.R import com.london.designsystem.component.CircularLoading import com.london.designsystem.component.Text import com.london.designsystem.component.UnSuitableEye @@ -63,8 +62,7 @@ private fun ActorImage( val imageShape = RoundedCornerShape( topStart = 12.dp, topEnd = 12.dp, - bottomStart = 12.dp, - bottomEnd = 0.dp + bottomStart = 12.dp ) Box { @@ -179,12 +177,12 @@ private fun TextSection( @ThemePreviews @Composable -private fun ActorItemPreview() { +private fun Preview() { NovixTheme { ActorItem( actorName = "Lee Jung-jae", characterName = "Character name", - imageRes = R.drawable.frame1597883073, + imageRes = "https://image.tmdb.org/t/p/w500/lx8oiTXL9lIx78KOXlrlvNfoz43.jpg", modifier = Modifier.padding(16.dp), onClick = {} ) diff --git a/presentation/src/main/java/com/london/presentation/shared/layout/EmptyGenreLayout.kt b/presentation/src/main/java/com/london/presentation/shared/layout/EmptyGenreLayout.kt index 06a3a0c69..bea7876f1 100644 --- a/presentation/src/main/java/com/london/presentation/shared/layout/EmptyGenreLayout.kt +++ b/presentation/src/main/java/com/london/presentation/shared/layout/EmptyGenreLayout.kt @@ -20,7 +20,7 @@ import com.london.presentation.R @Composable fun EmptyGenreLayout( modifier: Modifier = Modifier, - message: String = stringResource(R.string.there_is_no_items_for_this_genre), + message: String = stringResource(R.string.no_items_in_genre), ) { Column( modifier = modifier @@ -32,7 +32,7 @@ fun EmptyGenreLayout( Image( painter = painterResource(id = R.drawable.empty), - contentDescription = stringResource(R.string.there_is_no_items_for_this_genre), + contentDescription = stringResource(R.string.no_items_in_genre), modifier = Modifier.size(128.dp) ) diff --git a/presentation/src/main/java/com/london/presentation/shared/text/TextWithIcon.kt b/presentation/src/main/java/com/london/presentation/shared/text/TextWithIcon.kt index 16500ea49..5de39b12d 100644 --- a/presentation/src/main/java/com/london/presentation/shared/text/TextWithIcon.kt +++ b/presentation/src/main/java/com/london/presentation/shared/text/TextWithIcon.kt @@ -51,7 +51,7 @@ fun TextWithIcon( Icon( painter = icon, - contentDescription = stringResource(R.string.image_dot), + contentDescription = stringResource(R.string.dot), tint = tint, modifier = Modifier.size(baseIconSize * scale) ) diff --git a/presentation/src/main/res/drawable-hdpi/img_no_reviews.png b/presentation/src/main/res/drawable-hdpi/img_no_reviews.png deleted file mode 100644 index b00ed3d04..000000000 Binary files a/presentation/src/main/res/drawable-hdpi/img_no_reviews.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-hdpi/img_onboarding_glow.png b/presentation/src/main/res/drawable-hdpi/img_onboarding_glow.png deleted file mode 100644 index a12c4a89e..000000000 Binary files a/presentation/src/main/res/drawable-hdpi/img_onboarding_glow.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-mdpi/img_no_reviews.png b/presentation/src/main/res/drawable-mdpi/img_no_reviews.png deleted file mode 100644 index 42e8438e7..000000000 Binary files a/presentation/src/main/res/drawable-mdpi/img_no_reviews.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-mdpi/img_onboarding_glow.png b/presentation/src/main/res/drawable-mdpi/img_onboarding_glow.png deleted file mode 100644 index e9cbedc69..000000000 Binary files a/presentation/src/main/res/drawable-mdpi/img_onboarding_glow.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xhdpi/img_no_reviews.png b/presentation/src/main/res/drawable-xhdpi/img_no_reviews.png deleted file mode 100644 index bada622c7..000000000 Binary files a/presentation/src/main/res/drawable-xhdpi/img_no_reviews.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xhdpi/img_onboarding_glow.png b/presentation/src/main/res/drawable-xhdpi/img_onboarding_glow.png deleted file mode 100644 index 7eeb66476..000000000 Binary files a/presentation/src/main/res/drawable-xhdpi/img_onboarding_glow.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxhdpi/img_no_reviews.png b/presentation/src/main/res/drawable-xxhdpi/img_no_reviews.png deleted file mode 100644 index e924ab679..000000000 Binary files a/presentation/src/main/res/drawable-xxhdpi/img_no_reviews.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxhdpi/img_onbaording_glow.png b/presentation/src/main/res/drawable-xxhdpi/img_onbaording_glow.png deleted file mode 100644 index 34d011479..000000000 Binary files a/presentation/src/main/res/drawable-xxhdpi/img_onbaording_glow.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxxhdpi/img_no_reviews.png b/presentation/src/main/res/drawable-xxxhdpi/img_no_reviews.png deleted file mode 100644 index 219c6e5cc..000000000 Binary files a/presentation/src/main/res/drawable-xxxhdpi/img_no_reviews.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_first.png b/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_first.png deleted file mode 100644 index cb59e4f1f..000000000 Binary files a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_first.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_glow.png b/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_glow.png deleted file mode 100644 index aa70423b1..000000000 Binary files a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_glow.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_second.png b/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_second.png deleted file mode 100644 index effe55229..000000000 Binary files a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_second.png and /dev/null differ diff --git a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_third.png b/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_third.png deleted file mode 100644 index 218712acd..000000000 Binary files a/presentation/src/main/res/drawable-xxxhdpi/img_onboarding_third.png and /dev/null differ diff --git a/designSystem/src/main/res/drawable/image_no_internet.png b/presentation/src/main/res/drawable/image_no_internet.png similarity index 100% rename from designSystem/src/main/res/drawable/image_no_internet.png rename to presentation/src/main/res/drawable/image_no_internet.png diff --git a/presentation/src/main/res/drawable/img_no_reviews.webp b/presentation/src/main/res/drawable/img_no_reviews.webp new file mode 100644 index 000000000..7d33d5ff7 Binary files /dev/null and b/presentation/src/main/res/drawable/img_no_reviews.webp differ diff --git a/presentation/src/main/res/drawable/img_onboarding_glow.webp b/presentation/src/main/res/drawable/img_onboarding_glow.webp new file mode 100644 index 000000000..f7da17a8b Binary files /dev/null and b/presentation/src/main/res/drawable/img_onboarding_glow.webp differ diff --git a/designSystem/src/main/res/drawable/language_circle.webp b/presentation/src/main/res/drawable/language_circle.webp similarity index 100% rename from designSystem/src/main/res/drawable/language_circle.webp rename to presentation/src/main/res/drawable/language_circle.webp diff --git a/designSystem/src/main/res/drawable/lock_key.webp b/presentation/src/main/res/drawable/lock_key.webp similarity index 100% rename from designSystem/src/main/res/drawable/lock_key.webp rename to presentation/src/main/res/drawable/lock_key.webp diff --git a/designSystem/src/main/res/drawable/moon.webp b/presentation/src/main/res/drawable/moon.webp similarity index 100% rename from designSystem/src/main/res/drawable/moon.webp rename to presentation/src/main/res/drawable/moon.webp diff --git a/designSystem/src/main/res/drawable/shield_energy.webp b/presentation/src/main/res/drawable/shield_energy.webp similarity index 100% rename from designSystem/src/main/res/drawable/shield_energy.webp rename to presentation/src/main/res/drawable/shield_energy.webp diff --git a/designSystem/src/main/res/drawable/star_square.webp b/presentation/src/main/res/drawable/star_square.webp similarity index 100% rename from designSystem/src/main/res/drawable/star_square.webp rename to presentation/src/main/res/drawable/star_square.webp diff --git a/presentation/src/main/res/values-ar/strings.xml b/presentation/src/main/res/values-ar/strings.xml index 0f632e4f5..28cdf97c9 100644 --- a/presentation/src/main/res/values-ar/strings.xml +++ b/presentation/src/main/res/values-ar/strings.xml @@ -1,173 +1,242 @@ + + + + أفلام + مسلسلات + ممثلون + + + + ماذا تريد أن تشاهد؟ + مُشتق من نوڤا، مُصمم من أجل الأفلام + مشاهير + الأعلى تقييمًا + تابع المشاهدة + قريبًا + + + + الأفلام الرائجة + المسلسلات الرائجة + الأشخاص الرائجون + لا يوجد أشخاص رائجون حاليًا + + + بحث ابحث… - شوهد مؤخرًا - عمليات البحث الأخيرة - مسح الكل - الساعة - تصفية - سنة الإصدار - الأنواع - تقييم IMDb - خيال علمي - أكشن - دراما - كوميديا - مسح - ابدأ الاستكشاف! ابحث عن أفلامك ومسلسلاتك المفضلة - لا توجد نتائج، جرّب كلمة بحث أخرى! - غرامي - جريمة - قبول - مغامرة - وثائقي - أنمي - عائلي - خيالي - تاريخي - رعب - موسيقى - غموض - اطفال - اخبار - واقع - مسلسل درامي - حوار - فيلم تلفزيوني - إثارة - حرب - غربي - غير معروف - افلام - "مسلسلات" - "ممثلين" + + شوهد مؤخراً + عمليات البحث الأخيرة + ابدأ الاستكشاف! ابحث عن أفلامك ومسلسلاتك المفضلة + لم نعثر على نتائج، جرب كلمات بحث أخرى + + + + قوائمي + قوائمي المحفوظة + + عنوان القائمة + تعديل القائمة + إنشاء قائمة جديدة + إضافة قائمة جديدة + قائمة فارغة تنتظر اختياراتك المميزة + + حذف القائمة سيزيل جميع عناصرها. هل تريد المتابعة؟ + حذف القائمة + تم حذف القائمة بنجاح + فشل في حذف القائمة + تم إنشاء القائمة بنجاح + فشل في إنشاء القائمة + + تمت الإضافة بنجاح + فشل في إضافة العنصر + فشل في الحذف + تم الحذف بنجاح + + %1$d عناصر + إضافة إلى قائمة + + لا توجد قوائم محفوظة حتي الآن، اضغط على + لإضافة قائمة جديدة + لا توجد قوائم متاحة لهذا العنصر\nأنشئ واحدة جديدة الآن + + سجل دخولك أولاً لإنشاء القوائم وحفظ مفضلاتك + يرجى تسجيل الدخول للإضافة إلى قائمة + + + أفضل الأفلام المختارة - أفضل البرامج التلفزيونية - الحلقة - ضيوف الشرف - المراجعات + أفضل المسلسلات المختارة + نظرة عامة - المزيد مثل هذا - تشغيل الإعلان - نجمة - أيقونة الوقت - التقويم - فاصل - نقطة + ضيوف مميزون + طاقم التمثيل + سنة الإصدار + + المراجعات + عرض المراجعات + لا توجد مراجعات حتى الآن + اقرأ المزيد اقرأ أقل - طاقم العمل + + المزيد مثل هذا + مشاهدة الإعلان + + لا توجد تفاصيل متاحة للممثل السيرة المعرض - نقطة - صور الممثلين - صورة الممثل - صور مسلسلات - القادم"> + + صور الممثل + صورة المراجع + صورة المسلسل + + + + مرحباً بك في نوڤيكس + اكتشف أعظم الأفلام والمسلسلات. ابحث، شاهد، واحفظ مفضلاتك في مكان واحد + + + اكتشف أفضل الأفلام والمسلسلات - تصفح أحدث الإصدارات والاتجاهات والمحتوى المناسب لذوقك — كل ذلك في مكان واحد. - ابحث بسهولة… وشاهد ما تحب - استخدم البحث الذكي والفلاتر للوصول إلى ما تحبه بالضبط — أكشن، دراما، جريمة، أنمي والمزيد! + تصفح أحدث الإصدارات والاتجاهات والمحتوى المناسب لذوقك في مكان واحد + ابحث بسهولة… وشاهد ما يناسب ذوقك + استخدم البحث الذكي للعثور على ما تحبه — أكشن، دراما، جريمة، أنمي والمزيد قيّم، احفظ، وأنشئ قوائمك الخاصة - قيّم الأفلام، تابع سجل مشاهداتك، واحفظ قوائمك المفضلة بكل سهولة. - مرحبًا بك في Novix - اكتشف أعظم الأفلام والمسلسلات في العالم. ابحث، شاهد، واحفظ مفضلاتك كلها في مكان واحد. + قيّم الأفلام، تابع سجل مشاهداتك، واحفظ قوائمك المفضلة بسهولة تخطي - الاستمرار كضيف - تسجيل الدخول إلى حسابك - اسم المستخدم - ليس لديك حساب؟ - إنشاء حساب + + + تسجيل الدخول - صور التطبيق كلمة المرور - هل نسيت كلمة المرور؟ - اسم المستخدم"> - الممثلين - ماذا تريد أن تشاهد؟ - الكل - شائع - سياسي - اكشن ومغامره - حرب وسياسه - حاول مجددا - الأعلى تقييمًا - تابع المشاهدة - الأفلام الرائجة - المسلسلات الرائجة - الأشخاص الرائجون - لا يوجد أفلام في هذا التصنيف حالياً - لا يوجد مسلسلات في هذا التصنيف حالياً - لا توجد عناصر في هذا التصنيف حالياً - لا يوجد أشخاص في هذا التصنيف حالياً - لا توجد تفاصيل متاحة للممثل - المراجعات - لم تتفقد أي شيء بعد.\nخذ جولة في التطبيق ثم عُدّ مجددًا! - لا يوجد مسلسلات في هذا التصنيف حاليا - لا يوجد مراجعات! - فشل تسجيل الدخول. يرجى التحقق من بيانات التسجيل الخاصة بك. - فشل تسجيل الدخول كضيف. - تعديل القائمة - حفظ - عنوان القائمة - لا يوجد محتوى - أضف إلى قائمة - ألغي الإضافة إلي قائمة - انشئ قائمة جديدة - %1$d عناصر - القوائم المحفوظة - لا توجد أي قوائم حتي الان، اضغط علي زر + لاضافة قائمة جديدة - سجل دخول اولاً حتي تتمكن من استعراض او اضافة قوائم جديدة + نسيت كلمة المرور؟ + اسم المستخدم + + سجل دخولك إلى حسابك + المتابعة بدون تسجيل + + ليس لديك حساب؟ + إنشاء حساب + + فشل تسجيل الدخول. تحقق من بياناتك + فشل في المتابعة كزائر + + + حسابي + سجل دخولك للوصول إلى تفاصيل حسابك والميزات الأخرى + سجل المشاهدة - تقييمي - تقييد المحتوى - تغيير كلمة المرور الملف الشخصي - يرجى تسجيل الدخول للوصول إلى تفاصيل حسابك والميزات الأخرى! - لا يوجد عناصر لهذا النوع! + تغيير كلمة المرور + تسجيل الخروج - هل أنت متأكد أنك تريد المتابعة؟ + هل أنت متأكد من رغبتك في المتابعة؟ + + + + تقييماتي + لم تقيم أي شيء بعد + فشل في حذف التقييم + تم حذف التقييم بنجاح + + + المظهر مظلم فاتح + + + اللغة - الانجليزية + الإنجليزية العربية - اضافة قائمة جديدة - اضافة - نوفيكس - مشتق من نوفا، مُصمم من أجل الأفلام - أيقونة نوفيكس + + + + تقييد المحتوى صارم + يتم تمويه جميع المحتويات الحساسة متوسط + يتم تمويه المشاهد الصريحة فقط إيقاف - يتم تمويه جميع المحتويات الحساسة. - يتم تمويه المشاهد الصريحة فقط. - لا يتم تمويه أي محتوى. - تم حذف الفيلم بنجاح - الفيلم غير موجود - تم اضافه القائمه بنجاح - تم حذف القائمة بنجاح - حدث خطأ ما لا يمكن اضافه القائمه - حدث خطأ ما، فشل حذف التقييم!"> - تم حذف القائمة بنجاح - لا توجد عناصر هنا! - حذف القائمة - حذف القائمة المحفوظة سيحذف جميع عناصرها. هل أنت متأكد أنك تريد المتابعة؟ - حذف - تم حذف القائمة - فشل حذف القائمة - غلق - مجموعاتي - تم اضافه القائمه بنجاح - حدث خطأ ما، فشل الإضافه للقائمه - يرجى تسجيل الدخول للتمكن من الإضافة إالي قائمة - لا يوجد قوائم متاحة لهذا الفيلم!\nقم بإنشاء واحدة جديدة الآن. - تمت الإضافة إلى القائمة بنجاح - حدث خطأ ما، فشلت إضافة العنصر + لا يتم تمويه أي محتوى + + + التصنيفات - فشل الحذف + الأنواع + الكل + رائج + خيال علمي + أكشن + دراما + كوميديا + غرام + جريمة + مغامرة + وثائقي + رسوم متحركة + عائلي + خيال + تاريخي + رعب + موسيقى + غموض + أطفال + أخبار + واقعي + مسلسل درامي + برنامج حواري + فيلم تلفزيوني + إثارة + حرب + سياسة + غربي + أكشن ومغامرة + حرب وسياسة + غير معروف + + + + نوڤيكس + مسح + مسح الكل + حفظ + إضافة + حذف + إغلاق + إعادة المحاولة + إلغاء + + + + لا توجد أفلام في هذا النوع حالياً + لا توجد مسلسلات في هذا النوع حالياً + لا توجد عناصر لهذا النوع + لم تستعرض أي شيء بعد\nتجول في التطبيق ثم عُد لاحقاً + + + + التقويم + فاصل + نقطة + الساعة + أيقونة الوقت + أيقونة نوڤيكس + أيقونة التطبيق + نجمة تقييم أيقونة المسلسلات + + + + تحقق من اتصالك بالإنترنت + حدث خطأ ما. يرجى المحاولة مرة أخرى. + لا يوجد إنترنت + أوه! يبدو انك غير متصل بالإنترنت + تحقق من اتصالك وحاول مرة أخرى، سننتظرك مع أفلامك والفشار + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 420df8e36..21cc538ce 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -1,26 +1,184 @@ + + + + Movies + TV Shows + Actors + + + + What you want to watch? + Born from Nova, Made for Flix. + Celebrities + Top Rated + Continue Watching + Upcoming + + + + Trending Movies + Trending TV Shows + Trending People + No one\'s trending right now + + + Search Search… - Recent Viewed - Recent Search - Clear all - Clock - Filter - Released Year + + Recently Viewed + Recent Searches + Start exploring! Search for your favorite movies and shows + No results found, try different keywords + + + + My Lists + My Lists + + List Title + Edit List + Create New List + Add New List + Your collection awaits its first addition + + Deleting this list will remove all its items. Continue? + Delete List + List deleted successfully + Failed to delete list + List created successfully + Failed to create list + + Added successfully + Failed to add item + Failed to remove item + Removed successfully + + %1$d items + Save to List + + No saved lists yet, tap + to create one + No lists available for this item\nCreate one now + + Please log in to create and manage your lists + Please log in to save to lists + + + + Top Movie Picks + Top TV Show Picks + + Overview + Featured Guests + Cast + Release Year + + Reviews + View Reviews + No reviews yet + + Read More + Read Less + + More Like This + Play Trailer + + No details available for this actor + Biography + Gallery + + Actor Photos + Reviewer Avatar + TV Show Image + + + + Welcome to Novix + Discover the world\'s greatest movies and series. Search, watch, and save your favorites all in one place. + + + + Discover the Best Movies and Series + Browse the latest releases, trends, and content tailored to your taste — all in one place. + Search Easily… and Watch to Your Taste + Use smart search to find exactly what you love — action, drama, crime, anime and more! + Rate, Save, and Create Your Own Lists + Rate movies, track your viewing history, and easily save your favorite lists. + Skip + + + + Log In + Password + Forgot Password? + Username + + Log in to your account + Continue as Guest + + Don\'t have an account? + Create Account + + Login failed. Please check your credentials. + Failed to continue as guest + + + + My Account + Please log in to access your account details and features + + Watching History + User Profile + Change Password + + Log Out + Are you sure you want to continue? + + + + My Ratings + You haven\'t rated anything yet + Failed to delete rating + Rating deleted successfully + + + + Appearance + Dark + Light + + + + Language + English + Arabic + + + + Content Restriction + Strict + Blurs all sensitive content + Moderate + Blurs explicit scenes only + Off + No content is blurred + + + + Categories Genres - IMDb rating + All + Popular + Science Fiction Action - Apply - Clear - Start exploring! Search for your favorite movies, series and shows - No search result, please try with another keyword! Drama Comedy - Science Fiction Romance Crime Adventure + Documentary Animation Family Fantasy @@ -32,142 +190,53 @@ News Reality Soap - Talk + Talk Show TV Movie Thriller War - Western - Unknown - Documentary - Movies - "TV Shows" - "Actors" - Top movies picks - Top tv shows picks - Episode %1$d - Guests of honor - View reviews - Overview - More like this - Play trailer - star - time_icon - calendar - separator - dot - " Read more" - " Read less" - Cast - dot - Biography - Gallery - Actor Photos - Author profile - Login to your account - User name - TV Show Image - Discover best movies and series - Browse the latest releases, trends, and content tailored to your taste — all in one place. - Search easily… and watch to your taste - Use smart search and filters to find exactly what you love — action, drama, crime, anime and more! - Rate, save, and create your own lists. - Rate movies, track your viewing history, and easily save your favorite lists. - Welcome to Novix - Discover the world’s greatest movies and series. Search, watch, and save your favorites all in one place. - Skip - Continue as guest - Don\'t have an account? - Create account - Login - App Icon - Password - Forgot Password? - Username"> - Upcoming - All - Actors - What you want to watch? - Popular Politics + Western Action & Adventure War & Politics - Retry - Top rated - Continue Watching - Trending Movies - Trending TV Shows - Trending People - No movies found in this genre. - No items found in my rating list. - No tv shows found in this genre. - No people found in this genre. - no tv shows found in this category - No actor details available - Reviews - Looks like you haven\'t checked anything yet.\nTake a look around and come back! - There is no review! - Login failed. Please check your credentials. - Guest login failed. - Edit list - List title - There is no items - Save to list - Cancel addition to list - Create new list - %1$d items - My Lists - There is no saved list yet, click on + button to add a new list! - Please login to create lists and add your favorite items to it! - Add new list - Add - My account - Watching history - My rating - Content Restriction - Change password - User profile - Please login to access your account details and other features! - There is no items for this genre! - Logout - Are you sure to continue? - Appearance - Dark - Light - Save - Language - English - Arabic + Unknown + + + Novix - Born from Nova, Made for Flix. + Clear + Clear All + Save + Add + Delete + Close + Retry + Cancel + + + + No movies in this genre yet + No shows in this genre yet + No items in this genre + You haven\'t browsed anything yet\nExplore the app and come back later + + + + Calendar + Separator + Dot + Clock + Time Icon Novix Icon - Strict - Moderate - Off - Blurs all sensitive content. - Blurs explicit scenes only. - No content is blurred. - movie removed successfully - movie not found - List added successfully - Something went wrong, can not add list - list added successfully - list removed successfully - can not delete list - Rating deleted successfully"> - Something went wrong, could not delete rating"> - There is no items here! - Delete list - Deleting the saved list will remove all items it contains. Are you sure you want to proceed? - Delete - Deleted list successfully - List deletion failed - close - My Lists - Please login to save to list - No lists available for this item!\nCreate a new one now. - Added to list successfully - Something went wrong, item addition failed - Categories - Tv icon - Deletion failed + App Icon + Rating star icon + Tv Shows icon + + + + Check your internet connection + Something went wrong. Please try again. + No internet + Oops! It looks like you’re offline. + Check your connection and try again, we’ll be \n waiting with your movies and popcorn +