Skip to content

Remove email display in profile #710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yuni-ju merged 1 commit into from
Nov 30, 2025
Merged

Remove email display in profile #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 11 additions & 18 deletions presentation/src/main/java/daily/dayo/presentation/screen/mypage/MyPageScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
34 changes: 14 additions & 20 deletions presentation/src/main/java/daily/dayo/presentation/screen/profile/ProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -107,8 +107,10 @@ fun ProfileScreen(
}
onBackClick()
}

Status.ERROR -> {
}

else -> {}
}
}
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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,
Expand Down