Skip to content
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

feat: avatar border and message padding improvements [WPB-5059] #2428

Merged
merged 3 commits into from
Nov 15, 2023
Merged

feat: avatar border and message padding improvements [WPB-5059] #2428

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0111683
feat: avatar border and message padding improvements
Garzas Nov 15, 2023
cac1edd
make all system message icons big size
Garzas Nov 15, 2023
1a74e71
end call icon padding fix
Garzas Nov 15, 2023
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
8 changes: 7 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/common/UserProfileAvatar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ package com.wire.android.ui.common

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
Expand Down Expand Up @@ -68,7 +69,11 @@ fun UserProfileAvatar(
contentAlignment = Alignment.Center,
modifier = modifier
.wrapContentSize()
.let { if (clickable != null) it.clip(CircleShape).clickable(clickable) else it }
.let {
if (clickable != null) it
.clip(CircleShape)
.clickable(clickable) else it
}
.padding(padding)
) {
val painter = painter(avatarData, showPlaceholderIfNoAsset, withCrossfadeAnimation)
Expand All @@ -79,6 +84,7 @@ fun UserProfileAvatar(
.padding(statusBorderSize)
.background(MaterialTheme.wireColorScheme.divider, CircleShape)
.size(size)
.border(width = dimensions().spacing1x, shape = CircleShape, color = MaterialTheme.wireColorScheme.outline)
.clip(CircleShape)
.testTag("User avatar"),
contentScale = ContentScale.Crop
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/AuthorHeaderHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,23 @@ object AuthorHeaderHelper {
}
return showHeader
}

internal fun shouldHaveSmallBottomPadding(index: Int, messages: List<UIMessage>, currentMessage: UIMessage): Boolean {
var shouldHaveSmallBottomPadding = false
if (index > 0) {
val previousIndex = index - 1
val previousUiMessage = messages[previousIndex]
if (currentMessage.header.userId == previousUiMessage.header.userId
&& currentMessage is UIMessage.Regular
&& previousUiMessage is UIMessage.Regular
) {
val difference = DateTimeUtil.calculateMillisDifference(
currentMessage.header.messageTime.utcISO,
previousUiMessage.header.messageTime.utcISO
)
shouldHaveSmallBottomPadding = difference < AGGREGATION_TIME_WINDOW
}
}
return shouldHaveSmallBottomPadding
}
}
13 changes: 12 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/home/conversations/ConversationScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,7 +845,7 @@ fun MessageList(
reverseLayout = true,
// calculating bottom padding to have space for [UsersTypingIndicator]
contentPadding = PaddingValues(
bottom = dimensions().typingIndicatorHeight - dimensions().messageItemVerticalPadding
bottom = dimensions().typingIndicatorHeight - dimensions().messageItemBottomPadding
),
modifier = Modifier
.fillMaxSize()
Expand All @@ -870,12 +870,23 @@ fun MessageList(
)
}

val useSmallBottomPadding by remember {
mutableStateOf(
AuthorHeaderHelper.shouldHaveSmallBottomPadding(
index,
lazyPagingMessages.itemSnapshotList.items,
message
)
)
}

