Skip to content

fix(navigation-view): highlighting menu item, fixes index out of bound error #16808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 1 commit into from
Apr 8, 2026
Merged

fix(navigation-view): highlighting menu item, fixes index out of bound error #16808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 18 additions & 11 deletions app/src/main/java/com/nextcloud/utils/extensions/NavigationViewExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import android.view.Menu
import androidx.core.view.forEach
import com.google.android.material.bottomnavigation.BottomNavigationView
import com.google.android.material.navigation.NavigationView
import com.owncloud.android.R

fun NavigationView.getSelectedMenuItemId(): Int {
menu.forEach {
Expand All @@ -21,19 +22,25 @@ fun NavigationView.getSelectedMenuItemId(): Int {
return Menu.NONE
}

fun NavigationView.unsetAllNavigationItems() {
uncheckMenu(menu)
}
fun highlightNavigationView(
drawerNavigationView: NavigationView?,
bottomNavigationView: BottomNavigationView?,
menuItemId: Int
) {
drawerNavigationView?.setCheckedItem(menuItemId)

fun BottomNavigationView.unsetAllNavigationItems() {
uncheckMenu(menu)
}
bottomNavigationView?.let { bottomNav ->
val bottomNavItems = setOf(R.id.nav_assistant, R.id.nav_all_files, R.id.nav_favorites, R.id.nav_gallery)
val menuItem = bottomNav.menu.findItem(menuItemId)

private fun uncheckMenu(menu: Menu) {
menu.forEach { item ->
item.isChecked = false
// Uncheck previous item that exists in drawer if this ID doesn't belong to bottom nav
if (menuItemId !in bottomNavItems) {
bottomNav.menu.findItem(bottomNav.selectedItemId)?.isChecked = false
}

// recursively uncheck submenu items
item.subMenu?.let { uncheckMenu(it) }
// Highlight new item, skip assistant because Assistant screen doesn't have same bottom navigation bar
if (menuItem != null && menuItem.itemId != R.id.nav_assistant) {
menuItem.isChecked = true
}
}
}
22 changes: 3 additions & 19 deletions app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,25 +298,9 @@ protected void setupDrawer(int id) {
* @param menuItemId the ID of the menu item to mark as selected/highlighted
*/
public void highlightNavigationViewItem(int menuItemId) {
if (drawerNavigationView != null) {
NavigationViewExtensionsKt.unsetAllNavigationItems(drawerNavigationView);
MenuItem menuItem = drawerNavigationView.getMenu().findItem(menuItemId);

if (menuItem != null && !menuItem.isChecked()) {
menuItem.setChecked(true);
}
}

if (bottomNavigationView != null) {
NavigationViewExtensionsKt.unsetAllNavigationItems(bottomNavigationView);
MenuItem menuItem = bottomNavigationView.getMenu().findItem(menuItemId);

// Don't highlight assistant bottom navigation item because Assistant screen doesn't have same bottom navigation bar
if (menuItem != null && !menuItem.isChecked() && menuItem.getItemId() != R.id.nav_assistant) {
menuItem.setChecked(true);
}
}

NavigationViewExtensionsKt.highlightNavigationView(drawerNavigationView,
bottomNavigationView,
menuItemId);
Log_OC.d(TAG, "New menu item is: " + menuItemId);
}

Expand Down
Loading