[FIX]#111: 리소스 변경

app/src/main/kotlin/com/bff/wespot/MainActivity.kt

@@ -167,21 +167,21 @@ private fun MainScreen(
                                 modifier = Modifier
                                     .padding(top = 8.dp, bottom = 8.dp, start = 16.dp)
                                     .size(width = 112.dp, height = 44.dp),
-                                painter = painterResource(id = R.drawable.logo),
+                                painter = painterResource(id = R.drawable.main_logo),
                                 contentDescription = stringResource(
                                     id = com.bff.wespot.message.R.string.wespot_logo,
                                 ),
                             )
                         },
                         action = {
                             IconButton(
-                                modifier = Modifier.padding(top = 10.dp, bottom = 10.dp, end = 4.dp),
+                                modifier = Modifier.padding(end = 16.dp),
                                 onClick = {
                                     navController.navigateToNavGraph(AppNavGraphs.notification)
                                 },
                             ) {
                                 Icon(
-                                    painter = painterResource(id = R.drawable.notification),
+                                    painter = painterResource(id = R.drawable.icn_alarm),
                                     contentDescription = stringResource(
                                         id = com.bff.wespot.message.R.string.notification_icon,
                                     ),
@@ -334,7 +334,7 @@ private fun TabItem(
             horizontalAlignment = Alignment.CenterHorizontally,
         ) {
             Icon(
-                painter = if(selected) {
+                painter = if (selected) {
                     icon
                 } else {
                     emptyIcon

core/ui/src/main/res/raw/loading.json

@@ -1 +1 @@
-{"v":"4.8.0","meta":{"g":"LottieFiles AE 3.5.9","a":"","k":"","d":"","tc":""},"fr":30,"ip":0,"op":59,"w":800,"h":800,"nm":"4.로딩","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 1 Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[90]},{"t":60,"s":[450]}],"ix":10},"p":{"a":0,"k":[400,400,0],"ix":2},"a":{"a":0,"k":[482.723,482.723,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,128.529],[-128.53,0],[0,-128.529],[128.529,0]],"o":[[0,-128.529],[128.529,0],[0,128.529],[-128.53,0]],"v":[[-232.723,0],[0.001,-232.723],[232.723,0],[0.001,232.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.898846794577,0.926102941176,0.534296671549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":100,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[482.723,482.723],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":23,"s":[0]},{"t":60,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":35,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":59,"st":0,"bm":0}],"markers":[]}
+{"v":"4.8.0","meta":{"g":"LottieFiles AE 3.5.9","a":"","k":"","d":"","tc":""},"fr":30,"ip":0,"op":59,"w":800,"h":800,"nm":"4.로딩","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Layer 1 Outlines 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[90]},{"t":60,"s":[450]}],"ix":10},"p":{"a":0,"k":[400,400,0],"ix":2},"a":{"a":0,"k":[482.723,482.723,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,128.529],[-128.53,0],[0,-128.529],[128.529,0]],"o":[[0,-128.529],[128.529,0],[0,128.529],[-128.53,0]],"v":[[-232.723,0],[0.001,-232.723],[232.723,0],[0.001,232.723]],"c":true},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.898846794577,0.926102941176,0.534296671549,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":70,"ix":5},"lc":2,"lj":1,"ml":10,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[482.723,482.723],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Group 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"tm","s":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":23,"s":[0]},{"t":60,"s":[100]}],"ix":1},"e":{"a":1,"k":[{"i":{"x":[0.667],"y":[1]},"o":{"x":[0.333],"y":[0]},"t":0,"s":[0]},{"t":35,"s":[100]}],"ix":2},"o":{"a":0,"k":0,"ix":3},"m":1,"ix":2,"nm":"Trim Paths 1","mn":"ADBE Vector Filter - Trim","hd":false}],"ip":0,"op":59,"st":0,"bm":0}],"markers":[]}

designsystem/src/main/res/drawable/notification.xml → designsystem/src/main/res/drawable/icn_alarm.xml

@@ -8,12 +8,12 @@
       android:strokeAlpha="0.8"
       android:strokeLineJoin="round"
       android:strokeWidth="2"
-      android:fillColor="#00000000"
+      android:fillColor="#76777D"
       android:strokeColor="#76777D"
       android:fillAlpha="0.8"
       android:strokeLineCap="round"/>
   <path
-      android:pathData="M21.728,30.5C21.552,30.803 21.299,31.055 20.996,31.229C20.692,31.404 20.348,31.497 19.998,31.497C19.647,31.497 19.303,31.404 18.999,31.229C18.696,31.055 18.443,30.803 18.268,30.5"
+      android:pathData="M21.727,30.5C21.552,30.803 21.299,31.055 20.996,31.229C20.692,31.404 20.348,31.497 19.997,31.497C19.647,31.497 19.303,31.404 18.999,31.229C18.695,31.055 18.443,30.803 18.267,30.5"
       android:strokeAlpha="0.8"
       android:strokeLineJoin="round"
       android:strokeWidth="2"

designsystem/src/main/res/drawable/icn_settings.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M20,23.667C19.518,23.667 19.042,23.572 18.597,23.388C18.152,23.204 17.748,22.934 17.407,22.593C17.067,22.253 16.797,21.848 16.613,21.404C16.428,20.959 16.333,20.482 16.333,20C16.333,19.519 16.428,19.042 16.613,18.597C16.797,18.153 17.067,17.748 17.407,17.408C17.748,17.067 18.152,16.797 18.597,16.613C19.042,16.429 19.518,16.334 20,16.334C20.972,16.334 21.905,16.72 22.593,17.408C23.28,18.096 23.667,19.028 23.667,20C23.667,20.973 23.28,21.906 22.593,22.593C21.905,23.281 20.972,23.667 20,23.667V23.667ZM29.033,21.952C28.53,21.431 28.249,20.735 28.25,20.011V19.99C28.249,19.266 28.53,18.57 29.033,18.049L29.972,17.079C30.358,16.679 30.432,16.071 30.155,15.59L28.897,13.412C28.762,13.177 28.554,12.993 28.305,12.888C28.056,12.782 27.779,12.76 27.517,12.826L26.202,13.154C25.496,13.331 24.749,13.224 24.12,12.857L24.102,12.847C23.483,12.487 23.027,11.902 22.831,11.213L22.455,9.904C22.381,9.644 22.224,9.415 22.008,9.252C21.792,9.088 21.529,9 21.258,9H18.742C18.187,9 17.697,9.369 17.545,9.904L17.14,11.313C16.962,11.943 16.544,12.477 15.976,12.802C15.917,12.835 15.859,12.869 15.802,12.904C15.232,13.243 14.551,13.343 13.907,13.182L12.482,12.826C12.22,12.76 11.943,12.782 11.694,12.888C11.445,12.993 11.237,13.177 11.102,13.411L9.845,15.59C9.71,15.824 9.655,16.097 9.688,16.365C9.721,16.634 9.84,16.884 10.028,17.079L10.967,18.049C11.47,18.57 11.751,19.266 11.751,19.989V20.011C11.751,20.735 11.47,21.431 10.967,21.952L10.464,22.472C10.15,22.796 9.951,23.214 9.896,23.662C9.84,24.11 9.932,24.563 10.158,24.954L11.103,26.589C11.381,27.071 11.943,27.31 12.483,27.175L13.908,26.819C14.552,26.658 15.233,26.757 15.803,27.097C15.86,27.132 15.918,27.166 15.977,27.199C16.546,27.521 16.961,28.058 17.141,28.688L17.545,30.097C17.697,30.632 18.187,31 18.742,31H21.258C21.813,31 22.303,30.632 22.455,30.097L22.859,28.688C23.039,28.058 23.454,27.521 24.023,27.199C24.082,27.166 24.14,27.132 24.197,27.097C24.767,26.757 25.448,26.658 26.092,26.819L27.517,27.175C27.779,27.241 28.056,27.219 28.305,27.113C28.554,27.008 28.762,26.824 28.897,26.59L30.155,24.411C30.29,24.177 30.346,23.904 30.312,23.636C30.279,23.367 30.16,23.117 29.972,22.922L29.032,21.952H29.033Z"
+      android:fillColor="#76777D"
+      android:fillType="evenOdd"/>
+</vector>

designsystem/src/main/res/drawable/main_logo.xml

@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="112dp"
+    android:height="43dp"
+    android:viewportWidth="112"
+    android:viewportHeight="43">
+  <path
+      android:pathData="M58.09,34.63L59.46,34.15V19.66L58.09,19.3V19.18L63.36,17.35H63.38V20.12C64.17,19.27 64.92,18.6 65.62,18.1C66.34,17.6 67.11,17.35 67.93,17.35C68.68,17.35 69.39,17.58 70.05,18.03C70.7,18.46 71.23,19.12 71.63,20C72.05,20.87 72.26,21.93 72.26,23.18C72.26,24.65 71.97,25.93 71.39,27C70.83,28.08 70.06,28.89 69.08,29.46C68.12,30.02 67.04,30.3 65.84,30.3C65.39,30.3 64.98,30.26 64.61,30.18C64.24,30.11 63.83,30.02 63.38,29.89V34.15L65.21,34.63V34.75H58.09V34.63ZM63.38,28.59C63.72,29.02 64.07,29.38 64.44,29.65C64.81,29.91 65.23,30.03 65.69,30.03C66.14,30.03 66.57,29.86 66.97,29.5C67.37,29.14 67.69,28.57 67.93,27.82C68.17,27.05 68.29,26.1 68.29,24.98C68.29,23.78 68.14,22.78 67.83,22C67.55,21.21 67.16,20.63 66.68,20.27C66.2,19.9 65.69,19.71 65.14,19.71C64.51,19.71 63.93,19.95 63.38,20.43V28.59Z"
+      android:fillColor="#F6FE8C"/>
+  <path
+      android:pathData="M50.22,30.3C49.53,30.3 48.88,30.24 48.27,30.13C47.68,30.03 47.19,29.93 46.83,29.82L45.84,23.9H45.98C46.27,24.99 46.74,25.95 47.38,26.79C48.02,27.62 48.78,28.27 49.66,28.73C50.55,29.18 51.48,29.41 52.45,29.41C53.32,29.41 53.97,29.24 54.4,28.9C54.85,28.55 55.08,28.08 55.08,27.48C55.08,26.83 54.75,26.2 54.09,25.61C53.45,25.01 52.25,24.32 50.48,23.51C49.07,22.87 47.96,22.26 47.16,21.69C46.36,21.09 45.79,20.51 45.45,19.93C45.12,19.34 44.95,18.69 44.95,17.98C44.95,16.99 45.25,16.07 45.86,15.24C46.49,14.39 47.35,13.71 48.46,13.22C49.57,12.7 50.83,12.45 52.24,12.45C53.39,12.45 54.59,12.61 55.85,12.95L56.37,11.41H56.49V17.47H56.37C56.09,16.1 55.48,14.97 54.57,14.11C53.67,13.24 52.59,12.81 51.32,12.81C50.39,12.81 49.64,13.02 49.06,13.46C48.5,13.89 48.22,14.48 48.22,15.21C48.22,15.97 48.54,16.66 49.18,17.31C49.82,17.93 50.91,18.58 52.43,19.26C54.18,20.03 55.42,20.82 56.16,21.64C56.9,22.44 57.26,23.42 57.26,24.57C57.26,25.63 56.98,26.59 56.42,27.46C55.86,28.33 55.04,29.01 53.97,29.53C52.91,30.04 51.66,30.3 50.22,30.3Z"
+      android:fillColor="#F6FE8C"/>
+  <path
+      android:pathData="M38.18,30.3C37,30.3 35.93,30.04 34.98,29.53C34.05,29.01 33.32,28.29 32.79,27.36C32.28,26.43 32.02,25.36 32.02,24.14C32.02,22.79 32.32,21.6 32.91,20.58C33.51,19.55 34.31,18.76 35.32,18.2C36.33,17.64 37.44,17.35 38.64,17.35C40.1,17.35 41.26,17.68 42.13,18.34C43.01,18.98 43.5,19.78 43.59,20.75H36.02C35.99,21.13 35.97,21.44 35.97,21.66C35.97,23.67 36.38,25.17 37.2,26.16C38.01,27.15 39.17,27.65 40.66,27.65C41.62,27.65 42.35,27.45 42.85,27.05C43.35,26.63 43.74,26 44.03,25.15L44.17,25.2C43.19,28.6 41.2,30.3 38.18,30.3ZM39.82,20.36C39.74,19.58 39.53,18.93 39.19,18.41C38.86,17.9 38.45,17.64 37.97,17.64C37.45,17.64 37.03,17.89 36.69,18.39C36.35,18.89 36.13,19.6 36.02,20.53L39.82,20.36Z"
+      android:fillColor="#F6FE8C"/>
+  <path
+      android:pathData="M9.25,13.41L8,12.93V12.81H15.67V12.93L13.68,13.41L17.96,24.96L21.97,12.23H22.05L28.3,25.13L29.38,22.09C29.96,20.54 30.38,19.26 30.66,18.25C30.93,17.22 31.07,16.38 31.07,15.72C31.07,14.87 30.85,14.26 30.42,13.89C29.98,13.51 29.31,13.22 28.4,13.05L27.84,12.93V12.81H34.34V12.93L33.11,13.41L26.5,30.51H26.42L20.77,18.77L15.89,30.51H15.82L9.25,13.41Z"
+      android:fillColor="#F6FE8C"/>
+  <path
+      android:pathData="M100.42,30.3C99.49,30.3 98.75,30.03 98.2,29.5C97.66,28.96 97.39,28.21 97.39,27.27V19.18H96.09V19.04C97.24,18.7 98.31,18.08 99.29,17.16C100.26,16.25 100.89,15.32 101.16,14.37H101.31V17.72H104.41V19.18H101.31V27.03C101.31,27.49 101.45,27.85 101.74,28.11C102.03,28.35 102.44,28.47 102.97,28.47C103.29,28.47 103.58,28.42 103.86,28.33C104.13,28.23 104.43,28.07 104.75,27.84L104.84,27.96C103.66,28.89 102.77,29.52 102.2,29.84C101.64,30.15 101.04,30.3 100.42,30.3Z"
+      android:fillColor="#F6FE8C"/>
+  <path
+      android:pathData="M73.28,29.07L80.54,24.52L74.04,19.6L82.07,22.25L80.16,15.44L84.75,21.12L94.69,7.48L88.96,21.49L94.69,21.87L88.19,24.15L98.13,32.1L87.04,27.93L87.43,32.48L84.75,28.31L80.16,34.75L80.93,27.55L73.28,29.07Z"
+      android:fillColor="#F6FE8C"/>
+</vector>

feature/entire/src/main/java/com/bff/wespot/entire/screen/EntireScreen.kt

@@ -78,7 +78,9 @@ internal fun EntireScreen(
                         modifier = Modifier
                             .clickable { navigator.navigateToSetting() }
                             .padding(end = 16.dp),
-                        imageVector = ImageVector.vectorResource(R.drawable.ic_setting),
+                        imageVector = ImageVector.vectorResource(
+                           com.bff.wespot.designsystem.R.drawable.icn_settings
+                        ),
                         contentDescription = stringResource(R.string.setting_icon),
                         tint = WeSpotThemeManager.colors.secondaryBtnColor,
                     )
@@ -123,7 +125,9 @@ internal fun EntireScreen(
                 }
 
                 HorizontalDivider(
-                    modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 12.dp),
                     thickness = 1.dp,
                     color = WeSpotThemeManager.colors.cardBackgroundColor,
                 )
@@ -144,7 +148,9 @@ internal fun EntireScreen(
                 }
 
                 HorizontalDivider(
-                    modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 12.dp),
                     thickness = 1.dp,
                     color = WeSpotThemeManager.colors.cardBackgroundColor,
                 )

feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteResultScreen.kt

@@ -167,7 +167,7 @@ fun VoteResultScreen(
         }
     }
 
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S && state.onBoarding) {
+    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S && state.onBoarding) {
         Box(
             modifier = Modifier
                 .fillMaxSize()