Skip to content

Commit 7e0a085

Browse files
committed
Refactor full name, rewrite negative conditional
1 parent c471d2d commit 7e0a085

3 files changed

Lines changed: 8 additions & 9 deletions

File tree

app/src/main/java/com/example/reply/data/Account.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,4 @@ data class Account(
3232
@StringRes val email: Int,
3333
/** User's avatar image resource id **/
3434
@DrawableRes val avatar: Int
35-
) {
36-
/** User's full name **/
37-
val fullName: String = "$firstName $lastName"
38-
}
35+
)

app/src/main/java/com/example/reply/ui/ReplyDetailsScreen.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ private fun DetailsScreenHeader(email: Email, modifier: Modifier = Modifier) {
246246
Row(modifier = modifier) {
247247
ReplyProfileImage(
248248
drawableResource = email.sender.avatar,
249-
description = email.sender.fullName,
249+
description = stringResource(email.sender.firstName) + " "
250+
+ stringResource(email.sender.lastName),
250251
modifier = Modifier.size(
251252
dimensionResource(R.dimen.email_header_profile_size)
252253
)
@@ -288,10 +289,10 @@ private fun ActionButton(
288289
.padding(vertical = dimensionResource(R.dimen.detail_action_button_padding_vertical)),
289290
colors = ButtonDefaults.buttonColors(
290291
containerColor =
291-
if (!containIrreversibleAction) {
292-
MaterialTheme.colorScheme.primaryContainer
293-
} else {
292+
if (containIrreversibleAction) {
294293
MaterialTheme.colorScheme.onErrorContainer
294+
} else {
295+
MaterialTheme.colorScheme.primaryContainer
295296
}
296297
)
297298
) {

app/src/main/java/com/example/reply/ui/ReplyHomeContent.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ private fun ReplyEmailItemHeader(email: Email, modifier: Modifier = Modifier) {
172172
Row(modifier = modifier) {
173173
ReplyProfileImage(
174174
drawableResource = email.sender.avatar,
175-
description = email.sender.fullName,
175+
description = stringResource(email.sender.firstName) + " "
176+
+ stringResource(email.sender.lastName),
176177
modifier = Modifier.size(dimensionResource(R.dimen.email_header_profile_size))
177178
)
178179
Column(

0 commit comments

Comments
 (0)