From 0b4625dc22b4b43613d6f565e8cb53b405da8e0f Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 14:39:48 +0900 Subject: [PATCH 01/19] =?UTF-8?q?[Design/#29]=20color,=20shape,=20logo=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/drawable/ic_kakao_talk_logo.xml | 9 ++ app/src/main/res/drawable/ic_umbba_logo.xml | 123 ++++++++++++++++++ .../drawable/shape_gradient_btn_r50_rect.xml | 10 ++ .../drawable/shape_primary_btn_r50_rect.xml | 8 ++ .../drawable/shape_yellow_btn_r50_rect.xml | 5 + app/src/main/res/values/colors.xml | 24 ++-- 6 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 app/src/main/res/drawable/ic_kakao_talk_logo.xml create mode 100644 app/src/main/res/drawable/ic_umbba_logo.xml create mode 100644 app/src/main/res/drawable/shape_gradient_btn_r50_rect.xml create mode 100644 app/src/main/res/drawable/shape_primary_btn_r50_rect.xml create mode 100644 app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml diff --git a/app/src/main/res/drawable/ic_kakao_talk_logo.xml b/app/src/main/res/drawable/ic_kakao_talk_logo.xml new file mode 100644 index 00000000..e55852a4 --- /dev/null +++ b/app/src/main/res/drawable/ic_kakao_talk_logo.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_umbba_logo.xml b/app/src/main/res/drawable/ic_umbba_logo.xml new file mode 100644 index 00000000..47ab9b42 --- /dev/null +++ b/app/src/main/res/drawable/ic_umbba_logo.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/shape_gradient_btn_r50_rect.xml b/app/src/main/res/drawable/shape_gradient_btn_r50_rect.xml new file mode 100644 index 00000000..8a7f637c --- /dev/null +++ b/app/src/main/res/drawable/shape_gradient_btn_r50_rect.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_primary_btn_r50_rect.xml b/app/src/main/res/drawable/shape_primary_btn_r50_rect.xml new file mode 100644 index 00000000..95b520e6 --- /dev/null +++ b/app/src/main/res/drawable/shape_primary_btn_r50_rect.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml b/app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml new file mode 100644 index 00000000..9377c17e --- /dev/null +++ b/app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0bee65f6..d8246a77 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -8,15 +8,6 @@ #F0EBE8 #BBADA4 - #D2D2D2 - #666666 - #999999 - #CFCFCF - #EAEAEA - #D4D4D4 - #747474 - #E5E5E5 - #FF3A1F #419277 #32211B @@ -26,6 +17,21 @@ #E99F74 #C87759 + #F8C8AE + #EBA787 + #D87E7E + + #FBE44D + + #D2D2D2 + #666666 + #999999 + #CFCFCF + #EAEAEA + #D4D4D4 + #747474 + #E5E5E5 + #BABABA #808080 #D4D4D4 From d6693e9d7c5f545fe9c27872e4a75e24801dd272 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 14:40:04 +0900 Subject: [PATCH 02/19] =?UTF-8?q?[Chore/#29]=20String=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/values/strings.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 677e5570..0b786852 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -8,14 +8,15 @@ 초대코드를\n입력해주세요. - 부모와 떠나는 시간 여행 + 엄빠도 어렸다 + 처음부터 다시 나누는 이야기 카카오로 로그인 시작하기 ----------------- or ---------------- 초대 코드를 받으셨나요? - 초대코드 입력하기 + 초대코드로 시작하기 환영해!\n너에 대해 알려줘! From bffc4697005550d05a53e6897f6e460ba250e550 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 14:40:38 +0900 Subject: [PATCH 03/19] =?UTF-8?q?[Design/#29]=20=EB=A1=9C=EA=B3=A0,=20?= =?UTF-8?q?=EC=84=A4=EB=AA=85=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=83=89=EC=83=81=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 | 39 ++++++++++++++------- app/src/main/res/layout/activity_login.xml | 39 +++++++++++++++------ 2 files changed, 55 insertions(+), 23 deletions(-) diff --git a/app/src/main/res/layout/activity_invite.xml b/app/src/main/res/layout/activity_invite.xml index 7ddf358c..1b89cd29 100644 --- a/app/src/main/res/layout/activity_invite.xml +++ b/app/src/main/res/layout/activity_invite.xml @@ -10,37 +10,50 @@ + + diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 6f40f9af..cbb24183 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -10,39 +10,58 @@ + + From 8b99cf7900857cb66e2a1caef619aefb86559c52 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 16:16:15 +0900 Subject: [PATCH 04/19] =?UTF-8?q?[Chore/#29]=20selector=20color=20?= =?UTF-8?q?=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/color/sel_invite_code_input_layout.xml | 5 ++--- app/src/main/res/drawable/sel_btn_next.xml | 4 ++-- ...pe_g300_fill_r50_rect.xml => shape_g400_btn_r50_rect.xml} | 2 +- app/src/main/res/values/colors.xml | 1 + app/src/main/res/values/styles.xml | 1 + 5 files changed, 7 insertions(+), 6 deletions(-) rename app/src/main/res/drawable/{shape_g300_fill_r50_rect.xml => shape_g400_btn_r50_rect.xml} (79%) diff --git a/app/src/main/res/color/sel_invite_code_input_layout.xml b/app/src/main/res/color/sel_invite_code_input_layout.xml index 4a7dac16..38ae59f0 100644 --- a/app/src/main/res/color/sel_invite_code_input_layout.xml +++ b/app/src/main/res/color/sel_invite_code_input_layout.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/sel_btn_next.xml b/app/src/main/res/drawable/sel_btn_next.xml index 7d83ff02..3b74f5e3 100644 --- a/app/src/main/res/drawable/sel_btn_next.xml +++ b/app/src/main/res/drawable/sel_btn_next.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml b/app/src/main/res/drawable/shape_g400_btn_r50_rect.xml similarity index 79% rename from app/src/main/res/drawable/shape_g300_fill_r50_rect.xml rename to app/src/main/res/drawable/shape_g400_btn_r50_rect.xml index b7b8886c..1d2cb467 100644 --- a/app/src/main/res/drawable/shape_g300_fill_r50_rect.xml +++ b/app/src/main/res/drawable/shape_g400_btn_r50_rect.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d8246a77..35c85a84 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,6 +3,7 @@ #FF000000 #FFFFFFFF #99000000 + #80FFFFFF #F7F2F0 #F0EBE8 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 33e0df03..16ae7387 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,6 +17,7 @@ @drawable/ic_close @color/error_red @style/ErrorTextAppearance + @color/grey_800 50dp 50dp From abe307b8b5c49d7024367ddad0de57c82a959e3e Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 16:16:29 +0900 Subject: [PATCH 05/19] =?UTF-8?q?[Chore/#29]=20String=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/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b786852..2f2ac72c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,8 +4,8 @@ 다음으로 - 초대 코드를 입력해주세요. - 초대코드를\n입력해주세요. + ex) ORWO-11yzwx + 초대코드를 입력해줘 엄빠도 어렸다 From 75cb31b343316329d89c2c1839140f7eebcfc1e5 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 16:16:59 +0900 Subject: [PATCH 06/19] =?UTF-8?q?[Chore/#29]=20Color,=20Style=20=EB=B3=80?= =?UTF-8?q?=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_code.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml index 49d2f403..f3406923 100644 --- a/app/src/main/res/layout/activity_invite_code.xml +++ b/app/src/main/res/layout/activity_invite_code.xml @@ -10,7 +10,8 @@ + android:layout_height="match_parent" + android:background="@color/umbba_white"> @@ -50,6 +53,7 @@ Date: Mon, 10 Jul 2023 16:46:16 +0900 Subject: [PATCH 07/19] =?UTF-8?q?[Chore/#29]=20Color=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/color/sel_choice_chip_color.xml | 2 +- .../main/res/color/sel_choice_chip_stroke.xml | 4 +- .../main/res/color/sel_choice_chip_text.xml | 4 +- .../main/res/layout/activity_input_info.xml | 39 ++++++++++--------- 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/app/src/main/res/color/sel_choice_chip_color.xml b/app/src/main/res/color/sel_choice_chip_color.xml index ff88be7b..fbe4183b 100644 --- a/app/src/main/res/color/sel_choice_chip_color.xml +++ b/app/src/main/res/color/sel_choice_chip_color.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/color/sel_choice_chip_stroke.xml b/app/src/main/res/color/sel_choice_chip_stroke.xml index 5ab4bdf3..f8c74bc0 100644 --- a/app/src/main/res/color/sel_choice_chip_stroke.xml +++ b/app/src/main/res/color/sel_choice_chip_stroke.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/color/sel_choice_chip_text.xml b/app/src/main/res/color/sel_choice_chip_text.xml index 2d37d04b..77bf369d 100644 --- a/app/src/main/res/color/sel_choice_chip_text.xml +++ b/app/src/main/res/color/sel_choice_chip_text.xml @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml index c9b2d97f..645e44e4 100644 --- a/app/src/main/res/layout/activity_input_info.xml +++ b/app/src/main/res/layout/activity_input_info.xml @@ -13,6 +13,7 @@ - - + app:layout_constraintTop_toBottomOf="@id/layout_appbar"> + + + app:layout_constraintTop_toBottomOf="@id/tv_introduce_user"> + android:textColor="@color/umbba_black" /> @@ -128,6 +127,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintHorizontal_weight="1" app:layout_constraintTop_toBottomOf="@id/tv_sex" + app:selectionRequired="true" app:singleLine="true" app:singleSelection="true"> @@ -188,11 +188,11 @@ + android:textColor="@color/black" /> @@ -203,6 +203,7 @@ Date: Mon, 10 Jul 2023 16:46:38 +0900 Subject: [PATCH 08/19] =?UTF-8?q?[Chore/#29]=20String=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/values/strings.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2f2ac72c..c443312a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,14 +19,14 @@ 초대코드로 시작하기 - 환영해!\n너에 대해 알려줘! + 반가워!\n너에 대해 알고 싶어 너의 이름이 뭐야? 너의 성별을 알려줘! 남자 여자 - 이름을 입력해 주세요. + ex) 홍길동 태어난 연도는 언제야? - 태어난 연도를 입력해 주세요. + ex) 1988 지금부터\n먼 과거로 시간여행을 떠날 거야 From 3462e36cb511951d742683dbaf5ccc51dd2e9d73 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 16:53:18 +0900 Subject: [PATCH 09/19] =?UTF-8?q?[Chore/#29]=20String=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_select_family.xml | 5 ++++- app/src/main/res/values/strings.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/activity_select_family.xml b/app/src/main/res/layout/activity_select_family.xml index c941ed0b..32b41c51 100644 --- a/app/src/main/res/layout/activity_select_family.xml +++ b/app/src/main/res/layout/activity_select_family.xml @@ -13,6 +13,7 @@ @@ -120,6 +121,7 @@ app:chipSpacingHorizontal="13dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_more" + app:selectionRequired="true" app:singleLine="true" app:singleSelection="true"> @@ -145,6 +147,7 @@ ex) 1988 - 지금부터\n먼 과거로 시간여행을 떠날 거야 + 오늘부터 매일,\n과거로 시간여행을 떠날 거야 누구와 떠날래? 부모님 자식 From 8a442aecbf2d6fcfb25a254358d135de088d3ad5 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 21:57:21 +0900 Subject: [PATCH 10/19] =?UTF-8?q?[Design/#29]=20=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20shape,=20selector,=20svg=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/res/color/sel_btn_pri500_text.xml | 5 + .../color/sel_choice_chip_pri600_color.xml | 5 + .../main/res/drawable/ic_umbba_logo_big.xml | 123 ++++++++++++++++++ app/src/main/res/drawable/sel_btn_answer.xml | 5 + .../drawable/shape_pri500_btn_r50_rect.xml | 8 ++ .../drawable/shape_pri500_stroke_r56_rect.xml | 8 ++ 6 files changed, 154 insertions(+) create mode 100644 app/src/main/res/color/sel_btn_pri500_text.xml create mode 100644 app/src/main/res/color/sel_choice_chip_pri600_color.xml create mode 100644 app/src/main/res/drawable/ic_umbba_logo_big.xml create mode 100644 app/src/main/res/drawable/sel_btn_answer.xml create mode 100644 app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml create mode 100644 app/src/main/res/drawable/shape_pri500_stroke_r56_rect.xml diff --git a/app/src/main/res/color/sel_btn_pri500_text.xml b/app/src/main/res/color/sel_btn_pri500_text.xml new file mode 100644 index 00000000..24904c6d --- /dev/null +++ b/app/src/main/res/color/sel_btn_pri500_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/sel_choice_chip_pri600_color.xml b/app/src/main/res/color/sel_choice_chip_pri600_color.xml new file mode 100644 index 00000000..ff88be7b --- /dev/null +++ b/app/src/main/res/color/sel_choice_chip_pri600_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_umbba_logo_big.xml b/app/src/main/res/drawable/ic_umbba_logo_big.xml new file mode 100644 index 00000000..508bca94 --- /dev/null +++ b/app/src/main/res/drawable/ic_umbba_logo_big.xml @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/sel_btn_answer.xml b/app/src/main/res/drawable/sel_btn_answer.xml new file mode 100644 index 00000000..cf8078c0 --- /dev/null +++ b/app/src/main/res/drawable/sel_btn_answer.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml b/app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml new file mode 100644 index 00000000..43aa0375 --- /dev/null +++ b/app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_pri500_stroke_r56_rect.xml b/app/src/main/res/drawable/shape_pri500_stroke_r56_rect.xml new file mode 100644 index 00000000..0abd139d --- /dev/null +++ b/app/src/main/res/drawable/shape_pri500_stroke_r56_rect.xml @@ -0,0 +1,8 @@ + + + + + + \ No newline at end of file From 774c8c0d172dd1033296e16930f034b58336010c Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 21:58:35 +0900 Subject: [PATCH 11/19] =?UTF-8?q?[Chore/#29]=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 --- ...sel_choice_chip_color.xml => sel_choice_chip_pri500_color.xml} | 0 ...l_choice_chip_stroke.xml => sel_choice_chip_pri500_stroke.xml} | 0 .../{sel_choice_chip_text.xml => sel_choice_chip_pri500_text.xml} | 0 ...mary_btn_r50_rect.xml => shape_pri500_btn_stroke_r50_rect.xml} | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename app/src/main/res/color/{sel_choice_chip_color.xml => sel_choice_chip_pri500_color.xml} (100%) rename app/src/main/res/color/{sel_choice_chip_stroke.xml => sel_choice_chip_pri500_stroke.xml} (100%) rename app/src/main/res/color/{sel_choice_chip_text.xml => sel_choice_chip_pri500_text.xml} (100%) rename app/src/main/res/drawable/{shape_primary_btn_r50_rect.xml => shape_pri500_btn_stroke_r50_rect.xml} (100%) diff --git a/app/src/main/res/color/sel_choice_chip_color.xml b/app/src/main/res/color/sel_choice_chip_pri500_color.xml similarity index 100% rename from app/src/main/res/color/sel_choice_chip_color.xml rename to app/src/main/res/color/sel_choice_chip_pri500_color.xml diff --git a/app/src/main/res/color/sel_choice_chip_stroke.xml b/app/src/main/res/color/sel_choice_chip_pri500_stroke.xml similarity index 100% rename from app/src/main/res/color/sel_choice_chip_stroke.xml rename to app/src/main/res/color/sel_choice_chip_pri500_stroke.xml diff --git a/app/src/main/res/color/sel_choice_chip_text.xml b/app/src/main/res/color/sel_choice_chip_pri500_text.xml similarity index 100% rename from app/src/main/res/color/sel_choice_chip_text.xml rename to app/src/main/res/color/sel_choice_chip_pri500_text.xml diff --git a/app/src/main/res/drawable/shape_primary_btn_r50_rect.xml b/app/src/main/res/drawable/shape_pri500_btn_stroke_r50_rect.xml similarity index 100% rename from app/src/main/res/drawable/shape_primary_btn_r50_rect.xml rename to app/src/main/res/drawable/shape_pri500_btn_stroke_r50_rect.xml From 2c23f9b073c35a043f410643d66777dc3340f0af Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 21:59:13 +0900 Subject: [PATCH 12/19] =?UTF-8?q?[Delete/#29]=20=EC=95=88=20=EC=93=B0?= =?UTF-8?q?=EB=8A=94=20shape=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/color/sel_answer_input_layout.xml | 1 - app/src/main/res/drawable/shape_black_fill_r50_rect.xml | 6 ------ app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml | 6 ------ app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml | 6 ------ app/src/main/res/drawable/shape_grey_line_3dp_rect.xml | 5 ----- 5 files changed, 24 deletions(-) delete mode 100644 app/src/main/res/drawable/shape_black_fill_r50_rect.xml delete mode 100644 app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml delete mode 100644 app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml delete mode 100644 app/src/main/res/drawable/shape_grey_line_3dp_rect.xml diff --git a/app/src/main/res/color/sel_answer_input_layout.xml b/app/src/main/res/color/sel_answer_input_layout.xml index 000393a1..072631a9 100644 --- a/app/src/main/res/color/sel_answer_input_layout.xml +++ b/app/src/main/res/color/sel_answer_input_layout.xml @@ -1,5 +1,4 @@ - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_black_fill_r50_rect.xml b/app/src/main/res/drawable/shape_black_fill_r50_rect.xml deleted file mode 100644 index b362503b..00000000 --- a/app/src/main/res/drawable/shape_black_fill_r50_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml b/app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml deleted file mode 100644 index 6bec40f4..00000000 --- a/app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml b/app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml deleted file mode 100644 index 9b7ee7f2..00000000 --- a/app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_line_3dp_rect.xml b/app/src/main/res/drawable/shape_grey_line_3dp_rect.xml deleted file mode 100644 index d88dbc3e..00000000 --- a/app/src/main/res/drawable/shape_grey_line_3dp_rect.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From 41717ef07d806c3823e1904d97ce24a4aad4a0b1 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:00:44 +0900 Subject: [PATCH 13/19] =?UTF-8?q?[Chore/#29]=20Color=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._choice_chip_text.xml => sel_choice_chip_pri600_text.xml} | 2 +- app/src/main/res/drawable/progress_bar_quest.xml | 4 ++-- ...d4d4_stroke_r8_rect.xml => shape_g400_stroke_r8_rect.xml} | 2 +- app/src/main/res/drawable/shape_grey_btn_r50_stroke_rect.xml | 4 ++-- app/src/main/res/drawable/shape_grey_fill_r17_rect.xml | 5 ++++- ..._appbar_r68_rect.xml => shape_pri500_appbar_r68_rect.xml} | 2 +- ...hape_grey_fill_r84_rect.xml => shape_pri600_r84_rect.xml} | 2 +- ...y_dialog_r16_rect.xml => shape_white_dialog_r16_rect.xml} | 4 ++-- 8 files changed, 14 insertions(+), 11 deletions(-) rename app/src/main/res/color/{sel_quest_choice_chip_text.xml => sel_choice_chip_pri600_text.xml} (68%) rename app/src/main/res/drawable/{shape_gd4d4_stroke_r8_rect.xml => shape_g400_stroke_r8_rect.xml} (82%) rename app/src/main/res/drawable/{shape_grey_appbar_r68_rect.xml => shape_pri500_appbar_r68_rect.xml} (78%) rename app/src/main/res/drawable/{shape_grey_fill_r84_rect.xml => shape_pri600_r84_rect.xml} (78%) rename app/src/main/res/drawable/{shape_grey_dialog_r16_rect.xml => shape_white_dialog_r16_rect.xml} (69%) diff --git a/app/src/main/res/color/sel_quest_choice_chip_text.xml b/app/src/main/res/color/sel_choice_chip_pri600_text.xml similarity index 68% rename from app/src/main/res/color/sel_quest_choice_chip_text.xml rename to app/src/main/res/color/sel_choice_chip_pri600_text.xml index 6ec7b527..ebf94774 100644 --- a/app/src/main/res/color/sel_quest_choice_chip_text.xml +++ b/app/src/main/res/color/sel_choice_chip_pri600_text.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/progress_bar_quest.xml b/app/src/main/res/drawable/progress_bar_quest.xml index 8dbcdcf4..bc7cb671 100644 --- a/app/src/main/res/drawable/progress_bar_quest.xml +++ b/app/src/main/res/drawable/progress_bar_quest.xml @@ -3,7 +3,7 @@ - + @@ -16,7 +16,7 @@ - + diff --git a/app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml b/app/src/main/res/drawable/shape_g400_stroke_r8_rect.xml similarity index 82% rename from app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml rename to app/src/main/res/drawable/shape_g400_stroke_r8_rect.xml index 9c610b55..259c6979 100644 --- a/app/src/main/res/drawable/shape_gd4d4_stroke_r8_rect.xml +++ b/app/src/main/res/drawable/shape_g400_stroke_r8_rect.xml @@ -4,5 +4,5 @@ + android:color="@color/grey_400" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_btn_r50_stroke_rect.xml b/app/src/main/res/drawable/shape_grey_btn_r50_stroke_rect.xml index cf08605d..41afaa9a 100644 --- a/app/src/main/res/drawable/shape_grey_btn_r50_stroke_rect.xml +++ b/app/src/main/res/drawable/shape_grey_btn_r50_stroke_rect.xml @@ -1,6 +1,6 @@ - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_fill_r17_rect.xml b/app/src/main/res/drawable/shape_grey_fill_r17_rect.xml index 88419370..a6376658 100644 --- a/app/src/main/res/drawable/shape_grey_fill_r17_rect.xml +++ b/app/src/main/res/drawable/shape_grey_fill_r17_rect.xml @@ -2,5 +2,8 @@ - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_appbar_r68_rect.xml b/app/src/main/res/drawable/shape_pri500_appbar_r68_rect.xml similarity index 78% rename from app/src/main/res/drawable/shape_grey_appbar_r68_rect.xml rename to app/src/main/res/drawable/shape_pri500_appbar_r68_rect.xml index 6827282d..edd8419a 100644 --- a/app/src/main/res/drawable/shape_grey_appbar_r68_rect.xml +++ b/app/src/main/res/drawable/shape_pri500_appbar_r68_rect.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_fill_r84_rect.xml b/app/src/main/res/drawable/shape_pri600_r84_rect.xml similarity index 78% rename from app/src/main/res/drawable/shape_grey_fill_r84_rect.xml rename to app/src/main/res/drawable/shape_pri600_r84_rect.xml index dd094136..d9805d71 100644 --- a/app/src/main/res/drawable/shape_grey_fill_r84_rect.xml +++ b/app/src/main/res/drawable/shape_pri600_r84_rect.xml @@ -2,5 +2,5 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_grey_dialog_r16_rect.xml b/app/src/main/res/drawable/shape_white_dialog_r16_rect.xml similarity index 69% rename from app/src/main/res/drawable/shape_grey_dialog_r16_rect.xml rename to app/src/main/res/drawable/shape_white_dialog_r16_rect.xml index 3271384f..96a2637b 100644 --- a/app/src/main/res/drawable/shape_grey_dialog_r16_rect.xml +++ b/app/src/main/res/drawable/shape_white_dialog_r16_rect.xml @@ -4,6 +4,6 @@ - + android:color="@color/umbba_white" /> + \ No newline at end of file From ecce56bdf3e60da717b53228f55b6552c852d3b3 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:01:18 +0900 Subject: [PATCH 14/19] =?UTF-8?q?[Chore/#29]=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 --- app/src/main/res/drawable/inset_dialog_background.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/drawable/inset_dialog_background.xml b/app/src/main/res/drawable/inset_dialog_background.xml index 906623d0..8fac46dc 100644 --- a/app/src/main/res/drawable/inset_dialog_background.xml +++ b/app/src/main/res/drawable/inset_dialog_background.xml @@ -1,6 +1,6 @@ \ No newline at end of file From ec4c0f3d205b2268fba3b575dc03ceebf7851caa Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:03:13 +0900 Subject: [PATCH 15/19] =?UTF-8?q?[Chore/#29]=20placeholder=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index be39ea20..20f6ae5f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -15,7 +15,7 @@ 시작하기 ----------------- or ---------------- - 초대 코드를 받으셨나요? + 카카오톡 초대 코드를 받고 왔어요 초대코드로 시작하기 @@ -41,16 +41,16 @@ 매일 밤\n교신을 보내줄게 - 선택한 시간에 따라 푸시 알림을 보내드립니다 + 선택한 시간에 따라 푸시 알림을 보내드려요 과거로 떠나기 - 매일 밤 11시에\n타임머신을 보내줄게 + 매일 밤 11시에\n교신을 보내줄게 거의 다 왔어! 조금만 힘내줘! 간단한 질문에\n답해줘 - 해당 답변은 추후 제공될 질문을 구성하는 데 이용됩니다. + 해당 답변은 추후 제공될 질문을 구성하는 데 이용돼요 설정 @@ -60,9 +60,9 @@ 공지사항 - 답변을 입력해주세요. + 상대방은 아직 답변하지 않았어요 #1 가장 오래된 기억 - 당신과 어머니의 꿈은 달라? + 할머니와 엄마의 꿈이 달랐어? 답변하기 @@ -74,8 +74,7 @@ 질문 답변하기 - 아직 상대가 도착하지 않았어요 - 연결 후 문답을 시작해요 + 상대에게 교신을 보낼 차례야\n초대를 수락받으면 문답이 시작돼 초대코드 복사 초대장 보내기 @@ -89,7 +88,7 @@ #%d - 답변 작성을 취소하시겠습니까?\n 작성 중인 답변은 저장되지 않습니다. + 답변 작성을 취소하시겠습니까?\n작성 중인 답변은 저장되지 않아요 취소 확인 From b7d6a263401bbd02f97a227dddbd6454d03221f2 Mon Sep 17 00:00:00 2001 From: yeoncheong Date: Mon, 10 Jul 2023 22:03:48 +0900 Subject: [PATCH 16/19] =?UTF-8?q?[Chore/#29]=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 --- app/src/main/res/values/styles.xml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 16ae7387..76e3146c 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -39,6 +39,7 @@ true 300 + @color/umbba_black @style/AndroidCaptionRegular10 @@ -47,13 +48,13 @@ @font/pretendard_regular normal 16sp - @color/sel_choice_chip_text + @color/sel_choice_chip_pri500_text center 50dp - @color/sel_choice_chip_stroke - @color/sel_choice_chip_color + @color/sel_choice_chip_pri500_stroke + @color/sel_choice_chip_pri500_color