Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/bma/removeExternalCallSupport

Browse source
This commit is contained in:
Benoit Marty 2026-04-30 11:50:35 +02:00
commit f4b3ddfa0b
262 changed files with 1644 additions and 825 deletions
Download patch file Download diff file Expand all files Collapse all files

1
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
View file

@ -156,6 +156,7 @@ fun ActionListView(
sheetState = sheetState,
onDismissRequest = ::onDismiss,
modifier = modifier,
scrollable = false,
) {
ActionListViewContent(
state = state,

1
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/crypto/sendfailure/resolve/ResolveVerifiedUserSendFailureView.kt
View file

@ -75,6 +75,7 @@ fun ResolveVerifiedUserSendFailureView(
.navigationBarsPadding(),
sheetState = sheetState,
onDismissRequest = ::dismiss,
scrollable = true,
) {
IconTitleSubtitleMolecule(
modifier = Modifier.padding(24.dp),

6
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt
View file

@ -13,6 +13,8 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.imePadding
import androidx.compose.foundation.layout.navigationBarsPadding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.runtime.Composable
@ -74,7 +76,8 @@ internal fun AttachmentsBottomSheet(
sheetState = rememberModalBottomSheetState(
skipPartiallyExpanded = true
),
onDismissRequest = { isVisible = false }
onDismissRequest = { isVisible = false },
scrollable = false,
) {
AttachmentSourcePickerMenu(
state = state,
@ -97,6 +100,7 @@ private fun AttachmentSourcePickerMenu(
modifier = Modifier
.navigationBarsPadding()
.imePadding()
.verticalScroll(rememberScrollState())
) {
ListItem(
modifier = Modifier.clickable { state.eventSink(MessageComposerEvent.PickAttachmentSource.PhotoFromCamera) },

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/customreaction/CustomReactionBottomSheet.kt
View file

@ -50,7 +50,8 @@ fun CustomReactionBottomSheet(
ModalBottomSheet(
onDismissRequest = ::onDismiss,
sheetState = sheetState,
modifier = modifier
modifier = modifier,
scrollable = false,
) {
val presenter = remember {
EmojiPickerPresenter(

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/reactionsummary/ReactionSummaryView.kt
View file

@ -90,7 +90,8 @@ fun ReactionSummaryView(
if (state.target != null) {
ModalBottomSheet(
onDismissRequest = ::onDismiss,
modifier = modifier
modifier = modifier,
scrollable = false,
) {
ReactionSummaryViewContent(summary = state.target)
}

3
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/receipt/bottomsheet/ReadReceiptBottomSheet.kt
View file

@ -57,7 +57,8 @@ internal fun ReadReceiptBottomSheet(
sheetState.hide()
state.eventSink(ReadReceiptBottomSheetEvent.Dismiss)
}
}
},
scrollable = false,
) {
ReadReceiptBottomSheetContent(
state = state,