mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 12:23:58 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove notifications from nav drawer (#2319)

Browse source
This commit is contained in:
Vivek Maskara 2019-01-30 15:21:29 +05:30 • committed by neslihanturan
parent 4bbbfc839b
commit 1727a296c9
3 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/fr/free/nrw/commons/notification/NotificationActivity.java
View file

@ -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);
}
}

7
app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
View file

@ -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);

6
app/src/main/res/menu/drawer.xml
View file

@ -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"