Skip to content

Commit 6ef56da

Browse files
committed
#38 [ADD] 마이페이지 PaddingValues 추가
1 parent 06d1a5d commit 6ef56da

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

presentation/src/main/java/com/sopt/presentation/main/MainScreen.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,10 @@ fun MainScreen(
158158
)
159159
groupCreateSuccessNavGraph(navHostController = navigator.navController)
160160
groupDetailNavGraph(navHostController = navigator.navController)
161-
myPageNavGraph(navHostController = navigator.navController)
161+
myPageNavGraph(
162+
paddingValues = paddingValues,
163+
navHostController = navigator.navController
164+
)
162165
loginNavGraph(navHostController = navigator.navController)
163166
signUpNavGraph(navHostController = navigator.navController)
164167
checkInviteNavGraph(navHostController = navigator.navController)

presentation/src/main/java/com/sopt/presentation/mypage/MyPageRoute.kt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.sopt.presentation.mypage
22

33
import androidx.compose.foundation.layout.Column
4+
import androidx.compose.foundation.layout.PaddingValues
45
import androidx.compose.foundation.layout.Row
56
import androidx.compose.foundation.layout.Spacer
67
import androidx.compose.foundation.layout.aspectRatio
@@ -41,6 +42,7 @@ import com.sopt.presentation.mypage.component.MyPageProfileEditButton
4142

4243
@Composable
4344
fun MyPageRoute(
45+
paddingValues: PaddingValues,
4446
myPageViewModel: MyPageViewModel = hiltViewModel()
4547
) {
4648
val lifecycleOwner = LocalLifecycleOwner.current
@@ -88,6 +90,7 @@ fun MyPageRoute(
8890
}
8991

9092
MyPageScreen(
93+
paddingValues = paddingValues,
9194
onProfileEditBtnClick = {
9295
// nav Profile 추가해야 함
9396
},
@@ -101,6 +104,7 @@ fun MyPageRoute(
101104

102105
@Composable
103106
fun MyPageScreen(
107+
paddingValues: PaddingValues = PaddingValues(),
104108
onProfileEditBtnClick: () -> Unit = {},
105109
onPolicyBtnClick: () -> Unit = {},
106110
onLogoutBtnClick: () -> Unit = {},
@@ -109,7 +113,8 @@ fun MyPageScreen(
109113
Scaffold(
110114
modifier = Modifier
111115
.statusBarsPadding()
112-
.navigationBarsPadding(),
116+
.navigationBarsPadding()
117+
.padding(paddingValues),
113118
topBar = {
114119
NoostakTopAppBar(
115120
title = stringResource(com.sopt.presentation.R.string.appbar_mu_page_title),

presentation/src/main/java/com/sopt/presentation/mypage/navigation/MyPageNavigation.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.sopt.presentation.mypage.navigation
22

3+
import androidx.compose.foundation.layout.PaddingValues
34
import androidx.navigation.NavController
45
import androidx.navigation.NavGraphBuilder
56
import androidx.navigation.NavHostController
@@ -17,10 +18,13 @@ fun NavController.navigateMyPage(navOptions: NavOptions? = null) {
1718
}
1819

1920
fun NavGraphBuilder.myPageNavGraph(
21+
paddingValues: PaddingValues,
2022
navHostController: NavHostController
2123
) {
2224
composable<MyPage> {
23-
MyPageRoute()
25+
MyPageRoute(
26+
paddingValues = paddingValues
27+
)
2428
}
2529
}
2630

0 commit comments

Comments
 (0)