From 837c6ba8ada5f6c4f298498e18125fec02e0fd87 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 19 Sep 2020 19:28:22 +0900 Subject: [PATCH] Updated some icons and category in MorePreferencesFragment --- .../settings/MorePreferencesFragment.java | 40 ++++++++++--------- .../ic_account_multiple_remove_24.xml | 10 +++++ app/src/main/res/drawable/ic_logout.xml | 10 ----- app/src/main/res/drawable/ic_logout_24.xml | 10 +++++ 4 files changed, 41 insertions(+), 29 deletions(-) create mode 100644 app/src/main/res/drawable/ic_account_multiple_remove_24.xml delete mode 100644 app/src/main/res/drawable/ic_logout.xml create mode 100644 app/src/main/res/drawable/ic_logout_24.xml diff --git a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java index eb8da552..4050a963 100644 --- a/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/settings/MorePreferencesFragment.java @@ -59,7 +59,7 @@ public class MorePreferencesFragment extends BasePreferencesFragment { if (isLoggedIn) { accountCategory.setSummary(R.string.account_hint); accountCategory.addPreference(getAccountSwitcherPreference(cookie)); - accountCategory.addPreference(getPreference(R.string.logout, R.string.logout_summary, R.drawable.ic_logout, preference -> { + accountCategory.addPreference(getPreference(R.string.logout, R.string.logout_summary, R.drawable.ic_logout_24, preference -> { if (getContext() == null) return false; CookieUtils.setupCookies("LOGOUT"); shouldRecreate(); @@ -79,7 +79,7 @@ public class MorePreferencesFragment extends BasePreferencesFragment { } if (allCookies != null && allCookies.size() > 0) { - accountCategory.addPreference(getPreference(R.string.remove_all_acc, null, R.drawable.ic_delete, preference -> { + accountCategory.addPreference(getPreference(R.string.remove_all_acc, null, R.drawable.ic_account_multiple_remove_24, preference -> { if (getContext() == null) return false; new AlertDialog.Builder(getContext()) .setTitle(R.string.logout) @@ -96,42 +96,44 @@ public class MorePreferencesFragment extends BasePreferencesFragment { })); } - final PreferenceCategory generalCategory = new PreferenceCategory(context); - generalCategory.setTitle(R.string.pref_category_general); - generalCategory.setIconSpaceReserved(false); - screen.addPreference(generalCategory); + // final PreferenceCategory generalCategory = new PreferenceCategory(context); + // generalCategory.setTitle(R.string.pref_category_general); + // generalCategory.setIconSpaceReserved(false); + // screen.addPreference(generalCategory); + screen.addPreference(getDivider(context)); if (isLoggedIn) { - generalCategory.addPreference(getPreference(R.string.action_notif, R.drawable.ic_not_liked, preference -> { + screen.addPreference(getPreference(R.string.action_notif, R.drawable.ic_not_liked, preference -> { final NavDirections navDirections = MorePreferencesFragmentDirections.actionMorePreferencesFragmentToNotificationsViewer(); NavHostFragment.findNavController(this).navigate(navDirections); return true; })); } - generalCategory.addPreference(getPreference(R.string.title_favorites, R.drawable.ic_star_24, preference -> { + screen.addPreference(getPreference(R.string.title_favorites, R.drawable.ic_star_24, preference -> { final NavDirections navDirections = MorePreferencesFragmentDirections.actionMorePreferencesFragmentToFavoritesFragment(); NavHostFragment.findNavController(this).navigate(navDirections); return true; })); - generalCategory.addPreference(getPreference(R.string.action_settings, R.drawable.ic_outline_settings_24, preference -> { + + screen.addPreference(getDivider(context)); + screen.addPreference(getPreference(R.string.action_settings, R.drawable.ic_outline_settings_24, preference -> { final NavDirections navDirections = MorePreferencesFragmentDirections.actionMorePreferencesFragmentToSettingsPreferencesFragment(); NavHostFragment.findNavController(this).navigate(navDirections); return true; })); - final Preference aboutPreference = getPreference(R.string.action_about, R.drawable.ic_outline_info_24, preference -> { + screen.addPreference(getPreference(R.string.action_about, R.drawable.ic_outline_info_24, preference1 -> { final NavDirections navDirections = MorePreferencesFragmentDirections.actionMorePreferencesFragmentToAboutFragment(); NavHostFragment.findNavController(this).navigate(navDirections); return true; - }); - generalCategory.addPreference(aboutPreference); + })); screen.addPreference(getDivider(context)); - - final Preference versionPreference = getPreference(R.string.version, - BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")", -1, preference -> { - FlavorTown.updateCheck((AppCompatActivity) requireActivity(), true); - return true; - }); - screen.addPreference(versionPreference); + screen.addPreference(getPreference(R.string.version, + BuildConfig.VERSION_NAME + " (" + BuildConfig.VERSION_CODE + ")", + -1, + preference -> { + FlavorTown.updateCheck((AppCompatActivity) requireActivity(), true); + return true; + })); screen.addPreference(getDivider(context)); final Preference reminderPreference = getPreference(R.string.reminder, R.string.reminder_summary, R.drawable.ic_warning, null); diff --git a/app/src/main/res/drawable/ic_account_multiple_remove_24.xml b/app/src/main/res/drawable/ic_account_multiple_remove_24.xml new file mode 100644 index 00000000..eb035e53 --- /dev/null +++ b/app/src/main/res/drawable/ic_account_multiple_remove_24.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_logout.xml b/app/src/main/res/drawable/ic_logout.xml deleted file mode 100644 index bab545a7..00000000 --- a/app/src/main/res/drawable/ic_logout.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_logout_24.xml b/app/src/main/res/drawable/ic_logout_24.xml new file mode 100644 index 00000000..376bc7ce --- /dev/null +++ b/app/src/main/res/drawable/ic_logout_24.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file