Merge pull request #30 from CodandoTV/feature/25_list_streams_with_network

gabrielbmoro · web-flow · commit 3ca632496b3e · 2023-05-10T13:38:31.000-03:00
[ISSUE-25] - List Streams using Network Module
diff --git a/app/src/main/java/com/codandotv/streamplayerapp/MainActivity.kt b/app/src/main/java/com/codandotv/streamplayerapp/MainActivity.kt
@@ -16,6 +16,7 @@ import com.codandotv.streamplayerapp.core_navigation.helper.currentRoute
 import com.codandotv.streamplayerapp.core_navigation.routes.SplashRoutes
 import com.codandotv.streamplayerapp.core_shared_ui.theme.StreamPlayerTheme
 import com.codandotv.streamplayerapp.navigation.NavigationGraph
+
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt b/app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt
@@ -2,6 +2,7 @@ package com.codandotv.streamplayerapp.di
 
 import android.content.res.Resources
 import com.codandotv.streamplayerapp.core_networking.di.NetworkModule
+import com.codandotv.streamplayerapp.feature_list_streams.di.ListStreamModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.dsl.module
 
@@ -12,5 +13,5 @@ object AppModule {
     }
 
 
-    val list  = module + NetworkModule.module
+    val list  = module + NetworkModule.module + ListStreamModule.module
 }
diff --git a/buildSrc/src/main/java/Dependencies.kt b/buildSrc/src/main/java/Dependencies.kt
@@ -102,8 +102,15 @@ object Dependencies {
             )
     }
 
