Merge pull request #80 from AdultOfNineteen/design/issue-79

[DESIGN] 이미지, 그래픽 변경 및 전시회용 화면 제작
AdultOfNineteen · Jun 3, 2024 · 977e788 · 977e788
2 parents bd68d44 + 8a68ca6
commit 977e788
Show file tree

Hide file tree

Showing 125 changed files with 544 additions and 643 deletions.
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -5,166 +5,6 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:fillColor="#1F114A"
+        android:pathData="M0,0h108v108h-108z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,61 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="257"
+    android:viewportHeight="238">
+  <group android:scaleX="0.35"
+      android:scaleY="0.32412452"
+      android:translateX="83.525"
+      android:translateY="80.429184">
+    <path
+        android:pathData="M220.71,0H38.73C-67.05,182.29 70.23,243.93 137.05,237.56C296.29,222.37 264.78,68.59 220.71,0Z"
+        android:strokeAlpha="0.4"
+        android:fillAlpha="0.4">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="-50.75"
+            android:startY="-10.5"
+            android:endX="483"
+            android:endY="250.25"
+            android:type="linear">
+          <item android:offset="0" android:color="#FF671CC6"/>
+          <item android:offset="1" android:color="#00FFFFFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M44.04,162.77C26.56,136.46 26.93,105.87 32.93,86.72C34.82,85.59 36.69,84.59 38.54,83.72C73.76,67.22 111.84,99.81 149.42,109.85C205.91,124.94 228.05,116.36 229.98,107.97C231.94,133.75 225.47,153.34 214.57,168.11C175.53,221.04 80.43,217.56 44.04,162.77Z">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="81.67"
+            android:startY="42.26"
+            android:endX="129.45"
+            android:endY="211.34"
+            android:type="linear">
+          <item android:offset="0.18" android:color="#FF4D32B5"/>
+          <item android:offset="0.74" android:color="#FFA95FD0"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M185.15,192.38C92.75,234.5 36.49,171.97 32.12,134.08C41.35,127.77 62.13,130.67 81.67,150.22C106.45,174.99 158.91,189.46 185.15,192.38Z"
+        android:fillAlpha="0.7">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startX="57.75"
+            android:startY="148.75"
+            android:endX="108.63"
+            android:endY="207.68"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFFFFFFF"/>
+          <item android:offset="1" android:color="#FFCEBDFF"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M153.04,120.86C114.1,152.41 81.67,169.06 48.15,169.06C80.21,215.7 144.34,217.15 188.06,190.92C228.61,166.59 233.24,129.71 228.87,93.27C220.25,88.41 191.99,89.31 153.04,120.86Z"
+        android:fillColor="#983EDE"
+        android:fillAlpha="0.7"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#321B74</color>
+    <color name="ic_launcher_background">#1F114A</color>
 </resources>
diff --git a/core/common/src/main/java/com/teamwiney/core/common/base/BaseViewModel.kt b/core/common/src/main/java/com/teamwiney/core/common/base/BaseViewModel.kt
@@ -61,10 +61,7 @@ abstract class BaseViewModel<State: UiState, Event: UiEvent, Effect: UiEffect>(
     protected fun updateState(currentState: State) {
         _uiState.value = currentState
     }
-    // TODO : processEvent 메소드 사용할지 고민해보기
-    // onClick = { processEvent(LoginContract.Event.KaKaoButtonClicked()) } 처럼 사용?
-    // 아니면 ViewModel 단의 kakaoLogin 메소드에서 _event.emit()하고
-    // onClick = { kakaoLogin() } 이런 식으로 사용?
+
     fun processEvent(event: Event) {
         viewModelScope.launch { _event.emit(event) }
     }

diff --git a/core/common/src/main/java/com/teamwiney/core/common/navigation/Destinations.kt b/core/common/src/main/java/com/teamwiney/core/common/navigation/Destinations.kt
@@ -17,6 +17,7 @@ object AuthDestinations {
         const val PHONE = "signUpPhone"
         const val AUTHENTICATION = "signUpAuthentication"
         const val FAVORITE_TASTE = "signUpFavoriteTaste"
+        const val TASTE_RESULT = "signUpTasteResult"
         const val COMPLETE = "signUpComplete"
     }
 }

