Publish v1.0.1

Team-ComIT · Dec 27, 2022 · ce71a77 · ce71a77
2 parents 56b1b3d + fe21a2e
commit ce71a77
Show file tree

Hide file tree

Showing 8 changed files with 342 additions and 8 deletions.
diff --git a/buildSrc/src/main/java/ProjectProperties.kt b/buildSrc/src/main/java/ProjectProperties.kt
@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
 
 object ProjectProperties{
     const val VERSION_CODE = 1
-    const val VERSION_NAME = "1.0.0"
+    const val VERSION_NAME = "1.0.1"
 
     const val APPLICATION_ID =  "com.comit.simtong"
 

diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -1,5 +1,5 @@
 object Versions {
-    const val GOOGLE_SERVICE = "4.3.10"
+    const val GOOGLE_SERVICE = "4.3.14"
 
     const val FIREBASE_DISTRIBUTION = "3.0.1"
     const val GRADLE_FIREBASE_CRASHLYTICS = "2.9.2"

diff --git a/feature/feature-mypage/build.gradle.kts b/feature/feature-mypage/build.gradle.kts
@@ -64,6 +64,7 @@ dependencies {
     implementation(Dependency.Compose.COMPOSE_ANI_NAV)
     implementation(Dependency.Compose.COMPOSE_LANDSCAPIST)
     implementation(Dependency.Compose.COMPOSE_HILT_NAV)
+    implementation(Dependency.Compose.COMPOSE_WEBVOEW)
 
     implementation(Dependency.COIL.COIL)
 

diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt
@@ -7,6 +7,7 @@ import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
 import androidx.navigation.navigation
 import com.comit.feature_mypage.screen.MyPageScreen
+import com.comit.feature_mypage.screen.PrivacyPolicyScreen
 import com.comit.feature_mypage.screen.fix.email.FixEmailInputCertificationScreen
 import com.comit.feature_mypage.screen.fix.email.FixEmailScreen
 import com.comit.feature_mypage.screen.fix.nickname.FixNickNameScreen
@@ -79,5 +80,13 @@ fun NavGraphBuilder.myPageNavigation(
                 navController = navController,
             )
         }
+
+        composable(
+            route = SimTongScreen.MyPage.PRIVACY_POLICY,
+        ) {
+            PrivacyPolicyScreen {
+                navController.popBackStack()
+            }
+        }
     }
 }
diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt
@@ -158,6 +158,17 @@ fun MyPageScreen(
                 )
             }
         )
+        MyPageDescription(
+            title = stringResource(
+                id = R.string.privacy_policy,
+            ),
+            content = null,
+            onClick = {
+                navController.navigate(
+                    route = SimTongScreen.MyPage.PRIVACY_POLICY,
+                )
+            }
+        )
         MyPageDescriptionImage(
             title = stringResource(
                 id = R.string.password_fix
@@ -310,7 +321,7 @@ private fun MyPageDescriptionNoClickable(
 @Composable
 private fun MyPageDescription(
     title: String,
-    content: String,
+    content: String?,
     onClick: (() -> Unit)? = null,
 ) {
     Row(
@@ -330,10 +341,12 @@ private fun MyPageDescription(
 
         Spacer(modifier = Modifier.weight(1f))
 
-        Body5(
-            text = content,
-            color = SimTongColor.Gray300
-        )
+        if (content != null) {
+            Body5(
+                text = content,
+                color = SimTongColor.Gray300
+            )
+        }
     }
 }
 

diff --git a/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/PrivacyPolicyScreen.kt b/feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/PrivacyPolicyScreen.kt
diff --git a/feature/feature-mypage/src/main/res/values/string.xml b/feature/feature-mypage/src/main/res/values/string.xml
@@ -5,6 +5,7 @@
     <string name="kr_workplace">근무지점</string>
     <string name="kr_change_password">비밀번호 변경</string>
     <string name="kr_edit">수정</string>
+    <string name="privacy_policy">개인정보처리방침</string>
     <string name="check">확인</string>
     <string name="next">다음</string>
     <string name="left_time">남은 시간</string>
@@ -31,7 +32,6 @@
     <string name="certification_number_6">인증번호(6자리)</string>
     <string name="certification_number">인증번호</string>
 
-
     <string name="password_fix">비밀번호 수정</string>
     <string name="password_old_input">기존 비밀번호 입력</string>
     <string name="password_input">비밀번호 입력</string>

diff --git a/navigator/src/main/java/com/comit/navigator/SimTongScreen.kt b/navigator/src/main/java/com/comit/navigator/SimTongScreen.kt
@@ -27,6 +27,7 @@ sealed class SimTongScreen(
         const val FIX_NICKNAME = "FIX_NICKNAME"
         const val FIX_PASSWORD = "FIX_PASSWORD"
         const val FIX_WORKPLACE = "FIX_WORKPLACE"
+        const val PRIVACY_POLICY = "PRIVACY_POLICY"
     }
 }