[MERGE] #8 -> develop

[ADD/#8] 색상, 타이포 에셋 세팅
Team-Going · Dec 30, 2023 · eb1d47f · eb1d47f
2 parents 4664dcc + 3fe0bd2
commit eb1d47f
Show file tree

Hide file tree

Showing 16 changed files with 222 additions and 21 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -11,7 +11,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.GoingGoing"
+        android:theme="@style/Theme.Doorip"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
 

diff --git a/presentation/src/main/res/font/font_pretendard_bold.xml b/presentation/src/main/res/font/font_pretendard_bold.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_bold"
+        android:fontStyle="normal"
+        android:fontWeight="700" />
+    <font
+        android:font="@font/pretendard_bold"
+        android:fontStyle="italic"
+        android:fontWeight="700" />
+</font-family>
diff --git a/presentation/src/main/res/font/font_pretendard_extrabold.xml b/presentation/src/main/res/font/font_pretendard_extrabold.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_extrabold"
+        android:fontStyle="normal"
+        android:fontWeight="800" />
+    <font
+        android:font="@font/pretendard_extrabold"
+        android:fontStyle="italic"
+        android:fontWeight="800" />
+</font-family>
diff --git a/presentation/src/main/res/font/font_pretendard_medium.xml b/presentation/src/main/res/font/font_pretendard_medium.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_medium"
+        android:fontStyle="normal"
+        android:fontWeight="500" />
+    <font
+        android:font="@font/pretendard_medium"
+        android:fontStyle="italic"
+        android:fontWeight="500" />
+</font-family>
diff --git a/presentation/src/main/res/font/font_pretendard_regular.xml b/presentation/src/main/res/font/font_pretendard_regular.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_regular"
+        android:fontStyle="normal"
+        android:fontWeight="400" />
+    <font
+        android:font="@font/pretendard_regular"
+        android:fontStyle="italic"
+        android:fontWeight="400" />
+</font-family>
diff --git a/presentation/src/main/res/font/font_pretendard_semibold.xml b/presentation/src/main/res/font/font_pretendard_semibold.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:font="@font/pretendard_semibold"
+        android:fontStyle="normal"
+        android:fontWeight="600" />
+    <font
+        android:font="@font/pretendard_semibold"
+        android:fontStyle="italic"
+        android:fontWeight="600" />
+</font-family>
diff --git a/presentation/src/main/res/font/pretendard_bold.ttf b/presentation/src/main/res/font/pretendard_bold.ttf
diff --git a/presentation/src/main/res/font/pretendard_extrabold.ttf b/presentation/src/main/res/font/pretendard_extrabold.ttf
diff --git a/presentation/src/main/res/font/pretendard_medium.ttf b/presentation/src/main/res/font/pretendard_medium.ttf
diff --git a/presentation/src/main/res/font/pretendard_regular.ttf b/presentation/src/main/res/font/pretendard_regular.ttf
diff --git a/presentation/src/main/res/font/pretendard_semibold.ttf b/presentation/src/main/res/font/pretendard_semibold.ttf
diff --git a/presentation/src/main/res/layout/activity_mock.xml b/presentation/src/main/res/layout/activity_mock.xml
@@ -10,7 +10,23 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#8C8C8C">
+        android:background="@color/black_000">
+
+        <!-- 색상 적용은 @color 활용하기 -->
+        <!-- 폰트 적용은 style 활용하기 -->
+        <!-- 폰트 색상, 형태(italic) 등 필요시 textView에서 지정해서 덮어쓰면 됨! -->
+
+        <TextView
+            android:id="@+id/tv_mock_text"
+            style="@style/TextAppearance.Doorip.Head1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:background="@color/white_000"
+            android:text="MOCK ACTIVITY"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/rv_follower"
@@ -23,7 +39,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/tv_mock_text"
             app:spanCount="2"
             tools:listitem="@layout/item_mock" />
 

diff --git a/presentation/src/main/res/layout/item_mock.xml b/presentation/src/main/res/layout/item_mock.xml
@@ -19,7 +19,7 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white"
+            android:background="@color/white_000"
             android:padding="12dp">
 
             <ImageView

diff --git a/presentation/src/main/res/values/appearances.xml b/presentation/src/main/res/values/appearances.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <style name="TextAppearance.Doorip" parent="">
+        <item name="android:textStyle">normal</item>
+        <item name="android:textColor">@color/black_000</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:includeFontPadding">false</item>
+        <item name="android:lineSpacingMultiplier">1.0</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Head1">
+        <item name="fontFamily">@font/font_pretendard_extrabold</item>
+        <item name="android:textSize">24sp</item>
+        <item name="android:paddingVertical">6sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Head2">
+        <item name="fontFamily">@font/font_pretendard_bold</item>
+        <item name="android:textSize">22sp</item>
+        <item name="android:paddingVertical">5sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Head3">
+        <item name="fontFamily">@font/font_pretendard_semibold</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:paddingVertical">5sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Head4">
+        <item name="fontFamily">@font/font_pretendard_medium</item>
+        <item name="android:textSize">18sp</item>
+        <item name="android:paddingVertical">5sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body1">
+        <item name="android:textSize">16sp</item>
+        <item name="android:paddingVertical">6sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body1.Bold">
+        <item name="fontFamily">@font/font_pretendard_bold</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body1.Regular">
+        <item name="fontFamily">@font/font_pretendard_regular</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body2">
+        <item name="android:textSize">15sp</item>
+        <item name="android:paddingVertical">4sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body2.Bold">
+        <item name="fontFamily">@font/font_pretendard_bold</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body2.Regular">
+        <item name="fontFamily">@font/font_pretendard_regular</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body3">
+        <item name="android:textSize">14sp</item>
+        <item name="android:paddingVertical">3sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body3.Bold">
+        <item name="fontFamily">@font/font_pretendard_bold</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Body3.Regular">
+        <item name="fontFamily">@font/font_pretendard_regular</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail1">
+        <item name="android:textSize">13sp</item>
+        <item name="android:paddingVertical">3sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail1.Bold">
+        <item name="fontFamily">@font/font_pretendard_bold</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail1.Regular">
+        <item name="fontFamily">@font/font_pretendard_regular</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail2">
+        <item name="android:textSize">12sp</item>
+        <item name="android:paddingVertical">3sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail2.Bold">
+        <item name="fontFamily">@font/font_pretendard_bold</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail2.Regular">
+        <item name="fontFamily">@font/font_pretendard_regular</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail3">
+        <item name="android:textSize">11sp</item>
+        <item name="android:paddingVertical">3sp</item>
+    </style>
+
+    <style name="TextAppearance.Doorip.Detail3.Regular">
+        <item name="fontFamily">@font/font_pretendard_regular</item>
+    </style>
+
+</resources>
diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
@@ -1,10 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
+
+    <!-- Main _ Tangerine -->
+    <color name="red_100">#FAD3C6</color>
+    <color name="red_200">#FCAD95</color>
+    <color name="red_300">#FE8763</color>
+    <color name="red_400">#FE6032</color>
+    <color name="red_500">#FF4F17</color>
+    <color name="red_600">#E03600</color>
+
+    <!-- Sub _ Cool Gray -->
+    <color name="white_000">#FFFFFF</color>
+    <color name="black_000">#151515</color>
+
+    <color name="gray_50">#F3F3F6</color>
+    <color name="gray_200">#C3C4CE</color>
+    <color name="gray_300">#9093A8</color>
+    <color name="gray_400">#4A4D63</color>
+    <color name="gray_500">#36394F</color>
+    <color name="gray_600">#292C3C</color>
+    <color name="gray_700">#1D1F29</color>
+    <color name="gray_900">#15171E</color>
+
+    <!-- Transparent -->
+    <color name="transparent">#00000000</color>
+    <color name="transparent_70">#B3000000</color>
+    <color name="transparent_50">#80000000</color>
+    <color name="transparent_30">#4D000000</color>
+
+    <!-- Custom -->
+    <color name="kakao_yellow">#FEE500</color>
+
 </resources>
diff --git a/presentation/src/main/res/values/themes.xml b/presentation/src/main/res/values/themes.xml
@@ -1,17 +1,13 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.GoingGoing" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
+    <style name="Base.Theme.Doorip" parent="Theme.MaterialComponents.Light.NoActionBar">
+
         <!-- Status bar color. -->
         <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowLightStatusBar">true</item>
-        <!-- Customize your theme here. -->
+
     </style>
+
+    <style name="Theme.Doorip" parent="Base.Theme.Doorip" />
+
 </resources>