From 103188a4e5f2a143c2ba2bb548bf75b396d1556c Mon Sep 17 00:00:00 2001 From: Ju Yungyeom Date: Wed, 19 Nov 2025 20:19:08 +0900 Subject: [PATCH] #705 [layout] Remove email display in profile --- .../screen/mypage/MyPageScreen.kt | 29 ++++++---------- .../screen/profile/ProfileScreen.kt | 34 ++++++++----------- 2 files changed, 25 insertions(+), 38 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 1fba5465..d11514c0 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 @@ -40,6 +40,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -171,27 +172,19 @@ private fun MyPageProfile( ) ) - // nickname, email - Column( + // nickname + Text( + text = profile?.nickname ?: "", modifier = Modifier .weight(1f) - .padding(start = 8.dp) - ) { - Text( - text = profile?.nickname ?: "", - style = DayoTheme.typography.h1.copy( - color = Dark, - fontWeight = FontWeight.SemiBold - ) + .padding(horizontal = 8.dp), + overflow = TextOverflow.Ellipsis, + maxLines = 1, + style = DayoTheme.typography.h1.copy( + color = Dark, + fontWeight = FontWeight.SemiBold ) - - Text( - text = profile?.email ?: "", - style = DayoTheme.typography.caption5.copy( - color = Gray4_C5CAD2 - ) - ) - } + ) // follower Column( diff --git a/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt b/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt index e72175f6..90870d8f 100644 --- a/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt +++ b/presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt @@ -39,6 +39,7 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel @@ -56,7 +57,6 @@ import daily.dayo.presentation.theme.Dark import daily.dayo.presentation.theme.DayoTheme import daily.dayo.presentation.theme.Gray1_50545B import daily.dayo.presentation.theme.Gray2_767B83 -import daily.dayo.presentation.theme.Gray4_C5CAD2 import daily.dayo.presentation.view.DayoOutlinedButton import daily.dayo.presentation.view.FilledButton import daily.dayo.presentation.view.FolderView @@ -107,8 +107,10 @@ fun ProfileScreen( } onBackClick() } + Status.ERROR -> { } + else -> {} } } @@ -296,27 +298,19 @@ private fun UserProfile( ) ) - // nickname, email - Column( + // nickname + Text( + text = profile.nickname, modifier = Modifier .weight(1f) - .padding(start = 8.dp) - ) { - Text( - text = profile.nickname, - style = DayoTheme.typography.h1.copy( - color = Dark, - fontWeight = FontWeight.SemiBold - ) + .padding(horizontal = 8.dp), + overflow = TextOverflow.Ellipsis, + maxLines = 1, + style = DayoTheme.typography.h1.copy( + color = Dark, + fontWeight = FontWeight.SemiBold ) - - Text( - text = profile.email, - style = DayoTheme.typography.caption5.copy( - color = Gray4_C5CAD2 - ) - ) - } + ) // follower Column( @@ -483,7 +477,7 @@ private const val FOLLOWING = 1 private val DEFAULT_PROFILE = Profile( memberId = null, email = "", - nickname = "nickname", + nickname = "", profileImg = "", postCount = 10, followerCount = 10,