diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1c2e3bca..d183abb0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -14,9 +14,17 @@
android:supportsRtl="true"
android:theme="@style/Theme.Umbbaandroid"
tools:targetApi="31">
+
+
(R.layout.activity_agree_privacy_use) {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+
+ setHyperLinkAndColorInTermsTextView()
+ setHyperLinkAndColorInPrivacyTextView()
+ }
+
+ private fun setHyperLinkAndColorInTermsTextView() {
+ with(binding) {
+ setHyperLinkToTextView("서비스 이용약관", tvAgreeTermsAndCondition, "https://www.notion.so/f1a14bf60ed4421f9b3761ef88906adb?pvs=4")
+ setLinkTextColorToBlack(tvAgreeTermsAndCondition)
+ setLinkBold(tvAgreeTermsAndCondition, 13)
+ }
+ }
+
+ private fun setHyperLinkAndColorInPrivacyTextView() {
+ with(binding) {
+ setHyperLinkToTextView("개인정보 수집 및 이용", tvAgreePrivacy, "https://www.notion.so/99fe0f58825d4f87bd3b987fadc623b6?pvs=4")
+ setLinkTextColorToBlack(tvAgreePrivacy)
+ setLinkBold(tvAgreePrivacy, 17)
+ }
+ }
+
+ private fun setHyperLinkToTextView(text: String, view: TextView, uri: String) {
+ val transform = Linkify.TransformFilter { match, url -> "" }
+ val pattern = Pattern.compile(text)
+
+ Linkify.addLinks(view, pattern, uri, null, transform)
+ }
+
+ private fun setLinkTextColorToBlack(view: TextView) {
+ view.setLinkTextColor(ContextCompat.getColor(this, R.color.umbba_black))
+ }
+
+ private fun setLinkBold(view: TextView, end: Int) {
+ val sentence = SpannableStringBuilder(view.text)
+ sentence.setSpan(StyleSpan(Typeface.BOLD), 5, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
+ view.text = sentence
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt
new file mode 100644
index 00000000..b42ee09f
--- /dev/null
+++ b/app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt
@@ -0,0 +1,12 @@
+package com.sopt.umbba_android.presentation.onboarding
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.sopt.umbba_android.R
+
+class OnboardingFinishActivity : AppCompatActivity() {
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContentView(R.layout.activity_onboarding_finish)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/res/color/sel_choice_chip_pri500_text.xml b/app/src/main/res/color/sel_choice_chip_text.xml
similarity index 100%
rename from app/src/main/res/color/sel_choice_chip_pri500_text.xml
rename to app/src/main/res/color/sel_choice_chip_text.xml
diff --git a/app/src/main/res/drawable/ic_check_48.xml b/app/src/main/res/drawable/ic_check_48.xml
new file mode 100644
index 00000000..1c5a4110
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check_48.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_circle_check_48.xml b/app/src/main/res/drawable/ic_circle_check_48.xml
new file mode 100644
index 00000000..5ae7daec
--- /dev/null
+++ b/app/src/main/res/drawable/ic_circle_check_48.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_no_check_48.xml b/app/src/main/res/drawable/ic_no_check_48.xml
new file mode 100644
index 00000000..2292f109
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_check_48.xml
@@ -0,0 +1,13 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_no_circle_check_48.xml b/app/src/main/res/drawable/ic_no_circle_check_48.xml
new file mode 100644
index 00000000..cdd69722
--- /dev/null
+++ b/app/src/main/res/drawable/ic_no_circle_check_48.xml
@@ -0,0 +1,20 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/sel_btn_next_agree.xml b/app/src/main/res/drawable/sel_btn_next_agree.xml
new file mode 100644
index 00000000..aa05795f
--- /dev/null
+++ b/app/src/main/res/drawable/sel_btn_next_agree.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_grey_line_1dp_rect.xml b/app/src/main/res/drawable/shape_grey_line_1dp_rect.xml
new file mode 100644
index 00000000..02041e7a
--- /dev/null
+++ b/app/src/main/res/drawable/shape_grey_line_1dp_rect.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_agree_privacy_use.xml b/app/src/main/res/layout/activity_agree_privacy_use.xml
new file mode 100644
index 00000000..178d03e9
--- /dev/null
+++ b/app/src/main/res/layout/activity_agree_privacy_use.xml
@@ -0,0 +1,204 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_invite.xml b/app/src/main/res/layout/activity_invite.xml
index 8c445931..9ce74588 100644
--- a/app/src/main/res/layout/activity_invite.xml
+++ b/app/src/main/res/layout/activity_invite.xml
@@ -28,7 +28,7 @@
style="@style/BrandTypeBigRegular20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="2dp"
android:text="@string/app_title"
android:textColor="@color/primary_500"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index cbb24183..2d624cb8 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -28,7 +28,7 @@
style="@style/BrandTypeBigRegular20"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_marginTop="16dp"
+ android:layout_marginTop="2dp"
android:text="@string/app_title"
android:textColor="@color/primary_500"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_onboarding_finish.xml b/app/src/main/res/layout/activity_onboarding_finish.xml
new file mode 100644
index 00000000..683863b7
--- /dev/null
+++ b/app/src/main/res/layout/activity_onboarding_finish.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_set_time.xml b/app/src/main/res/layout/activity_set_time.xml
index c431c186..9183298a 100644
--- a/app/src/main/res/layout/activity_set_time.xml
+++ b/app/src/main/res/layout/activity_set_time.xml
@@ -65,11 +65,9 @@
android:layout_marginHorizontal="24dp"
android:layout_marginVertical="24dp"
android:background="@drawable/sel_btn_next"
- android:enabled="true"
android:stateListAnimator="@null"
android:text="@string/btn_next"
- android:textColor="@color/white"
- android:textSize="16sp"
+ android:textColor="@color/umbba_white"
app:layout_constraintBottom_toBottomOf="parent" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f68c7856..21034a00 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -106,4 +106,16 @@
회원 탈퇴
계정 관리
+
+ 과거에 도착했어!\n앞으로 나눌 이야기가 많을 거야
+
+
+ 전체 동의하기
+ 본인은 만 14세 이상이며, 엄빠도 어렸다 서비스 이용약관, 개인정보 수집 및 이용에 모두 동의합니다.
+ [필수] 만 14세 이상입니다.
+ 엄빠도 어렸다 서비스를 이용하기 위해서는 만 14세 이상이 되어야 합니다. 만 14세 미만의 이용자의 경우 서비스 이용이 제한됩니다.
+ [필수] 서비스 이용약관에 동의합니다.
+ [필수] 개인정보 수집 및 이용에 동의합니다.
+ \'(주)이승준 컴퍼니\'(이하 \'회사\')가 운영하는 \'엄빠도 어렸다\'는 개인정보보호법 제30조 의거 이용자의 개인정보보호와 권익을 보호하고 관련된 고충 및 애로사항을 신속하게 처리하기 위해 아래의 개인정보처리방침을 제정·운영하고 있습니다.
+
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 14af760e..71d88aa6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -48,7 +48,7 @@
- @font/pretendard_regular
- normal
- 16sp
- - @color/sel_choice_chip_pri500_text
+ - @color/sel_choice_chip_text
- center
@@ -62,7 +62,7 @@
- @font/pretendard_regular
- normal
- 16sp
- - @color/sel_choice_chip_pri500_text
+ - @color/sel_choice_chip_text
- center