diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt index 3cd54e59a..7207198ed 100644 --- a/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt +++ b/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt @@ -107,11 +107,13 @@ fun MyPageRoute( is UiState.Success -> { MyPageScreen( paddingValues = paddingValues, + onEditClick = { viewModel.navigateToProfileEdit() }, onLogoutClick = { viewModel.fetchShowLogoutBottomSheet(true) }, onQuitClick = { viewModel.fetchShowQuitBottomSheet(true) }, onNoticeClick = { viewModel.fetchShowNotice(true) }, onOpinionClick = { viewModel.fetchShowOpinion(true) }, - onEditClick = { viewModel.navigateToProfileEdit() }, + onServiceClick = {}, + onPersonalClick = {}, name = state.name, profile = state.profile ) @@ -135,11 +137,13 @@ fun MyPageRoute( @Composable fun MyPageScreen( + onEditClick: () -> Unit, onLogoutClick: () -> Unit, onQuitClick: () -> Unit, onNoticeClick: () -> Unit, onOpinionClick: () -> Unit, - onEditClick: () -> Unit, + onServiceClick: () -> Unit, + onPersonalClick: () -> Unit, modifier: Modifier = Modifier, paddingValues: PaddingValues = PaddingValues(), name: String = "", @@ -161,8 +165,8 @@ fun MyPageScreen( onOpinionClick = onOpinionClick ) ServiceInfo( - onNoticeClick = onNoticeClick, - onOpinionClick = onOpinionClick + onServiceClick = onServiceClick, + onPersonalClick = onPersonalClick ) Row( modifier = Modifier @@ -226,10 +230,12 @@ fun UserProfile( bottom = 7.dp ) ) - Row(verticalAlignment = Alignment.CenterVertically, + Row( + verticalAlignment = Alignment.CenterVertically, modifier = Modifier.noRippleClickable { onEditClick() - }) { + } + ) { Text( text = stringResource(id = R.string.my_page_edit_profile), modifier = Modifier.padding(start = 16.dp, end = 7.dp), @@ -278,9 +284,9 @@ fun TerningCommunity( modifier = Modifier.padding(bottom = 20.dp) ) MyPageItem( - text = stringResource(id = R.string.my_page_information), + text = stringResource(id = R.string.my_page_notice), icon = R.drawable.ic_my_page_notice, - onButtonClick = { onNoticeClick() } + onButtonClick = onNoticeClick ) HorizontalDivider( modifier = Modifier @@ -291,7 +297,7 @@ fun TerningCommunity( MyPageItem( text = stringResource(id = R.string.my_page_opinion), icon = R.drawable.ic_my_page_opinion, - onButtonClick = { onOpinionClick() } + onButtonClick = onOpinionClick ) } } @@ -300,8 +306,8 @@ fun TerningCommunity( @Composable fun ServiceInfo( modifier: Modifier = Modifier, - onNoticeClick: () -> Unit, - onOpinionClick: () -> Unit + onServiceClick: () -> Unit, + onPersonalClick: () -> Unit ) { Column( modifier = modifier @@ -332,9 +338,9 @@ fun ServiceInfo( modifier = Modifier.padding(bottom = 20.dp) ) MyPageItem( - text = stringResource(id = R.string.my_page_notice), - icon = R.drawable.ic_my_page_notice, - onButtonClick = { onNoticeClick() } + text = stringResource(id = R.string.my_page_service), + icon = R.drawable.ic_my_page_service, + onButtonClick = onServiceClick ) HorizontalDivider( modifier = Modifier @@ -343,9 +349,9 @@ fun ServiceInfo( color = Grey150 ) MyPageItem( - text = stringResource(id = R.string.my_page_private_information), - icon = R.drawable.ic_my_page_opinion, - onButtonClick = { onOpinionClick() } + text = stringResource(id = R.string.my_page_personal), + icon = R.drawable.ic_my_page_personal, + onButtonClick = onPersonalClick ) HorizontalDivider( modifier = Modifier @@ -374,7 +380,9 @@ fun MyPageScreenPreview() { onOpinionClick = {}, onLogoutClick = {}, onQuitClick = {}, - onEditClick = {} + onEditClick = {}, + onServiceClick = {}, + onPersonalClick = {}, ) } } \ No newline at end of file diff --git a/feature/src/main/res/drawable/ic_my_page_notice.xml b/feature/src/main/res/drawable/ic_my_page_notice.xml index 6f049a9e3..3e56590a0 100644 --- a/feature/src/main/res/drawable/ic_my_page_notice.xml +++ b/feature/src/main/res/drawable/ic_my_page_notice.xml @@ -1,26 +1,21 @@ + android:width="22dp" + android:height="22dp" + android:viewportWidth="22" + android:viewportHeight="22"> + android:pathData="M2.17,6.609H3.44V10.929H2.17C1.5,10.929 0.96,10.389 0.96,9.719V7.819C0.96,7.149 1.5,6.609 2.17,6.609Z" + android:fillColor="#1EAC61"/> + android:pathData="M12.76,20.279H11.23C10.87,20.279 10.56,19.989 10.45,19.569L7.77,8.449H10.99L13.54,18.999C13.69,19.639 13.31,20.289 12.76,20.289V20.279Z" + android:fillColor="#1EAC61"/> + android:pathData="M5.84,4.641H15.44V12.911H5.84C4.38,12.911 3.2,11.731 3.2,10.271V7.271C3.2,5.811 4.38,4.631 5.84,4.631V4.641Z" + android:fillColor="#65DB9B"/> + android:pathData="M19.75,10.291H18.78V7.261H19.75C20.59,7.261 21.27,7.941 21.27,8.781C21.27,9.621 20.59,10.301 19.75,10.301V10.291Z" + android:fillColor="#0D8443"/> + android:pathData="M13.27,4.7V12.85L19.03,15.79C19.33,15.94 19.65,15.67 19.65,15.27V2.29C19.65,1.89 19.32,1.61 19.03,1.77L13.27,4.71V4.7Z" + android:fillColor="#1EAC61"/> diff --git a/feature/src/main/res/drawable/ic_my_page_opinion.xml b/feature/src/main/res/drawable/ic_my_page_opinion.xml index 41512f23e..848db9d9a 100644 --- a/feature/src/main/res/drawable/ic_my_page_opinion.xml +++ b/feature/src/main/res/drawable/ic_my_page_opinion.xml @@ -1,26 +1,21 @@ + android:width="22dp" + android:height="22dp" + android:viewportWidth="22" + android:viewportHeight="22"> + android:pathData="M21.1,14.81V11.63C21.1,10 19.78,8.68 18.15,8.68H10.3C8.67,8.68 7.35,10 7.35,11.63V14.81C7.35,16.44 8.67,17.76 10.3,17.76H16.75C18.67,19.74 20.97,19.93 20.97,19.93C20.09,19.11 19.58,18.25 19.28,17.54C20.35,17.1 21.11,16.05 21.11,14.81H21.1Z" + android:fillColor="#1EAC61"/> + android:pathData="M0.9,9.26V5.53C0.9,3.62 2.57,2.07 4.62,2.07H14.52C16.57,2.07 18.24,3.62 18.24,5.53V9.26C18.24,11.17 16.57,12.72 14.52,12.72H6.4C3.98,15.04 1.08,15.27 1.08,15.27C2.19,14.31 2.83,13.3 3.21,12.46C1.86,11.94 0.9,10.71 0.9,9.26Z" + android:fillColor="#65DB9B"/> + android:pathData="M9.63,8.379C10.072,8.379 10.43,8.021 10.43,7.579C10.43,7.137 10.072,6.779 9.63,6.779C9.188,6.779 8.83,7.137 8.83,7.579C8.83,8.021 9.188,8.379 9.63,8.379Z" + android:fillColor="#1EAC61"/> + android:pathData="M12.71,8.379C13.152,8.379 13.51,8.021 13.51,7.579C13.51,7.137 13.152,6.779 12.71,6.779C12.268,6.779 11.91,7.137 11.91,7.579C11.91,8.021 12.268,8.379 12.71,8.379Z" + android:fillColor="#1EAC61"/> + android:pathData="M6.55,8.379C6.992,8.379 7.35,8.021 7.35,7.579C7.35,7.137 6.992,6.779 6.55,6.779C6.108,6.779 5.75,7.137 5.75,7.579C5.75,8.021 6.108,8.379 6.55,8.379Z" + android:fillColor="#1EAC61"/> diff --git a/feature/src/main/res/drawable/ic_my_page_personal.xml b/feature/src/main/res/drawable/ic_my_page_personal.xml new file mode 100644 index 000000000..62f540bf0 --- /dev/null +++ b/feature/src/main/res/drawable/ic_my_page_personal.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/feature/src/main/res/drawable/ic_my_page_service.xml b/feature/src/main/res/drawable/ic_my_page_service.xml new file mode 100644 index 000000000..ea3583ef0 --- /dev/null +++ b/feature/src/main/res/drawable/ic_my_page_service.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/feature/src/main/res/drawable/ic_my_page_version.xml b/feature/src/main/res/drawable/ic_my_page_version.xml index f264846fb..1d70ec4c2 100644 --- a/feature/src/main/res/drawable/ic_my_page_version.xml +++ b/feature/src/main/res/drawable/ic_my_page_version.xml @@ -1,34 +1,21 @@ + android:width="22dp" + android:height="22dp" + android:viewportWidth="22" + android:viewportHeight="22"> + android:pathData="M15.21,0.711H6.79C5.244,0.711 3.99,1.965 3.99,3.511V18.491C3.99,20.037 5.244,21.291 6.79,21.291H15.21C16.756,21.291 18.01,20.037 18.01,18.491V3.511C18.01,1.965 16.756,0.711 15.21,0.711Z" + android:fillColor="#1EAC61"/> + android:pathData="M15.73,3.85H6.28C5.855,3.85 5.51,4.194 5.51,4.62V16.19C5.51,16.615 5.855,16.96 6.28,16.96H15.73C16.155,16.96 16.5,16.615 16.5,16.19V4.62C16.5,4.194 16.155,3.85 15.73,3.85Z" + android:fillColor="#65DB9B"/> + android:pathData="M8.38,2.6C8.656,2.6 8.88,2.376 8.88,2.1C8.88,1.823 8.656,1.6 8.38,1.6C8.104,1.6 7.88,1.823 7.88,2.1C7.88,2.376 8.104,2.6 8.38,2.6Z" + android:fillColor="#0D8443"/> + android:pathData="M13.62,1.6H9.97C9.694,1.6 9.47,1.823 9.47,2.1C9.47,2.376 9.694,2.6 9.97,2.6H13.62C13.896,2.6 14.12,2.376 14.12,2.1C14.12,1.823 13.896,1.6 13.62,1.6Z" + android:fillColor="#0D8443"/> - - + android:pathData="M11,20.511C11.635,20.511 12.15,19.996 12.15,19.361C12.15,18.726 11.635,18.211 11,18.211C10.365,18.211 9.85,18.726 9.85,19.361C9.85,19.996 10.365,20.511 11,20.511Z" + android:fillColor="#0D8443"/> diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index bf3482521..fc9ccfc9b 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -136,11 +136,11 @@ 탈퇴하기 프로필 수정 터닝 커뮤니티 - 공지사항 + 공지사항 의견보내기 서비스 정보 - 서비스 이용약관 - 개인정보 처리방침 + 서비스 이용약관 + 개인정보 처리방침 버전정보