[MERGE] #16 -> develop

[ADD/#16] 타이포, 색상 에셋 수정, 로고 추가
Team-Going · Jan 1, 2024 · 82df2cc · 82df2cc
2 parents 0f281f9 + 788ce8b
commit 82df2cc
Show file tree

Hide file tree

Showing 21 changed files with 22 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,9 +7,9 @@
     <application
         android:name=".MyApp"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_doorip_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_doorip_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Doorip"
         android:usesCleartextTraffic="true"

diff --git a/presentation/src/main/ic_doorip_launcher-playstore.png b/presentation/src/main/ic_doorip_launcher-playstore.png
diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_doorip_launcher.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_doorip_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_doorip_launcher_foreground"/>
+</adaptive-icon>
diff --git a/presentation/src/main/res/mipmap-anydpi-v26/ic_doorip_launcher_round.xml b/presentation/src/main/res/mipmap-anydpi-v26/ic_doorip_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_doorip_launcher_foreground"/>
+</adaptive-icon>
diff --git a/presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher.png b/presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher.png
diff --git a/presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher_foreground.png b/presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher_foreground.png
diff --git a/presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher_round.png b/presentation/src/main/res/mipmap-hdpi/ic_doorip_launcher_round.png
diff --git a/presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher.png b/presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher.png
diff --git a/presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher_foreground.png b/presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher_foreground.png
diff --git a/presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher_round.png b/presentation/src/main/res/mipmap-mdpi/ic_doorip_launcher_round.png
diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher.png b/presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher.png
diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher_foreground.png b/presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher_foreground.png
diff --git a/presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher_round.png b/presentation/src/main/res/mipmap-xhdpi/ic_doorip_launcher_round.png
diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher.png b/presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher.png
diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher_foreground.png b/presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher_foreground.png
diff --git a/presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher_round.png b/presentation/src/main/res/mipmap-xxhdpi/ic_doorip_launcher_round.png
diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher.png
diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher_foreground.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher_foreground.png
diff --git a/presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher_round.png b/presentation/src/main/res/mipmap-xxxhdpi/ic_doorip_launcher_round.png
diff --git a/presentation/src/main/res/values/appearances.xml b/presentation/src/main/res/values/appearances.xml
@@ -18,7 +18,7 @@
     <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>
+        <item name="android:paddingVertical">6sp</item>
     </style>
 
     <style name="TextAppearance.Doorip.Head3">
@@ -35,15 +35,15 @@
 
     <style name="TextAppearance.Doorip.Body1">
         <item name="android:textSize">16sp</item>
-        <item name="android:paddingVertical">6sp</item>
+        <item name="android:paddingVertical">4sp</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 name="TextAppearance.Doorip.Body1.Medi">
+        <item name="fontFamily">@font/font_pretendard_medium</item>
     </style>
 
     <style name="TextAppearance.Doorip.Body2">
@@ -55,21 +55,21 @@
         <item name="fontFamily">@font/font_pretendard_bold</item>
     </style>
 
-    <style name="TextAppearance.Doorip.Body2.Regular">
-        <item name="fontFamily">@font/font_pretendard_regular</item>
+    <style name="TextAppearance.Doorip.Body2.Medi">
+        <item name="fontFamily">@font/font_pretendard_medium</item>
     </style>
 
     <style name="TextAppearance.Doorip.Body3">
         <item name="android:textSize">14sp</item>
-        <item name="android:paddingVertical">3sp</item>
+        <item name="android:paddingVertical">4sp</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 name="TextAppearance.Doorip.Body3.Medi">
+        <item name="fontFamily">@font/font_pretendard_medium</item>
     </style>
 
     <style name="TextAppearance.Doorip.Detail1">

diff --git a/presentation/src/main/res/values/colors.xml b/presentation/src/main/res/values/colors.xml
@@ -5,7 +5,6 @@
     <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>
 
@@ -14,13 +13,13 @@
     <color name="black_000">#151515</color>
 
     <color name="gray_50">#F3F3F6</color>
+    <color name="gray_100">#E4E5ED</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>