-    object Koin {
+    object Koin : GroupLibs {
         const val koin = "io.insert-koin:koin-android:${Versions.koin}"
+        const val compose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"
+
+        override val list: List<String>
+            get() = listOf(
+                koin,
+                compose
+            )
     }
 
     object Retrofit : GroupLibs {
diff --git a/feature-list-streams/build.gradle.kts b/feature-list-streams/build.gradle.kts
@@ -14,7 +14,7 @@ android {
         implementation(project(Dependencies.Module.core_networking))
         implementation(project(Dependencies.Module.core_shared_ui))
         implementation(project(Dependencies.Module.core_navigation))
-        implementation(Dependencies.Koin.koin)
+        Dependencies.Koin.list.forEach { implementation(it) }
         Dependencies.Retrofit.list.forEach { implementation(it) }
         Dependencies.Kotlin.list.forEach { implementation(it) }
         Dependencies.Support.list.forEach { implementation(it) }
diff --git a/feature-list-streams/src/main/AndroidManifest.xml b/feature-list-streams/src/main/AndroidManifest.xml
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/ListStreamRepository.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/ListStreamRepository.kt
@@ -1,24 +1,29 @@
 package com.codandotv.streamplayerapp.feature_list_streams.data
 
-import com.codandotv.streamplayerapp.core_networking.handleError.toFlow
 import com.codandotv.streamplayerapp.core_networking.handleError.toResult
 import com.codandotv.streamplayerapp.feature_list_streams.domain.model.ListStream
 import com.codandotv.streamplayerapp.feature_list_streams.domain.toListStream
 import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.flow
 
 interface ListStreamRepository {
-    suspend fun getMovies(): Flow<ListStream>
+    suspend fun getMovies(): Flow<List<ListStream>>
 }
 
 class ListStreamRepositoryImpl(
     private val service: ListStreamService
 ) : ListStreamRepository {
 
-    override suspend fun getMovies(): Flow<ListStream> =
-        service.getMovies()
-            .toFlow()
-            .map {
-                it.toListStream()
+    override suspend fun getMovies(): Flow<List<ListStream>> {
+        val genres = service.getGenres().toResult().getOrNull()
+        return flow {
+            val response = genres?.genres?.mapNotNull { genre ->
+                service.getMovies(genre.id.toString())
+                    .toResult().getOrNull()?.toListStream(
+                        genre.name
+                    )
             }
+            emit(response ?: emptyList())
+        }
+    }
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/ListStreamService.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/ListStreamService.kt
@@ -1,10 +1,15 @@
 package com.codandotv.streamplayerapp.feature_list_streams.data
 
 import com.codandotv.streamplayerapp.core_networking.handleError.NetworkResponse
+import com.codandotv.streamplayerapp.feature_list_streams.data.model.GenresResponse
 import com.codandotv.streamplayerapp.feature_list_streams.data.model.ListStreamResponse
 import retrofit2.http.GET
+import retrofit2.http.Query
 
 interface ListStreamService {
-    @GET("3/movie/76341")
-    suspend fun getMovies() : NetworkResponse<ListStreamResponse>
+    @GET("3/discover/movie")
+    suspend fun getMovies(@Query("with_genres") genres: String) : NetworkResponse<ListStreamResponse>
+
+    @GET("3/genre/movie/list")
+    suspend fun getGenres(): NetworkResponse<GenresResponse>
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/model/GenresResponse.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/model/GenresResponse.kt
@@ -0,0 +1,10 @@
+package com.codandotv.streamplayerapp.feature_list_streams.data.model
+
+data class GenreResponse(
+    val id: Long,
+    val name: String
+)
+
+data class GenresResponse(
+    val genres: List<GenreResponse>
+)
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/model/ListStreamResponse.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/data/model/ListStreamResponse.kt
@@ -1,6 +1,10 @@
 package com.codandotv.streamplayerapp.feature_list_streams.data.model
 
-data class ListStreamResponse(
+data class StreamResponse(
     val title : String,
-    val overview : String
+    val overview : String,
+    val poster_path: String,
+)
+data class ListStreamResponse(
+    val results: List<StreamResponse>
 )
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/di/ListStreamModule.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/di/ListStreamModule.kt
@@ -7,7 +7,7 @@ import com.codandotv.streamplayerapp.feature_list_streams.domain.ListStreamAnaly
 import com.codandotv.streamplayerapp.feature_list_streams.domain.ListStreamAnalyticsImpl
 import com.codandotv.streamplayerapp.feature_list_streams.domain.ListStreamUseCase
 import com.codandotv.streamplayerapp.feature_list_streams.domain.ListStreamUseCaseImpl
-import com.codandotv.streamplayerapp.feature_list_streams.presentation.ListStreamViewModel
+import com.codandotv.streamplayerapp.feature_list_streams.presentation.screens.ListStreamViewModel
 import com.codandotv.streamplayerapp.feature_list_streams.presentation.ListStreamUiModelImpl
 import com.codandotv.streamplayerapp.feature_list_streams.presentation.ListStreamUimodel
 import org.koin.androidx.viewmodel.dsl.viewModel
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/domain/ListMovieUseCase.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/domain/ListMovieUseCase.kt
@@ -5,14 +5,13 @@ import com.codandotv.streamplayerapp.feature_list_streams.domain.model.ListStrea
 import kotlinx.coroutines.flow.Flow
 
 interface ListStreamUseCase {
-    suspend fun getMovies() : Flow<ListStream>
+    suspend fun getMovies() : Flow<List<ListStream>>
 }
 
 class ListStreamUseCaseImpl(
     private val repository: ListStreamRepository
 ) : ListStreamUseCase {
-    override suspend fun getMovies(): Flow<ListStream> {
-        println(">>>>>>> Curta o video!!!")
+    override suspend fun getMovies(): Flow<List<ListStream>> {
         return repository.getMovies()
     }
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/domain/ListStreamMapper.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/domain/ListStreamMapper.kt
@@ -2,9 +2,16 @@ package com.codandotv.streamplayerapp.feature_list_streams.domain
 
 import com.codandotv.streamplayerapp.feature_list_streams.data.model.ListStreamResponse
 import com.codandotv.streamplayerapp.feature_list_streams.domain.model.ListStream
+import com.codandotv.streamplayerapp.feature_list_streams.domain.model.Stream
 
-fun ListStreamResponse.toListStream() : ListStream =
+fun ListStreamResponse.toListStream(genre: String): ListStream =
     ListStream(
-        name = this.title,
-        description = this.overview
+        categoryName = genre,
+        streams = this.results.map {
+            Stream(
+                description = it.overview,
+                name = it.title,
+                posterPathUrl =  "https://image.tmdb.org/t/p/w300${it.poster_path}"
+            )
+        }
     )
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/domain/model/ListStream.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/domain/model/ListStream.kt
@@ -1,6 +1,11 @@
 package com.codandotv.streamplayerapp.feature_list_streams.domain.model
 
-data class ListStream(
+data class Stream(
     val name : String,
-    val description : String
+    val description : String,
+    val posterPathUrl: String,
+)
+data class ListStream(
+    val categoryName: String,
+    val streams: List<Stream>
 )
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/ListStreamActivity.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/ListStreamActivity.kt
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/ListStreamUimodel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/ListStreamUimodel.kt
@@ -1,16 +1,32 @@
 package com.codandotv.streamplayerapp.feature_list_streams.presentation
 
 import android.content.res.Resources
+import com.codandotv.streamplayerapp.feature_list_streams.domain.model.ListStream
+import com.codandotv.streamplayerapp.feature_list_streams.presentation.screens.CarouselData
+import com.codandotv.streamplayerapp.feature_list_streams.presentation.screens.ListStreamsUIState
+import com.codandotv.streamplayerapp.feature_list_streams.presentation.widgets.StreamsCardContent
 
 interface ListStreamUimodel {
+    fun convertToCardContent(listStream: List<ListStream>): ListStreamsUIState
 }
 
 class ListStreamUiModelImpl(
-    private val resources : Resources
+    private val resources: Resources
 ) : ListStreamUimodel {
-
-
-
-
-
+    override fun convertToCardContent(listStream: List<ListStream>): ListStreamsUIState {
+        return ListStreamsUIState(
+            isLoading = false,
+            carousels = listStream.map {
+                CarouselData(
+                    categoryName = it.categoryName,
+                    cards = it.streams.map { stream ->
+                        StreamsCardContent(
+                            contentDescription = stream.name,
+                            url = stream.posterPathUrl
+                        )
+                    }
+                )
+            }
+        )
+    }
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/ListStreamViewModel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/ListStreamViewModel.kt
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamViewModel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamViewModel.kt
@@ -0,0 +1,54 @@
+package com.codandotv.streamplayerapp.feature_list_streams.presentation.screens
+
+import androidx.compose.runtime.State
+import androidx.compose.runtime.mutableStateOf
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.codandotv.streamplayerapp.core_networking.handleError.catchFailure
+import com.codandotv.streamplayerapp.feature_list_streams.domain.ListStreamAnalytics
+import com.codandotv.streamplayerapp.feature_list_streams.domain.ListStreamUseCase
+import com.codandotv.streamplayerapp.feature_list_streams.presentation.ListStreamUimodel
+import kotlinx.coroutines.flow.onCompletion
+import kotlinx.coroutines.flow.onStart
+import kotlinx.coroutines.launch
+
+class ListStreamViewModel(
+    private val uiModel: ListStreamUimodel,
+    private val useCase: ListStreamUseCase,
+    private val analytics: ListStreamAnalytics
+) : ViewModel() {
+
+    private val _uiState = mutableStateOf(
+        ListStreamsUIState(
+            carousels = emptyList(),
+            isLoading = false
+        )
+    )
+    val uiState : State<ListStreamsUIState> = _uiState
+
+    init {
+        viewModelScope.launch {
+            useCase.getMovies()
+                .onStart { onLoading() }
+                .catchFailure {
+                    println(">>>> ${it.errorMessage}")
+                }
+                .onCompletion { loaded() }
+                .collect {
+                    _uiState.value = uiModel.convertToCardContent(it)
+                }
+        }
+    }
+
+    private fun loaded() {
+        _uiState.value = _uiState.value.copy(
+            isLoading = false
+        )
+    }
+
+    private fun onLoading() {
+        _uiState.value = _uiState.value.copy(
+            isLoading = true
+        )
+    }
+}
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamsScreen.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamsScreen.kt
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamsUIState.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamsUIState.kt

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.codandotv.streamplayerapp.di`
`2`	`2`
`3`	`3`	`import android.content.res.Resources`
`4`	`4`	`import com.codandotv.streamplayerapp.core_networking.di.NetworkModule`
	`5`	`+import com.codandotv.streamplayerapp.feature_list_streams.di.ListStreamModule`
`5`	`6`	`import org.koin.android.ext.koin.androidContext`
`6`	`7`	`import org.koin.dsl.module`
`7`	`8`
`@@ -12,5 +13,5 @@ object AppModule {`
`12`	`13`	`}`
`13`	`14`
`14`	`15`
`15`		`- val list = module + NetworkModule.module`
	`16`	`+ val list = module + NetworkModule.module + ListStreamModule.module`
`16`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,15 @@ object Dependencies {`
`102`	`102`	`)`
`103`	`103`	`}`
`104`	`104`
`105`		`- object Koin {`
	`105`	`+ object Koin : GroupLibs {`
`106`	`106`	`const val koin = "io.insert-koin:koin-android:${Versions.koin}"`
	`107`	`+ const val compose = "io.insert-koin:koin-androidx-compose:${Versions.koin}"`
	`108`	`+`
	`109`	`+ override val list: List<String>`
	`110`	`+ get() = listOf(`
	`111`	`+ koin,`
	`112`	`+ compose`
	`113`	`+ )`
`107`	`114`	`}`
`108`	`115`
`109`	`116`	`object Retrofit : GroupLibs {`