Code cleanup.

nextmcloud · May 16, 2023 · ce4b038 · ce4b038
1 parent 4e51cac
commit ce4b038
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 31 deletions.
diff --git a/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/DrawableThemeUtils.kt
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java
@@ -60,7 +60,6 @@
 import com.nextcloud.common.NextcloudClient;
 import com.nextcloud.java.util.Optional;
 import com.nextcloud.ui.ChooseAccountDialogFragment;
-import com.nmc.android.utils.DrawableThemeUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.PassCodeManager;
@@ -716,10 +715,10 @@ protected void setDrawerMenuItemChecked(int menuItemId) {
                 MenuItem menuItem = mNavigationView.getMenu().getItem(i);
                 if (menuItem.getIcon() != null) {
                     if (menuItem == currentItem) {
-                        DrawableThemeUtils.tintDrawable(currentItem.getIcon(), drawerActiveIconColor);
+                        viewThemeUtils.platform.colorDrawable(currentItem.getIcon(), drawerActiveIconColor);
                         currentItem.setTitle(StringUtils.getColorSpan(currentItem.getTitle().toString(), drawerActiveTxtColor));
                     } else {
-                        DrawableThemeUtils.tintDrawable(menuItem.getIcon(), drawerDefaultIconColor);
+                        viewThemeUtils.platform.colorDrawable(menuItem.getIcon(), drawerDefaultIconColor);
                         menuItem.setTitle(StringUtils.getColorSpan(menuItem.getTitle().toString(), drawerDefaultTxtColor));
                     }
                 }

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -26,16 +26,6 @@
     <color name="secondary_text_color">#A5A5A5</color>
     <color name="list_divider_background">#222222</color>
 
-    <!--  NavigationView colors  -->
-    <color name="nav_selected_bg_color">@color/grey_60</color>
-    <color name="nav_txt_unselected_color">@color/grey_0</color>
-    <color name="nav_txt_selected_color">@color/grey_0</color>
-    <color name="nav_icon_unselected_color">@color/grey_30</color>
-    <color name="nav_icon_selected_color">#FFFFFF</color>
-    <color name="nav_divider_color">@color/grey_30</color>
-    <color name="nav_bg_color">@color/grey_80</color>
-    <color name="drawer_quota_txt_color">#FFFFFF</color>
-
     <!-- Colors -->
     <color name="dark">#ffffff</color>
     <color name="bg_default">#121212</color>
@@ -48,6 +38,16 @@
     <color name="action_mode_background">@color/appbar</color>
     <color name="selected_item_background">#373535</color>
 
+    <!--  NavigationView colors  -->
+    <color name="nav_selected_bg_color">@color/grey_60</color>
+    <color name="nav_txt_unselected_color">@color/grey_0</color>
+    <color name="nav_txt_selected_color">@color/grey_0</color>
+    <color name="nav_icon_unselected_color">@color/grey_30</color>
+    <color name="nav_icon_selected_color">#FFFFFF</color>
+    <color name="nav_divider_color">@color/grey_30</color>
+    <color name="nav_bg_color">@color/grey_80</color>
+    <color name="drawer_quota_txt_color">#FFFFFF</color>
+
     <color name="filelist_icon_background">#222222</color>
     <color name="standard_grey">#DADADA</color>