[MOD/#6] Material Design Typography 적용

GO-SOPT-ANDROID · May 4, 2023 · 81c606a · 81c606a
1 parent 690b29e
commit 81c606a
Show file tree

Hide file tree

Showing 18 changed files with 129 additions and 61 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,11 +29,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = '11'
+        jvmTarget = '17'
     }
     buildFeatures {
         viewBinding true

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -23,9 +23,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="50dp"
             android:text="@string/login_welcome_msg"
+            android:textAppearance="?textAppearanceDisplayMedium"
             android:textColor="?colorOnBackground"
-            android:textSize="24sp"
-            android:textStyle="bold"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -36,9 +35,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="50dp"
             android:text="@string/login_id_label"
+            android:textAppearance="?textAppearanceHeadlineMedium"
             android:textColor="?colorOnBackground"
-            android:textSize="18sp"
-            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tv_login_welcome_msg" />
 
@@ -50,8 +48,9 @@
             android:hint="@string/login_id_hint"
             android:imeOptions="actionNext"
             android:inputType="text"
-            android:paddingVertical="12dp"
+            android:paddingVertical="16dp"
             android:text="@={vm.id}"
+            android:textAppearance="?textAppearanceBodyLarge"
             app:layout_constraintTop_toBottomOf="@id/tv_login_id_label" />
 
         <TextView
@@ -60,24 +59,24 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="40dp"
             android:text="@string/login_pwd_label"
+            android:textAppearance="@style/TextAppearance.GoSopt.HeadlineMedium"
             android:textColor="?colorOnBackground"
-            android:textSize="18sp"
-            android:textStyle="bold"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/et_login_id" />
 
         <EditText
             android:id="@+id/et_login_pwd"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="8dp"
             android:hint="@string/login_pwd_hint"
             android:imeOptions="actionDone"
             android:inputType="textPassword"
-            android:paddingVertical="12dp"
+            android:paddingVertical="16dp"
             android:text="@={vm.pwd}"
+            android:textAppearance="?textAppearanceBodyLarge"
             app:layout_constraintTop_toBottomOf="@id/tv_login_pwd_label"
-            tools:layout_editor_absoluteX="40dp" />
+            tools:layout_editor_absoluteX="-58dp" />
 
         <Button
             android:id="@+id/btn_login_login"
@@ -86,17 +85,15 @@
             android:onClick="@{()->vm.login()}"
             android:paddingVertical="16dp"
             android:text="@string/login_login_btn"
-            android:textSize="16sp"
-            android:textStyle="bold" />
+            android:textAppearance="?textAppearanceHeadlineMedium" />
 
         <Button
             android:id="@+id/btn_login_signup"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:paddingVertical="16dp"
             android:text="@string/login_signup_btn"
-            android:textSize="16sp"
-            android:textStyle="bold" />
+            android:textAppearance="?textAppearanceHeadlineMedium" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:id="@+id/flow_login_sign_buttons"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -15,9 +15,11 @@
 
         <androidx.fragment.app.FragmentContainerView
             android:id="@+id/fcv_main_container"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="0dp"
             app:layout_constraintBottom_toTopOf="@id/bnv_main"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             tools:layout="@layout/fragment_home" />
 
@@ -28,6 +30,8 @@
             android:background="?colorPrimaryVariant"
             app:itemActiveIndicatorStyle="@style/Widget.GoSopt.BottomNavigationView.ActiveIndicator"
             app:itemIconTint="@drawable/sel_main_bot_nav_menu_color"
+            app:itemTextAppearanceActive="?textAppearanceCaption"
+            app:itemTextAppearanceInactive="?textAppearanceCaption"
             app:itemTextColor="?android:colorBackground"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/activity_signup.xml b/app/src/main/res/layout/activity_signup.xml
@@ -36,9 +36,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/login_id_label"
+                    android:textAppearance="?textAppearanceHeadlineMedium"
                     android:textColor="?colorOnBackground"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
@@ -51,8 +50,9 @@
                     android:imeOptions="actionNext"
                     android:inputType="text"
                     android:maxLength="@{vm.MAX_ID_LENGTH}"
-                    android:paddingVertical="12dp"
+                    android:paddingVertical="16dp"
                     android:text="@={vm.id}"
+                    android:textAppearance="@style/TextAppearance.GoSopt.BodyLarge"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_id_label" />
 
                 <TextView
@@ -61,9 +61,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:text="@string/login_pwd_label"
+                    android:textAppearance="?textAppearanceHeadlineMedium"
                     android:textColor="?colorOnBackground"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/et_signup_id" />
 
@@ -76,8 +75,9 @@
                     android:imeOptions="actionNext"
                     android:inputType="textPassword"
                     android:maxLength="@{vm.MAX_PWD_LENGTH}"
-                    android:paddingVertical="12dp"
+                    android:paddingVertical="16dp"
                     android:text="@={vm.pwd}"
+                    android:textAppearance="@style/TextAppearance.GoSopt.BodyLarge"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_pwd_label" />
 
                 <TextView
@@ -86,9 +86,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:text="@string/signup_name_label"
+                    android:textAppearance="?textAppearanceHeadlineMedium"
                     android:textColor="?colorOnBackground"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/et_signup_pwd" />
 
@@ -100,8 +99,9 @@
                     android:hint="@string/signup_name_hint"
                     android:imeOptions="actionNext"
                     android:inputType="text|textPersonName"
-                    android:paddingVertical="12dp"
+                    android:paddingVertical="16dp"
                     android:text="@={vm.name}"
+                    android:textAppearance="@style/TextAppearance.GoSopt.BodyLarge"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_name_label" />
 
                 <TextView
@@ -110,9 +110,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:text="@string/signup_specialty_label"
+                    android:textAppearance="?textAppearanceHeadlineMedium"
                     android:textColor="?colorOnBackground"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/et_signup_name" />
 
@@ -124,8 +123,9 @@
                     android:hint="@string/signup_specialty_hint"
                     android:imeOptions="actionNext"
                     android:inputType="text"
-                    android:paddingVertical="12dp"
+                    android:paddingVertical="16dp"
                     android:text="@={vm.specialty}"
+                    android:textAppearance="@style/TextAppearance.GoSopt.BodyLarge"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_specialty_label" />
 
                 <TextView
@@ -134,9 +134,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="20dp"
                     android:text="@string/signup_mbti_label"
+                    android:textAppearance="?textAppearanceHeadlineMedium"
                     android:textColor="?colorOnBackground"
-                    android:textSize="18sp"
-                    android:textStyle="bold"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/et_signup_specialty" />
 
@@ -148,8 +147,9 @@
                     android:hint="@string/signup_mbti_hint"
                     android:imeOptions="actionDone"
                     android:inputType="textCapCharacters"
-                    android:paddingVertical="12dp"
+                    android:paddingVertical="16dp"
                     android:text="@={vm.mbti}"
+                    android:textAppearance="@style/TextAppearance.GoSopt.BodyLarge"
                     app:layout_constraintTop_toBottomOf="@id/tv_signup_mbti_label" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </ScrollView>
@@ -158,13 +158,12 @@
             android:id="@+id/btn_signup_signup_complete"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:textAppearance="?textAppearanceHeadlineMedium"
             android:layout_marginHorizontal="40dp"
             android:layout_marginBottom="16dp"
             android:onClick="@{()->vm.signup()}"
             android:paddingVertical="16dp"
             android:text="@string/signup_signup_complete_btn"
-            android:textSize="16sp"
-            android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
@@ -15,7 +15,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:text="@string/gallery_fragment" />
+            android:text="@string/gallery_fragment"
+            android:textAppearance="?textAppearanceBodyLarge" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
@@ -34,8 +34,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@{@string/profile_name(vm.signedUpUser.name)}"
+            android:textAppearance="?textAppearanceBodyLarge"
             android:textColor="?colorOnBackground"
-            android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/iv_profile_profile" />
@@ -46,6 +46,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@{@string/profile_specialty(vm.signedUpUser.specialty)}"
+            android:textAppearance="?textAppearanceBodyLarge"
             android:textColor="?colorOnBackground"
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -58,6 +59,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="12dp"
             android:text="@{@string/profile_mbti(vm.signedUpUser.mbti)}"
+            android:textAppearance="?textAppearanceBodyLarge"
             android:textColor="?colorOnBackground"
             android:textSize="16sp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -72,7 +74,8 @@
             android:layout_marginBottom="40dp"
             android:paddingVertical="16dp"
             android:text="@string/profile_logout_and_leave_btn"
-            android:textSize="16sp"
+            android:textAppearance="?textAppearanceHeadlineMedium"
+            android:textSize="18sp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
@@ -16,6 +16,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:gravity="center"
-            android:text="@string/search_fragment" />
+            android:text="@string/search_fragment"
+            android:textAppearance="?textAppearanceBodyLarge" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/header_home_repo.xml b/app/src/main/res/layout/header_home_repo.xml
@@ -14,8 +14,7 @@
         android:maxLines="1"
         android:text="@string/home_repo_header_title"
         android:textColor="?colorOnBackground"
-        android:textSize="24sp"
-        android:textStyle="bold"
+        android:textAppearance="?textAppearanceDisplayMedium"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/item_home_repo.xml b/app/src/main/res/layout/item_home_repo.xml
@@ -36,8 +36,7 @@
             android:maxLines="1"
             android:text="@{data.name}"
             android:textColor="?colorOnSurface"
-            android:textSize="18sp"
-            android:textStyle="bold"
+            android:textAppearance="?textAppearanceHeadlineMedium"
             app:layout_constraintEnd_toEndOf="@id/flow_repo_description"
             app:layout_constraintStart_toStartOf="@id/flow_repo_description"
             tools:text="@string/dummy" />
@@ -48,6 +47,7 @@
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:maxLines="1"
+            android:textAppearance="?textAppearanceBodySmall"
             android:text="@{data.owner}"
             android:textColor="?colorOnSurface"
             app:layout_constraintEnd_toEndOf="@id/flow_repo_description"

diff --git a/app/src/main/res/values-night-v31/themes.xml b/app/src/main/res/values-night-v31/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!-- Base application theme. -->
     <style name="Theme.GoSopt" parent="Theme.Material3.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/coral_600</item>
@@ -21,7 +21,13 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Remove font padding. -->
         <item name="android:includeFontPadding">false</item>
-        <!-- Splash screen theme. -->
+        <!-- Font theme. -->
+        <item name="textAppearanceDisplayMedium">@style/TextAppearance.GoSopt.DisplayMedium</item>
+        <item name="textAppearanceHeadlineMedium">@style/TextAppearance.GoSopt.HeadlineMedium</item>
+        <item name="textAppearanceBodyLarge">@style/TextAppearance.GoSopt.BodyLarge</item>
+        <item name="textAppearanceBodySmall">@style/TextAppearance.GoSopt.BodySmall</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.GoSopt.CaptionMedium</item>
+        <!-- Splash screen color. -->
         <item name="android:windowSplashScreenBackground">@color/gray_900</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -20,7 +20,13 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Remove font padding. -->
         <item name="android:includeFontPadding">false</item>
-        <!-- Splash screen theme. -->
-        <item name="windowSplashScreenBackground">@color/gray_900</item>
+        <!-- Font theme. -->
+        <item name="textAppearanceDisplayMedium">@style/TextAppearance.GoSopt.DisplayMedium</item>
+        <item name="textAppearanceHeadlineMedium">@style/TextAppearance.GoSopt.HeadlineMedium</item>
+        <item name="textAppearanceBodyLarge">@style/TextAppearance.GoSopt.BodyLarge</item>
+        <item name="textAppearanceBodySmall">@style/TextAppearance.GoSopt.BodySmall</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.GoSopt.CaptionMedium</item>
+        <!-- Splash screen color. -->
+        <!-- TODO : 스플래시 화면 호환성 지원 -->
     </style>
 </resources>
diff --git a/app/src/main/res/values-v31/themes.xml b/app/src/main/res/values-v31/themes.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <!-- Base application theme. -->
     <style name="Theme.GoSopt" parent="Theme.Material3.Light.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/coral_600</item>
@@ -21,7 +21,13 @@
         <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
         <!-- Remove font padding. -->
         <item name="android:includeFontPadding">false</item>
-        <!-- Splash screen theme. -->
+        <!-- Font theme. -->
+        <item name="textAppearanceDisplayMedium">@style/TextAppearance.GoSopt.DisplayMedium</item>
+        <item name="textAppearanceHeadlineMedium">@style/TextAppearance.GoSopt.HeadlineMedium</item>
+        <item name="textAppearanceBodyLarge">@style/TextAppearance.GoSopt.BodyLarge</item>
+        <item name="textAppearanceBodySmall">@style/TextAppearance.GoSopt.BodySmall</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.GoSopt.CaptionMedium</item>
+        <!-- Splash screen color. -->
         <item name="android:windowSplashScreenBackground">@color/gray_900</item>
     </style>
 </resources>