diff --git a/core/design/src/main/java/com/teamwiney/ui/components/WineBadge.kt b/core/design/src/main/java/com/teamwiney/ui/components/WineBadge.kt
@@ -22,27 +22,27 @@ fun WineBadge(
     val (badge, image) = when (color) {
         "RED" -> BadgeProperties(
             R.drawable.ic_red_wine_badge,
-            R.drawable.ic_red_wine
+            R.mipmap.img_red_wine
         )
         "WHITE" -> BadgeProperties(
             R.drawable.ic_white_wine_badge,
-            R.drawable.ic_white_wine
+            R.mipmap.img_white_wine
         )
         "ROSE" -> BadgeProperties(
             R.drawable.ic_rose_wine_badge,
-            R.drawable.ic_rose_wine
+            R.mipmap.img_rose_wine
         )
         "SPARKL" -> BadgeProperties(
             R.drawable.ic_sparkl_wine_badge,
-            R.drawable.ic_sparkl_wine
+            R.mipmap.img_sparkl_wine
         )
         "PORT" -> BadgeProperties(
             R.drawable.ic_port_wine_badge,
-            R.drawable.ic_port_wine
+            R.mipmap.img_port_wine
         )
         else -> BadgeProperties(
             R.drawable.ic_etc_wine_badge,
-            R.drawable.ic_etc_wine
+            R.mipmap.img_etc_wine
         )
     }
 

diff --git a/core/design/src/main/java/com/teamwiney/ui/components/WineCard.kt b/core/design/src/main/java/com/teamwiney/ui/components/WineCard.kt
@@ -74,47 +74,47 @@ fun WineCard(
     val (wineName, image, borderColor, gradientCircleColor, circleColor, cardColor) = when (color) {
         "RED" -> CardProperties(
             color,
-            R.drawable.ic_red_wine,
+            R.mipmap.img_red_wine,
             Color(0xFFA87575),
             listOf(Color(0xFFBF3636), Color(0xFF8F034F)),
             Color(0xFF640D0D),
             Color(0xFF441010)
         )
         "WHITE" -> CardProperties(
             color,
-            R.drawable.ic_white_wine,
+            R.mipmap.img_white_wine,
             Color(0xFFC1BA9E),
             listOf(Color(0xFFAEAB99), Color(0xFF754A09)),
             Color(0xFF898472),
             Color(0xFF7A706D)
         )
         "ROSE" -> CardProperties(
             color,
-            R.drawable.ic_rose_wine,
+            R.mipmap.img_rose_wine,
             Color(0xFFC9A4A1),
             listOf(Color(0xFFAA678F), Color(0xFFD29263)),
             Color(0xFFBA7A71),
             Color(0xFF8F6C64)
         )
         "SPARKL" -> CardProperties(
             color,
-            R.drawable.ic_sparkl_wine,
+            R.mipmap.img_sparkl_wine,
             Color(0xFFC1BA9E),
             listOf(Color(0xFF827D6B), Color(0xFFBAC59C)),
             Color(0xFF777151),
             Color(0xFF4F5144)
         )
         "PORT" -> CardProperties(
             color,
-            R.drawable.ic_port_wine,
+            R.mipmap.img_port_wine,
             Color(0xFFB09A86),
             listOf(Color(0xFF4A2401), Color(0xFF77503A)),
             Color(0xFF4F3F28),
             Color(0xFF3A2F2F)
         )
         else -> CardProperties(
             color,
-            R.drawable.ic_etc_wine,
+            R.mipmap.img_etc_wine,
             Color(0xFF768169),
             listOf(Color(0xFF3C3D12), Color(0xFF465C18)),
             Color(0xFF2D4328),