From fd81c50691082396e05197b65f7a1f8f5a2a1ec0 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:53:44 +0900 Subject: [PATCH 01/12] =?UTF-8?q?[Chore/#37]=20AndroidManifest=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1c2e3bca..611fb21c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,9 +14,13 @@ android:supportsRtl="true" android:theme="@style/Theme.Umbbaandroid" tools:targetApi="31"> + Date: Mon, 10 Jul 2023 22:54:34 +0900 Subject: [PATCH 02/12] =?UTF-8?q?[Chore/#37]=20String=20=EC=B6=94=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f68c7856..e38292ac 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -106,4 +106,7 @@ 회원 탈퇴 계정 관리 + + 과거에 도착했어!\n앞으로 나눌 이야기가 많을 거야 + \ No newline at end of file From ee4ed697ed20539eff27476dbe4082c1c716f292 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:55:26 +0900 Subject: [PATCH 03/12] =?UTF-8?q?[Chore/#37]=20=EC=83=89=EC=83=81=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=ED=95=84=EC=9A=94=EC=97=86?= =?UTF-8?q?=EB=8A=94=20=EC=98=B5=EC=85=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_set_time.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/app/src/main/res/layout/activity_set_time.xml b/app/src/main/res/layout/activity_set_time.xml index 9c3e56dc..b61dee33 100644 --- a/app/src/main/res/layout/activity_set_time.xml +++ b/app/src/main/res/layout/activity_set_time.xml @@ -60,11 +60,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" /> From fcac9a6f1d3e5b128af8606c362ca41759241abe Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:55:53 +0900 Subject: [PATCH 04/12] =?UTF-8?q?[Design/#37]=20OnboardingFinishActivity?= =?UTF-8?q?=20UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../onboarding/OnboardingFinishActivity.kt | 12 +++++ .../res/layout/activity_onboarding_finish.xml | 47 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/onboarding/OnboardingFinishActivity.kt create mode 100644 app/src/main/res/layout/activity_onboarding_finish.xml 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/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 From c4891593046e9f1e76348d9a545e9c1587cd821a Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 23:18:18 +0900 Subject: [PATCH 05/12] =?UTF-8?q?[Chore/#37]=20=EB=84=A4=EC=9D=B4=EB=B0=8D?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...l_choice_chip_pri500_text.xml => sel_choice_chip_text.xml} | 0 app/src/main/res/values/styles.xml | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) rename app/src/main/res/color/{sel_choice_chip_pri500_text.xml => sel_choice_chip_text.xml} (100%) 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/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 From d7afbcafe1c3135ef5e53d0d46a46ff3db8519b0 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 00:03:17 +0900 Subject: [PATCH 06/12] =?UTF-8?q?[Chore/#37]=20svg=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/ic_check_48.xml | 13 ++++++++++++ .../main/res/drawable/ic_circle_check_48.xml | 20 +++++++++++++++++++ app/src/main/res/drawable/ic_no_check_48.xml | 13 ++++++++++++ .../res/drawable/ic_no_circle_check_48.xml | 20 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 app/src/main/res/drawable/ic_check_48.xml create mode 100644 app/src/main/res/drawable/ic_circle_check_48.xml create mode 100644 app/src/main/res/drawable/ic_no_check_48.xml create mode 100644 app/src/main/res/drawable/ic_no_circle_check_48.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 @@ + + + + From 0c9262e7075149fdf85eae6b9f6493d550526170 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 00:03:47 +0900 Subject: [PATCH 07/12] =?UTF-8?q?[Chore/#37]=20margin=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_invite.xml | 2 +- app/src/main/res/layout/activity_login.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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" From 96fee4b19329f78343241a4fe4ecad886a57f289 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 00:04:04 +0900 Subject: [PATCH 08/12] =?UTF-8?q?[Design/#37]=20=EB=B2=84=ED=8A=BC=20selec?= =?UTF-8?q?tor=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/sel_btn_next_agree.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/src/main/res/drawable/sel_btn_next_agree.xml 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 From f1a3f0c5e766417ebea3b2baa71a76d60950f2fb Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 02:55:21 +0900 Subject: [PATCH 09/12] =?UTF-8?q?[Design/#37]=20line=20shape=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/drawable/shape_grey_line_1dp_rect.xml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 app/src/main/res/drawable/shape_grey_line_1dp_rect.xml 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 From e2b96e9d077130881040d65e4097c26ebc87cba7 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 02:55:47 +0900 Subject: [PATCH 10/12] =?UTF-8?q?[Chore/#37]=20String=20=EC=B6=94=EC=B6=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index e38292ac..21034a00 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -109,4 +109,13 @@ 과거에 도착했어!\n앞으로 나눌 이야기가 많을 거야 + + 전체 동의하기 + 본인은 만 14세 이상이며, 엄빠도 어렸다 서비스 이용약관, 개인정보 수집 및 이용에 모두 동의합니다. + [필수] 만 14세 이상입니다. + 엄빠도 어렸다 서비스를 이용하기 위해서는 만 14세 이상이 되어야 합니다. 만 14세 미만의 이용자의 경우 서비스 이용이 제한됩니다. + [필수] 서비스 이용약관에 동의합니다. + [필수] 개인정보 수집 및 이용에 동의합니다. + \'(주)이승준 컴퍼니\'(이하 \'회사\')가 운영하는 \'엄빠도 어렸다\'는 개인정보보호법 제30조 의거 이용자의 개인정보보호와 권익을 보호하고 관련된 고충 및 애로사항을 신속하게 처리하기 위해 아래의 개인정보처리방침을 제정·운영하고 있습니다. + \ No newline at end of file From e33aa89228bfbcfbd0a584eb9e6174474d6cc22d Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 02:58:06 +0900 Subject: [PATCH 11/12] =?UTF-8?q?[Design/#37]=20AgreePrivacyUseActivity=20?= =?UTF-8?q?UI=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 + .../res/layout/activity_agree_privacy_use.xml | 204 ++++++++++++++++++ 2 files changed, 208 insertions(+) create mode 100644 app/src/main/res/layout/activity_agree_privacy_use.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 611fb21c..d183abb0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -14,6 +14,10 @@ android:supportsRtl="true" android:theme="@style/Theme.Umbbaandroid" tools:targetApi="31"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 518bbee558385ecf3cdfef3262f1b228d2020f91 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Tue, 11 Jul 2023 02:58:39 +0900 Subject: [PATCH 12/12] =?UTF-8?q?[Feat/#37]=20=ED=8A=B9=EC=A0=95=20?= =?UTF-8?q?=EA=B8=80=EC=9E=90=20=ED=95=98=EC=9D=B4=ED=8D=BC=EB=A7=81?= =?UTF-8?q?=ED=81=AC=20=EC=82=BD=EC=9E=85,=20=EC=BB=AC=EB=9F=AC=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD,=20=EB=B3=BC=EB=93=9C=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../login/AgreePrivacyUseActivity.kt | 58 +++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 app/src/main/java/com/sopt/umbba_android/presentation/login/AgreePrivacyUseActivity.kt diff --git a/app/src/main/java/com/sopt/umbba_android/presentation/login/AgreePrivacyUseActivity.kt b/app/src/main/java/com/sopt/umbba_android/presentation/login/AgreePrivacyUseActivity.kt new file mode 100644 index 00000000..3de98783 --- /dev/null +++ b/app/src/main/java/com/sopt/umbba_android/presentation/login/AgreePrivacyUseActivity.kt @@ -0,0 +1,58 @@ +package com.sopt.umbba_android.presentation.login + +import android.graphics.Typeface +import android.os.Bundle +import android.text.Spannable +import android.text.SpannableStringBuilder +import android.text.style.StyleSpan +import android.text.util.Linkify +import android.view.View +import android.widget.TextView +import androidx.core.content.ContextCompat +import com.sopt.umbba_android.R +import com.sopt.umbba_android.databinding.ActivityAgreePrivacyUseBinding +import com.sopt.umbba_android.util.binding.BindingActivity +import java.util.regex.Pattern + +class AgreePrivacyUseActivity : BindingActivity(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