Skip to content

Commit ce71a77

Browse files
authored
Publish v1.0.1
2 parents 56b1b3d + fe21a2e commit ce71a77

File tree

8 files changed

+342
-8
lines changed

8 files changed

+342
-8
lines changed

buildSrc/src/main/java/ProjectProperties.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.gradle.api.JavaVersion
22

33
object 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

buildSrc/src/main/java/Versions.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object 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"

feature/feature-mypage/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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

feature/feature-mypage/src/main/java/com/comit/feature_mypage/navigation/MyPageNavigation.kt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import androidx.navigation.compose.composable
77
import androidx.navigation.navArgument
88
import androidx.navigation.navigation
99
import com.comit.feature_mypage.screen.MyPageScreen
10+
import com.comit.feature_mypage.screen.PrivacyPolicyScreen
1011
import com.comit.feature_mypage.screen.fix.email.FixEmailInputCertificationScreen
1112
import com.comit.feature_mypage.screen.fix.email.FixEmailScreen
1213
import 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
}

feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/MyPageScreen.kt

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff 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
311322
private 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

feature/feature-mypage/src/main/java/com/comit/feature_mypage/screen/PrivacyPolicyScreen.kt

Lines changed: 310 additions & 0 deletions
Large diffs are not rendered by default.

feature/feature-mypage/src/main/res/values/string.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
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>
@@ -31,7 +32,6 @@
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>

navigator/src/main/java/com/comit/navigator/SimTongScreen.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff 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

0 commit comments

Comments
 (0)