[Chore/#109] 폰트 디자인 일괄 적용

Team-Umbba · Aug 31, 2023 · da2e693 · da2e693
1 parent 95bba02
commit da2e693
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 19 deletions.
diff --git a/app/src/main/res/layout/activity_agree_privacy_use.xml b/app/src/main/res/layout/activity_agree_privacy_use.xml
@@ -41,6 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@string/app_description"
+            android:textAppearance="@style/AndroidBody2_2Regular12"
             android:textColor="@color/primary_500"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_communication.xml b/app/src/main/res/layout/activity_communication.xml
@@ -15,16 +15,16 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_start"
-            style="@style/AndroidBody3Bold16"
+            style="@style/AndroidBody1_1SemiBold16"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:layout_marginHorizontal="24dp"
             android:layout_marginBottom="24dp"
-            android:background="@drawable/shape_gradient_btn_r50_rect"
+            android:background="@drawable/shape_pri500_btn_stroke_r50_rect"
             android:enabled="true"
             android:stateListAnimator="@null"
             android:text="@string/answer_phone"
-            android:textColor="@color/umbba_white"
+            android:textColor="@color/primary_500"
             app:layout_constraintBottom_toBottomOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/activity_input_info.xml b/app/src/main/res/layout/activity_input_info.xml
@@ -153,6 +153,7 @@
                             android:layout_height="wrap_content"
                             android:checked="@={viewmodel.man}"
                             android:text="@string/man"
+                            android:textAppearance="@style/AndroidBody1_2Regular16"
                             app:chipMinHeight="52dp" />
 
                         <com.google.android.material.chip.Chip
@@ -162,6 +163,7 @@
                             android:layout_height="wrap_content"
                             android:checked="@={viewmodel.woman}"
                             android:text="@string/woman"
+                            android:textAppearance="@style/AndroidBody1_2Regular16"
                             app:chipMinHeight="52dp" />
                     </com.google.android.material.chip.ChipGroup>
 

diff --git a/app/src/main/res/layout/activity_invite.xml b/app/src/main/res/layout/activity_invite.xml
@@ -41,14 +41,14 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@string/app_description"
+            android:textAppearance="@style/AndroidBody2_2Regular12"
             android:textColor="@color/primary_500"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_app_title" />
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/btn_start"
-            style="@style/AndroidBody3Bold16"
             android:layout_width="match_parent"
             android:layout_height="60dp"
             android:layout_marginHorizontal="24dp"
@@ -57,28 +57,29 @@
             android:enabled="true"
             android:stateListAnimator="@null"
             android:text="@string/btn_start"
+            android:textAppearance="@style/AndroidBody1_1SemiBold16"
             android:textColor="@color/white"
             app:layout_constraintBottom_toTopOf="@id/tv_or" />
 
         <TextView
             android:id="@+id/tv_or"
-            style="@style/AndroidBody1_2Regular16"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
             android:text="@string/or"
+            android:textAppearance="@style/AndroidBody1_2Regular16"
             android:textColor="@color/grey_800"
             app:layout_constraintBottom_toTopOf="@id/tv_receive_code"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent" />
 
         <TextView
             android:id="@+id/tv_receive_code"
-            style="@style/AndroidBody1_2Regular16"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="12dp"
             android:text="@string/did_you_receive_code"
+            android:textAppearance="@style/AndroidBody1_2Regular16"
             android:textColor="@color/grey_800"
             app:layout_constraintBottom_toTopOf="@id/btn_input_code"
             app:layout_constraintEnd_toEndOf="parent"
@@ -93,6 +94,7 @@
             android:background="@drawable/shape_pri500_btn_stroke_r50_rect"
             android:stateListAnimator="@null"
             android:text="@string/btn_start_code"
+            android:textAppearance="@style/AndroidBody1_1SemiBold16"
             android:textColor="@color/primary_500"
             android:textSize="16sp"
             app:layout_constraintBottom_toBottomOf="parent" />

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -41,6 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@string/app_description"
+            android:textAppearance="@style/AndroidBody2_2Regular12"
             android:textColor="@color/primary_500"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -59,9 +60,9 @@
             android:paddingEnd="44dp"
             android:stateListAnimator="@null"
             android:text="@string/kakao_login"
+            android:textAlignment="center"
             android:textColor="@color/umbba_black"
             android:textSize="16sp"
-            android:textAlignment="center"
             app:layout_constraintBottom_toBottomOf="parent" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -28,6 +28,8 @@
                 app:itemBackground="@drawable/sel_bottom_nav_indicator"
                 app:itemIconSize="24dp"
                 app:itemIconTint="@color/sel_bottom_nav_icon"
+                app:itemTextAppearanceActive="@style/AndroidBody2_2Regular12"
+                app:itemTextAppearanceInactive="@style/AndroidBody2_2Regular12"
                 app:itemTextColor="@color/sel_bottom_nav_text"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/activity_question_answer.xml b/app/src/main/res/layout/activity_question_answer.xml
@@ -92,13 +92,13 @@
             android:id="@+id/tv_question_me"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="43dp"
             android:layout_marginHorizontal="28dp"
-            android:text="@{vm.isBeforeList ? vm.listQnaResponse.myQuestion : vm.qnaResponse.myQuestion}"
+            android:layout_marginTop="43dp"
             android:gravity="right"
-            app:layout_constraintStart_toStartOf="parent"
+            android:text="@{vm.isBeforeList ? vm.listQnaResponse.myQuestion : vm.qnaResponse.myQuestion}"
             android:textAppearance="@style/AndroidSubHead1SemiBold20"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/cl_answer_other" />
 
         <androidx.constraintlayout.widget.ConstraintLayout

diff --git a/app/src/main/res/layout/activity_select_family.xml b/app/src/main/res/layout/activity_select_family.xml
@@ -88,6 +88,7 @@
                     android:layout_height="wrap_content"
                     android:checked="@={viewmodel.parent}"
                     android:text="@string/parent"
+                    android:textAppearance="@style/AndroidBody1_2Regular16"
                     app:chipMinHeight="52dp" />
 
                 <com.google.android.material.chip.Chip
@@ -97,6 +98,7 @@
                     android:layout_height="wrap_content"
                     android:checked="@={viewmodel.child}"
                     android:text="@string/child"
+                    android:textAppearance="@style/AndroidBody1_2Regular16"
                     app:chipMinHeight="52dp" />
             </com.google.android.material.chip.ChipGroup>
 
@@ -110,8 +112,8 @@
             android:layout_marginHorizontal="28dp"
             android:layout_marginTop="12dp"
             android:background="@drawable/shape_g400_stroke_r8_rect"
-            app:layout_constraintTop_toBottomOf="@id/cl_family"
-            android:visibility="gone">
+            android:visibility="gone"
+            app:layout_constraintTop_toBottomOf="@id/cl_family">
 
             <TextView
                 android:id="@+id/tv_more"
@@ -147,6 +149,7 @@
                     android:layout_height="wrap_content"
                     android:checked="@={viewmodel.mom}"
                     android:text="@string/mom"
+                    android:textAppearance="@style/AndroidBody1_2Regular16"
                     app:chipMinHeight="52dp" />
 
                 <com.google.android.material.chip.Chip
@@ -156,6 +159,7 @@
                     android:layout_height="wrap_content"
                     android:checked="@={viewmodel.dad}"
                     android:text="@string/dad"
+                    android:textAppearance="@style/AndroidBody1_2Regular16"
                     app:chipMinHeight="52dp" />
             </com.google.android.material.chip.ChipGroup>
 

diff --git a/app/src/main/res/layout/activity_set_time.xml b/app/src/main/res/layout/activity_set_time.xml
@@ -51,6 +51,7 @@
 
         <TimePicker
             android:id="@+id/tp_time"
+            style="@style/AndroidBody1_2Regular16"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:timePickerMode="spinner"

diff --git a/app/src/main/res/layout/fragment_quest_five.xml b/app/src/main/res/layout/fragment_quest_five.xml
@@ -16,12 +16,12 @@
 
         <TextView
             android:id="@+id/tv_question"
-            style="@style/AndroidSubHead1SemiBold20"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="24dp"
             android:layout_marginTop="38dp"
             android:text="@string/quest_5"
+            android:textAppearance="@style/AndroidSubHead1SemiBold20"
             android:textColor="@color/umbba_black"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -47,6 +47,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedYes}"
                 android:text="@string/yes"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -57,6 +59,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedNo}"
                 android:text="@string/no"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -66,6 +70,8 @@
                 android:layout_height="48dp"
                 android:checked="@={viewmodel.isClickedAmbiguous}"
                 android:text="@string/ambiguous"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
         </com.google.android.material.chip.ChipGroup>
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_quest_four.xml b/app/src/main/res/layout/fragment_quest_four.xml
@@ -47,6 +47,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedYes}"
                 android:text="@string/yes"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -57,6 +59,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedNo}"
                 android:text="@string/no"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -66,6 +70,8 @@
                 android:layout_height="48dp"
                 android:checked="@={viewmodel.isClickedAmbiguous}"
                 android:text="@string/ambiguous"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
         </com.google.android.material.chip.ChipGroup>
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_quest_one.xml b/app/src/main/res/layout/fragment_quest_one.xml
@@ -49,6 +49,8 @@
                 android:layout_height="48dp"
                 android:checked="@={viewmodel.isClickedYes}"
                 android:text="@string/yes"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp"
                 tools:layout_editor_absoluteX="32dp"
                 tools:layout_editor_absoluteY="110dp" />
@@ -61,6 +63,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedNo}"
                 android:text="@string/no"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -70,6 +74,8 @@
                 android:layout_height="48dp"
                 android:checked="@={viewmodel.isClickedAmbiguous}"
                 android:text="@string/ambiguous"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
         </com.google.android.material.chip.ChipGroup>
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_quest_three.xml b/app/src/main/res/layout/fragment_quest_three.xml
@@ -48,6 +48,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedYes}"
                 android:text="@string/yes"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -58,6 +60,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedNo}"
                 android:text="@string/no"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -67,6 +71,8 @@
                 android:layout_height="48dp"
                 android:checked="@={viewmodel.isClickedAmbiguous}"
                 android:text="@string/ambiguous"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
         </com.google.android.material.chip.ChipGroup>
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_quest_two.xml b/app/src/main/res/layout/fragment_quest_two.xml
@@ -47,6 +47,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedYes}"
                 android:text="@string/yes"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -57,6 +59,8 @@
                 android:layout_marginBottom="12dp"
                 android:checked="@={viewmodel.isClickedNo}"
                 android:text="@string/no"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
 
             <com.google.android.material.chip.Chip
@@ -66,6 +70,8 @@
                 android:layout_height="48dp"
                 android:checked="@={viewmodel.isClickedAmbiguous}"
                 android:text="@string/ambiguous"
+                android:textAppearance="@style/AndroidBody1_2Regular16"
+                android:textColor="@color/umbba_black"
                 app:chipMinTouchTargetSize="0dp" />
         </com.google.android.material.chip.ChipGroup>
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/values/fonts.xml b/app/src/main/res/values/fonts.xml
@@ -43,12 +43,6 @@
         <item name="android:textSize">16sp</item>
     </style>
 
-    <style name="AndroidBody3Bold16">
-        <item name="android:fontFamily">@font/pretendard_bold</item>
-        <item name="android:textStyle">normal</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
     <style name="AndroidBody2_1SemiBold12">
         <item name="android:fontFamily">@font/pretendard_semibold</item>
         <item name="android:textStyle">normal</item>