mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added outbox to unified folders / accounts

This commit is contained in:
M66B 2022-08-31 11:40:09 +02:00
parent 88ea3bf52a
commit f300673c97
4 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/FragmentAccounts.java
View File

@ -48,6 +48,7 @@ import androidx.core.view.MenuCompat;
import androidx.fragment.app.FragmentTransaction;
import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Observer;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -352,6 +353,7 @@ public class FragmentAccounts extends FragmentBase {
public void onPrepareOptionsMenu(Menu menu) {
menu.findItem(R.id.menu_search).setVisible(!settings);
menu.findItem(R.id.menu_unified).setVisible(!settings);
menu.findItem(R.id.menu_outbox).setVisible(!settings);
menu.findItem(R.id.menu_compact).setChecked(compact);
menu.findItem(R.id.menu_compact).setVisible(!settings);
menu.findItem(R.id.menu_theme).setVisible(!settings);
@ -369,6 +371,9 @@ public class FragmentAccounts extends FragmentBase {
} else if (itemId == R.id.menu_unified) {
onMenuUnified();
return true;
} else if (itemId == R.id.menu_outbox) {
onMenuOutbox();
return true;
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
@ -402,6 +407,11 @@ public class FragmentAccounts extends FragmentBase {
fragmentTransaction.commit();
}
private void onMenuOutbox() {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityView.ACTION_VIEW_OUTBOX));
}
private void onMenuCompact() {
compact = !compact;

10
app/src/main/java/eu/faircode/email/FragmentFolders.java
View File

@ -63,6 +63,7 @@ import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.Observer;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.lifecycle.ViewModelProvider;
import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
@ -681,6 +682,7 @@ public class FragmentFolders extends FragmentBase {
boolean sort_unread_atop = prefs.getBoolean("sort_unread_atop", false);
menu.findItem(R.id.menu_unified).setVisible(account < 0 || primary);
menu.findItem(R.id.menu_outbox).setVisible(account < 0 || primary);
menu.findItem(R.id.menu_compact).setChecked(compact);
menu.findItem(R.id.menu_theme).setVisible(account < 0 || primary);
menu.findItem(R.id.menu_show_hidden).setChecked(show_hidden);
@ -705,6 +707,9 @@ public class FragmentFolders extends FragmentBase {
} else if (itemId == R.id.menu_unified) {
onMenuUnified();
return true;
} else if (itemId == R.id.menu_outbox) {
onMenuOutbox();
return true;
} else if (itemId == R.id.menu_compact) {
onMenuCompact();
return true;
@ -763,6 +768,11 @@ public class FragmentFolders extends FragmentBase {
fragmentTransaction.commit();
}
private void onMenuOutbox() {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivityView.ACTION_VIEW_OUTBOX));
}
private void onMenuCompact() {
compact = !compact;

6
app/src/main/res/menu/menu_accounts.xml
View File

@ -14,6 +14,12 @@
android:title="@string/title_folders_unified"
app:showAsAction="always" />
<item
android:id="@+id/menu_outbox"
android:icon="@drawable/twotone_outbox_24"
android:title="@string/title_folder_outbox"
app:showAsAction="ifRoom" />
<group android:id="@+id/group_appearance">
<item
android:id="@+id/menu_compact"

6
app/src/main/res/menu/menu_folders.xml
View File

@ -14,6 +14,12 @@
android:title="@string/title_folder_unified"
app:showAsAction="always" />
<item
android:id="@+id/menu_outbox"
android:icon="@drawable/twotone_outbox_24"
android:title="@string/title_folder_outbox"
app:showAsAction="ifRoom" />
<group android:id="@+id/group_appearance">
<item
android:id="@+id/menu_compact"