Merge pull request #30 from boostcampwm2023/AOS-ui-setting

글꼴, 색상 설정
boostcampwm2023 · Nov 13, 2023 · b259bbc · b259bbc
2 parents 080289e + 31114ff
commit b259bbc
Show file tree

Hide file tree

Showing 7 changed files with 88 additions and 1 deletion.
diff --git a/AOS/app/src/main/res/font/pretendard_bold.otf b/AOS/app/src/main/res/font/pretendard_bold.otf
diff --git a/AOS/app/src/main/res/font/pretendard_light.otf b/AOS/app/src/main/res/font/pretendard_light.otf
diff --git a/AOS/app/src/main/res/font/pretendard_medium.otf b/AOS/app/src/main/res/font/pretendard_medium.otf
diff --git a/AOS/app/src/main/res/font/pretendard_regular.otf b/AOS/app/src/main/res/font/pretendard_regular.otf
diff --git a/AOS/app/src/main/res/font/pretendard_semi_bold.otf b/AOS/app/src/main/res/font/pretendard_semi_bold.otf
diff --git a/AOS/app/src/main/res/values/colors.xml b/AOS/app/src/main/res/values/colors.xml
@@ -1,5 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#FF000000</color>
+    <color name="black">#222227</color>
+    <color name="gray6">#333232</color>
+    <color name="gray5">#6A6A6A</color>
+    <color name="gray4">#949494</color>
+    <color name="gray3">#D9D9D9</color>
+    <color name="gray2">#F4F4F4</color>
+    <color name="gray1">#F9F9F9</color>
+
     <color name="white">#FFFFFFFF</color>
+
+    <color name="main4">#FF8080</color>
+    <color name="main3">#FFCF96</color>
+    <color name="main2">#F2FDBB</color>
+    <color name="main1">#C7FACF</color>
+
+    <color name="sub2">#49AA95</color>
+    <color name="sub1">#FB5D67</color>
 </resources>
diff --git a/AOS/app/src/main/res/values/typograpy.xml b/AOS/app/src/main/res/values/typograpy.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="Typography">
+        <item name="android:textColor">@color/black</item>
+        <item name="android:includeFontPadding">false</item>
+    </style>
+
+    <style name="Typography.Title01" parent="Typography">
+        <item name="fontFamily">@font/pretendard_semi_bold</item>
+        <item name="android:textSize">24sp</item>
+    </style>
+
+    <style name="Typography.Title02" parent="Typography">
+        <item name="fontFamily">@font/pretendard_semi_bold</item>
+        <item name="android:textSize">20sp</item>
+    </style>
+
+    <style name="Typography.Title03" parent="Typography">
+        <item name="fontFamily">@font/pretendard_semi_bold</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="Typography.Body01.Medium" parent="Typography">
+        <item name="fontFamily">@font/pretendard_medium</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="Typography.Body01.Regular" parent="Typography">
+        <item name="fontFamily">@font/pretendard_regular</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+
+    <style name="Typography.Body02.Medium" parent="Typography">
+        <item name="fontFamily">@font/pretendard_medium</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="Typography.Body02.Regular" parent="Typography">
+        <item name="fontFamily">@font/pretendard_regular</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="Typography.Body02.Light" parent="Typography">
+        <item name="fontFamily">@font/pretendard_light</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="Typography.Body03.Medium" parent="Typography">
+        <item name="fontFamily">@font/pretendard_medium</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="Typography.Body03.Regular" parent="Typography">
+        <item name="fontFamily">@font/pretendard_regular</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="Typography.Body03.Light" parent="Typography">
+        <item name="fontFamily">@font/pretendard_light</item>
+        <item name="android:textSize">12sp</item>
+    </style>
+
+    <style name="Typography.Bottom01" parent="Typography">
+        <item name="fontFamily">@font/pretendard_semi_bold</item>
+        <item name="android:textSize">18sp</item>
+    </style>
+
+    <style name="Typography.Bottom02" parent="Typography">
+        <item name="fontFamily">@font/pretendard_semi_bold</item>
+        <item name="android:textSize">16sp</item>
+    </style>
+</resources>