Merge pull request #20 from YAPP-Github/feature/NDGL-97/remove-scaffold-on-ndgl-app

[NDGL-97] NDGLApp에서 Scaffold 제거

Author: jihee-dev

app/src/main/java/com/yapp/ndgl/ui/NDGLApp.kt

@@ -3,7 +3,6 @@ package com.yapp.ndgl.ui
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -30,22 +29,18 @@ fun NDGLApp() {
         remember(navigationState.currentKey) { navigationState.currentKey in navigationState.topLevelKeys }
 
     Box(modifier = Modifier.fillMaxSize()) {
-        Scaffold(
-            modifier = Modifier.fillMaxSize(),
-        ) { innerPadding ->
-            val entryProvider = entryProvider {
-                homeEntry(navigator, innerPadding)
-                travelEntry(navigator, innerPadding)
-                travelHelperEntry(navigator, innerPadding)
-            }
-
-            NavDisplay(
-                modifier = Modifier.fillMaxSize(),
-                onBack = navigator::goBack,
-                entries = navigationState.toEntries(entryProvider),
-            )
+        val entryProvider = entryProvider {
+            homeEntry(navigator)
+            travelEntry(navigator)
+            travelHelperEntry(navigator)
         }
 
+        NavDisplay(
+            modifier = Modifier.fillMaxSize(),
+            onBack = navigator::goBack,
+            entries = navigationState.toEntries(entryProvider),
+        )
+
         AnimatedVisibility(
             modifier = Modifier.align(Alignment.BottomCenter),
             visible = shouldShowBottomBar,

feature/home/src/main/java/com/yapp/ndgl/feature/home/main/HomeScreen.kt

@@ -25,11 +25,9 @@ import java.time.LocalDate
 @Composable
 internal fun HomeRoute(
     viewModel: HomeViewModel = hiltViewModel(),
-    innerPadding: PaddingValues,
 ) {
     val state by viewModel.collectAsState()
     HomeScreen(
-        modifier = Modifier.padding(innerPadding),
         state = state,
         onTabSelected = { index ->
             viewModel.onIntent(HomeIntent.SelectPopularTravelTab(index))
@@ -39,7 +37,6 @@ internal fun HomeRoute(
 
 @Composable
 private fun HomeScreen(
-    modifier: Modifier,
     state: HomeState = HomeState(),
     onTabSelected: (Int) -> Unit = {},
 ) {
@@ -64,7 +61,9 @@ private fun HomeScreen(
         },
     ) { innerPadding ->
         LazyColumn(
-            modifier = modifier.fillMaxSize(),
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(innerPadding),
             contentPadding = PaddingValues(
                 top = innerPadding.calculateTopPadding() + 20.dp,
                 bottom = 80.dp,
@@ -145,7 +144,6 @@ private fun HomeScreenPreview() {
 
     NDGLTheme {
         HomeScreen(
-            modifier = Modifier,
             state = HomeState(
                 userName = "유저123",
                 myTravel = HomeState.MyTravel.InProgress(

feature/home/src/main/java/com/yapp/ndgl/feature/home/navigation/HomeEntry.kt

@@ -1,14 +1,15 @@
 package com.yapp.ndgl.feature.home.navigation
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavKey
 import com.yapp.ndgl.feature.home.main.HomeRoute
 import com.yapp.ndgl.navigation.Navigator
 import com.yapp.ndgl.navigation.Route
 
-fun EntryProviderScope<NavKey>.homeEntry(navigator: Navigator, innerPadding: PaddingValues) {
+fun EntryProviderScope<NavKey>.homeEntry(
+    navigator: Navigator,
+) {
     entry<Route.Home> {
-        HomeRoute(innerPadding = innerPadding)
+        HomeRoute()
     }
 }

feature/travel-helper/src/main/java/com/yapp/ndgl/feature/travelhelper/navigation/TravelHelperEntry.kt

@@ -1,14 +1,13 @@
 package com.yapp.ndgl.feature.travelhelper.navigation
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavKey
 import com.yapp.ndgl.feature.travelhelper.TravelHelperRoute
 import com.yapp.ndgl.navigation.Navigator
 import com.yapp.ndgl.navigation.Route
 
-fun EntryProviderScope<NavKey>.travelHelperEntry(navigator: Navigator, innerPadding: PaddingValues) {
+fun EntryProviderScope<NavKey>.travelHelperEntry(navigator: Navigator) {
     entry<Route.TravelHelper> {
-        TravelHelperRoute(innerPadding = innerPadding)
+        TravelHelperRoute()
     }
 }

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/datepicker/DatePickerScreen.kt

@@ -31,7 +31,7 @@ import kotlinx.datetime.LocalDate
 internal fun DatePickerRoute(
     viewModel: DatePickerViewModel = hiltViewModel(),
     navigateBack: () -> Unit = {},
-    innerPadding: PaddingValues,
+    innerPadding: PaddingValues = PaddingValues(),
 ) {
     val state by viewModel.collectAsState()
 

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/navigation/TravelEntry.kt

@@ -1,6 +1,5 @@
 package com.yapp.ndgl.feature.travel.navigation
 
-import androidx.compose.foundation.layout.PaddingValues
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
 import androidx.navigation3.runtime.EntryProviderScope
 import androidx.navigation3.runtime.NavKey
@@ -16,7 +15,7 @@ import com.yapp.ndgl.feature.travel.traveldetail.TravelDetailViewModel
 import com.yapp.ndgl.navigation.Navigator
 import com.yapp.ndgl.navigation.Route
 
-fun EntryProviderScope<NavKey>.travelEntry(navigator: Navigator, innerPadding: PaddingValues) {
+fun EntryProviderScope<NavKey>.travelEntry(navigator: Navigator) {
     entry<Route.Travel> {
         TravelRoute(
             navigateToFollowTravel = { travelId ->
@@ -25,7 +24,6 @@ fun EntryProviderScope<NavKey>.travelEntry(navigator: Navigator, innerPadding: P
             navigateToTravelDetail = { travelId ->
                 navigator.navigate(Route.TravelDetail(travelId))
             },
-            innerPadding = innerPadding,
         )
     }
     entry<Route.FollowTravel> { route ->
@@ -61,7 +59,6 @@ fun EntryProviderScope<NavKey>.travelEntry(navigator: Navigator, innerPadding: P
             }
         PlaceDetailRoute(
             viewModel = viewModel,
-            innerPadding = innerPadding,
             navigateBack = { navigator.goBack() },
         )
     }
@@ -73,7 +70,6 @@ fun EntryProviderScope<NavKey>.travelEntry(navigator: Navigator, innerPadding: P
         DatePickerRoute(
             viewModel = viewModel,
             navigateBack = { navigator.goBack() },
-            innerPadding = innerPadding,
         )
     }
 }

feature/travel/src/main/java/com/yapp/ndgl/feature/travel/placedetail/PlaceDetailScreen.kt

@@ -56,7 +56,7 @@ import com.yapp.ndgl.feature.travel.placedetail.component.PlacePhotoTab
 @Composable
 internal fun PlaceDetailRoute(
     viewModel: PlaceDetailViewModel = hiltViewModel(),
-    innerPadding: PaddingValues,
+    innerPadding: PaddingValues = PaddingValues(),
     navigateBack: () -> Unit,
 ) {
     val state by viewModel.collectAsState()