[FEAT/#206] 마이페이지 아이콘 수정

teamterning · Sep 4, 2024 · cf12689 · cf12689
1 parent 197b16f
commit cf12689
Show file tree

Hide file tree

Showing 7 changed files with 122 additions and 86 deletions.
diff --git a/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt b/feature/src/main/java/com/terning/feature/mypage/mypage/MyPageRoute.kt
@@ -107,11 +107,13 @@ fun MyPageRoute(
         is UiState.Success -> {
             MyPageScreen(
                 paddingValues = paddingValues,
+                onEditClick = { viewModel.navigateToProfileEdit() },
                 onLogoutClick = { viewModel.fetchShowLogoutBottomSheet(true) },
                 onQuitClick = { viewModel.fetchShowQuitBottomSheet(true) },
                 onNoticeClick = { viewModel.fetchShowNotice(true) },
                 onOpinionClick = { viewModel.fetchShowOpinion(true) },
-                onEditClick = { viewModel.navigateToProfileEdit() },
+                onServiceClick = {},
+                onPersonalClick = {},
                 name = state.name,
                 profile = state.profile
             )
@@ -135,11 +137,13 @@ fun MyPageRoute(
 
 @Composable
 fun MyPageScreen(
+    onEditClick: () -> Unit,
     onLogoutClick: () -> Unit,
     onQuitClick: () -> Unit,
     onNoticeClick: () -> Unit,
     onOpinionClick: () -> Unit,
-    onEditClick: () -> Unit,
+    onServiceClick: () -> Unit,
+    onPersonalClick: () -> Unit,
     modifier: Modifier = Modifier,
     paddingValues: PaddingValues = PaddingValues(),
     name: String = "",
@@ -161,8 +165,8 @@ fun MyPageScreen(
             onOpinionClick = onOpinionClick
         )
         ServiceInfo(
-            onNoticeClick = onNoticeClick,
-            onOpinionClick = onOpinionClick
+            onServiceClick = onServiceClick,
+            onPersonalClick = onPersonalClick
         )
         Row(
             modifier = Modifier
@@ -226,10 +230,12 @@ fun UserProfile(
                     bottom = 7.dp
                 )
             )
-            Row(verticalAlignment = Alignment.CenterVertically,
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
                 modifier = Modifier.noRippleClickable {
                     onEditClick()
-                }) {
+                }
+            ) {
                 Text(
                     text = stringResource(id = R.string.my_page_edit_profile),
                     modifier = Modifier.padding(start = 16.dp, end = 7.dp),
@@ -278,9 +284,9 @@ fun TerningCommunity(
                 modifier = Modifier.padding(bottom = 20.dp)
             )
             MyPageItem(
-                text = stringResource(id = R.string.my_page_information),
+                text = stringResource(id = R.string.my_page_notice),
                 icon = R.drawable.ic_my_page_notice,
-                onButtonClick = { onNoticeClick() }
+                onButtonClick = onNoticeClick
             )
             HorizontalDivider(
                 modifier = Modifier
@@ -291,7 +297,7 @@ fun TerningCommunity(
             MyPageItem(
                 text = stringResource(id = R.string.my_page_opinion),
                 icon = R.drawable.ic_my_page_opinion,
-                onButtonClick = { onOpinionClick() }
+                onButtonClick = onOpinionClick
             )
         }
     }
@@ -300,8 +306,8 @@ fun TerningCommunity(
 @Composable
 fun ServiceInfo(
     modifier: Modifier = Modifier,
-    onNoticeClick: () -> Unit,
-    onOpinionClick: () -> Unit
+    onServiceClick: () -> Unit,
+    onPersonalClick: () -> Unit
 ) {
     Column(
         modifier = modifier
@@ -332,9 +338,9 @@ fun ServiceInfo(
                 modifier = Modifier.padding(bottom = 20.dp)
             )
             MyPageItem(
-                text = stringResource(id = R.string.my_page_notice),
-                icon = R.drawable.ic_my_page_notice,
-                onButtonClick = { onNoticeClick() }
+                text = stringResource(id = R.string.my_page_service),
+                icon = R.drawable.ic_my_page_service,
+                onButtonClick = onServiceClick
             )
             HorizontalDivider(
                 modifier = Modifier
@@ -343,9 +349,9 @@ fun ServiceInfo(
                 color = Grey150
             )
             MyPageItem(
-                text = stringResource(id = R.string.my_page_private_information),
-                icon = R.drawable.ic_my_page_opinion,
-                onButtonClick = { onOpinionClick() }
+                text = stringResource(id = R.string.my_page_personal),
+                icon = R.drawable.ic_my_page_personal,
+                onButtonClick = onPersonalClick
             )
             HorizontalDivider(
                 modifier = Modifier
@@ -374,7 +380,9 @@ fun MyPageScreenPreview() {
             onOpinionClick = {},
             onLogoutClick = {},
             onQuitClick = {},
-            onEditClick = {}
+            onEditClick = {},
+            onServiceClick = {},
+            onPersonalClick = {},
         )
     }
 }
diff --git a/feature/src/main/res/drawable/ic_my_page_notice.xml b/feature/src/main/res/drawable/ic_my_page_notice.xml
@@ -1,26 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="280dp"
-    android:height="280dp"
-    android:viewportWidth="280"
-    android:viewportHeight="280">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
   <path
-      android:pathData="M237.49,140m-22.44,0a22.44,22.44 0,1 1,44.88 0a22.44,22.44 0,1 1,-44.88 0"
-      android:strokeWidth="0"
-      android:fillColor="#00c177"/>
+      android:pathData="M2.17,6.609H3.44V10.929H2.17C1.5,10.929 0.96,10.389 0.96,9.719V7.819C0.96,7.149 1.5,6.609 2.17,6.609Z"
+      android:fillColor="#1EAC61"/>
   <path
-      android:pathData="M34.91,114.39L62.54,114.39A14.84,14.84 0,0 1,77.38 129.23L77.38,150.77A14.84,14.84 0,0 1,62.54 165.61L34.91,165.61A14.84,14.84 0,0 1,20.07 150.77L20.07,129.23A14.84,14.84 0,0 1,34.91 114.39z"
-      android:strokeWidth="0"
-      android:fillColor="#00c177"/>
+      android:pathData="M12.76,20.279H11.23C10.87,20.279 10.56,19.989 10.45,19.569L7.77,8.449H10.99L13.54,18.999C13.69,19.639 13.31,20.289 12.76,20.289V20.279Z"
+      android:fillColor="#1EAC61"/>
   <path
-      android:pathData="M210.97,237.59l-118.75,-69.42l0,-56.15l118.75,-69.61l0,195.18z"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M5.84,4.641H15.44V12.911H5.84C4.38,12.911 3.2,11.731 3.2,10.271V7.271C3.2,5.811 4.38,4.631 5.84,4.631V4.641Z"
+      android:fillColor="#65DB9B"/>
   <path
-      android:pathData="M46.25,98.39L90.67,98.39A10.9,10.9 0,0 1,101.57 109.29L101.57,170.72A10.9,10.9 0,0 1,90.67 181.62L46.25,181.62A10.9,10.9 0,0 1,35.35 170.72L35.35,109.29A10.9,10.9 0,0 1,46.25 98.39z"
-      android:strokeWidth="0"
-      android:fillColor="#00a458"/>
+      android:pathData="M19.75,10.291H18.78V7.261H19.75C20.59,7.261 21.27,7.941 21.27,8.781C21.27,9.621 20.59,10.301 19.75,10.301V10.291Z"
+      android:fillColor="#0D8443"/>
   <path
-      android:pathData="M202.38,36.98L227.31,36.98A10.18,10.18 0,0 1,237.49 47.16L237.49,232.85A10.18,10.18 0,0 1,227.31 243.03L202.38,243.03A10.18,10.18 0,0 1,192.2 232.85L192.2,47.16A10.18,10.18 0,0 1,202.38 36.98z"
-      android:strokeWidth="0"
-      android:fillColor="#00a458"/>
+      android:pathData="M13.27,4.7V12.85L19.03,15.79C19.33,15.94 19.65,15.67 19.65,15.27V2.29C19.65,1.89 19.32,1.61 19.03,1.77L13.27,4.71V4.7Z"
+      android:fillColor="#1EAC61"/>
 </vector>
diff --git a/feature/src/main/res/drawable/ic_my_page_opinion.xml b/feature/src/main/res/drawable/ic_my_page_opinion.xml
@@ -1,26 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="280dp"
-    android:height="280dp"
-    android:viewportWidth="280"
-    android:viewportHeight="280">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
   <path
-      android:pathData="M238.51,89.4H93.34c-9.73,0 -17.62,7.89 -17.62,17.62v71.92c0,9.73 7.89,17.62 17.62,17.62h101.45l24.42,29.54c1.84,2.23 5.46,0.93 5.46,-1.96v-27.58h13.85c9.73,0 17.62,-7.89 17.62,-17.62v-71.92c0,-9.73 -7.89,-17.62 -17.62,-17.62Z"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M21.1,14.81V11.63C21.1,10 19.78,8.68 18.15,8.68H10.3C8.67,8.68 7.35,10 7.35,11.63V14.81C7.35,16.44 8.67,17.76 10.3,17.76H16.75C18.67,19.74 20.97,19.93 20.97,19.93C20.09,19.11 19.58,18.25 19.28,17.54C20.35,17.1 21.11,16.05 21.11,14.81H21.1Z"
+      android:fillColor="#1EAC61"/>
   <path
-      android:pathData="M41.49,51.67h145.17c9.73,0 17.62,7.89 17.62,17.62v71.92c0,9.73 -7.89,17.62 -17.62,17.62h-101.45s-24.42,29.54 -24.42,29.54c-1.84,2.23 -5.46,0.93 -5.46,-1.96v-27.58s-13.85,0 -13.85,0c-9.73,0 -17.62,-7.89 -17.62,-17.62v-71.92c0,-9.73 7.89,-17.62 17.62,-17.62Z"
-      android:strokeWidth="0"
-      android:fillColor="#00a458"/>
+      android:pathData="M0.9,9.26V5.53C0.9,3.62 2.57,2.07 4.62,2.07H14.52C16.57,2.07 18.24,3.62 18.24,5.53V9.26C18.24,11.17 16.57,12.72 14.52,12.72H6.4C3.98,15.04 1.08,15.27 1.08,15.27C2.19,14.31 2.83,13.3 3.21,12.46C1.86,11.94 0.9,10.71 0.9,9.26Z"
+      android:fillColor="#65DB9B"/>
   <path
-      android:pathData="M74.06,106.65m-10.19,0a10.19,10.19 0,1 1,20.38 0a10.19,10.19 0,1 1,-20.38 0"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M9.63,8.379C10.072,8.379 10.43,8.021 10.43,7.579C10.43,7.137 10.072,6.779 9.63,6.779C9.188,6.779 8.83,7.137 8.83,7.579C8.83,8.021 9.188,8.379 9.63,8.379Z"
+      android:fillColor="#1EAC61"/>
   <path
-      android:pathData="M114.07,106.65m-10.19,0a10.19,10.19 0,1 1,20.38 0a10.19,10.19 0,1 1,-20.38 0"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M12.71,8.379C13.152,8.379 13.51,8.021 13.51,7.579C13.51,7.137 13.152,6.779 12.71,6.779C12.268,6.779 11.91,7.137 11.91,7.579C11.91,8.021 12.268,8.379 12.71,8.379Z"
+      android:fillColor="#1EAC61"/>
   <path
-      android:pathData="M154.09,106.65m-10.19,0a10.19,10.19 0,1 1,20.38 0a10.19,10.19 0,1 1,-20.38 0"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M6.55,8.379C6.992,8.379 7.35,8.021 7.35,7.579C7.35,7.137 6.992,6.779 6.55,6.779C6.108,6.779 5.75,7.137 5.75,7.579C5.75,8.021 6.108,8.379 6.55,8.379Z"
+      android:fillColor="#1EAC61"/>
 </vector>
diff --git a/feature/src/main/res/drawable/ic_my_page_personal.xml b/feature/src/main/res/drawable/ic_my_page_personal.xml
@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M0.82,3.91H21.17V15.08C21.17,16.74 19.82,18.09 18.16,18.09H3.83C2.17,18.09 0.82,16.74 0.82,15.08V3.91Z"
+      android:fillColor="#65DB9B"/>
+  <path
+      android:pathData="M21.17,3.91H0.82V6.63H21.17V3.91Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M6.24,12.13C7.201,12.13 7.98,11.351 7.98,10.39C7.98,9.429 7.201,8.65 6.24,8.65C5.279,8.65 4.5,9.429 4.5,10.39C4.5,11.351 5.279,12.13 6.24,12.13Z"
+      android:fillColor="#0D8443"/>
+  <path
+      android:pathData="M6.24,11.891C4.31,11.891 2.74,13.461 2.74,15.391H9.74C9.74,13.461 8.17,11.891 6.24,11.891Z"
+      android:fillColor="#0D8443"/>
+  <path
+      android:pathData="M18.76,9.119H11.7C11.49,9.119 11.32,9.289 11.32,9.499V9.659C11.32,9.869 11.49,10.039 11.7,10.039H18.76C18.97,10.039 19.14,9.869 19.14,9.659V9.499C19.14,9.289 18.97,9.119 18.76,9.119Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M18.76,11.43H11.7C11.49,11.43 11.32,11.6 11.32,11.81V11.97C11.32,12.18 11.49,12.35 11.7,12.35H18.76C18.97,12.35 19.14,12.18 19.14,11.97V11.81C19.14,11.6 18.97,11.43 18.76,11.43Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M18.76,13.74H11.7C11.49,13.74 11.32,13.91 11.32,14.12V14.28C11.32,14.49 11.49,14.66 11.7,14.66H18.76C18.97,14.66 19.14,14.49 19.14,14.28V14.12C19.14,13.91 18.97,13.74 18.76,13.74Z"
+      android:fillColor="#1EAC61"/>
+</vector>
diff --git a/feature/src/main/res/drawable/ic_my_page_service.xml b/feature/src/main/res/drawable/ic_my_page_service.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
+  <path
+      android:pathData="M5.78,0.811H19.44V13.25C19.44,17.631 15.88,21.191 11.5,21.191H2.56V4.041C2.56,2.261 4,0.821 5.78,0.821V0.811Z"
+      android:fillColor="#65DB9B"/>
+  <path
+      android:pathData="M13.51,14.88C13.51,14.88 15.81,20.44 12.24,21.15C16.28,20.78 19.44,17.38 19.44,13.25C19.44,13.25 18.77,15.01 13.51,14.88Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M16.48,3.26H5.52C5.255,3.26 5.04,3.475 5.04,3.74C5.04,4.005 5.255,4.22 5.52,4.22H16.48C16.745,4.22 16.96,4.005 16.96,3.74C16.96,3.475 16.745,3.26 16.48,3.26Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M16.48,5.67H5.52C5.255,5.67 5.04,5.885 5.04,6.15C5.04,6.415 5.255,6.63 5.52,6.63H16.48C16.745,6.63 16.96,6.415 16.96,6.15C16.96,5.885 16.745,5.67 16.48,5.67Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M16.48,8.08H5.52C5.255,8.08 5.04,8.295 5.04,8.56C5.04,8.825 5.255,9.04 5.52,9.04H16.48C16.745,9.04 16.96,8.825 16.96,8.56C16.96,8.295 16.745,8.08 16.48,8.08Z"
+      android:fillColor="#1EAC61"/>
+  <path
+      android:pathData="M13.61,10.49H5.46C5.228,10.49 5.04,10.678 5.04,10.91V11.03C5.04,11.262 5.228,11.45 5.46,11.45H13.61C13.842,11.45 14.03,11.262 14.03,11.03V10.91C14.03,10.678 13.842,10.49 13.61,10.49Z"
+      android:fillColor="#1EAC61"/>
+</vector>
diff --git a/feature/src/main/res/drawable/ic_my_page_version.xml b/feature/src/main/res/drawable/ic_my_page_version.xml
@@ -1,34 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="280dp"
-    android:height="280dp"
-    android:viewportWidth="280"
-    android:viewportHeight="280">
+    android:width="22dp"
+    android:height="22dp"
+    android:viewportWidth="22"
+    android:viewportHeight="22">
   <path
-      android:pathData="M71.82,43.48h136.36c10.17,0 18.42,8.25 18.42,18.42v110.97c0,42.53 -34.53,77.05 -77.05,77.05h-77.72c-10.17,0 -18.42,-8.25 -18.42,-18.42V61.9c0,-10.17 8.25,-18.42 18.42,-18.42Z"
-      android:strokeWidth="0"
-      android:fillColor="#00a458"/>
+      android:pathData="M15.21,0.711H6.79C5.244,0.711 3.99,1.965 3.99,3.511V18.491C3.99,20.037 5.244,21.291 6.79,21.291H15.21C16.756,21.291 18.01,20.037 18.01,18.491V3.511C18.01,1.965 16.756,0.711 15.21,0.711Z"
+      android:fillColor="#1EAC61"/>
   <path
-      android:pathData="M149.54,249.92c18.65,0.07 23.21,-39.58 17.11,-46.24 0,0 48.77,-0.04 58.03,-13.67 0,0 -5.66,55.81 -75.14,59.91Z"
-      android:strokeWidth="0"
-      android:fillColor="#00c177"/>
+      android:pathData="M15.73,3.85H6.28C5.855,3.85 5.51,4.194 5.51,4.62V16.19C5.51,16.615 5.855,16.96 6.28,16.96H15.73C16.155,16.96 16.5,16.615 16.5,16.19V4.62C16.5,4.194 16.155,3.85 15.73,3.85Z"
+      android:fillColor="#65DB9B"/>
   <path
-      android:pathData="M81.34,83.18L181.51,83.18A5.6,5.6 0,0 1,187.11 88.78L187.11,88.79A5.6,5.6 0,0 1,181.51 94.39L81.34,94.39A5.6,5.6 0,0 1,75.74 88.79L75.74,88.78A5.6,5.6 0,0 1,81.34 83.18z"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M8.38,2.6C8.656,2.6 8.88,2.376 8.88,2.1C8.88,1.823 8.656,1.6 8.38,1.6C8.104,1.6 7.88,1.823 7.88,2.1C7.88,2.376 8.104,2.6 8.38,2.6Z"
+      android:fillColor="#0D8443"/>
   <path
-      android:pathData="M80.4,109.15L142.35,109.15A4.66,4.66 0,0 1,147.01 113.81L147.01,115.7A4.66,4.66 0,0 1,142.35 120.36L80.4,120.36A4.66,4.66 0,0 1,75.74 115.7L75.74,113.81A4.66,4.66 0,0 1,80.4 109.15z"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
+      android:pathData="M13.62,1.6H9.97C9.694,1.6 9.47,1.823 9.47,2.1C9.47,2.376 9.694,2.6 9.97,2.6H13.62C13.896,2.6 14.12,2.376 14.12,2.1C14.12,1.823 13.896,1.6 13.62,1.6Z"
+      android:fillColor="#0D8443"/>
   <path
-      android:pathData="M81.34,135.12L193.92,135.12A5.6,5.6 0,0 1,199.52 140.72L199.52,140.73A5.6,5.6 0,0 1,193.92 146.33L81.34,146.33A5.6,5.6 0,0 1,75.74 140.73L75.74,140.72A5.6,5.6 0,0 1,81.34 135.12z"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
-  <path
-      android:pathData="M80.86,161.09L156.8,161.09A5.12,5.12 0,0 1,161.92 166.21L161.92,167.18A5.12,5.12 0,0 1,156.8 172.3L80.86,172.3A5.12,5.12 0,0 1,75.74 167.18L75.74,166.21A5.12,5.12 0,0 1,80.86 161.09z"
-      android:strokeWidth="0"
-      android:fillColor="#58da9c"/>
-  <path
-      android:pathData="M119.93,30.01L164.53,30.01A6.61,6.61 0,0 1,171.14 36.62L171.14,46.84A6.61,6.61 0,0 1,164.53 53.45L119.93,53.45A6.61,6.61 0,0 1,113.32 46.84L113.32,36.62A6.61,6.61 0,0 1,119.93 30.01z"
-      android:strokeWidth="0"
-      android:fillColor="#00c177"/>
+      android:pathData="M11,20.511C11.635,20.511 12.15,19.996 12.15,19.361C12.15,18.726 11.635,18.211 11,18.211C10.365,18.211 9.85,18.726 9.85,19.361C9.85,19.996 10.365,20.511 11,20.511Z"
+      android:fillColor="#0D8443"/>
 </vector>
diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
@@ -136,11 +136,11 @@
     <string name="my_page_quit">탈퇴하기</string>
     <string name="my_page_edit_profile">프로필 수정</string>
     <string name="my_page_terning_community">터닝 커뮤니티</string>
-    <string name="my_page_information">공지사항</string>
+    <string name="my_page_notice">공지사항</string>
     <string name="my_page_opinion">의견보내기</string>
     <string name="my_page_service_info">서비스 정보</string>
-    <string name="my_page_notice">서비스 이용약관</string>
-    <string name="my_page_private_information">개인정보 처리방침</string>
+    <string name="my_page_service">서비스 이용약관</string>
+    <string name="my_page_personal">개인정보 처리방침</string>
     <string name="my_page_version">버전정보</string>
 
     <!--ProfileEidt-->