Skip to content

CMM-1040 Edge-to-edge cutoff in support screens #22397

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
nbradbury merged 4 commits into from
Dec 10, 2025
Merged

CMM-1040 Edge-to-edge cutoff in support screens #22397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
021cc32
Fix overlapping caused by edge-to-edge support
nbradbury Dec 4, 2025
b4aed36
Undo changes to AttachmentFullscreenVideoPlayer
nbradbury Dec 4, 2025
33fd5da
Restored the SendButton composable
nbradbury Dec 4, 2025
efb6acf
Pulled trunk and resolved conflicts
nbradbury Dec 10, 2025
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
87 changes: 50 additions & 37 deletions WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.foundation.lazy.rememberLazyListState
Expand Down Expand Up @@ -124,15 +125,17 @@ fun HEConversationDetailScreen(
bottomBar = {
val status = ConversationStatus.fromStatus(conversation.status)
val isClosed = status == ConversationStatus.CLOSED
if (isClosed) {
ClosedConversationBanner()
} else {
ReplyButton(
enabled = !isLoading,
onClick = {
onReplyBottomSheetVisibilityChange(true)
}
)
Box(modifier = Modifier.navigationBarsPadding()) {
if (isClosed) {
ClosedConversationBanner()
} else {
ReplyButton(
enabled = !isLoading,
onClick = {
onReplyBottomSheetVisibilityChange(true)
}
)
}
}
}
) { contentPadding ->
Expand All @@ -148,35 +151,35 @@ fun HEConversationDetailScreen(
state = listState,
verticalArrangement = Arrangement.spacedBy(12.dp)
) {
item {
ConversationHeader(
status = conversation.status,
lastUpdated = formatRelativeTime(conversation.lastMessageSentAt, resources),
isLoading = isLoading
)
}
item {
ConversationHeader(
status = conversation.status,
lastUpdated = formatRelativeTime(conversation.lastMessageSentAt, resources),
isLoading = isLoading
)
}

item {
ConversationTitleCard(title = conversation.title)
}
item {
ConversationTitleCard(title = conversation.title)
}

items(
items = conversation.messages,
key = { it.id }
) { message ->
MessageItem(
message = message,
timestamp = formatRelativeTime(message.createdAt, resources),
onPreviewAttachment = { attachment -> previewAttachment = attachment },
onDownloadAttachment = onDownloadAttachment,
onGetAuthorizationHeaderArgument = onGetAuthorizationHeaderArgument
)
}
items(
items = conversation.messages,
key = { it.id }
) { message ->
MessageItem(
message = message,
timestamp = formatRelativeTime(message.createdAt, resources),
onPreviewAttachment = { attachment -> previewAttachment = attachment },
onDownloadAttachment = onDownloadAttachment,
onGetAuthorizationHeaderArgument = onGetAuthorizationHeaderArgument
)
}

item {
Spacer(modifier = Modifier.height(8.dp))
item {
Spacer(modifier = Modifier.height(8.dp))
}
}
}

if (isLoading) {
CircularProgressIndicator(
Expand Down Expand Up @@ -238,6 +241,7 @@ fun HEConversationDetailScreen(
}
)
}

AttachmentType.Video -> {
AttachmentFullscreenVideoPlayer(
videoUrl = attachment.url,
Expand All @@ -252,6 +256,7 @@ fun HEConversationDetailScreen(
},
)
}

else -> {
// For other types (documents, etc.), do nothing
// They should only be downloadable, not previewable
Expand All @@ -269,12 +274,16 @@ private fun ConversationHeader(
val statusText = when (ConversationStatus.fromStatus(status)) {
ConversationStatus.WAITING_FOR_SUPPORT ->
stringResource(R.string.he_support_status_waiting_for_support)

ConversationStatus.WAITING_FOR_USER ->
stringResource(R.string.he_support_status_waiting_for_user)

ConversationStatus.SOLVED ->
stringResource(R.string.he_support_status_solved)

ConversationStatus.CLOSED ->
stringResource(R.string.he_support_status_closed)

ConversationStatus.UNKNOWN ->
stringResource(R.string.he_support_status_unknown)
}
Expand Down Expand Up @@ -478,7 +487,8 @@ private fun AttachmentItem(
contentAlignment = Alignment.Center
) {
if (attachment.type == AttachmentType.Image ||
attachment.type == AttachmentType.Video) {
attachment.type == AttachmentType.Video
) {
// Show image/video preview for image and video attachments
SubcomposeAsyncImage(
model = ImageRequest.Builder(LocalContext.current)
Expand Down Expand Up @@ -602,8 +612,11 @@ private fun HEConversationDetailScreenPreviewContent(
}

private object ConversationDetailPreviewAttachmentActionsListener : AttachmentActionsListener {
override fun onAddImageClick() { /* Preview stub */ }
override fun onRemoveImage(uri: Uri) { /* Preview stub */ }
override fun onAddImageClick() { /* Preview stub */
}

override fun onRemoveImage(uri: Uri) { /* Preview stub */
}
}

@Preview(showBackground = true, name = "HE Conversation Detail")
Expand Down
9 changes: 6 additions & 3 deletions WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.rememberScrollState
Expand Down Expand Up @@ -147,7 +148,8 @@ private fun HENewTicketScreenContent(
selectedCategory?.let { category ->
onSubmit(category, subject, messageText, siteAddress, includeAppLogs)
}
}
},
modifier = Modifier.navigationBarsPadding()
)
}
) { contentPadding ->
Expand Down Expand Up @@ -283,10 +285,11 @@ private fun SectionHeader(
private fun SendButton(
enabled: Boolean,
isLoading: Boolean,
onClick: () -> Unit
onClick: () -> Unit,
modifier: Modifier = Modifier
) {
Surface(
modifier = Modifier.fillMaxWidth(),
modifier = modifier.fillMaxWidth(),
color = MaterialTheme.colorScheme.surface,
shadowElevation = 8.dp
) {
Expand Down