MyPage Screen UI based on QA

presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt

@@ -299,6 +299,7 @@ private fun MyPageMenu(
             Icon(
                 painter = painterResource(R.drawable.ic_bookmark_default),
                 contentDescription = stringResource(id = R.string.bookmark),
+                modifier = Modifier.size(20.dp),
                 tint = Gray1_50545B
             )
         }
@@ -339,12 +340,13 @@ private fun MyPageDiaryHeader(
         ) {
             Icon(
                 imageVector = Icons.Filled.Add,
-                contentDescription = stringResource(id = R.string.my_profile_new_folder)
+                contentDescription = stringResource(id = R.string.my_profile_new_folder),
+                modifier = Modifier.size(12.dp)
             )
             Spacer(modifier = Modifier.width(4.dp))
             Text(
                 text = stringResource(id = R.string.my_profile_new_folder),
-                style = DayoTheme.typography.b6.copy(
+                style = DayoTheme.typography.caption4.copy(
                     if (isCreateFolderEnabled) Primary_23C882 else Gray4_C5CAD2
                 )
             )
@@ -372,7 +374,7 @@ private fun MyPageTopNavigation(onSettingsClick: () -> Unit) {
                 Text(
                     text = stringResource(id = R.string.my_page),
                     style = DayoTheme.typography.h1.copy(
-                        color = Gray1_50545B,
+                        color = Dark,
                         fontWeight = FontWeight.SemiBold
                     )
                 )
@@ -383,9 +385,10 @@ private fun MyPageTopNavigation(onSettingsClick: () -> Unit) {
                 onClick = onSettingsClick,
                 iconContentDescription = "setting button",
                 iconPainter = painterResource(id = R.drawable.ic_setting),
+                iconButtonModifier = Modifier.padding(end = 8.dp),
                 iconModifier = Modifier
-                    .padding(end = 18.dp)
-                    .size(24.dp),
+                    .size(44.dp)
+                    .padding(10.dp),
                 iconTintColor = Dark
             )
         }

presentation/src/main/java/daily/dayo/presentation/view/FolderView.kt

@@ -21,6 +21,7 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import daily.dayo.domain.model.Folder
 import daily.dayo.domain.model.Privacy
 import daily.dayo.presentation.BuildConfig
@@ -77,10 +78,18 @@ fun FolderView(
 
         // folder info
         Column {
-            Text(text = folder.title, style = DayoTheme.typography.b6.copy(Dark))
+            Text(
+                text = folder.title,
+                lineHeight = 21.sp,
+                style = DayoTheme.typography.b6.copy(Dark)
+            )
 
             val dec = DecimalFormat("#,###")
-            Text(text = "${dec.format(folder.postCount)}개", style = DayoTheme.typography.b6.copy(Gray3_9FA5AE))
+            Text(
+                text = "${dec.format(folder.postCount)}개",
+                lineHeight = 21.sp,
+                style = DayoTheme.typography.b6.copy(Gray3_9FA5AE)
+            )
         }
     }
 }

presentation/src/main/res/drawable/ic_setting.xml

@@ -1,9 +1,14 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="26dp"
-    android:height="26dp"
-    android:viewportWidth="26"
-    android:viewportHeight="26">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
     <path
-        android:fillColor="#313131"
-        android:pathData="M13 17.89v-0.5v0.5zm-2.71-0.83l-0.28 0.42l0.28-0.42zm7.59-4.05h-0.5h0.5zm-0.82-2.71l-0.42 0.28l0.42-0.28zm-7.5-0.74L9.9 9.9L9.55 9.56zm-1.34 2.5l-0.5-0.1l0.5 0.1zm0.27 2.81l-0.46 0.2l0.46-0.2zm1.87-11.1l0.13 0.47l-0.13-0.48zm0.38-0.47l0.5 0.03l-0.5-0.03zm-3 1.24L7.4 4.9l0.33-0.37zm0.6 0.06L8.09 4.16L8.34 4.6zM5.68 3.33L5.33 2.98l0.35 0.35zM3.31 6.37L2.94 6.71l0.37-0.34zm0.02-0.69L2.98 5.33l0.35 0.35zM4.6 8.34L4.16 8.09L4.6 8.34zm-1.3 2.4l-0.03-0.5l0.03 0.5zm0.46-0.38l0.48 0.13l-0.48-0.13zm-2.29 0.48l0.03 0.5l-0.03-0.5zm0 4.32l0.03-0.5l-0.03 0.5zm1.83 0.1l-0.03 0.5l0.03-0.5zm1.24 3L4.9 18.6l-0.37-0.33zm0.06-0.6l-0.44 0.25l0.44-0.25zm-1.27 2.66l0.36-0.36l-0.36 0.36zm-0.02-0.7L2.94 19.3l0.37 0.34zm3.06 3.07L6.04 22.3l0.33 0.38zm-0.69-0.02l0.36-0.36l-0.36 0.36zm2.66-1.27l-0.25 0.44l0.25-0.44zm-0.6 0.06l0.33 0.37l-0.33-0.37zm3 1.24l-0.5 0.03l0.5-0.03zm-0.38-0.46l-0.14 0.48l0.14-0.48zm0.48 2.29l-0.5 0.03l0.5-0.03zm4.32 0l-0.5-0.03l0.5 0.03zm0.48-2.3l0.14 0.49l-0.14-0.48zm2.62-0.77l0.33-0.37l-0.33 0.37zm-0.6-0.06l0.25 0.44l-0.25-0.44zm2.66 1.27l0.35 0.35l-0.35-0.35zm-0.7 0.02l-0.33 0.37l0.34-0.37zm3.07-3.06l0.37-0.34l-0.37 0.34zm-0.02 0.69l0.35 0.35l-0.35-0.35zm-1.27-2.66l-0.44-0.24l0.44 0.24zm0.06 0.6l0.37-0.33l-0.37 0.33zm1.24-3l0.03 0.5l-0.03-0.5zm-0.46 0.38l0.48 0.14l-0.48-0.14zm2.29-0.48l-0.03-0.5l0.03 0.5zm0-4.32l-0.03 0.5l0.03-0.5zm-2.3-0.48l-0.47 0.13l0.48-0.13zm-0.77-2.62l0.37 0.33l-0.37-0.33zm-0.06 0.6l-0.44 0.24l0.44-0.24zm1.27-2.66L22.3 6.04l0.36-0.36zm-3.04-2.37l-0.34-0.37l0.34 0.37zm0.69 0.02l0.35-0.35l-0.35 0.35zM17.66 4.6l0.25-0.44l-0.25 0.44zm0.6-0.06L18.6 4.9l-0.33-0.37zm-7.42-3.07l0.5 0.03l-0.5-0.03zm4.32 0l-0.5 0.03l0.5-0.03zm-0.5-0.97h-3.32v1h3.32v-1zm1.1 2.77l-0.1-1.83l-1 0.06l0.1 1.83l1-0.06zm2.15 0.9c-0.68-0.38-1.39-0.68-2.13-0.89l-0.27 0.96c0.66 0.2 1.3 0.46 1.91 0.8l0.49-0.88zm1.38-1.23l-1.36 1.23l0.66 0.74l1.37-1.22l-0.67-0.75zm3.73 2.4l-2.35-2.36l-0.7 0.7l2.34 2.36l0.71-0.7zm-1.19 2.73l1.23-1.36l-0.75-0.67L21.1 7.4l0.74 0.66zm0.89 2.15c-0.21-0.74-0.5-1.45-0.88-2.13l-0.88 0.49c0.34 0.6 0.6 1.25 0.8 1.91l0.96-0.27zm1.84 0.12l-1.83-0.1l-0.06 1l1.83 0.1l0.06-1zm0.94 4.32v-3.32h-1v3.32h1zm-2.77 1.1l1.83-0.1l-0.06-1l-1.83 0.1l0.06 1zm-0.9 2.15c0.38-0.68 0.68-1.39 0.89-2.13l-0.96-0.27c-0.2 0.66-0.46 1.3-0.8 1.91l0.88 0.49zm1.23 1.38l-1.23-1.36l-0.74 0.66l1.22 1.37l0.75-0.67zm-2.4 3.73l2.36-2.35l-0.7-0.7l-2.36 2.34l0.7 0.71zm-2.73-1.19l1.36 1.23l0.67-0.75l-1.37-1.22l-0.66 0.74zm-2.15 0.89c0.74-0.21 1.45-0.5 2.13-0.88l-0.49-0.88c-0.6 0.34-1.25 0.6-1.91 0.8l0.27 0.96zm-0.12 1.84l0.1-1.83l-1-0.06l-0.1 1.83l1 0.06zm-4.32 0.94h3.32v-1h-3.32v1zm-1.1-2.77l0.1 1.83l1-0.06l-0.1-1.83l-1 0.06zm-2.15-0.9c0.68 0.38 1.39 0.68 2.13 0.89l0.27-0.96c-0.66-0.2-1.3-0.46-1.91-0.8l-0.49 0.88zm-1.38 1.23l1.36-1.23l-0.66-0.74l-1.37 1.22l0.67 0.75zm-3.73-2.4l2.35 2.36l0.7-0.7l-2.34-2.36l-0.71 0.7zm1.19-2.73l-1.23 1.36l0.75 0.67L4.9 18.6l-0.74-0.66zm-0.89-2.15c0.21 0.74 0.5 1.45 0.88 2.13l0.88-0.49c-0.34-0.6-0.6-1.25-0.8-1.91l-0.96 0.27zm-1.84-0.12l1.83 0.1l0.06-1l-1.83-0.1l-0.06 1zM0.5 11.34v3.32h1v-3.32h-1zm2.77-1.1l-1.83 0.1l0.06 1l1.83-0.1l-0.06-1zm0.9-2.15c-0.38 0.68-0.68 1.39-0.89 2.13l0.96 0.27c0.2-0.66 0.46-1.3 0.8-1.91L4.16 8.09zM2.93 6.71l1.23 1.36l0.74-0.66L3.7 6.04L2.94 6.7zm2.4-3.73L2.97 5.33l0.7 0.7L6.05 3.7l-0.7-0.71zm2.73 1.19L6.71 2.94L6.04 3.7L7.4 4.9l0.66-0.74zm2.15-0.89C9.48 3.5 8.77 3.78 8.09 4.16l0.49 0.88c0.6-0.34 1.25-0.6 1.91-0.8l-0.27-0.96zm0.12-1.84l-0.1 1.83l1 0.06l0.1-1.83l-1-0.06zM13 17.4c-0.87 0-1.71-0.26-2.43-0.74L10 17.48c0.89 0.59 1.93 0.9 2.99 0.9v-1zm1.68-0.34c-0.54 0.22-1.1 0.34-1.68 0.34v1c0.7 0 1.4-0.14 2.06-0.41l-0.38-0.93zm1.42-0.95c-0.41 0.41-0.9 0.73-1.42 0.95l0.38 0.93c0.65-0.27 1.24-0.67 1.74-1.17l-0.7-0.7zm0.95-1.42c-0.22 0.54-0.55 1.02-0.95 1.42l0.7 0.71c0.5-0.5 0.9-1.1 1.17-1.74l-0.92-0.39zm0.33-1.67c0 0.57-0.11 1.14-0.33 1.67l0.92 0.39c0.27-0.66 0.4-1.36 0.4-2.06h-1zm-0.74-2.43c0.48 0.72 0.74 1.56 0.74 2.43h1c0-1.07-0.32-2.1-0.9-2.99l-0.84 0.56zm-1.96-1.62c0.8 0.33 1.48 0.9 1.96 1.62l0.83-0.56c-0.59-0.88-1.43-1.57-2.41-1.98l-0.38 0.92zm-2.53-0.25c0.85-0.16 1.73-0.08 2.53 0.25l0.38-0.92c-0.98-0.4-2.07-0.51-3.1-0.3l0.19 0.97zM9.9 9.91c0.62-0.61 1.4-1.03 2.25-1.2l-0.2-0.98c-1.04 0.21-2 0.72-2.75 1.48l0.7 0.7zm-1.2 2.24c0.18-0.85 0.6-1.63 1.2-2.24l-0.7-0.7c-0.75 0.75-1.27 1.7-1.47 2.75l0.98 0.2zm0.26 2.53C8.62 13.88 8.54 13 8.7 12.15l-0.98-0.2c-0.21 1.05-0.1 2.13 0.3 3.12l0.93-0.39zm1.6 1.97c-0.71-0.48-1.27-1.17-1.6-1.97l-0.93 0.39c0.4 0.98 1.1 1.82 1.98 2.41l0.56-0.83zM10.5 4.25c0.41-0.12 0.72-0.48 0.75-0.92l-1-0.06l-0.02 0.01l0.27 0.96zM7.41 4.9c0.33 0.3 0.8 0.33 1.17 0.13L8.09 4.16H8.08L7.4 4.92zM6.04 3.7L6.7 2.94C6.3 2.6 5.7 2.6 5.33 2.98l0.7 0.7zM3.69 6.04l-0.71-0.7C2.6 5.7 2.58 6.3 2.94 6.7L3.7 6.04zm1.35 2.54C5.24 8.2 5.2 7.74 4.9 7.4L4.17 8.07V8.1l0.87 0.49zm-1.71 2.66c0.44-0.03 0.8-0.34 0.91-0.75l-0.96-0.27v0.02H3.26l0.06 1zm-1.83 0.1l-0.06-1c-0.53 0.03-0.94 0.47-0.94 1h1zm0 3.32h-1c0 0.53 0.41 0.97 0.94 1l0.06-1zm2.74 0.85c-0.11-0.41-0.47-0.72-0.91-0.75l-0.06 1l0.01 0.02l0.96-0.27zm0.67 3.08c0.3-0.33 0.33-0.8 0.13-1.17l-0.88 0.49v0.01l0.75 0.67zM3.7 19.96L2.94 19.3c-0.35 0.4-0.34 1 0.04 1.38l0.7-0.7zm2.35 2.35l-0.7 0.71c0.37 0.38 0.97 0.4 1.37 0.04L6.04 22.3zm2.54-1.35C8.2 20.76 7.74 20.8 7.4 21.1l0.66 0.74H8.1l0.49-0.87zm2.66 1.71c-0.03-0.44-0.34-0.8-0.75-0.91l-0.27 0.96h0.02v0.01l1-0.06zm0.1 1.83l-1 0.06c0.03 0.53 0.47 0.94 1 0.94v-1zm3.32 0v1c0.53 0 0.97-0.41 1-0.94l-1-0.06zm0.85-2.74c-0.41 0.11-0.72 0.47-0.75 0.91l1 0.06l0.02-0.01l-0.27-0.96zm3.08-0.67c-0.33-0.3-0.8-0.33-1.17-0.13l0.49 0.88h0.01l0.67-0.75zm1.37 1.22l-0.67 0.75c0.4 0.35 1 0.34 1.38-0.04l-0.7-0.7zm2.35-2.35l0.71 0.7c0.38-0.37 0.4-0.97 0.04-1.37l-0.75 0.67zm-1.35-2.54c-0.2 0.37-0.17 0.84 0.13 1.17l0.74-0.66V17.9l-0.87-0.49zm1.71-2.66c-0.44 0.03-0.8 0.34-0.91 0.75l0.96 0.27v-0.02h0.01l-0.06-1zm1.83-0.1l0.06 1c0.53-0.03 0.94-0.47 0.94-1h-1zm0-3.32h1c0-0.53-0.41-0.97-0.94-1l-0.06 1zm-2.74-0.85c0.11 0.41 0.47 0.72 0.91 0.75l0.06-1l-0.01-0.02l-0.96 0.27zm-0.67-3.08c-0.3 0.33-0.33 0.8-0.13 1.17l0.88-0.49V8.08L21.08 7.4zm1.22-1.37l0.75 0.67c0.35-0.4 0.34-1-0.04-1.38l-0.7 0.7zm-2.35-2.35l0.7-0.71C20.3 2.6 19.7 2.58 19.3 2.94l0.67 0.75zm-2.54 1.35c0.37 0.2 0.84 0.17 1.17-0.13l-0.66-0.74H17.9l-0.49 0.87zm-2.66-1.71c0.03 0.44 0.34 0.8 0.75 0.91l0.27-0.96h-0.02V3.26l-1 0.06zM11.34 0.5c-0.53 0-0.97 0.41-1 0.94l1 0.06v-1zm3.32 1l1-0.06c-0.03-0.53-0.47-0.94-1-0.94v1z"/>
+        android:pathData="M5.42 3.1C4.46 3.65 4.13 4.87 4.69 5.83l0.23 0.41C5.12 6.6 5.1 7.03 4.87 7.37c-0.16 0.25-0.31 0.5-0.45 0.77C4.24 8.5 3.88 8.75 3.48 8.75H3c-1.1 0-2 0.9-2 2v2.5c0 1.1 0.9 2 2 2h0.48c0.4 0 0.76 0.25 0.94 0.6 0.14 0.27 0.29 0.53 0.45 0.78 0.22 0.34 0.26 0.78 0.05 1.13l-0.23 0.4c-0.56 0.97-0.23 2.19 0.73 2.74l2.16 1.25c0.96 0.55 2.18 0.23 2.73-0.73L10.55 21c0.2-0.35 0.6-0.54 1-0.52L12 20.5l0.45-0.01c0.4-0.02 0.8 0.17 1 0.52l0.24 0.4c0.55 0.97 1.77 1.3 2.73 0.74l2.16-1.25c0.96-0.55 1.29-1.77 0.73-2.73l-0.23-0.41c-0.2-0.35-0.17-0.79 0.05-1.13 0.16-0.25 0.31-0.5 0.45-0.77 0.18-0.36 0.54-0.61 0.94-0.61H21c1.1 0 2-0.9 2-2v-2.5c0-1.1-0.9-2-2-2h-0.48c-0.4 0-0.76-0.25-0.94-0.6-0.14-0.27-0.29-0.53-0.45-0.78-0.22-0.34-0.26-0.78-0.05-1.13l0.23-0.4c0.56-0.97 0.23-2.19-0.73-2.74l-2.16-1.25c-0.96-0.55-2.18-0.23-2.73 0.73L13.45 3c-0.2 0.35-0.6 0.54-1 0.52L12 3.5l-0.45 0.01c-0.4 0.02-0.8-0.17-1-0.52l-0.24-0.41C9.76 1.62 8.54 1.3 7.58 1.85L5.42 3.1Z"
+        android:strokeWidth="1.4"
+        android:strokeColor="#FF313131" />
+    <path
+        android:pathData="M12 8.5A3.5 3.5 0 1 0 12 15.5 3.5 3.5 0 1 0 12 8.5z"
+        android:strokeWidth="1.4"
+        android:strokeColor="#FF313131" />
 </vector>