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/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_pri500_color.xml b/app/src/main/res/color/sel_choice_chip_pri500_color.xml new file mode 100644 index 00000000..fbe4183b --- /dev/null +++ b/app/src/main/res/color/sel_choice_chip_pri500_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/sel_choice_chip_pri500_stroke.xml b/app/src/main/res/color/sel_choice_chip_pri500_stroke.xml new file mode 100644 index 00000000..f8c74bc0 --- /dev/null +++ b/app/src/main/res/color/sel_choice_chip_pri500_stroke.xml @@ -0,0 +1,5 @@ + + + + + \ 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_pri500_text.xml new file mode 100644 index 00000000..77bf369d --- /dev/null +++ b/app/src/main/res/color/sel_choice_chip_pri500_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/color/sel_choice_chip_color.xml b/app/src/main/res/color/sel_choice_chip_pri600_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_pri600_color.xml 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/color/sel_choice_chip_stroke.xml b/app/src/main/res/color/sel_choice_chip_stroke.xml deleted file mode 100644 index 5ab4bdf3..00000000 --- a/app/src/main/res/color/sel_choice_chip_stroke.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ 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 deleted file mode 100644 index 2d37d04b..00000000 --- a/app/src/main/res/color/sel_choice_chip_text.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file 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/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/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/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 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/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/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/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_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_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_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 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_btn_r50_rectangle.xml b/app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml similarity index 51% rename from app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml rename to app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml index 9b7ee7f2..43aa0375 100644 --- a/app/src/main/res/drawable/shape_grey_btn_r50_rectangle.xml +++ b/app/src/main/res/drawable/shape_pri500_btn_r50_rect.xml @@ -1,6 +1,8 @@ - + - + + \ 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_pri500_btn_stroke_r50_rect.xml similarity index 50% rename from app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml rename to app/src/main/res/drawable/shape_pri500_btn_stroke_r50_rect.xml index 6bec40f4..95b520e6 100644 --- a/app/src/main/res/drawable/shape_grey74_btn_r50_rect.xml +++ b/app/src/main/res/drawable/shape_pri500_btn_stroke_r50_rect.xml @@ -1,6 +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 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 diff --git a/app/src/main/res/drawable/shape_black_fill_r50_rect.xml b/app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml similarity index 65% rename from app/src/main/res/drawable/shape_black_fill_r50_rect.xml rename to app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml index b362503b..9377c17e 100644 --- a/app/src/main/res/drawable/shape_black_fill_r50_rect.xml +++ b/app/src/main/res/drawable/shape_yellow_btn_r50_rect.xml @@ -1,6 +1,5 @@ - + - + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_answer.xml b/app/src/main/res/layout/activity_answer.xml index ab457364..b1ee0a99 100644 --- a/app/src/main/res/layout/activity_answer.xml +++ b/app/src/main/res/layout/activity_answer.xml @@ -20,7 +20,8 @@ + android:layout_height="match_parent" + android:background="@color/umbba_white"> @@ -49,6 +51,7 @@ android:layout_height="wrap_content" android:layout_marginTop="19dp" android:text="@string/answer_question" + android:textColor="@color/umbba_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" /> @@ -82,6 +85,7 @@ android:layout_height="wrap_content" android:gravity="left" android:hint="@string/answer_edittext_hint" + android:textColorHint="@color/grey_800" android:minHeight="172dp" android:textAppearance="@style/AndroidBody1_2Regular16" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml index c9b2d97f..8fd46c98 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"> + + + android:layout_marginTop="12dp" + android:background="@drawable/shape_g400_stroke_r8_rect" + app:layout_constraintTop_toBottomOf="@id/tv_introduce_user"> + android:textColor="@color/umbba_black" /> @@ -102,7 +101,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:background="@drawable/shape_gd4d4_stroke_r8_rect" + android:background="@drawable/shape_g400_stroke_r8_rect" app:layout_constraintTop_toBottomOf="@id/cl_name"> @@ -156,7 +156,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:background="@drawable/shape_gd4d4_stroke_r8_rect" + android:background="@drawable/shape_g400_stroke_r8_rect" app:layout_constraintTop_toBottomOf="@id/cl_sex"> + android:textColor="@color/black" /> @@ -203,12 +203,14 @@ + + @@ -53,7 +67,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:text="@string/or" - android:textColor="@color/grey_or" + android:textColor="@color/grey_800" app:layout_constraintBottom_toTopOf="@id/tv_receive_code" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -65,6 +79,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="12dp" android:text="@string/did_you_receive_code" + android:textColor="@color/grey_800" app:layout_constraintBottom_toTopOf="@id/btn_input_code" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -73,11 +88,12 @@ android:id="@+id/btn_input_code" android:layout_width="match_parent" android:layout_height="60dp" + android:layout_marginHorizontal="21dp" android:layout_marginVertical="24dp" - android:background="@drawable/shape_grey_btn_r50_rectangle" - android:enabled="false" - android:text="@string/btn_input_code" - android:textColor="@color/white" + android:background="@drawable/shape_pri500_btn_stroke_r50_rect" + android:stateListAnimator="@null" + android:text="@string/btn_start_code" + android:textColor="@color/primary_500" android:textSize="16sp" app:layout_constraintBottom_toBottomOf="parent" /> diff --git a/app/src/main/res/layout/activity_invite_code.xml b/app/src/main/res/layout/activity_invite_code.xml index 49d2f403..e3d00685 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"> @@ -60,14 +64,16 @@ 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 @@ + + diff --git a/app/src/main/res/layout/activity_notify_time.xml b/app/src/main/res/layout/activity_notify_time.xml index b8573636..4c01c164 100644 --- a/app/src/main/res/layout/activity_notify_time.xml +++ b/app/src/main/res/layout/activity_notify_time.xml @@ -10,35 +10,58 @@ + android:layout_height="match_parent" + android:background="@color/umbba_white"> + + + app:layout_constraintTop_toBottomOf="@id/tv_timemachine_description" /> + + diff --git a/app/src/main/res/layout/activity_quest.xml b/app/src/main/res/layout/activity_quest.xml index 74103356..e37c3f13 100644 --- a/app/src/main/res/layout/activity_quest.xml +++ b/app/src/main/res/layout/activity_quest.xml @@ -11,7 +11,8 @@ + android:layout_height="match_parent" + android:background="@color/umbba_white"> + android:layout_height="match_parent" + android:background="@color/umbba_white"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_select_family.xml b/app/src/main/res/layout/activity_select_family.xml index c941ed0b..e5df62bc 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 @@ @@ -95,7 +96,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="28dp" android:layout_marginTop="12dp" - android:background="@drawable/shape_gd4d4_stroke_r8_rect" + android:background="@drawable/shape_g400_stroke_r8_rect" app:layout_constraintTop_toBottomOf="@id/cl_family"> @@ -145,12 +147,14 @@ @@ -49,17 +49,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:timePickerMode="spinner" - app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="parent"/> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + android:layout_height="60dp" + android:background="@color/umbba_white"> @@ -29,10 +29,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginHorizontal="33dp" - android:layout_marginTop="12dp" - android:layout_marginBottom="23dp" - app:layout_constraintBottom_toBottomOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_confirm"> + android:layout_marginTop="24dp" + android:layout_marginBottom="24dp" + app:layout_constraintTop_toBottomOf="@id/tv_confirm" + app:layout_constraintBottom_toBottomOf="parent"> diff --git a/app/src/main/res/layout/fragment_confirm_answer_dialog.xml b/app/src/main/res/layout/fragment_confirm_answer_dialog.xml index 8bb90a2f..26be4902 100644 --- a/app/src/main/res/layout/fragment_confirm_answer_dialog.xml +++ b/app/src/main/res/layout/fragment_confirm_answer_dialog.xml @@ -19,7 +19,7 @@ android:layout_height="0dp" android:layout_marginHorizontal="83dp" android:layout_marginTop="25dp" - android:background="@drawable/shape_grey_appbar_r68_rect" + android:background="@drawable/shape_pri500_appbar_r68_rect" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> @@ -30,7 +30,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginVertical="5dp" - android:textColor="@color/black" + android:textColor="@color/umbba_white" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -45,7 +45,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:textColor="@color/black" + android:textColor="@color/umbba_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/cl_topic" @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="40dp" - android:textColor="@color/black" + android:textColor="@color/umbba_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_title" @@ -70,7 +70,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="16dp" android:layout_marginTop="24dp" - android:textColor="@color/black" + android:textColor="@color/umbba_black" app:layout_constraintTop_toBottomOf="@id/tv_question" tools:text="@string/content_example" /> @@ -81,7 +81,7 @@ android:layout_height="wrap_content" android:layout_marginTop="80dp" android:text="@string/save_answer" - android:textColor="@color/black" + android:textColor="@color/umbba_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_answer" /> @@ -93,8 +93,8 @@ android:layout_marginHorizontal="33dp" android:layout_marginTop="12dp" android:layout_marginBottom="23dp" - app:layout_constraintTop_toBottomOf="@id/tv_save_answer" - app:layout_constraintBottom_toBottomOf="parent"> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_save_answer"> diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index f6e3ecc5..9030167e 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -20,25 +20,26 @@ android:layout_height="56dp" android:layout_marginStart="24dp" android:layout_marginTop="40dp" - android:background="@drawable/shape_grey_fill_r84_rect" + android:background="@drawable/shape_pri600_r84_rect" android:gravity="center" android:paddingHorizontal="40dp" android:text="@string/answer_title" android:textAppearance="@style/BrandTypeBigRegular20" - android:textColor="@color/white" + android:textColor="@color/umbba_white" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/fragment_invite_code_dialog.xml b/app/src/main/res/layout/fragment_invite_code_dialog.xml index 7870e8a3..03fbe2ee 100644 --- a/app/src/main/res/layout/fragment_invite_code_dialog.xml +++ b/app/src/main/res/layout/fragment_invite_code_dialog.xml @@ -31,40 +31,32 @@ android:layout_height="wrap_content" android:layout_marginTop="2dp" android:text="@string/not_have_partner" - android:textColor="@color/black" + android:textColor="@color/umbba_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/btn_close" /> - - + app:layout_constraintTop_toBottomOf="@id/tv_not_have_partner" /> @@ -75,37 +67,25 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="12dp" - android:textColor="@color/black" + android:textColor="@color/umbba_black" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_copy_invite_code" tools:text="umbbachoigo123" /> - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml index 506eb05e..a1aa2617 100644 --- a/app/src/main/res/layout/fragment_quest_one.xml +++ b/app/src/main/res/layout/fragment_quest_one.xml @@ -6,7 +6,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="335dp" - android:background="@drawable/shape_gd4d4_stroke_r8_rect"> + android:background="@drawable/shape_g400_stroke_r8_rect"> @@ -28,7 +28,7 @@ android:layout_marginStart="20dp" android:layout_marginTop="12dp" android:text="@string/quest_sub_title" - android:textColor="@color/grey_999999" + android:textColor="@color/grey_800" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/tv_question" /> diff --git a/app/src/main/res/layout/qna_appbar.xml b/app/src/main/res/layout/qna_appbar.xml index 4e4130aa..fe1e90aa 100644 --- a/app/src/main/res/layout/qna_appbar.xml +++ b/app/src/main/res/layout/qna_appbar.xml @@ -17,11 +17,13 @@ + android:layout_height="60dp" + android:background="@color/umbba_white"> + tools:text="어린시절" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0bee65f6..287b0839 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,20 +3,12 @@ #FF000000 #FFFFFFFF #99000000 + #80FFFFFF #F7F2F0 #F0EBE8 #BBADA4 - #D2D2D2 - #666666 - #999999 - #CFCFCF - #EAEAEA - #D4D4D4 - #747474 - #E5E5E5 - #FF3A1F #419277 #32211B @@ -26,15 +18,12 @@ #E99F74 #C87759 - #BABABA - #808080 - #D4D4D4 - #DBDBDB - #EAEAEA - #747474 - #6A6A6A - #999999 - #EFEFEF - #D9D9D9 + #F8C8AE + #EBA787 + #D87E7E + + #FBE44D + + #999999 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b76e6127..f68c7856 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,31 +4,32 @@ 다음으로 - 초대 코드를 입력해주세요. - 초대코드를\n입력해주세요. + ex) ORWO-11yzwx + 초대코드를 입력해줘 - 부모와 떠나는 시간 여행 + 엄빠도 어렸다 + 처음부터 다시 나누는 이야기 카카오로 로그인 시작하기 ----------------- or ---------------- - 초대 코드를 받으셨나요? - 초대코드 입력하기 + 카카오톡 초대 코드를 받고 왔어요 + 초대코드로 시작하기 - 환영해!\n너에 대해 알려줘! + 반가워!\n너에 대해 알고 싶어 너의 이름이 뭐야? 너의 성별을 알려줘! 남자 여자 - 이름을 입력해 주세요. + ex) 홍길동 태어난 연도는 언제야? - 태어난 연도를 입력해 주세요. + ex) 1988 - 지금부터\n먼 과거로 시간여행을 떠날 거야 + 오늘부터 매일,\n과거로 시간여행을 떠날 거야 누구와 떠날래? 부모님 자식 @@ -40,16 +41,18 @@ 매일 밤\n교신을 보내줄게 - 선택한 시간에 따라 푸시 알림을 보내드립니다 + 선택한 시간에 따라 푸시 알림을 보내드려요 - + + 오늘부터 매일, 과거로 시간 여행을 떠날 거야 + 초대자가 선택한 시간에 따라 푸시 알림을 보내드려요 과거로 떠나기 - 매일 밤 11시에\n타임머신을 보내줄게 + 매일 밤 11시에\n교신을 보내줄게 거의 다 왔어! 조금만 힘내줘! 간단한 질문에\n답해줘 - 해당 답변은 추후 제공될 질문을 구성하는 데 이용됩니다. + 해당 답변은 추후 제공될 질문을 구성하는 데 이용돼요 설정 @@ -59,9 +62,9 @@ 공지사항 - 답변을 입력해주세요. + 상대방은 아직 답변하지 않았어요 #1 가장 오래된 기억 - 당신과 어머니의 꿈은 달라? + 할머니와 엄마의 꿈이 달랐어? 답변하기 @@ -73,8 +76,7 @@ 질문 답변하기 - 아직 상대가 도착하지 않았어요 - 연결 후 문답을 시작해요 + 상대에게 교신을 보낼 차례야\n초대를 수락받으면 문답이 시작돼 초대코드 복사 초대장 보내기 @@ -88,7 +90,7 @@ #%d - 답변 작성을 취소하시겠습니까?\n 작성 중인 답변은 저장되지 않습니다. + 답변 작성을 취소하시겠습니까?\n작성 중인 답변은 저장되지 않아요 취소 확인 On diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 59f6dd90..14af760e 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 @@ -38,6 +39,7 @@ true 300 + @color/umbba_black @style/AndroidCaptionRegular10 @@ -46,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