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

Open
nbradbury wants to merge 3 commits into
base: trunk
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 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
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
21 changes: 12 additions & 9 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 @@ -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
Expand Down Expand Up @@ -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 ->
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 @@ -101,7 +102,8 @@ fun HENewTicketScreen(
selectedCategory?.let { category ->
onSubmit(category, subject, messageText, siteAddress)
}
}
},
modifier = Modifier.navigationBarsPadding()
)
}
) { contentPadding ->
Expand Down Expand Up @@ -237,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
) {
Expand Down