From fe54303e6dae1cd2b186efc2f1cb24f76d32239d Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 17 Mar 2026 21:18:57 +0900 Subject: [PATCH 1/3] [QA] Fix top navigation bar title text style --- .../main/java/daily/dayo/presentation/view/TopNavigation.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt b/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt index 1e5c56ac..daa40142 100644 --- a/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt +++ b/presentation/src/main/java/daily/dayo/presentation/view/TopNavigation.kt @@ -40,7 +40,7 @@ fun TopNavigation( navigationIcon = leftIcon, actions = { rightIcon() }, title = { - Text(text = title, maxLines = 1, style = DayoTheme.typography.h3) + Text(text = title, maxLines = 1, style = DayoTheme.typography.b3) } ) } @@ -55,7 +55,7 @@ fun TopNavigation( navigationIcon = leftIcon, actions = { rightIcon() }, title = { - Text(text = title, maxLines = 1, style = DayoTheme.typography.h3) + Text(text = title, maxLines = 1, style = DayoTheme.typography.b3) } ) } From 39045c431b958426396ee7cd8ae8d195d52aa417 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 17 Mar 2026 21:19:37 +0900 Subject: [PATCH 2/3] [QA] Add Missing Top Navigation bar title alignment parameter --- .../dayo/presentation/screen/settings/BlockedUsersScreen.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt index 3869a205..cf79adc6 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt @@ -49,6 +49,7 @@ import daily.dayo.presentation.view.FilledRoundedCornerButton import daily.dayo.presentation.view.NoRippleIconButton import daily.dayo.presentation.view.RoundImageView import daily.dayo.presentation.view.TopNavigation +import daily.dayo.presentation.view.TopNavigationAlign import daily.dayo.presentation.viewmodel.ProfileSettingViewModel import daily.dayo.presentation.viewmodel.ProfileViewModel import kotlinx.coroutines.launch @@ -261,5 +262,6 @@ fun BlockedUsersActionbarLayout( ) }, title = stringResource(R.string.blocked_users_title), + titleAlignment = TopNavigationAlign.CENTER, ) } \ No newline at end of file From 172ddbdb09dbbd5f071f6a36ef5d0c9b2f36b601 Mon Sep 17 00:00:00 2001 From: DongJun Huh Date: Tue, 17 Mar 2026 21:33:55 +0900 Subject: [PATCH 3/3] [QA] Fix Retry Layout, modify retry text string/error image --- .../screen/settings/BlockedUsersScreen.kt | 104 ++++++++++-------- .../res/drawable/ic_blocked_users_empty.xml | 49 ++------- presentation/src/main/res/values/strings.xml | 2 +- 3 files changed, 69 insertions(+), 86 deletions(-) diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt index cf79adc6..465f4878 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/settings/BlockedUsersScreen.kt @@ -4,6 +4,7 @@ import android.content.Context import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row @@ -97,19 +98,25 @@ fun BlockedUsersScreen( topBar = { BlockedUsersActionbarLayout(onBackClick = onBackClick) }, snackbarHost = { SnackbarHost(snackBarHostState) }, content = { innerPadding -> - Column( + Box( modifier = Modifier .background(DayoTheme.colorScheme.background) .padding(innerPadding) .fillMaxSize() - .padding(top = 12.dp, start = 20.dp, end = 20.dp) + .padding(top = 12.dp) ) { - LazyColumn( - modifier = Modifier.fillMaxSize(), - verticalArrangement = Arrangement.spacedBy(16.dp), - contentPadding = PaddingValues(vertical = 16.dp) - ) { - if (blockedUsers.status != Status.ERROR) { + if (blockedUsers.status == Status.ERROR) { + BlockedUsersErrorLayout( + onRetry = { profileSettingViewModel.requestBlockList() }, + ) + } else { + LazyColumn( + modifier = Modifier + .fillMaxSize() + .padding(start = 20.dp, end = 20.dp), + verticalArrangement = Arrangement.spacedBy(16.dp), + contentPadding = PaddingValues(vertical = 16.dp) + ) { blockedUsers.data.orEmpty().let { blockedUsers -> if (blockedUsers.isEmpty()) { item { @@ -160,41 +167,6 @@ fun BlockedUsersScreen( } } } - } else { - item { - Column( - modifier = Modifier - .fillMaxSize() - .padding(top = 164.dp), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Image( - painter = painterResource(id = R.drawable.ic_blocked_users_empty), - contentDescription = null, - modifier = Modifier - .width(136.dp) - .wrapContentHeight() - .padding(6.5.dp) - ) - Spacer(modifier = Modifier.height(20.dp)) - Text( - text = stringResource(R.string.blocked_users_error_description), - color = Gray3_9FA5AE, - style = DayoTheme.typography.b3, - modifier = Modifier - .wrapContentSize() - ) - Spacer(modifier = Modifier.height(20.dp)) - FilledRoundedCornerButton( - modifier = Modifier - .padding(horizontal = 20.dp) - .wrapContentSize(), - onClick = { profileSettingViewModel.requestBlockList() }, - label = stringResource(R.string.re_try) - ) - } - } } } } @@ -202,6 +174,50 @@ fun BlockedUsersScreen( ) } +@Composable +private fun BlockedUsersErrorLayout( + onRetry: () -> Unit, +) { + Column( + modifier = Modifier + .fillMaxSize() + .padding(horizontal = 20.dp), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Spacer(modifier = Modifier.weight(176f)) + + Column( + modifier = Modifier.wrapContentHeight(), + horizontalAlignment = Alignment.CenterHorizontally, + ) { + Image( + painter = painterResource(id = R.drawable.ic_blocked_users_empty), + contentDescription = null, + modifier = Modifier + .width(136.dp) + .height(100.dp) + ) + Spacer(modifier = Modifier.height(20.dp)) + Text( + text = stringResource(R.string.blocked_users_error_description), + style = DayoTheme.typography.h3.copy(color = Gray3_9FA5AE), + modifier = Modifier.wrapContentSize() + ) + } + + Spacer(modifier = Modifier.weight(336f)) + + FilledRoundedCornerButton( + modifier = Modifier + .fillMaxWidth() + .height(52.dp) + .padding(bottom = 20.dp), + onClick = onRetry, + label = stringResource(R.string.re_try), + ) + } +} + @Preview @Composable fun BlockedUser( @@ -264,4 +280,4 @@ fun BlockedUsersActionbarLayout( title = stringResource(R.string.blocked_users_title), titleAlignment = TopNavigationAlign.CENTER, ) -} \ No newline at end of file +} diff --git a/presentation/src/main/res/drawable/ic_blocked_users_empty.xml b/presentation/src/main/res/drawable/ic_blocked_users_empty.xml index 648d468e..144752c3 100644 --- a/presentation/src/main/res/drawable/ic_blocked_users_empty.xml +++ b/presentation/src/main/res/drawable/ic_blocked_users_empty.xml @@ -1,42 +1,9 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 236dd6e1..61e0f4cb 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -28,7 +28,7 @@ 잠시만 기다려 주세요 인터넷 연결 상태를 확인해주세요 닫기 - 재시도 + 다시 시도 방금 전