File tree Expand file tree Collapse file tree 8 files changed +342
-8
lines changed
java/com/comit/feature_mypage
navigator/src/main/java/com/comit/navigator Expand file tree Collapse file tree 8 files changed +342
-8
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
22
33object ProjectProperties{
44 const val VERSION_CODE = 1
5- const val VERSION_NAME = " 1.0.0 "
5+ const val VERSION_NAME = " 1.0.1 "
66
77 const val APPLICATION_ID = " com.comit.simtong"
88
Original file line number Diff line number Diff line change 11object Versions {
2- const val GOOGLE_SERVICE = " 4.3.10 "
2+ const val GOOGLE_SERVICE = " 4.3.14 "
33
44 const val FIREBASE_DISTRIBUTION = " 3.0.1"
55 const val GRADLE_FIREBASE_CRASHLYTICS = " 2.9.2"
Original file line number Diff line number Diff line change @@ -64,6 +64,7 @@ dependencies {
6464 implementation(Dependency .Compose .COMPOSE_ANI_NAV )
6565 implementation(Dependency .Compose .COMPOSE_LANDSCAPIST )
6666 implementation(Dependency .Compose .COMPOSE_HILT_NAV )
67+ implementation(Dependency .Compose .COMPOSE_WEBVOEW )
6768
6869 implementation(Dependency .COIL .COIL )
6970
Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ import androidx.navigation.compose.composable
77import androidx.navigation.navArgument
88import androidx.navigation.navigation
99import com.comit.feature_mypage.screen.MyPageScreen
10+ import com.comit.feature_mypage.screen.PrivacyPolicyScreen
1011import com.comit.feature_mypage.screen.fix.email.FixEmailInputCertificationScreen
1112import com.comit.feature_mypage.screen.fix.email.FixEmailScreen
1213import com.comit.feature_mypage.screen.fix.nickname.FixNickNameScreen
@@ -79,5 +80,13 @@ fun NavGraphBuilder.myPageNavigation(
7980 navController = navController,
8081 )
8182 }
83+
84+ composable(
85+ route = SimTongScreen .MyPage .PRIVACY_POLICY ,
86+ ) {
87+ PrivacyPolicyScreen {
88+ navController.popBackStack()
89+ }
90+ }
8291 }
8392}
Original file line number Diff line number Diff line change @@ -158,6 +158,17 @@ fun MyPageScreen(
158158 )
159159 }
160160 )
161+ MyPageDescription (
162+ title = stringResource(
163+ id = R .string.privacy_policy,
164+ ),
165+ content = null ,
166+ onClick = {
167+ navController.navigate(
168+ route = SimTongScreen .MyPage .PRIVACY_POLICY ,
169+ )
170+ }
171+ )
161172 MyPageDescriptionImage (
162173 title = stringResource(
163174 id = R .string.password_fix
@@ -310,7 +321,7 @@ private fun MyPageDescriptionNoClickable(
310321@Composable
311322private fun MyPageDescription (
312323 title : String ,
313- content : String ,
324+ content : String? ,
314325 onClick : (() -> Unit )? = null,
315326) {
316327 Row (
@@ -330,10 +341,12 @@ private fun MyPageDescription(
330341
331342 Spacer (modifier = Modifier .weight(1f ))
332343
333- Body5 (
334- text = content,
335- color = SimTongColor .Gray300
336- )
344+ if (content != null ) {
345+ Body5 (
346+ text = content,
347+ color = SimTongColor .Gray300
348+ )
349+ }
337350 }
338351}
339352
Load Diff Large diffs are not rendered by default.
Original file line number Diff line number Diff line change 55 <string name =" kr_workplace" >근무지점</string >
66 <string name =" kr_change_password" >비밀번호 변경</string >
77 <string name =" kr_edit" >수정</string >
8+ <string name =" privacy_policy" >개인정보처리방침</string >
89 <string name =" check" >확인</string >
910 <string name =" next" >다음</string >
1011 <string name =" left_time" >남은 시간</string >
3132 <string name =" certification_number_6" >인증번호(6자리)</string >
3233 <string name =" certification_number" >인증번호</string >
3334
34-
3535 <string name =" password_fix" >비밀번호 수정</string >
3636 <string name =" password_old_input" >기존 비밀번호 입력</string >
3737 <string name =" password_input" >비밀번호 입력</string >
Original file line number Diff line number Diff line change @@ -27,6 +27,7 @@ sealed class SimTongScreen(
2727 const val FIX_NICKNAME = " FIX_NICKNAME"
2828 const val FIX_PASSWORD = " FIX_PASSWORD"
2929 const val FIX_WORKPLACE = " FIX_WORKPLACE"
30+ const val PRIVACY_POLICY = " PRIVACY_POLICY"
3031 }
3132}
3233
You can’t perform that action at this time.
0 commit comments