Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-12-28 16:40:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move local contacts to setup

Browse Source
This commit is contained in:
M66B
2019-03-16 19:40:30 +00:00
parent 359e53d8fe
commit 2c4494ddb0
2 changed files with 30 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,6 +161,9 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
case R.string.title_setup_advanced:
onMenuOptions();
break;
case R.string.menu_contacts:
onMenuContacts();
break;
case R.string.menu_legend:
onMenuLegend();
break;
@@ -202,15 +205,16 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
items.add(new DrawerItem(-7, R.drawable.baseline_notifications_24, R.string.title_setup_notifications));
items.add(new DrawerItem(-8, R.drawable.baseline_settings_applications_24, R.string.title_setup_advanced));
items.add(new DrawerItem(-9, R.drawable.baseline_person_24, R.string.menu_contacts));
items.add(new DrawerItem(-9));
items.add(new DrawerItem(-10));
items.add(new DrawerItem(-10, R.drawable.baseline_help_24, R.string.menu_legend));
items.add(new DrawerItem(-11, R.drawable.baseline_help_24, R.string.menu_legend));
if (Helper.getIntentFAQ().resolveActivity(getPackageManager()) != null)
items.add(new DrawerItem(-11, R.drawable.baseline_question_answer_24, R.string.menu_faq));
items.add(new DrawerItem(-12, R.drawable.baseline_question_answer_24, R.string.menu_faq));
if (Helper.getIntentPrivacy().resolveActivity(getPackageManager()) != null)
items.add(new DrawerItem(-12, R.drawable.baseline_account_box_24, R.string.menu_privacy));
items.add(new DrawerItem(-13, R.drawable.baseline_info_24, R.string.menu_about));
items.add(new DrawerItem(-13, R.drawable.baseline_account_box_24, R.string.menu_privacy));
items.add(new DrawerItem(-14, R.drawable.baseline_info_24, R.string.menu_about));
drawerArray.set(items);
@@ -402,6 +406,15 @@ public class ActivitySetup extends ActivityBilling implements FragmentManager.On
fragmentTransaction.commit();
}
private void onMenuContacts() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getSupportFragmentManager().popBackStack("contacts", FragmentManager.POP_BACK_STACK_INCLUSIVE);
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.replace(R.id.content_frame, new FragmentContacts()).addToBackStack("contacts");
fragmentTransaction.commit();
}
private void onMenuLegend() {
if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED))
getSupportFragmentManager().popBackStack("legend", FragmentManager.POP_BACK_STACK_INCLUSIVE);