remove navigation from drawer

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>

app/src/main/java/com/nextcloud/client/files/DeepLinkConstants.kt

@@ -15,7 +15,7 @@ enum class DeepLinkConstants(val route: String, val navId: Int) {
     OPEN_MEDIA("openMedia", R.id.nav_gallery),
     OPEN_SHARED("openShared", R.id.nav_shared),
     OPEN_OFFLINE("openOffline", R.id.nav_on_device),
-    OPEN_NOTIFICATIONS("openNotifications", R.id.nav_notifications),
+    OPEN_NOTIFICATIONS("openNotifications", -1),
     OPEN_DELETED("openDeleted", R.id.nav_trashbin),
     OPEN_SETTINGS("openSettings", R.id.nav_settings),
 

app/src/main/java/com/nextcloud/utils/extensions/DrawerActivityExtensions.kt

@@ -36,7 +36,6 @@ fun DrawerActivity.getMenuItemIdFromTitle(): Int? {
         getString(R.string.drawer_item_groupfolders) -> R.id.nav_groupfolders
         getString(R.string.drawer_item_on_device) -> R.id.nav_on_device
         getString(R.string.drawer_item_recently_modified) -> R.id.nav_recently_modified
-        getString(R.string.drawer_item_notifications) -> R.id.nav_notifications
         getString(R.string.drawer_item_assistant) -> R.id.nav_assistant
         getString(R.string.drawer_item_uploads_list) -> R.id.nav_uploads
         getString(R.string.drawer_item_trashbin) -> R.id.nav_trashbin

app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -539,8 +539,6 @@ public abstract class DrawerActivity extends ToolbarActivity
             startActivity(TrashbinActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
         } else if (itemId == R.id.nav_activity) {
             startActivity(ActivitiesActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP);
-        } else if (itemId == R.id.nav_notifications) {
-            startActivity(NotificationsActivity.class);
         } else if (itemId == R.id.nav_settings) {
             startActivity(SettingsActivity.class);
         } else if (itemId == R.id.nav_community) {
@@ -1306,6 +1304,9 @@ public abstract class DrawerActivity extends ToolbarActivity
             case ACTION_APP_UPDATE:
                 openAppStore(getPackageName(), false);
                 break;
+            case OPEN_NOTIFICATIONS:
+                startActivity(NotificationsActivity.class);
+                break;
             default:
                 handleNavItemClickEvent(deepLinkType.getNavId());
                 break;

app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt

@@ -13,6 +13,7 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import androidx.annotation.VisibleForTesting
+import androidx.core.content.res.ResourcesCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
 import com.nextcloud.client.account.User
@@ -64,17 +65,34 @@ class NotificationsActivity : DrawerActivity(), NotificationsContract.View {
         }
 
         setupToolbar()
-        updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_notifications))
         setupDrawer()
+        setupBack()
+        setupContainingList()
+        setupPushWarning()
+        setupContent()
 
         if (optionalUser?.isPresent == false) {
             showError()
         }
-
-        setupContainingList()
-        setupPushWarning()
-        setupContent()
     }
+    
+     private fun setupBack() {
+         updateActionBarTitleAndHomeButtonByString("1")
+         
+         if (resources == null) return
+         val menuIcon = ResourcesCompat.getDrawable(
+             resources,
+             R.drawable.ic_arrow_back,
+             null
+         )
+
+         if (menuIcon == null) return
+
+         supportActionBar?.let {
+             it.setHomeAsUpIndicator(menuIcon)
+             it.title = getString(R.string.drawer_item_notifications)
+         }
+     }
 
     private fun setupContainingList() {
         viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList)

app/src/main/res/menu/partial_drawer_entries.xml

@@ -64,12 +64,6 @@
             android:orderInCategory="0"
             android:title="@string/drawer_item_recently_modified"
             android:visible="true"/>
-        <item
-            android:orderInCategory="0"
-            android:id="@+id/nav_notifications"
-            android:icon="@drawable/nav_notifications"
-            android:title="@string/drawer_item_notifications"/>
-
         <item
             android:id="@+id/nav_assistant"
             android:icon="@drawable/ic_assistant"