when (message) {
is UIMessage.Regular -> {
MessageItem(
message = message,
conversationDetailsData = conversationDetailsData,
showAuthor = showAuthor,
useSmallBottomPadding = useSmallBottomPadding,
audioMessagesState = audioMessagesState,
onAudioClick = onAudioItemClicked,
onChangeAudioPosition = onChangeAudioPosition,
Expand Down
13 changes: 8 additions & 5 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/MessageItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import androidx.compose.animation.core.tween
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.background
import androidx.compose.foundation.combinedClickable
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
Expand All @@ -36,6 +37,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material.ripple.rememberRipple
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -93,6 +95,7 @@ fun MessageItem(
message: UIMessage.Regular,
conversationDetailsData: ConversationDetailsData,
showAuthor: Boolean = true,
useSmallBottomPadding: Boolean = false,
audioMessagesState: Map<String, AudioState>,
onLongClicked: (UIMessage.Regular) -> Unit,
onAssetMessageClicked: (String) -> Unit,
Expand Down Expand Up @@ -147,21 +150,22 @@ fun MessageItem(
.fillMaxWidth()
.combinedClickable(
enabled = message.isAvailable,
interactionSource = MutableInteractionSource(),
indication = rememberRipple(bounded = true),
onClick = { onMessageClick(message.header.messageId) },
onLongClick = remember(message) { { onLongClicked(message) } }
)
.padding(
end = dimensions().messageItemHorizontalPadding,
top = dimensions().messageItemVerticalPadding - fullAvatarOuterPadding,
bottom = dimensions().messageItemVerticalPadding
top = if (showAuthor) dimensions().spacing0x else dimensions().spacing4x,
bottom = if (useSmallBottomPadding) dimensions().spacing2x else dimensions().messageItemBottomPadding
)
) {
val isProfileRedirectEnabled =
header.userId != null &&
!(header.isSenderDeleted || header.isSenderUnavailable)

Box(
modifier = Modifier.width(dimensions().spacing56x),
contentAlignment = Alignment.TopStart
) {
if (showAuthor) {
Expand All @@ -188,8 +192,8 @@ fun MessageItem(
}
Spacer(Modifier.width(dimensions().messageItemHorizontalPadding - fullAvatarOuterPadding))
Column {
Spacer(modifier = Modifier.height(fullAvatarOuterPadding))
if (showAuthor) {
Spacer(modifier = Modifier.height(dimensions().avatarClickablePadding))
MessageAuthorRow(messageHeader = message.header)
}
if (selfDeletionTimerState is SelfDeletionTimerHelper.SelfDeletionTimerState.Expirable) {
Expand Down Expand Up @@ -414,7 +418,6 @@ private fun MessageFooter(
FlowRow(
horizontalArrangement = Arrangement.spacedBy(dimensions().spacing4x, Alignment.Start),
verticalArrangement = Arrangement.spacedBy(dimensions().spacing6x, Alignment.Top),
modifier = Modifier.padding(top = dimensions().spacing4x)
) {
messageFooter.reactions.entries
.sortedBy { it.key }
Expand Down
14 changes: 9 additions & 5 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/SystemMessageItem.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,21 +106,25 @@ fun SystemMessageItem(
.padding(
end = dimensions().spacing16x,
top = fullAvatarOuterPadding,
bottom = dimensions().messageItemVerticalPadding
bottom = dimensions().messageItemBottomPadding
)
.fillMaxWidth()
) {
Box(
modifier = Modifier
.width(dimensions().spacing56x)
.padding(end = fullAvatarOuterPadding),
.width(
dimensions().avatarDefaultSize
+ (dimensions().avatarStatusBorderSize * 2)
+ (dimensions().avatarClickablePadding * 2)
)
.padding(end = fullAvatarOuterPadding, top = fullAvatarOuterPadding),
contentAlignment = Alignment.TopEnd
) {
if (message.messageContent.iconResId != null) {
Box(
modifier = Modifier.size(
width = dimensions().systemMessageIconLargeSize,
height = dimensions().spacing20x
height = dimensions().systemMessageIconLargeSize
),
contentAlignment = Alignment.Center
) {
Expand All @@ -140,7 +144,7 @@ fun SystemMessageItem(
}
}
}
Spacer(Modifier.padding(start = dimensions().messageItemHorizontalPadding - fullAvatarOuterPadding))
Spacer(Modifier.width(dimensions().messageItemHorizontalPadding - fullAvatarOuterPadding))
Column(
Modifier
.defaultMinSize(minHeight = dimensions().spacing20x)
Expand Down
21 changes: 11 additions & 10 deletions app/src/main/kotlin/com/wire/android/ui/home/conversations/model/UIMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ sealed class UIMessageContent {
sealed class SystemMessage(
@DrawableRes val iconResId: Int?,
@StringRes open val stringResId: Int,
val isSmallIcon: Boolean = true,
val isSmallIcon: Boolean = false,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: so right now all system messages have "large icon", right? If so then we can remove this parameter completely 😄

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is one exception for this and I will add some code for it

val additionalContent: String = "",
@StringRes val learnMoreResId: Int? = null
) : UIMessageContent() {
Expand Down Expand Up @@ -355,13 +355,17 @@ sealed class UIMessageContent {
}

data class RenamedConversation(val author: UIText, val content: MessageContent.ConversationRenamed) :
SystemMessage(R.drawable.ic_edit, R.string.label_system_message_renamed_the_conversation, true, content.conversationName)
SystemMessage(
R.drawable.ic_edit, R.string.label_system_message_renamed_the_conversation,
false,
content.conversationName
)

data class TeamMemberRemoved(val content: MessageContent.TeamMemberRemoved) :
SystemMessage(R.drawable.ic_minus, R.string.label_system_message_team_member_left, true, content.userName)
SystemMessage(R.drawable.ic_minus, R.string.label_system_message_team_member_left, false, content.userName)

data class CryptoSessionReset(val author: UIText) :
SystemMessage(R.drawable.ic_info, R.string.label_system_message_session_reset, true)
SystemMessage(R.drawable.ic_info, R.string.label_system_message_session_reset)

data class NewConversationReceiptMode(
val receiptMode: UIText
Expand Down Expand Up @@ -407,8 +411,7 @@ sealed class UIMessageContent {

class MLSWrongEpochWarning : SystemMessage(
iconResId = R.drawable.ic_info,
stringResId = R.string.label_system_message_conversation_mls_wrong_epoch_error_handled,
isSmallIcon = true
stringResId = R.string.label_system_message_conversation_mls_wrong_epoch_error_handled
)

data class ConversationProtocolChanged(
Expand All @@ -424,14 +427,12 @@ sealed class UIMessageContent {

object HistoryLost : SystemMessage(
R.drawable.ic_info,
R.string.label_system_message_conversation_history_lost,
true
R.string.label_system_message_conversation_history_lost
)

object HistoryLostProtocolChanged : SystemMessage(
R.drawable.ic_info,
R.string.label_system_message_conversation_history_lost_protocol_changed,
true
R.string.label_system_message_conversation_history_lost_protocol_changed
)

data class ConversationMessageCreated(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/kotlin/com/wire/android/ui/theme/WireDimensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ data class WireDimensions(
val initiatingCallHangUpButtonSize: Dp,
val ongoingCallLabelHeight: Dp,
// Message item
val messageItemVerticalPadding: Dp,
val messageItemBottomPadding: Dp,
val messageItemHorizontalPadding: Dp,
// audio message
val audioMessageHeight: Dp,
Expand Down Expand Up @@ -330,7 +330,7 @@ private val DefaultPhonePortraitWireDimensions: WireDimensions = WireDimensions(
defaultIncomingCallSheetPeekHeight = 280.dp,
callingIncomingUserAvatarSize = 128.dp,
initiatingCallHangUpButtonSize = 72.dp,
messageItemVerticalPadding = 8.dp,
messageItemBottomPadding = 6.dp,
messageItemHorizontalPadding = 12.dp,
conversationOptionsItemMinHeight = 57.dp,
ongoingCallLabelHeight = 28.dp,
Expand Down