mirror of https://github.com/M66B/FairEmail.git
Removed button inbox option
This commit is contained in:
parent
1431641383
commit
80fdd085a4
|
@ -1537,7 +1537,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
boolean expand_all = prefs.getBoolean("expand_all", false);
|
||||
boolean expand_one = prefs.getBoolean("expand_one", true);
|
||||
boolean tools = prefs.getBoolean("message_tools", true);
|
||||
boolean button_inbox = prefs.getBoolean("button_inbox", true);
|
||||
boolean button_junk = prefs.getBoolean("button_junk", true);
|
||||
boolean button_trash = prefs.getBoolean("button_trash", true);
|
||||
boolean button_archive = prefs.getBoolean("button_archive", true);
|
||||
|
@ -1561,7 +1560,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
ibArchive.setVisibility(tools && button_archive && archive ? View.VISIBLE : View.GONE);
|
||||
ibTrash.setVisibility(outbox || (tools && button_trash && trash) ? View.VISIBLE : View.GONE);
|
||||
ibJunk.setVisibility(tools && button_junk && junk ? View.VISIBLE : View.GONE);
|
||||
ibInbox.setVisibility(tools && button_inbox && inbox ? View.VISIBLE : View.GONE);
|
||||
ibInbox.setVisibility(tools && inbox ? View.VISIBLE : View.GONE);
|
||||
ibMore.setVisibility(tools && !outbox ? View.VISIBLE : View.GONE);
|
||||
ibTools.setImageLevel(tools ? 0 : 1);
|
||||
ibTools.setVisibility(outbox ? View.GONE : View.VISIBLE);
|
||||
|
@ -3752,7 +3751,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
boolean full = properties.getValue("full", message.id);
|
||||
|
||||
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
boolean button_inbox = prefs.getBoolean("button_inbox", true);
|
||||
boolean button_junk = prefs.getBoolean("button_junk", true);
|
||||
boolean button_trash = prefs.getBoolean("button_trash", true);
|
||||
boolean button_archive = prefs.getBoolean("button_archive", true);
|
||||
|
@ -3765,7 +3763,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
PopupMenuLifecycle popupMenu = new PopupMenuLifecycle(context, powner, ibMore);
|
||||
popupMenu.inflate(R.menu.popup_message_more);
|
||||
|
||||
popupMenu.getMenu().findItem(R.id.menu_button_inbox).setChecked(button_inbox);
|
||||
popupMenu.getMenu().findItem(R.id.menu_button_junk).setChecked(button_junk);
|
||||
popupMenu.getMenu().findItem(R.id.menu_button_trash).setChecked(button_trash);
|
||||
popupMenu.getMenu().findItem(R.id.menu_button_archive).setChecked(button_archive);
|
||||
|
@ -3827,9 +3824,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
|
|||
@Override
|
||||
public boolean onMenuItemClick(MenuItem target) {
|
||||
switch (target.getItemId()) {
|
||||
case R.id.menu_button_inbox:
|
||||
onMenuButton(message, "inbox", target.isChecked());
|
||||
return true;
|
||||
case R.id.menu_button_junk:
|
||||
onMenuButton(message, "junk", target.isChecked());
|
||||
return true;
|
||||
|
|
|
@ -4,10 +4,6 @@
|
|||
android:id="@+id/menu_button"
|
||||
android:title="@string/title_buttons">
|
||||
<menu>
|
||||
<item
|
||||
android:id="@+id/menu_button_inbox"
|
||||
android:checkable="true"
|
||||
android:title="@string/title_folder_inbox" />
|
||||
<item
|
||||
android:id="@+id/menu_button_junk"
|
||||
android:checkable="true"
|
||||
|
|
Loading…
Reference in New Issue