From 2298e029e667714b676cc1b0f262acc72665a812 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 25 Mar 2026 21:06:14 +0900 Subject: [PATCH 1/5] #1043 [QA] Change title text color --- .../java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt index d11514c0..ce8ce02d 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt @@ -372,7 +372,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 ) ) From c388be394ccae40effdf117830cfebd7f6859e9c Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 25 Mar 2026 21:26:17 +0900 Subject: [PATCH 2/5] #1044 [QA] Fix setting icon --- .../presentation/screen/mypage/MyPageScreen.kt | 5 +++-- .../src/main/res/drawable/ic_setting.xml | 17 +++++++++++------ 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt index ce8ce02d..757908a9 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt @@ -383,9 +383,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 ) } diff --git a/presentation/src/main/res/drawable/ic_setting.xml b/presentation/src/main/res/drawable/ic_setting.xml index ac866b61..9ef66caf 100644 --- a/presentation/src/main/res/drawable/ic_setting.xml +++ b/presentation/src/main/res/drawable/ic_setting.xml @@ -1,9 +1,14 @@ + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + 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" /> + \ No newline at end of file From b39d0de19d92ec3b731ac68d4c3085c025a0eebd Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 1 Apr 2026 20:10:07 +0900 Subject: [PATCH 3/5] #1048 [QA] Fix line height for folder title --- .../java/daily/dayo/presentation/view/FolderView.kt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/FolderView.kt b/presentation/src/main/java/daily/dayo/presentation/view/FolderView.kt index d49cce7e..6727d234 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/FolderView.kt +++ b/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) + ) } } } \ No newline at end of file From 4e70dfccdda307ecb197775c007c945b0f956580 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 1 Apr 2026 20:24:33 +0900 Subject: [PATCH 4/5] #1047 [QA] Fix bookmark icon size on My Page --- .../java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt index 757908a9..85c87011 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt +++ b/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 ) } From 34b005e039d3b2da7a5c566dc7bffff4b45ac829 Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 1 Apr 2026 20:35:43 +0900 Subject: [PATCH 5/5] #1047 [QA] Fix button icon and text style on MyPage --- .../daily/dayo/presentation/screen/mypage/MyPageScreen.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt index 85c87011..3716b7f3 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt @@ -340,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 ) )