From 2e1c94d3f51dc6d667435b2a2bbd81a036d57bae Mon Sep 17 00:00:00 2001
From: akuma <akuma>
Date: Sun, 8 Sep 2019 20:40:29 +0200
Subject: New icon and text for Excluded Apps. Using PreferenceHelper. Test
 done.

---
 .../leap/bitmaskclient/drawer/NavigationDrawerFragment.java   | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'app/src/main/java/se/leap/bitmaskclient/drawer')

diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
index 99dfb890..a604c536 100644
--- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java
@@ -59,7 +59,7 @@ import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.fragments.AboutFragment;
 import se.leap.bitmaskclient.fragments.AlwaysOnDialog;
 import se.leap.bitmaskclient.fragments.LogFragment;
-import se.leap.bitmaskclient.fragments.Settings_Allowed_Apps;
+import se.leap.bitmaskclient.fragments.ExcludeAppsFragment;
 
 import static android.content.Context.MODE_PRIVATE;
 import static se.leap.bitmaskclient.BitmaskApp.getRefWatcher;
@@ -78,11 +78,10 @@ import static se.leap.bitmaskclient.DrawerSettingsAdapter.LOG;
 import static se.leap.bitmaskclient.DrawerSettingsAdapter.SELECT_APPS;
 import static se.leap.bitmaskclient.DrawerSettingsAdapter.SWITCH_PROVIDER;
 import static se.leap.bitmaskclient.R.string.about_fragment_title;
-import static se.leap.bitmaskclient.R.string.allow_apps_fragment_title;
+import static se.leap.bitmaskclient.R.string.exclude_apps_fragment_title;
 import static se.leap.bitmaskclient.R.string.donate_title;
 import static se.leap.bitmaskclient.R.string.log_fragment_title;
 import static se.leap.bitmaskclient.R.string.switch_provider_menu_option;
-import static se.leap.bitmaskclient.R.string.allow_apps_fragment_title;
 import static se.leap.bitmaskclient.utils.ConfigHelper.isDefaultBitmask;
 import static se.leap.bitmaskclient.utils.PreferenceHelper.getProviderName;
 import static se.leap.bitmaskclient.utils.PreferenceHelper.getSaveBattery;
@@ -272,12 +271,12 @@ public class NavigationDrawerFragment extends Fragment {
         if (isDefaultBitmask()) {
             settingsListAdapter.addItem(getSimpleTextInstance(getContext(), getString(switch_provider_menu_option), R.drawable.ic_switch_provider_36, SWITCH_PROVIDER));
         }
+        settingsListAdapter.addItem(getSimpleTextInstance(getContext(), getString(exclude_apps_fragment_title), R.drawable.ic_shield_remove_grey600_36dp, SELECT_APPS));
         settingsListAdapter.addItem(getSimpleTextInstance(getContext(), getString(log_fragment_title), R.drawable.ic_log_36, LOG));
         if (ENABLE_DONATION) {
             settingsListAdapter.addItem(getSimpleTextInstance(getContext(), getString(donate_title), R.drawable.ic_donate_36, DONATE));
         }
         settingsListAdapter.addItem(getSimpleTextInstance(getContext(), getString(about_fragment_title), R.drawable.ic_about_36, ABOUT));
-        settingsListAdapter.addItem(getSimpleTextInstance(getContext(), getString(allow_apps_fragment_title), R.drawable.ic_about_36, SELECT_APPS));
     }
 
     private ActionBar setupActionBar() {
@@ -500,8 +499,8 @@ public class NavigationDrawerFragment extends Fragment {
                     startActivity(browserIntent);
                     break;
                 case SELECT_APPS:
-                    fragment = new Settings_Allowed_Apps();
-                    setActionBarTitle(allow_apps_fragment_title);
+                    fragment = new ExcludeAppsFragment();
+                    setActionBarTitle(exclude_apps_fragment_title);
                     break;
                 default:
                     break;
-- 
cgit v1.2.3