wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #6668 from thundernest/send_menu

Browse source 
Remove "Send…" menu
This commit is contained in:
cketti 2023-02-15 10:59:05 +01:00 committed by GitHub
commit cbe6991205
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 6 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.kt
View file

@ -279,7 +279,6 @@ class MessageViewFragment :
}
menu.findItem(R.id.move_to_drafts).isVisible = isOutbox
menu.findItem(R.id.single_message_options).isVisible = true
menu.findItem(R.id.unsubscribe).isVisible = canMessageBeUnsubscribed()
menu.findItem(R.id.show_headers).isVisible = true
menu.findItem(R.id.compose).isVisible = true
@ -396,6 +395,7 @@ class MessageViewFragment :
R.id.reply_all -> onReplyAll()
R.id.forward -> onForward()
R.id.forward_as_attachment -> onForwardAsAttachment()
R.id.edit_as_new_message -> onEditAsNewMessage()
R.id.share -> onSendAlternate()
else -> error("Missing handler for reply menu item $itemId")
}

2
app/ui/legacy/src/main/res/layout/message_view_header.xml
View file

@ -162,7 +162,7 @@
android:paddingHorizontal="12dp"
app:layout_constraintEnd_toStartOf="@id/menu_overflow"
app:layout_constraintTop_toTopOf="@+id/menu_overflow"
app:srcCompat="?iconActionSingleMessageOptions" />
tools:srcCompat="@drawable/ic_reply_all" />
<ImageView
android:id="@+id/menu_overflow"

30
app/ui/legacy/src/main/res/menu/message_list_option.xml
View file

@ -79,39 +79,9 @@
android:visible="false"
app:showAsAction="never" />
<!-- MessageView -->
<item
android:id="@+id/single_message_options"
android:icon="?attr/iconActionSingleMessageOptions"
android:title="@string/single_message_options_action"
android:visible="false"
app:showAsAction="ifRoom">
<menu>
<item
android:id="@+id/reply"
android:title="@string/reply_action" />
<item
android:id="@+id/reply_all"
android:title="@string/reply_all_action" />
<item
android:id="@+id/forward"
android:title="@string/forward_action" />
<item
android:id="@+id/forward_as_attachment"
android:title="@string/forward_as_attachment_action" />
<item
android:id="@+id/edit_as_new_message"
android:title="@string/edit_as_new_message_action" />
<item
android:id="@+id/share"
android:title="@string/send_alternate_action" />
</menu>
</item>
<!-- MessageView -->
<item
android:id="@+id/refile"
android:icon="?attr/iconActionSingleMessageOptions"
android:title="@string/refile_action"
android:visible="false"
app:showAsAction="never">

5
app/ui/legacy/src/main/res/menu/single_message_options.xml
View file

@ -12,7 +12,10 @@
<item
android:id="@+id/forward_as_attachment"
android:title="@string/forward_as_attachment_action"/>
<item
android:id="@+id/edit_as_new_message"
android:title="@string/edit_as_new_message_action" />
<item
android:id="@+id/share"
android:title="@string/send_alternate_action"/>
</menu>
</menu>

1
app/ui/legacy/src/main/res/values/attrs.xml
View file

@ -29,7 +29,6 @@
<attr name="iconActionSearchFolder" format="reference" />
<attr name="iconActionSend" format="reference" />
<attr name="iconActionSettings" format="reference" />
<attr name="iconActionSingleMessageOptions" format="reference" />
<attr name="iconActionSort" format="reference" />
<attr name="iconActionSpam" format="reference" />
<attr name="iconActionFlag" format="reference" />

1
app/ui/legacy/src/main/res/values/strings.xml
View file

@ -111,7 +111,6 @@ Please submit bug reports, contribute new features and ask questions at
<string name="edit_as_new_message_action">Edit as new message</string>
<string name="move_action">Move</string>
<string name="move_to_drafts_action">Move to Drafts</string>
<string name="single_message_options_action">Send…</string>
<string name="refile_action">Refile…</string>
<string name="done_action">Done</string>
<string name="discard_action">Discard</string>

2
app/ui/legacy/src/main/res/values/themes.xml
View file

@ -52,7 +52,6 @@
<item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
<item name="iconActionSend">@drawable/ic_send</item>
<item name="iconActionSettings">@drawable/ic_cog</item>
<item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>
<item name="iconActionSort">@drawable/ic_sort</item>
<item name="iconActionSpam">@drawable/ic_alert_octagon</item>
<item name="iconActionFlag">@drawable/ic_star</item>
@ -215,7 +214,6 @@
<item name="iconActionSearchFolder">@drawable/ic_folder_magnify</item>
<item name="iconActionSend">@drawable/ic_send</item>
<item name="iconActionSettings">@drawable/ic_cog</item>
<item name="iconActionSingleMessageOptions">@drawable/ic_reply_all</item>
<item name="iconActionSort">@drawable/ic_sort</item>
<item name="iconActionSpam">@drawable/ic_alert_octagon</item>
<item name="iconActionFlag">@drawable/ic_star</item>