From 9ad3c9f72c64ae91fd58de224805962ec83e9516 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Mart=C3=ADn?= Date: Mon, 6 May 2024 16:45:00 +0200 Subject: [PATCH 1/2] UX cleanup: reorder text composer actions --- changelog.d/2803.misc | 1 + .../messagecomposer/AttachmentsBottomSheet.kt | 24 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 changelog.d/2803.misc diff --git a/changelog.d/2803.misc b/changelog.d/2803.misc new file mode 100644 index 00000000000..ee67bc9e007 --- /dev/null +++ b/changelog.d/2803.misc @@ -0,0 +1 @@ +UX cleanup: reorder text composer actions to prioritise camera ones. diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt index c2ed969a92a..88458546026 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/AttachmentsBottomSheet.kt @@ -106,18 +106,6 @@ private fun AttachmentSourcePickerMenu( .navigationBarsPadding() .imePadding() ) { - ListItem( - modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery) }, - leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Image())), - headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_gallery)) }, - style = ListItemStyle.Primary, - ) - ListItem( - modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.FromFiles) }, - leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Attachment())), - headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_files)) }, - style = ListItemStyle.Primary, - ) ListItem( modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.PhotoFromCamera) }, leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.TakePhoto())), @@ -130,6 +118,18 @@ private fun AttachmentSourcePickerMenu( headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_camera_video)) }, style = ListItemStyle.Primary, ) + ListItem( + modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.FromGallery) }, + leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Image())), + headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_gallery)) }, + style = ListItemStyle.Primary, + ) + ListItem( + modifier = Modifier.clickable { state.eventSink(MessageComposerEvents.PickAttachmentSource.FromFiles) }, + leadingContent = ListItemContent.Icon(IconSource.Vector(CompoundIcons.Attachment())), + headlineContent = { Text(stringResource(R.string.screen_room_attachment_source_files)) }, + style = ListItemStyle.Primary, + ) if (state.canShareLocation) { ListItem( modifier = Modifier.clickable { From d1fdabc35afe8fa2042df90414eba2ebeeb9a83e Mon Sep 17 00:00:00 2001 From: ElementBot Date: Mon, 6 May 2024 14:52:30 +0000 Subject: [PATCH 2/2] Update screenshots --- ..._AttachmentSourcePickerMenu-Day-4_4_null,NEXUS_5,1.0,en].png | 2 +- ...ttachmentSourcePickerMenu-Night-4_5_null,NEXUS_5,1.0,en].png | 2 +- ...gesView_null_MessagesView-Day-0_0_null_2,NEXUS_5,1.0,en].png | 2 +- ...sView_null_MessagesView-Night-0_1_null_2,NEXUS_5,1.0,en].png | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Day-4_4_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Day-4_4_null,NEXUS_5,1.0,en].png index 0920708a90a..5ff865b9078 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Day-4_4_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Day-4_4_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:71231170c8d6cff3137aaa59df68f5d4b186cd501a8195ebff18b78635a36c66 +oid sha256:a8775112e8078f699bf9366d8ef3238421527601cb5eb8c8ba946b4c3a22fefb size 26182 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Night-4_5_null,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Night-4_5_null,NEXUS_5,1.0,en].png index 1a98922aea6..0fa2501a128 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Night-4_5_null,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl.messagecomposer_AttachmentSourcePickerMenu_null_AttachmentSourcePickerMenu-Night-4_5_null,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44a3bf1e15ca379d471e7a1e531564d585298d8ba1edf82aa064b8512ccf5f22 +oid sha256:3934bee2240469aa5dd91cc7654ca012e0aa424a266ad47e09f24ed78d82ec62 size 23845 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Day-0_0_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Day-0_0_null_2,NEXUS_5,1.0,en].png index e8e53e2110b..b167bf0fd57 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Day-0_0_null_2,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Day-0_0_null_2,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5f6f3350f9e409d8a6e87116b5500f519cad1f1d731f03b3674412207c6f4b1e +oid sha256:8ef8c712e3327374c8f186501c7dfd790b57e061b7a6540b7a53baec0e8ff563 size 28044 diff --git a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Night-0_1_null_2,NEXUS_5,1.0,en].png b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Night-0_1_null_2,NEXUS_5,1.0,en].png index 35a7ef73bc6..0f841402e97 100644 --- a/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Night-0_1_null_2,NEXUS_5,1.0,en].png +++ b/tests/uitests/src/test/snapshots/images/ui_S_t[f.messages.impl_MessagesView_null_MessagesView-Night-0_1_null_2,NEXUS_5,1.0,en].png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e56586426695abaf31a2e5fd3f4367177e69378daa5ed4f8a19ec93f768a60ff +oid sha256:3d912533966c2eca1e1b881247fb9ede01c3f47d79ea238ab4da3ee34e574721 size 24781