Merge pull request #5626 from nextcloud/darkRename

Correct font color in dark mode

src/main/java/com/owncloud/android/utils/ThemeUtils.java

@@ -509,12 +509,9 @@ public final class ThemeUtils {
     public static void themeEditText(Context context, EditText editText, boolean themedBackground) {
         if (editText == null) { return; }
 
-        int color = ContextCompat.getColor(context, R.color.fg_default);
+        int color = ContextCompat.getColor(context, R.color.text_color);
 
-        // Theme the view when it is already on a theme'd background according to dark / light theme
-        if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
-            color = Color.WHITE;
-        } else if (themedBackground) {
+        if (themedBackground) {
             if (darkTheme(context)) {
                 color = ContextCompat.getColor(context, R.color.themed_fg);
             } else {

src/main/res/values/colors.xml

@@ -28,7 +28,6 @@
     <color name="text_color_inverse">#ffffff</color>
     <color name="disabled_text">#ff888888</color>
     <color name="list_divider_background">#eee</color>
-    <color name="fg_default">#000000</color>
     <color name="fg_contrast">#656565</color>
     <color name="fg_inverse">#FFFFFF</color>
     <color name="filelist_icon_background">#DDDDDD</color>