From 021cc32f51ca3bff119395237889d09fc40bda3d Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 4 Dec 2025 13:34:19 -0500 Subject: [PATCH 1/3] Fix overlapping caused by edge-to-edge support --- .../he/ui/AttachmentFullscreenVideoPlayer.kt | 2 + .../he/ui/HEConversationDetailScreen.kt | 21 +++++---- .../support/he/ui/HENewTicketScreen.kt | 47 ++++++++++++++++--- 3 files changed, 54 insertions(+), 16 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt index 1718741eeeca..1da44bda01ed 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -175,6 +176,7 @@ fun AttachmentFullscreenVideoPlayer( Row( modifier = Modifier .align(Alignment.TopEnd) + .systemBarsPadding() .padding(16.dp) .background( color = Color.Black.copy(alpha = 0.5f), diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt index 3e0a551df042..9ac8476f0599 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HEConversationDetailScreen.kt @@ -13,6 +13,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.navigationBarsPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.FlowRow import androidx.compose.foundation.lazy.LazyColumn @@ -126,15 +127,17 @@ fun HEConversationDetailScreen( bottomBar = { val status = ConversationStatus.fromStatus(conversation.status) val isClosed = status == ConversationStatus.CLOSED - if (isClosed) { - ClosedConversationBanner() - } else { - ReplyButton( - enabled = !isLoading, - onClick = { - showBottomSheet = true - } - ) + Box(modifier = Modifier.navigationBarsPadding()) { + if (isClosed) { + ClosedConversationBanner() + } else { + ReplyButton( + enabled = !isLoading, + onClick = { + showBottomSheet = true + } + ) + } } } ) { contentPadding -> diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt index e9d4b0da8aab..cd13732b07ff 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt @@ -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 @@ -94,15 +95,47 @@ fun HENewTicketScreen( ) }, bottomBar = { - SendButton( - enabled = selectedCategory != null && subject.isNotBlank() && messageText.isNotBlank(), - isLoading = isSendingNewConversation, - onClick = { - selectedCategory?.let { category -> - onSubmit(category, subject, messageText, siteAddress) + Surface( + modifier = Modifier + .fillMaxWidth() + .navigationBarsPadding(), + color = MaterialTheme.colorScheme.surface, + shadowElevation = 8.dp + ) { + Box( + modifier = Modifier + .fillMaxWidth() + .imePadding() + .padding(16.dp) + ) { + Button( + onClick = { + selectedCategory?.let { category -> + onSubmit(category, subject, messageText, siteAddress) + } + }, + enabled = selectedCategory != null && subject.isNotBlank() && + messageText.isNotBlank() && !isSendingNewConversation, + modifier = Modifier + .fillMaxWidth() + .height(52.dp), + shape = RoundedCornerShape(12.dp) + ) { + if (isSendingNewConversation) { + CircularProgressIndicator( + modifier = Modifier.size(20.dp), + color = MaterialTheme.colorScheme.onPrimary + ) + } else { + Text( + text = stringResource(R.string.he_support_send_button), + style = MaterialTheme.typography.bodyLarge, + fontWeight = FontWeight.Medium + ) + } } } - ) + } } ) { contentPadding -> Column( From b4aed36a7712fbae61bca0d6bc86f10ac105edee Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 4 Dec 2025 13:46:42 -0500 Subject: [PATCH 2/3] Undo changes to AttachmentFullscreenVideoPlayer --- .../android/support/he/ui/AttachmentFullscreenVideoPlayer.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt index 1da44bda01ed..1718741eeeca 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/he/ui/AttachmentFullscreenVideoPlayer.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.systemBarsPadding import androidx.compose.foundation.layout.size import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -176,7 +175,6 @@ fun AttachmentFullscreenVideoPlayer( Row( modifier = Modifier .align(Alignment.TopEnd) - .systemBarsPadding() .padding(16.dp) .background( color = Color.Black.copy(alpha = 0.5f), From 33fd5da1dd056d1fd315c23855830c754ae9d6b2 Mon Sep 17 00:00:00 2001 From: Nick Bradbury Date: Thu, 4 Dec 2025 14:22:50 -0500 Subject: [PATCH 3/3] Restored the SendButton composable --- .../support/he/ui/HENewTicketScreen.kt | 54 +++++-------------- 1 file changed, 12 insertions(+), 42 deletions(-) diff --git a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt index cd13732b07ff..d296252777c8 100644 --- a/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt +++ b/WordPress/src/main/java/org/wordpress/android/support/he/ui/HENewTicketScreen.kt @@ -95,47 +95,16 @@ fun HENewTicketScreen( ) }, bottomBar = { - Surface( - modifier = Modifier - .fillMaxWidth() - .navigationBarsPadding(), - color = MaterialTheme.colorScheme.surface, - shadowElevation = 8.dp - ) { - Box( - modifier = Modifier - .fillMaxWidth() - .imePadding() - .padding(16.dp) - ) { - Button( - onClick = { - selectedCategory?.let { category -> - onSubmit(category, subject, messageText, siteAddress) - } - }, - enabled = selectedCategory != null && subject.isNotBlank() && - messageText.isNotBlank() && !isSendingNewConversation, - modifier = Modifier - .fillMaxWidth() - .height(52.dp), - shape = RoundedCornerShape(12.dp) - ) { - if (isSendingNewConversation) { - CircularProgressIndicator( - modifier = Modifier.size(20.dp), - color = MaterialTheme.colorScheme.onPrimary - ) - } else { - Text( - text = stringResource(R.string.he_support_send_button), - style = MaterialTheme.typography.bodyLarge, - fontWeight = FontWeight.Medium - ) - } + SendButton( + enabled = selectedCategory != null && subject.isNotBlank() && messageText.isNotBlank(), + isLoading = isSendingNewConversation, + onClick = { + selectedCategory?.let { category -> + onSubmit(category, subject, messageText, siteAddress) } - } - } + }, + modifier = Modifier.navigationBarsPadding() + ) } ) { contentPadding -> Column( @@ -270,10 +239,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 ) {