From 1727a296c90a50ca85fd98419e5dc0bf122d1ad8 Mon Sep 17 00:00:00 2001
From: Vivek Maskara <maskaravivek@gmail.com>
Date: Wed, 30 Jan 2019 15:21:29 +0530
Subject: [PATCH] Remove notifications from nav drawer (#2319)

---
 .../nrw/commons/notification/NotificationActivity.java     | 7 -------
 .../fr/free/nrw/commons/theme/NavigationBaseActivity.java  | 7 -------
 app/src/main/res/menu/drawer.xml                           | 6 ------
 3 files changed, 20 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
index 879e7cb99..17390e5fb 100644
--- a/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
@@ -142,11 +142,4 @@ public class NotificationActivity extends NavigationBaseActivity {
         context.startActivity(intent);
     }
 
-    private void initializeAndSetNotificationList(List<Notification> notificationList){
-        FragmentManager fm = getFragmentManager();
-        mNotificationWorkerFragment = new NotificationWorkerFragment();
-        fm.beginTransaction().add(mNotificationWorkerFragment, TAG_NOTIFICATION_WORKER_FRAGMENT)
-                .commit();
-        mNotificationWorkerFragment.setNotificationList(notificationList);
-    }
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index e76ad3565..a2cac0fb9 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -37,7 +37,6 @@ import fr.free.nrw.commons.bookmarks.BookmarksActivity;
 import fr.free.nrw.commons.category.CategoryImagesActivity;
 import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.kvstore.BasicKvStore;
-import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import timber.log.Timber;
@@ -78,7 +77,6 @@ public abstract class NavigationBaseActivity extends BaseActivity
             userIcon.setVisibility(View.GONE);
             nav_Menu.findItem(R.id.action_login).setVisible(true);
             nav_Menu.findItem(R.id.action_home).setVisible(false);
-            nav_Menu.findItem(R.id.action_notifications).setVisible(false);
             nav_Menu.findItem(R.id.action_settings).setVisible(false);
             nav_Menu.findItem(R.id.action_logout).setVisible(false);
             nav_Menu.findItem(R.id.action_bookmarks).setVisible(true);
@@ -86,7 +84,6 @@ public abstract class NavigationBaseActivity extends BaseActivity
             userIcon.setVisibility(View.VISIBLE);
             nav_Menu.findItem(R.id.action_login).setVisible(false);
             nav_Menu.findItem(R.id.action_home).setVisible(true);
-            nav_Menu.findItem(R.id.action_notifications).setVisible(true);
             nav_Menu.findItem(R.id.action_settings).setVisible(true);
             nav_Menu.findItem(R.id.action_logout).setVisible(true);
             nav_Menu.findItem(R.id.action_bookmarks).setVisible(true);
@@ -215,10 +212,6 @@ public abstract class NavigationBaseActivity extends BaseActivity
                         .setNegativeButton(R.string.no, (dialog, which) -> dialog.cancel())
                         .show();
                 return true;
-            case R.id.action_notifications:
-                drawerLayout.closeDrawer(navigationView);
-                NotificationActivity.startYourself(this);
-                return true;
             case R.id.action_explore:
                 drawerLayout.closeDrawer(navigationView);
                 CategoryImagesActivity.startYourself(this, getString(R.string.title_activity_explore), FEATURED_IMAGES_CATEGORY);
diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index 70ac42550..d8a9425d9 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -24,12 +24,6 @@
 
     </group>
     <group android:id="@+id/drawer_account">
-        <item
-            android:id="@+id/action_notifications"
-            android:icon="@drawable/ic_notifications_black_24dp"
-            android:title="@string/navigation_item_notification" />
-
-
         <item
             android:id="@+id/action_settings"
             android:icon="@drawable/ic_settings_black_24dp"