Merge pull request #6198 from nextcloud/fix/white-drawer-items

Applied a new fallback color for DarkMode

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

@@ -709,12 +709,12 @@ public abstract class DrawerActivity extends ToolbarActivity
             for (int i = 0; i < mNavigationView.getMenu().size(); i++) {
                 MenuItem menuItem = mNavigationView.getMenu().getItem(i);
                 if (menuItem.getIcon() != null) {
-                    if (menuItem != currentItem) {
-                        ThemeUtils.tintDrawable(menuItem.getIcon(), drawerColor);
-                        ThemeUtils.tintMenuItemText(menuItem, drawerColor);
-                    } else {
+                    if (menuItem == currentItem) {
                         ThemeUtils.tintDrawable(currentItem.getIcon(), activeColor);
                         ThemeUtils.tintMenuItemText(currentItem, activeColor);
+                    } else {
+                        ThemeUtils.tintDrawable(menuItem.getIcon(), drawerColor);
+                        ThemeUtils.tintMenuItemText(menuItem, drawerColor);
                     }
                 }
             }

src/main/java/com/owncloud/android/ui/dialog/SortingOrderDialogFragment.java

@@ -130,7 +130,7 @@ public class SortingOrderDialogFragment extends DialogFragment {
      * tints the icon reflecting the actual sorting choice in the apps primary color.
      */
     private void setupActiveOrderSelection() {
-        final int color = ThemeUtils.primaryAccentColor(getContext());
+        final int color = ThemeUtils.elementColor(getContext());
         for (View view: mTaggedViews) {
             if (!((FileSortOrder) view.getTag()).name.equals(mCurrentSortOrderName)) {
                 continue;

src/main/res/values-night/colors.xml

@@ -36,12 +36,14 @@
     <color name="selected_item_background">#373535</color>
 
     <color name="filelist_icon_background">#222222</color>
+    <color name="standard_grey">#DADADA</color>
 
     <color name="drawer_menu_icon">#ffffff</color>
     <color name="bg_fallback_highlight">#737373</color>
     <color name="switch_thumb_color_unchecked">#2a2a2a</color>
     <color name="switch_track_color_unchecked">#B3FFFFFF</color>
     <color name="drawer_active_item_background">@color/white</color>
+    <color name="element_fallback_color">#EDEDED</color>
 
     <!-- App bar -->
     <color name="appbar">#1E1E1E</color>