From e8a8be65429efcabd932190d1e1336019ccd93f5 Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 17 Aug 2021 21:05:47 +0200 Subject: [PATCH] Added quick setup menu divider --- app/src/main/java/eu/faircode/email/FragmentSetup.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentSetup.java b/app/src/main/java/eu/faircode/email/FragmentSetup.java index 6f858a3240..f504927ff4 100644 --- a/app/src/main/java/eu/faircode/email/FragmentSetup.java +++ b/app/src/main/java/eu/faircode/email/FragmentSetup.java @@ -53,6 +53,7 @@ import androidx.appcompat.app.AlertDialog; import androidx.appcompat.widget.PopupMenu; import androidx.cardview.widget.CardView; import androidx.constraintlayout.widget.Group; +import androidx.core.view.MenuCompat; import androidx.fragment.app.FragmentActivity; import androidx.lifecycle.Observer; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -205,13 +206,13 @@ public class FragmentSetup extends FragmentBase { int order = 1; String gmail = getString(R.string.title_setup_oauth, getString(R.string.title_setup_gmail)); - menu.add(Menu.NONE, R.string.title_setup_gmail, order++, gmail); + menu.add(Menu.FIRST, R.string.title_setup_gmail, order++, gmail); for (EmailProvider provider : EmailProvider.loadProfiles(context)) if (provider.oauth != null && (provider.oauth.enabled || BuildConfig.DEBUG)) { MenuItem item = menu - .add(Menu.NONE, -1, order++, getString(R.string.title_setup_oauth, provider.description)) + .add(Menu.FIRST, -1, order++, getString(R.string.title_setup_oauth, provider.description)) .setIntent(new Intent(ActivitySetup.ACTION_QUICK_OAUTH) .putExtra("id", provider.id) .putExtra("name", provider.description) @@ -228,7 +229,7 @@ public class FragmentSetup extends FragmentBase { menu.add(Menu.NONE, R.string.title_setup_classic, order++, R.string.title_setup_classic) .setIcon(R.drawable.twotone_settings_24) - .setVisible(BuildConfig.DEBUG); + .setVisible(false); SpannableString ss = new SpannableString(getString(R.string.title_setup_pop3)); ss.setSpan(new RelativeSizeSpan(0.9f), 0, ss.length(), 0); @@ -240,6 +241,8 @@ public class FragmentSetup extends FragmentBase { popupMenu.insertIcons(context); + MenuCompat.setGroupDividerEnabled(menu, true); + popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem item) {