Merge pull request #24 from TeamOwori/feat/#23-font

TeamOwori · Sep 24, 2023 · c56c55d · c56c55d
2 parents fcebeca + b863cd3
commit c56c55d
Show file tree

Hide file tree

Showing 21 changed files with 82 additions and 8 deletions.
diff --git a/app/src/main/res/font/notosanskr_black.ttf b/app/src/main/res/font/notosanskr_black.ttf
diff --git a/app/src/main/res/font/notosanskr_bold.ttf b/app/src/main/res/font/notosanskr_bold.ttf
diff --git a/app/src/main/res/font/notosanskr_extrabold.ttf b/app/src/main/res/font/notosanskr_extrabold.ttf
diff --git a/app/src/main/res/font/notosanskr_extralight.ttf b/app/src/main/res/font/notosanskr_extralight.ttf
diff --git a/app/src/main/res/font/notosanskr_light.ttf b/app/src/main/res/font/notosanskr_light.ttf
diff --git a/app/src/main/res/font/notosanskr_semibold.ttf b/app/src/main/res/font/notosanskr_semibold.ttf
diff --git a/app/src/main/res/font/notosanskr_thin.ttf b/app/src/main/res/font/notosanskr_thin.ttf
diff --git a/app/src/main/res/font/pretendard_bold.otf b/app/src/main/res/font/pretendard_bold.otf
diff --git a/app/src/main/res/font/pretendard_extra_bold.otf b/app/src/main/res/font/pretendard_extra_bold.otf
diff --git a/app/src/main/res/font/pretendard_extra_light.otf b/app/src/main/res/font/pretendard_extra_light.otf
diff --git a/app/src/main/res/font/pretendard_light.otf b/app/src/main/res/font/pretendard_light.otf
diff --git a/app/src/main/res/font/pretendard_medium.otf b/app/src/main/res/font/pretendard_medium.otf
diff --git a/app/src/main/res/font/pretendard_regular.otf b/app/src/main/res/font/pretendard_regular.otf
diff --git a/app/src/main/res/font/pretendard_semi_bold.otf b/app/src/main/res/font/pretendard_semi_bold.otf
diff --git a/app/src/main/res/font/pretendard_thin.otf b/app/src/main/res/font/pretendard_thin.otf
diff --git a/app/src/main/res/font/pretentdar_black.otf b/app/src/main/res/font/pretentdar_black.otf
diff --git a/app/src/main/res/layout/fragment_login.xml b/app/src/main/res/layout/fragment_login.xml
@@ -37,7 +37,6 @@
                 android:id="@+id/subtitle_login"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/pretendard_bold"
                 android:text="@string/owori_splash_subtitle"
                 android:textColor="@color/black"
                 android:textSize="18dp"

diff --git a/app/src/main/res/layout/fragment_onboarding.xml b/app/src/main/res/layout/fragment_onboarding.xml
@@ -21,7 +21,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginTop="106dp"
-            android:fontFamily="@font/pretendard_bold"
             setTitleText="@{vm.currentItemIndex}"
             android:textColor="@color/black"
             android:textSize="22dp"
@@ -37,7 +36,6 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
             android:layout_marginBottom="24dp"
-            android:fontFamily="@font/pretendard_medium"
             android:textColor="@color/grey_909090"
             android:textSize="16dp"
             app:layout_constraintBottom_toTopOf="@+id/onboarding_viewpager"
@@ -97,7 +95,6 @@
             android:layout_height="64dp"
             android:clickable="true"
             android:background="@color/owori_red"
-            android:fontFamily="@font/pretendard_bold"
             android:onClick="@{() -> vm.onClickNextButton()}"
             android:text="@{vm.currentItemIndex >= 2 ? @string/onboarding_login : @string/onboarding_next}"
             android:textColor="@color/white"

diff --git a/app/src/main/res/layout/fragment_policy.xml b/app/src/main/res/layout/fragment_policy.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -15,7 +14,6 @@
             app:layout_constraintTop_toTopOf="parent"
             android:textSize="36dp"
             android:textColor="@color/black_050708"
-            android:fontFamily="@font/pretendard_medium"
             app:layout_constraintBottom_toBottomOf="parent"
             android:text="PolicyFragment"/>
 

diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
@@ -20,7 +20,6 @@
                 android:id="@+id/subTitle"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:fontFamily="@font/pretendard_medium"
                 android:text="@string/owori_splash_subtitle"
                 android:textColor="@color/grey_f2f2f2"
                 android:textSize="16dp"

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="SpUsage">
+
+    <style name="TextTitle">
+        <item name="fontFamily">@font/notosanskr_regular</item>
+        <item name="fontWeight">700</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TextTitle.00">
+        <item name="android:textSize">26dp</item>
+    </style>
+
+    <style name="TextTitle.01">
+        <item name="android:textSize">22dp</item>
+    </style>
+
+    <style name="TextTitle.02">
+        <item name="android:textSize">20dp</item>
+    </style>
+
+    <style name="TextSubTitle">
+        <item name="fontFamily">@font/notosanskr_medium</item>
+        <item name="fontWeight">500</item>
+    </style>
+
+    <style name="TextSubTitle.01">
+        <item name="android:textSize">18dp</item>
+    </style>
+
+    <style name="TextSubTitle.02">
+        <item name="android:textSize">16dp</item>
+    </style>
+
+    <style name="TextBodyMedium">
+        <item name="fontFamily">@font/notosanskr_medium</item>
+        <item name="fontWeight">500</item>
+    </style>
+
+    <style name="TextBodyMedium.01">
+        <item name="android:textSize">16dp</item>
+    </style>
+
+    <style name="TextBodyMedium.02">
+        <item name="android:textSize">15dp</item>
+    </style>
+
+    <style name="TextBodyMedium.03">
+        <item name="android:textSize">14dp</item>
+    </style>
+
+    <style name="TextBodyRegular">
+        <item name="fontFamily">@font/notosanskr_regular</item>
+        <item name="fontWeight">400</item>
+    </style>
+
+    <style name="TextBodyRegular.01">
+        <item name="android:textSize">16dp</item>
+    </style>
+
+    <style name="TextBodyRegular.02">
+        <item name="android:textSize">15dp</item>
+    </style>
+
+    <style name="TextBodyRegular.03">
+        <item name="android:textSize">14dp</item>
+    </style>
+
+    <style name="TextCaptionMedium">
+        <item name="fontFamily">@font/notosanskr_medium</item>
+        <item name="fontWeight">500</item>
+        <item name="android:textSize">12dp</item>
+    </style>
+
+    <style name="TextCaptionRegular">
+        <item name="fontFamily">@font/notosanskr_regular</item>
+        <item name="fontWeight">400</item>
+        <item name="android:textSize">12dp</item>
+    </style>
+
+</resources>