Эх сурвалжийг харах

use right colors for drawer menu item text and icons

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 6 жил өмнө
parent
commit
3d60c83ba2

+ 3 - 2
src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -991,7 +991,8 @@ public abstract class DrawerActivity extends ToolbarActivity
                 MenuItem menuItem = mNavigationView.getMenu().getItem(i);
                 if (menuItem.getIcon() != null) {
                     menuItem.getIcon().clearColorFilter();
-                    menuItem.setTitle(Html.fromHtml("<font color='" + ThemeUtils.colorToHexString(ContextCompat.getColor(getApplicationContext(), R.color.textColor)) + "'>" + menuItem.getTitle() + "</font>"));
+                    ThemeUtils.tintDrawable(menuItem.getIcon(), ContextCompat.getColor(this, R.color.drawer_menu_icon));
+                    menuItem.setTitle(Html.fromHtml("<font color='" + ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.textColor)) + "'>" + menuItem.getTitle() + "</font>"));
                 }
             }
 
@@ -1070,7 +1071,7 @@ public abstract class DrawerActivity extends ToolbarActivity
 
             float density = getResources().getDisplayMetrics().density;
             final int size = Math.round(24 * density);
-            int greyColor = getResources().getColor(R.color.standard_grey);
+            int greyColor = ContextCompat.getColor(this, R.color.drawer_menu_icon);
 
             for (final ExternalLink link : externalLinksProvider.getExternalLink(ExternalLinkType.LINK)) {
                 int id = mNavigationView.getMenu().add(R.id.drawer_menu_external_links,

+ 1 - 0
src/main/res/values-night/colors.xml

@@ -76,5 +76,6 @@
     <color name="selected_item_background">#616161</color>
 
     <!--<color name="background_material_light">#555555</color>-->
+    <color name="drawer_menu_icon">#ffffff</color>
 
 </resources>

+ 1 - 0
src/main/res/values/colors.xml

@@ -81,6 +81,7 @@
     <color name="selected_item_background">#ECECEC</color>
 
     <!--<color name="background_material_light">#ef4</color>-->
+    <color name="drawer_menu_icon">#757575</color>
 
     <!-- Excluded from future app dark theme -->
     <color name="themed_fg">#FFFFFF</color>