fix(drawer-menu): item highlight

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

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

@@ -8,10 +8,13 @@
 package com.nextcloud.utils.extensions
 
 import android.content.Intent
+import android.view.Menu
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.ui.activity.DrawerActivity
 import com.owncloud.android.ui.activity.FileDisplayActivity
+import androidx.core.view.get
+import androidx.core.view.size
 
 fun DrawerActivity.navigateToAllFiles() {
     DrawerActivity.menuItemId = R.id.nav_all_files
@@ -27,3 +30,18 @@ fun DrawerActivity.navigateToAllFiles() {
         startActivity(this)
     }
 }
+
+fun DrawerActivity.unsetAllNavigationItems() {
+    fun uncheckMenu(menu: Menu) {
+        for (i in 0 until menu.size) {
+            val item = menu[i]
+            item.isChecked = false
+
+            // recursively uncheck submenu items
+            item.subMenu?.let { uncheckMenu(it) }
+        }
+    }
+
+    drawerNavigationView?.menu?.let { uncheckMenu(it) }
+    bottomNavigationView?.menu?.let { uncheckMenu(it) }
+}

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

@@ -63,6 +63,7 @@
 import com.nextcloud.utils.GlideHelper;
 import com.nextcloud.utils.LinkHelper;
 import com.nextcloud.utils.extensions.ActivityExtensionsKt;
+import com.nextcloud.utils.extensions.DrawerActivityExtensionsKt;
 import com.nextcloud.utils.extensions.ViewExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
 import com.owncloud.android.MainApp;
@@ -160,7 +161,7 @@ public abstract class DrawerActivity extends ToolbarActivity
     /**
      * Reference to the navigation view.
      */
-    private NavigationView drawerNavigationView;
+    public NavigationView drawerNavigationView;
 
     /**
      * Reference to the navigation view header.
@@ -225,6 +226,7 @@ protected void setupDrawer() {
 
         drawerNavigationView = findViewById(R.id.nav_view);
         if (drawerNavigationView != null) {
+            viewThemeUtils.files.colorNavigationView(drawerNavigationView);
 
             // Setting up drawer header
             mNavigationViewHeader = drawerNavigationView.getHeaderView(0);
@@ -877,22 +879,6 @@ private void setQuotaInformation(long usedSpace, long totalSpace, int relative,
         showQuota(true);
     }
 
-    private void unsetAllDrawerMenuItems() {
-        if (drawerNavigationView != null) {
-            Menu menu = drawerNavigationView.getMenu();
-            for (int i = 0; i < menu.size(); i++) {
-                menu.getItem(i).setChecked(false);
-            }
-        }
-
-        if (bottomNavigationView != null) {
-            Menu menu = bottomNavigationView.getMenu();
-            for (int i = 0; i < menu.size(); i++) {
-                menu.getItem(i).setChecked(false);
-            }
-        }
-    }
-
     private void updateQuotaLink() {
         if (mQuotaTextLink != null) {
             if (MDMConfig.INSTANCE.externalSiteSupport(this)) {
@@ -960,13 +946,12 @@ public void onLoadFailed(@Nullable Drawable errorDrawable) {
         };
     }
 
-
     /**
      * Sets the menu item as checked in both the drawer and bottom navigation views, if applicable.
      */
     @SuppressFBWarnings("RV")
     public void setNavigationViewItemChecked() {
-        unsetAllDrawerMenuItems();
+        DrawerActivityExtensionsKt.unsetAllNavigationItems(this);
 
         // Don't check any items
         if (menuItemId == Menu.NONE) {
@@ -978,7 +963,6 @@ public void setNavigationViewItemChecked() {
 
             if (menuItem != null && !menuItem.isChecked()) {
                 menuItem.setChecked(true);
-                viewThemeUtils.platform.colorNavigationView(drawerNavigationView);
             }
         }
 
@@ -1444,6 +1428,7 @@ protected void handleDeepLink(@NonNull Uri uri) {
     private void handleNavItemClickEvent(@IdRes int menuItemId) {
         if (drawerNavigationView == null) {
             drawerNavigationView = findViewById(R.id.nav_view);
+            viewThemeUtils.files.colorNavigationView(drawerNavigationView);
         }
         Menu navMenu = drawerNavigationView.getMenu();
         onNavigationItemClicked(navMenu.findItem(menuItemId));

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

@@ -1389,8 +1389,6 @@ class FileDisplayActivity :
             menuItemId = R.id.nav_personal_files
         } else if (MainApp.isOnlyOnDevice()) {
             menuItemId = R.id.nav_on_device
-        } else if (menuItemId == R.id.nav_trashbin || menuItemId == R.id.nav_activity) {
-            menuItemId = R.id.nav_all_files
         } else if (menuItemId == Menu.NONE) {
             menuItemId = R.id.nav_all_files
         }

app/src/main/java/com/owncloud/android/utils/theme/FilesSpecificViewThemeUtils.kt

@@ -27,15 +27,18 @@ import androidx.appcompat.widget.AppCompatAutoCompleteTextView
 import androidx.appcompat.widget.SearchView
 import androidx.core.content.res.ResourcesCompat
 import com.google.android.material.card.MaterialCardView
+import com.google.android.material.navigation.NavigationView
 import com.nextcloud.android.common.ui.color.ColorUtil
 import com.nextcloud.android.common.ui.theme.MaterialSchemes
 import com.nextcloud.android.common.ui.theme.ViewThemeUtilsBase
 import com.nextcloud.android.common.ui.theme.utils.AndroidViewThemeUtils
 import com.nextcloud.android.common.ui.theme.utils.AndroidXViewThemeUtils
+import com.nextcloud.android.common.ui.util.buildColorStateList
 import com.nextcloud.utils.view.FastScrollPopupBackground
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.lib.resources.shares.ShareType
+import dynamiccolor.MaterialDynamicColors
 import me.zhanghai.android.fastscroll.FastScrollerBuilder
 import me.zhanghai.android.fastscroll.PopupStyles
 import javax.inject.Inject
@@ -47,6 +50,8 @@ class FilesSpecificViewThemeUtils @Inject constructor(
     private val androidViewThemeUtils: AndroidViewThemeUtils,
     private val androidXViewThemeUtils: AndroidXViewThemeUtils
 ) : ViewThemeUtilsBase(schemes) {
+    private val dynamicColor = MaterialDynamicColors()
+
     // not ported to common lib because PreferenceCategory is deprecated
     fun themePreferenceCategory(category: PreferenceCategory) {
         withScheme(category.context) {
@@ -279,6 +284,29 @@ class FilesSpecificViewThemeUtils @Inject constructor(
         }
     }
 
+    @JvmOverloads
+    fun colorNavigationView(navigationView: NavigationView, colorIcons: Boolean = true) {
+        withScheme(navigationView) { scheme ->
+            navigationView.run {
+                itemBackground?.setTintList(
+                    buildColorStateList(
+                        android.R.attr.state_checked to dynamicColor.secondaryContainer().getArgb(scheme),
+                        -android.R.attr.state_checked to Color.TRANSPARENT
+                    )
+                )
+
+                background.setTintList(ColorStateList.valueOf(dynamicColor.surface().getArgb(scheme)))
+
+                if (colorIcons) {
+                    itemIconTintList = buildColorStateList(
+                        android.R.attr.state_checked to dynamicColor.onSecondaryContainer().getArgb(scheme),
+                        -android.R.attr.state_checked to dynamicColor.onSurfaceVariant().getArgb(scheme)
+                    )
+                }
+            }
+        }
+    }
+
     companion object {
         private val TAG = FilesSpecificViewThemeUtils::class.simpleName