Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-05 08:33:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added reorder folders as extra

Browse Source
This commit is contained in:
M66B
2022-07-03 10:02:46 +02:00
parent 74f594c9de
commit 907e986571
3 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,7 +239,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override
public void run() {
drawerLayout.closeDrawer(drawerContainer);
onMenuOrder(R.string.title_setup_reorder_accounts, EntityAccount.class);
onMenuOrder(R.string.title_setup_reorder_accounts, EntityAccount.class.getName());
}
}));
@@ -247,7 +247,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
@Override
public void run() {
drawerLayout.closeDrawer(drawerContainer);
onMenuOrder(R.string.title_setup_reorder_folders, TupleFolderSort.class);
onMenuOrder(R.string.title_setup_reorder_folders, TupleFolderSort.class.getName());
}
}).setSeparated());
@@ -552,13 +552,13 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
}
}
private void onMenuOrder(int title, Class clazz) {
private void onMenuOrder(int title, String className) {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED))
getSupportFragmentManager().popBackStack("order", FragmentManager.POP_BACK_STACK_INCLUSIVE);
Bundle args = new Bundle();
args.putInt("title", title);
args.putString("class", clazz.getName());
args.putString("class", className);
FragmentOrder fragment = new FragmentOrder();
fragment.setArguments(args);
@@ -2003,7 +2003,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac
else if (ACTION_IMPORT_CERTIFICATE.equals(action))
onImportCertificate(intent);
else if (ACTION_SETUP_REORDER.equals(action))
onMenuOrder(R.string.title_setup_reorder_accounts, EntityAccount.class);
onMenuOrder(R.string.title_setup_reorder_accounts, intent.getStringExtra("className"));
else if (ACTION_SETUP_MORE.equals(action))
onSetupMore(intent);
}

25
app/src/main/java/eu/faircode/email/FragmentSetup.java
View File

@@ -120,7 +120,8 @@ public class FragmentSetup extends FragmentBase {
private CardView cardExtra;
private TextView tvExtra;
private Button btnNotification;
private Button btnReorder;
private Button btnReorderAccounts;
private Button btnReorderFolders;
private Button btnDelete;
private Button btnApp;
private Button btnMore;
@@ -199,7 +200,8 @@ public class FragmentSetup extends FragmentBase {
cardExtra = view.findViewById(R.id.cardExtra);
tvExtra = view.findViewById(R.id.tvExtra);
btnNotification = view.findViewById(R.id.btnNotification);
btnReorder = view.findViewById(R.id.btnReorder);
btnReorderAccounts = view.findViewById(R.id.btnReorderAccounts);
btnReorderFolders = view.findViewById(R.id.btnReorderFolders);
btnDelete = view.findViewById(R.id.btnDelete);
btnApp = view.findViewById(R.id.btnApp);
btnMore = view.findViewById(R.id.btnMore);
@@ -628,14 +630,25 @@ public class FragmentSetup extends FragmentBase {
}
});
btnReorder.setOnClickListener(new View.OnClickListener() {
btnReorderAccounts.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_REORDER));
public void onClick(View v) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(v.getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_REORDER)
.putExtra("className", EntityAccount.class.getName()));
}
});
btnReorderFolders.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
LocalBroadcastManager lbm = LocalBroadcastManager.getInstance(v.getContext());
lbm.sendBroadcast(new Intent(ActivitySetup.ACTION_SETUP_REORDER)
.putExtra("className", TupleFolderSort.class.getName()));
}
});
btnDelete.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {