[ISSUE-36] - Moving Scafold to be internal component of each screen

Author: gabrielbmoro

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

@@ -3,17 +3,8 @@ package com.codandotv.streamplayerapp
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 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.SplashRoutes
 import com.codandotv.streamplayerapp.core_shared_ui.theme.StreamPlayerTheme
 import com.codandotv.streamplayerapp.navigation.NavigationGraph
 
@@ -26,22 +17,10 @@ class MainActivity : ComponentActivity() {
     }
 }
 
-@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun StreamPlayerApp() {
     StreamPlayerTheme {
         val navController = rememberNavController()
-
-        Scaffold(
-            bottomBar = {
-                if (currentRoute(navController = navController) != SplashRoutes.Splash) {
-                    StreamPlayerBottomNavigation(navController = navController)
-                }
-            }
-        ) { innerPadding ->
-            Box(Modifier.padding(innerPadding)) {
-                NavigationGraph(navController = navController)
-            }
-        }
+        NavigationGraph(navController = navController)
     }
 }

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

@@ -1,13 +1,17 @@
 package com.codandotv.streamplayerapp.navigation
 
-import androidx.compose.foundation.layout.Column
+import android.annotation.SuppressLint
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
+import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavHostController
 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
@@ -18,20 +22,28 @@ fun NavigationGraph(navController: NavHostController) {
     NavHost(navController = navController, startDestination = SplashRoutes.Splash) {
         splashNavGraph(navController = navController)
         listStreamsNavGraph(navController = navController)
-        temporaryFun(BottomNavRoutes.GAMES)
-        temporaryFun(BottomNavRoutes.NEWS)
-        temporaryFun(BottomNavRoutes.SCENES)
-        temporaryFun(BottomNavRoutes.DOWNLOADS)
+        temporaryFun(BottomNavRoutes.GAMES, navController)
+        temporaryFun(BottomNavRoutes.NEWS, navController)
+        temporaryFun(BottomNavRoutes.SCENES, navController)
+        temporaryFun(BottomNavRoutes.DOWNLOADS, navController)
     }
 }
 
-fun NavGraphBuilder.temporaryFun(route: String) {
+fun NavGraphBuilder.temporaryFun(route: String, navController: NavController) {
     composable(route = route) {
-        example(route)
+        example(navController = navController, route)
     }
 }
 
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun example(route: String) {
-    Text(text = route, color = Color.White)
+fun example(navController: NavController, route: String) {
+    Scaffold(
+        bottomBar = {
+            StreamPlayerBottomNavigation(navController = navController)
+        }
+    ) { _ ->
+        Text(text = route, color = Color.White)
+    }
 }

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/navigation/ListStreamsNavigation.kt

@@ -8,6 +8,6 @@ import com.codandotv.streamplayerapp.feature_list_streams.presentation.screens.L
 
 fun NavGraphBuilder.listStreamsNavGraph(navController: NavHostController) {
     composable(BottomNavRoutes.HOME) {
-        ListStreamsScreen()
+        ListStreamsScreen(navController)
     }
 }

feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/presentation/screens/ListStreamsScreen.kt

@@ -1,5 +1,6 @@
 package com.codandotv.streamplayerapp.feature_list_streams.presentation.screens
 
+import android.annotation.SuppressLint
 import androidx.compose.foundation.ScrollState
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -9,59 +10,64 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreview
-import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
+import androidx.navigation.NavController
+import com.codandotv.streamplayerapp.core_navigation.bottomnavigation.StreamPlayerBottomNavigation
 import com.codandotv.streamplayerapp.feature_list_streams.presentation.widgets.StreamsCarousel
 import org.koin.androidx.compose.koinViewModel
 
+@SuppressLint("UnusedMaterial3ScaffoldPaddingParameter")
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun ListStreamsScreen(viewModel: ListStreamViewModel = koinViewModel()) {
+fun ListStreamsScreen(
+    navController: NavController,
+    viewModel: ListStreamViewModel = koinViewModel()
+) {
 
     val uiState = remember {
         viewModel.uiState
     }
 
-    Box(
-        modifier = Modifier
-            .fillMaxSize()
-            .background(MaterialTheme.colorScheme.background)
-    ) {
-        if (uiState.value.isLoading) {
-            CircularProgressIndicator(
-                modifier = Modifier.align(
-                    Alignment.Center
-                )
-            )
-        } else {
-            Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .align(Alignment.TopCenter)
-                    .verticalScroll(ScrollState(0))
-            ) {
-                uiState.value.carousels.forEach {
-                    StreamsCarousel(
-                        title = it.categoryName,
-                        contentList = it.cards
+    Scaffold(
+        bottomBar = {
+            StreamPlayerBottomNavigation(navController = navController)
+        }
+    ) { _ ->
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .background(MaterialTheme.colorScheme.background)
+        ) {
+            if (uiState.value.isLoading) {
+                CircularProgressIndicator(
+                    modifier = Modifier.align(
+                        Alignment.Center
                     )
-                }
+                )
+            } else {
+                Column(
+                    modifier = Modifier
+                        .fillMaxSize()
+                        .align(Alignment.TopCenter)
+                        .verticalScroll(ScrollState(0))
+                ) {
+                    uiState.value.carousels.forEach {
+                        StreamsCarousel(
+                            title = it.categoryName,
+                            contentList = it.cards
+                        )
+                    }
 
-                Spacer(modifier = Modifier.height(12.dp))
+                    Spacer(modifier = Modifier.height(12.dp))
+                }
             }
         }
     }
-}
-
-@Composable
-@ThemePreviews
-fun ListStreamsScreenPreview() {
-    ThemePreview {
-        ListStreamsScreen()
-    }
 }