1
0
mirror of https://github.com/moparisthebest/k-9 synced 2024-12-25 00:58:50 -05:00

Restructure code to set visibility of copy, move, archive, spam menu items

In my opinion this structure makes the code much easier to read.
This commit is contained in:
cketti 2013-08-29 18:20:03 +02:00
parent ee9246b4f9
commit 2043df74da

View File

@ -1030,31 +1030,46 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
menu.findItem(R.id.select_text).setVisible(Build.VERSION.SDK_INT < 16); menu.findItem(R.id.select_text).setVisible(Build.VERSION.SDK_INT < 16);
menu.findItem(R.id.delete).setVisible(K9.isMessageViewDeleteActionVisible()); menu.findItem(R.id.delete).setVisible(K9.isMessageViewDeleteActionVisible());
menu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable()
&& K9.isMessageViewCopyActionVisible());
menu.findItem(R.id.move).setVisible(mMessageViewFragment.isMoveCapable()
&& K9.isMessageViewMoveActionVisible());
menu.findItem(R.id.archive).setVisible(mMessageViewFragment.isMoveCapable()
&& mMessageViewFragment.canMessageBeArchived()
&& K9.isMessageViewArchiveActionVisible());
menu.findItem(R.id.spam).setVisible(mMessageViewFragment.isMoveCapable()
&& mMessageViewFragment.canMessageBeMovedToSpam()
&& K9.isMessageViewSpamActionVisible());
/*
* Set visibility of copy, move, archive, spam in action bar and refile submenu
*/
Menu refileSubmenu = menu.findItem(R.id.refile).getSubMenu(); Menu refileSubmenu = menu.findItem(R.id.refile).getSubMenu();
refileSubmenu.findItem(R.id.copy).setVisible(mMessageViewFragment.isCopyCapable());
refileSubmenu.findItem(R.id.move).setVisible(mMessageViewFragment.isMoveCapable()); if (mMessageViewFragment.isCopyCapable()) {
refileSubmenu.findItem(R.id.archive).setVisible(mMessageViewFragment.isMoveCapable() menu.findItem(R.id.copy).setVisible(K9.isMessageViewCopyActionVisible());
&& mMessageViewFragment.canMessageBeArchived()); refileSubmenu.findItem(R.id.copy).setVisible(true);
refileSubmenu.findItem(R.id.spam).setVisible(mMessageViewFragment.isMoveCapable() } else {
&& mMessageViewFragment.canMessageBeMovedToSpam()); menu.findItem(R.id.copy).setVisible(false);
refileSubmenu.findItem(R.id.copy).setVisible(false);
}
if (mMessageViewFragment.isMoveCapable()) {
boolean canMessageBeArchived = mMessageViewFragment.canMessageBeArchived();
boolean canMessageBeMovedToSpam = mMessageViewFragment.canMessageBeMovedToSpam();
menu.findItem(R.id.move).setVisible(K9.isMessageViewMoveActionVisible());
menu.findItem(R.id.archive).setVisible(canMessageBeArchived &&
K9.isMessageViewArchiveActionVisible());
menu.findItem(R.id.spam).setVisible(canMessageBeMovedToSpam &&
K9.isMessageViewSpamActionVisible());
refileSubmenu.findItem(R.id.move).setVisible(true);
refileSubmenu.findItem(R.id.archive).setVisible(canMessageBeArchived);
refileSubmenu.findItem(R.id.spam).setVisible(canMessageBeMovedToSpam);
} else {
menu.findItem(R.id.move).setVisible(false);
menu.findItem(R.id.archive).setVisible(false);
menu.findItem(R.id.spam).setVisible(false);
menu.findItem(R.id.refile).setVisible(false);
}
if (mMessageViewFragment.allHeadersVisible()) { if (mMessageViewFragment.allHeadersVisible()) {
menu.findItem(R.id.show_headers).setVisible(false); menu.findItem(R.id.show_headers).setVisible(false);
} else { } else {
menu.findItem(R.id.hide_headers).setVisible(false); menu.findItem(R.id.hide_headers).setVisible(false);
} }
} }