Merge pull request nextcloud#16284 from nextcloud/fix/drawer-item-highlight

fix(navigation): item highlight, content displaying

Author: alperozturk96

app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt

@@ -80,9 +80,16 @@ class ComposeActivity : DrawerActivity() {
         composeViewModel.updateSelectedText(text.toString())
     }
 
+    override fun getMenuItemId(): Int = R.id.nav_assistant
+
+    override fun onResume() {
+        super.onResume()
+        highlightNavigationViewItem(menuItemId)
+    }
+
     private fun setupActivityUIFor(destination: ComposeDestination) {
         if (destination is ComposeDestination.AssistantScreen) {
-            setupDrawer()
+            setupDrawer(menuItemId)
             setupToolbarShowOnlyMenuButtonAndTitle(destination.title) {
                 openDrawer()
             }

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

@@ -13,12 +13,12 @@ import com.owncloud.android.R
 import com.owncloud.android.ui.activity.DrawerActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
 
-fun DrawerActivity.navigateToAllFiles() {
-    DrawerActivity.menuItemId = R.id.nav_all_files
-    setNavigationViewItemChecked()
-
+@JvmOverloads
+fun DrawerActivity.navigateToAllFiles(onlyPersonal: Boolean = false) {
     MainApp.showOnlyFilesOnDevice(false)
-    MainApp.showOnlyPersonalFiles(false)
+    MainApp.showOnlyPersonalFiles(onlyPersonal)
+    highlightNavigationViewItem(R.id.nav_all_files)
+    setupHomeSearchToolbarWithSortAndListButtons()
 
     Intent(applicationContext, FileDisplayActivity::class.java).apply {
         addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)

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

@@ -0,0 +1,39 @@
+/*
+ * Nextcloud - Android Client
+ *
+ * SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+package com.nextcloud.utils.extensions
+
+import android.view.Menu
+import androidx.core.view.forEach
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationView
+
+fun NavigationView.getSelectedMenuItemId(): Int {
+    menu.forEach {
+        if (it.isChecked) {
+            return it.itemId
+        }
+    }
+    return Menu.NONE
+}
+
+fun NavigationView.unsetAllNavigationItems() {
+    uncheckMenu(menu)
+}
+
+fun BottomNavigationView.unsetAllNavigationItems() {
+    uncheckMenu(menu)
+}
+
+private fun uncheckMenu(menu: Menu) {
+    menu.forEach { item ->
+        item.isChecked = false
+
+        // recursively uncheck submenu items
+        item.subMenu?.let { uncheckMenu(it) }
+    }
+}

app/src/main/java/com/owncloud/android/MainApp.java

@@ -803,6 +803,18 @@ public static boolean isOnlyPersonFiles() {
         return mOnlyPersonalFiles;
     }
 
+    public static Integer getMenuItemId() {
+        if (MainApp.isOnlyPersonFiles()) {
+            return R.id.nav_personal_files;
+        }
+
+        if (MainApp.isOnlyOnDevice()) {
+            return R.id.nav_on_device;
+        }
+
+        return null;
+    }
+
     public static String getUserAgent() {
         // Mozilla/5.0 (Android) Nextcloud-android/2.1.0
         return getUserAgent(R.string.nextcloud_user_agent);

app/src/main/java/com/owncloud/android/ui/activities/ActivitiesActivity.java

@@ -77,7 +77,7 @@ protected void onCreate(Bundle savedInstanceState) {
         viewThemeUtils.androidx.themeSwipeRefreshLayout(binding.swipeContainingList);
 
         // setup drawer
-        setupDrawer();
+        setupDrawer(getMenuItemId());
         updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_item_activities));
 
         binding.swipeContainingList.setOnRefreshListener(() -> {
@@ -88,6 +88,11 @@ protected void onCreate(Bundle savedInstanceState) {
         });
     }
 
+    @Override
+    protected int getMenuItemId() {
+        return R.id.nav_activity;
+    }
+
     @VisibleForTesting
     public ActivityListLayoutBinding getBinding() {
         return binding;
@@ -153,6 +158,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     @Override
     protected void onResume() {
         super.onResume();
+        highlightNavigationViewItem(getMenuItemId());
         actionListener.onResume();
         setupContent();
     }

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

@@ -30,7 +30,7 @@ open class CommunityActivity : DrawerActivity() {
 
         setupToolbar()
         updateActionBarTitleAndHomeButtonByString(getString(R.string.drawer_community))
-        setupDrawer()
+        setupDrawer(menuItemId)
         binding.communityReleaseCandidateText.movementMethod = LinkMovementMethod.getInstance()
         setupContributeForumView()
         setupContributeTranslationView()
@@ -39,6 +39,13 @@ open class CommunityActivity : DrawerActivity() {
         setOnClickListeners()
     }
 
+    override fun getMenuItemId(): Int = R.id.nav_community
+
+    override fun onResume() {
+        super.onResume()
+        highlightNavigationViewItem(menuItemId)
+    }
+
     private fun setupContributeForumView() {
         val htmlContent = getString(R.string.community_contribute_forum_text) + " " +
             getString(