Merge pull request #549 from MadridSquad/refactor/SeriesDetails

Refactor/series details code

Author: fatimafaisalghazi

domain/src/main/java/com/madrid/domain/usecase/series/AddSeriesToHistoryUseCase.kt

@@ -1,6 +1,5 @@
 package com.madrid.domain.usecase.series
 
-import com.madrid.domain.repository.AuthenticationRepository
 import com.madrid.domain.repository.SeriesRepository
 import com.madrid.domain.usecase.authentication.GetCurrentUserDetailsUseCase
 import javax.inject.Inject

presentation/src/main/java/com/madrid/presentation/component/TopCastHorizontalScroll.kt

@@ -19,26 +19,22 @@ import com.madrid.designSystem.R
 import com.madrid.designSystem.component.CustomTextTitle
 import com.madrid.designSystem.theme.MovioTheme
 import com.madrid.presentation.component.movioCards.MovioArtistsCard
-
-data class CastMember(
-    val id: String,
-    val name: String,
-    val imageUrl: String
-)
+import com.madrid.presentation.viewModel.detailsViewModel.ArtistUiState
+import com.madrid.presentation.viewModel.detailsViewModel.SeeAllType
 
 @Composable
 fun TopCastHorizontalScroll(
     modifier: Modifier = Modifier,
-    castMembers: List<CastMember>,
+    castMembers: List<ArtistUiState>,
     onSeeAllClick: () -> Unit = {},
-    onCastMemberClick: (Int) -> Unit,
+    onCastMemberClick: (Int) -> Unit
 ) {
     Column(
         modifier = modifier
             .fillMaxWidth()
     ) {
         CustomTextTitle(
-            primaryText = stringResource(com.madrid.presentation.R.string.top_cast),
+            primaryText = stringResource(SeeAllType.TopCast.stringResId),
             secondaryText = stringResource(com.madrid.presentation.R.string.see_all),
             endIcon = painterResource(R.drawable.outline_alt_arrow_left),
             onSeeAllClick = { onSeeAllClick() },
@@ -64,7 +60,7 @@ fun TopCastHorizontalScroll(
 @Composable
 private fun CastMemberItem(
     onCastMemberClick: (Int) -> Unit,
-    castMember: CastMember,
+    castMember: ArtistUiState,
     modifier: Modifier = Modifier
 ) {
     Column(
@@ -87,18 +83,18 @@ private fun TopCastSectionPreview() {
     MovioTheme {
         TopCastHorizontalScroll(
             castMembers = listOf(
-                CastMember(
-                    id = "1",
+                ArtistUiState(
+                    id = 1,
                     name = "Ana de Armas",
                     imageUrl = "https://image.tmdb.org/t/p/w500/3vxvsmYLTf4jnr163SUlBIWX8qx.jpg"
                 ),
-                CastMember(
-                    id = "2",
+                ArtistUiState(
+                    id = 2,
                     name = "Keanu Reeves",
                     imageUrl = "https://image.tmdb.org/t/p/w500/4D0PpNI0km5B9Gk7SZOo6hJxJ9P.jpg"
                 ),
-                CastMember(
-                    id = "3",
+                ArtistUiState(
+                    id = 3,
                     name = "Ian McShane",
                     imageUrl = "https://image.tmdb.org/t/p/w500/9H7oVx4b6Z0j3EjLZN9mzcqcJjU.jpg"
                 )

presentation/src/main/java/com/madrid/presentation/screens/detailsScreen/movieDetail/MovieDetail.kt

@@ -54,7 +54,6 @@ import com.madrid.designSystem.component.TopAppBar
 import com.madrid.designSystem.theme.Theme
 import com.madrid.presentation.R
 import com.madrid.presentation.component.BottomMediaActions
-import com.madrid.presentation.component.CastMember
 import com.madrid.presentation.component.TopCastHorizontalScroll
 import com.madrid.presentation.component.header.MovieDetailsHeader
 import com.madrid.presentation.component.logout.LogoutConfirmationBottomSheet
@@ -64,9 +63,9 @@ import com.madrid.presentation.navigation.Destinations
 import com.madrid.presentation.navigation.LocalNavController
 import com.madrid.presentation.screens.addtolist.ListManagementBottomSheet
 import com.madrid.presentation.screens.detailsScreen.reviewsScreen.composables.ReviewScreen
-import com.madrid.presentation.screens.detailsScreen.seriesDetails.toReviewScreenUiState
 import com.madrid.presentation.screens.detailsScreen.similarMedia.SimilarMovie
 import com.madrid.presentation.screens.detailsScreen.similarMedia.SimilarMoviesSection
+import com.madrid.presentation.viewModel.detailsViewModel.ArtistUiState
 import com.madrid.presentation.viewModel.detailsViewModel.DetailsMovieViewModel
 import com.madrid.presentation.viewModel.libraryViewModel.addtolist.MovieListViewModel
 
@@ -454,15 +453,15 @@ fun MovieDetailsScreen(
                     },
                     modifier = Modifier.padding(top = 32.dp),
                     castMembers = uiState.casts.map { cast ->
-                        CastMember(
-                            id = cast.id.toString(),
+                        ArtistUiState(
+                            id = cast.id,
                             name = cast.name,
                             imageUrl = cast.imageUrl
                         )
                     }
                 )
                 ReviewScreen(
-                    modifier = Modifier.padding(top = 32.dp),
+                    reviews = uiState.reviews,
                     onSeeAllReviews = {
                         navController.navigate(
                             Destinations.ReviewsScreen(
@@ -471,7 +470,7 @@ fun MovieDetailsScreen(
                             )
                         )
                     },
-                    uiState = uiState.reviews.toReviewScreenUiState()
+                    modifier = Modifier.padding(top = 32.dp),
                 )
                 SimilarMoviesSection(
                     modifier = Modifier.padding(vertical = 32.dp),

presentation/src/main/java/com/madrid/presentation/screens/detailsScreen/reviewsScreen/composables/ReviewsSection.kt

@@ -16,27 +16,26 @@ import androidx.compose.ui.unit.dp
 import com.madrid.designSystem.component.CustomTextTitle
 import com.madrid.presentation.R
 import com.madrid.presentation.viewModel.detailsViewModel.ReviewUiState
-import com.madrid.presentation.viewModel.detailsViewModel.ReviewsScreenUiState
+import com.madrid.presentation.viewModel.detailsViewModel.SeeAllType
 
 @Composable
 fun ReviewScreen(
-    uiState: ReviewsScreenUiState,
+    reviews: List<ReviewUiState>,
     modifier: Modifier = Modifier,
-    onSeeAllReviews: () -> Unit = {},
-    reviews: List<ReviewUiState> = uiState.reviews,
+    onSeeAllReviews: () -> Unit = {}
 ) {
     if (reviews.isNotEmpty()) {
         Column(
             modifier = modifier.fillMaxWidth()
         ) {
             CustomTextTitle(
-                primaryText = stringResource(R.string.reviews),
+                primaryText = stringResource(SeeAllType.Review.stringResId),
                 secondaryText = stringResource(R.string.see_all),
                 endIcon = painterResource(com.madrid.designSystem.R.drawable.outline_alt_arrow_left),
                 onSeeAllClick = { onSeeAllReviews() },
                 modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 12.dp)
             )
-            ReviewsSectionContent(reviews = uiState.reviews)
+            ReviewsSectionContent(reviews = reviews)
         }
     }
 }

presentation/src/main/java/com/madrid/presentation/screens/detailsScreen/seriesDetails/EpisodesScreen.kt

@@ -1,5 +1,6 @@
 package com.madrid.presentation.screens.detailsScreen.seriesDetails
 
+import android.content.Context
 import android.content.Intent
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -36,30 +37,29 @@ import com.madrid.presentation.component.movieActorBackground.MoviePosterDetailS
 import com.madrid.presentation.component.movioCards.MovioEpisodesCard
 import com.madrid.presentation.navigation.LocalNavController
 import com.madrid.presentation.viewModel.detailsViewModel.EpisodeUiState
+import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetails.SeriesDetailsInteractionListener
+import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetails.SeriesDetailsViewModel
 import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetailsUiState
-import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetailsViewModel
 
 @Composable
-fun EpisodesScreen(viewModel: SeriesDetailsViewModel = hiltViewModel()) {
+fun EpisodesScreen(viewModel: SeriesDetailsViewModel = hiltViewModel()
+) {
     val uiState by viewModel.state.collectAsState()
+    val interactionListener = viewModel as SeriesDetailsInteractionListener
     val navController = LocalNavController.current
     val context = LocalContext.current
+
     EpisodesScreenContent(
         uiState = uiState,
         onSeasonSelection = viewModel::updateSelectedSeason,
         onClickEpisode = { episode ->
-            viewModel.loadEpisodeTrailer(
+
+            interactionListener.onEpisodePlayItClick(
                 seriesId = uiState.seriesId,
                 seasonNumber = uiState.selectedSeasonUiState.seasonNumber,
                 episodeNumber = episode.episodeNumber
             ) { trailerKey ->
-                trailerKey?.let {
-                    val intent = Intent(
-                        Intent.ACTION_VIEW,
-                        "https://www.youtube.com/watch?v=$it".toUri()
-                    )
-                    context.startActivity(intent)
-                }
+                openTrailer(trailerKey, context)
             }
         },
         onClickBack = { navController.popBackStack() }
@@ -168,4 +168,14 @@ fun EpisodesScreenContent(
             )
         }
     }
+}
+
+private fun openTrailer(trailerKey:String?,context:Context){
+    trailerKey?.let {
+        val intent = Intent(
+            Intent.ACTION_VIEW,
+            "https://www.youtube.com/watch?v=$it".toUri()
+        )
+        context.startActivity(intent)
+    }
 }

presentation/src/main/java/com/madrid/presentation/screens/detailsScreen/seriesDetails/SeasonsScreen.kt

@@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.items
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -20,8 +20,8 @@ import com.madrid.presentation.R
 import com.madrid.presentation.component.movioCards.MovioSeasonCard
 import com.madrid.presentation.navigation.Destinations
 import com.madrid.presentation.navigation.LocalNavController
+import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetails.SeriesDetailsViewModel
 import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetailsUiState
-import com.madrid.presentation.viewModel.detailsViewModel.SeriesDetailsViewModel
 import com.madrid.presentation.viewModel.shared.parser.formatFullDateKtx
 import com.madrid.presentation.viewModel.shared.parser.formatYearKtx
 
@@ -66,7 +66,7 @@ fun SeasonsScreenContent(
         LazyColumn(
             contentPadding = PaddingValues(bottom = 40.dp)
         ) {
-            itemsIndexed(seasons) { index, season ->
+            items(seasons) { season ->
                 MovioSeasonCard(
                     movieTitle = season.title,
                     movieImage = season.imageUrl,