Merge pull request #39 from CodandoTV/feature/31_detail

Criando tela de detalhe e fazendo melhorias no codigo

Author: rviannaoliveira

app/src/main/java/com/codandotv/streamplayerapp/MainActivity.kt

@@ -5,6 +5,9 @@ import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 import androidx.navigation.compose.rememberNavController
+import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
+import com.codandotv.streamplayerapp.core_navigation.helper.currentRoute
+import com.codandotv.streamplayerapp.core_navigation.routes.Routes
 import com.codandotv.streamplayerapp.core_shared_ui.theme.StreamPlayerTheme
 import com.codandotv.streamplayerapp.navigation.NavigationGraph
 

app/src/main/java/com/codandotv/streamplayerapp/di/AppModule.kt

@@ -2,16 +2,12 @@ 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
 
 object AppModule {
-
-    val module = module {
+    private val module = module {
         single<Resources> { androidContext().resources }
     }
-
-
-    val list  = module + NetworkModule.module + ListStreamModule.module
+    val list  = module + NetworkModule.module
 }

app/src/main/java/com/codandotv/streamplayerapp/navigation/NavigationGraph.kt

@@ -5,6 +5,7 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.graphics.Color
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
@@ -13,15 +14,17 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
 import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.core_navigation.routes.SplashRoutes
-import com.codandotv.streamplayerapp.feature_list_streams.presentation.navigation.listStreamsNavGraph
+import com.codandotv.streamplayerapp.core_navigation.routes.Routes
+import com.codandotv.streamplayerapp.feature_list_streams.detail.presentation.navigation.detailStreamNavGraph
+import com.codandotv.streamplayerapp.feature_list_streams.list.presentation.navigation.listStreamsNavGraph
 import com.codandotv.streamplayerapp.splah.presentation.navigation.splashNavGraph
 
 @Composable
 fun NavigationGraph(navController: NavHostController) {
-    NavHost(navController = navController, startDestination = SplashRoutes.Splash) {
+    NavHost(navController = navController, startDestination = Routes.Splash) {
         splashNavGraph(navController = navController)
         listStreamsNavGraph(navController = navController)
+        detailStreamNavGraph(navController = navController)
         temporaryFun(BottomNavRoutes.GAMES, navController)
         temporaryFun(BottomNavRoutes.NEWS, navController)
         temporaryFun(BottomNavRoutes.SCENES, navController)

app/src/main/java/com/codandotv/streamplayerapp/splah/presentation/navigation/SplashNavigation.kt

@@ -4,11 +4,11 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.composable
 import com.codandotv.streamplayerapp.core_navigation.routes.BottomNavRoutes
-import com.codandotv.streamplayerapp.core_navigation.routes.SplashRoutes
+import com.codandotv.streamplayerapp.core_navigation.routes.Routes
 import com.codandotv.streamplayerapp.splah.presentation.screens.SplashScreen
 
 fun NavGraphBuilder.splashNavGraph(navController: NavHostController) {
-    composable(SplashRoutes.Splash) {
+    composable(Routes.Splash) {
         SplashScreen(
             onAnimationFinished = { navController.navigate(BottomNavRoutes.HOME) }
         )

build.gradle.kts

@@ -35,6 +35,7 @@ fun Project.configureAndroid() {
 
     apply(plugin = "kotlin-android")
     apply(plugin = "kotlin-kapt")
+    apply(plugin = "kotlin-parcelize")
 
     configure<com.android.build.gradle.BaseExtension> {
         compileSdkVersion(Config.compileSdkVersion)

buildSrc/src/main/java/Config.kt

@@ -9,7 +9,7 @@ object Config {
     const val packageName = "com.codandotv.streamplayerapp."
 
     object BuildField {
-        const val host_debug = "\"https://api.themoviedb.org/\""
-        const val host_release = "\"https://api.themoviedb.org/\""
+        const val host_debug = "\"https://api.themoviedb.org/3/\""
+        const val host_release = "\"https://api.themoviedb.org/3/\""
     }
 }

buildSrc/src/main/java/Dependencies.kt

@@ -91,14 +91,14 @@ object Dependencies {
         const val constraintLayout =
             "androidx.constraintlayout:constraintlayout:${Versions.constraint_motion_version}"
         const val material = "com.google.android.material:material:${Versions.material_version}"
-        const val animation = "androidx.dynamicanimation:dynamicanimation:1.0.0"
+        const val animation = "androidx.dynamicanimation:dynamicanimation:${Versions.dynamic_animation}"
 
         override val list: List<String>
             get() = listOf(
                 Support.appCompat,
                 Support.constraintLayout,
                 Support.material,
-                Support.animation
+                Support.animation,
             )
     }
 
@@ -154,6 +154,7 @@ object Dependencies {
         const val composeUITooling = "androidx.compose.ui:ui-tooling"
         const val composeMaterial3 = "androidx.compose.material3:material3:${Versions.composeMaterial3Version}"
         const val composeNavigation = "androidx.navigation:navigation-compose:${Versions.composeNavigationVersion}"
+        const val composeIcons = "androidx.compose.material:material-icons-extended:${Versions.composeIcons}"
 
         override val list: List<String>
             get() = listOf(
@@ -162,7 +163,8 @@ object Dependencies {
                 Compose.composeActivityCompose,
                 Compose.composeUITooling,
                 Compose.composeMaterial3,
-                Compose.composeNavigation
+                Compose.composeNavigation,
+                Compose.composeIcons
             )
     }
 }

buildSrc/src/main/java/Versions.kt

@@ -14,6 +14,7 @@ object Versions {
     const val androidCoreKtx = "1.7.0"
     const val support_version = "1.4.1"
     const val material_version = "1.5.0"
+    const val dynamic_animation = "1.0.0"
     const val retrofit_version = "2.9.0"
     const val moshi_version = "1.14.0"
     const val okhttp_version = "4.10.0"
@@ -31,6 +32,7 @@ object Versions {
     const val composeCompilerVersion = "1.4.2"
     const val composeMaterial3Version = "1.0.1"
     const val composeActivity = "1.5.0"
+    const val composeIcons = "1.4.3"
     const val composeNavigationVersion = "2.5.3"
 
     const val coilVersion = "2.3.0"

core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/bottomnavigation/StreamPlayerBottomNavigation.kt

@@ -18,7 +18,10 @@ import androidx.navigation.NavController
 import com.codandotv.streamplayerapp.core_navigation.helper.currentRoute
 
 private val bottomMenuItems = listOf(
-    BottomNavItem.Home, BottomNavItem.Games, BottomNavItem.News, BottomNavItem.Downloads
+    BottomNavItem.Home,
+    BottomNavItem.Games,
+    BottomNavItem.News,
+    BottomNavItem.Downloads
 )
 
 @Composable

core-navigation/src/main/java/com/codandotv/streamplayerapp/core_navigation/routes/Routes.kt

@@ -0,0 +1,13 @@
+package com.codandotv.streamplayerapp.core_navigation.routes
+
+import com.codandotv.streamplayerapp.core_navigation.routes.Routes.PARAM.ID
+
+object Routes {
+    const val DETAIL = "DetailList/"
+    const val DETAIL_COMPLETE = "${DETAIL}{${ID}}"
+    const val Splash = "splash"
+
+    object PARAM {
+        const val ID = "id"
+    }
+}