From b52e7061387bce7c279d33c0992c4a2ee2153dd2 Mon Sep 17 00:00:00 2001 From: Jon Daley Date: Sun, 12 Apr 2026 01:41:13 -0400 Subject: [PATCH 1/3] put non-floating compose button back on the initial screen. --- legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml | 2 +- .../legacy/src/main/res/menu/new_message_list_option_menu.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml b/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml index 5def058bef4..36cacf4467f 100644 --- a/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml +++ b/legacy/ui/legacy/src/main/res/menu/message_list_option_menu.xml @@ -62,7 +62,7 @@ android:id="@+id/compose" android:icon="@drawable/ic_edit" android:title="@string/compose_action" - app:showAsAction="never" + app:showAsAction="always" /> Date: Sun, 12 Apr 2026 01:59:01 -0400 Subject: [PATCH 2/3] restore compose button when viewing another message. fixes https://github.com/thunderbird/thunderbird-android/issues/10753 --- .../main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt index 432a69fc8a9..7bdac748102 100644 --- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt +++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt @@ -41,6 +41,7 @@ import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons import app.k9mail.legacy.message.controller.MessageReference import com.eygraber.uri.toKmpUri import com.fsck.k9.activity.MessageCompose +import com.fsck.k9.activity.compose.MessageActions import com.fsck.k9.activity.MessageLoaderHelper import com.fsck.k9.activity.MessageLoaderHelper.MessageLoaderCallbacks import com.fsck.k9.activity.MessageLoaderHelperFactory @@ -470,6 +471,7 @@ class MessageViewFragment : R.id.set_format_plain -> onDisplayPlainText() R.id.set_format_html -> onDisplayHTML() + R.id.view_compose -> MessageActions.actionCompose(requireActivity(), account) else -> return false } From b24dcb97108f10b739a0d8f93153c1e7cfdaade1 Mon Sep 17 00:00:00 2001 From: Jon Daley Date: Wed, 22 Apr 2026 14:29:49 -0400 Subject: [PATCH 3/3] ran spotlessApply --- .../main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt index 7bdac748102..74e3984ccd0 100644 --- a/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt +++ b/legacy/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt @@ -41,10 +41,10 @@ import app.k9mail.core.ui.legacy.designsystem.atom.icon.Icons import app.k9mail.legacy.message.controller.MessageReference import com.eygraber.uri.toKmpUri import com.fsck.k9.activity.MessageCompose -import com.fsck.k9.activity.compose.MessageActions import com.fsck.k9.activity.MessageLoaderHelper import com.fsck.k9.activity.MessageLoaderHelper.MessageLoaderCallbacks import com.fsck.k9.activity.MessageLoaderHelperFactory +import com.fsck.k9.activity.compose.MessageActions import com.fsck.k9.controller.MessagingController import com.fsck.k9.fragment.AttachmentDownloadDialogFragment import com.fsck.k9.fragment.ConfirmationDialogFragment