Colour ecosystem app icons

Signed-off-by: ZetaTom <[email protected]>

Author: ZetaTom

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

@@ -37,6 +37,7 @@
 import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
+import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.ColorDrawable;
 import android.graphics.drawable.Drawable;
@@ -133,6 +134,7 @@
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.fragment.app.Fragment;
+import hct.Hct;
 
 /**
  * Base class to handle setup of the drawer implementation including user switching and avatar fetching and fallback
@@ -362,14 +364,19 @@ public void onResourceReady(Bitmap resource, GlideAnimation glideAnimation) {
                 views[1].setOnClickListener(v -> openAppOrStore("com.nextcloud.talk2"));
                 views[2].setOnClickListener(v -> openAppStore("Nextcloud", true));
 
-                int color = themeColorUtils.unchangedIconColor(this, primaryColor);
+                int iconColor;
+                if (Hct.fromInt(primaryColor).getTone() < 80.0) {
+                    iconColor = Color.WHITE;
+                } else {
+                    iconColor = getColor(R.color.grey_800_transparent);
+                }
                 for (LinearLayout view : views) {
                     ImageView imageView = (ImageView) view.getChildAt(0);
-                    imageView.setImageTintList(ColorStateList.valueOf(color));
+                    imageView.setImageTintList(ColorStateList.valueOf(iconColor));
                     GradientDrawable background = (GradientDrawable) imageView.getBackground();
-                    background.setStroke(DisplayUtils.convertDpToPixel(1, this), color);
+                    background.setStroke(DisplayUtils.convertDpToPixel(1, this), iconColor);
                     TextView textView = (TextView) view.getChildAt(1);
-                    textView.setTextColor(color);
+                    textView.setTextColor(iconColor);
                 }
 
                 ecosystemApps.setVisibility(View.VISIBLE);

app/src/main/java/com/owncloud/android/utils/theme/ThemeColorUtils.java

@@ -29,8 +29,6 @@
 import com.nextcloud.android.common.ui.util.PlatformThemeUtil;
 import com.owncloud.android.R;
 
-import hct.Hct;
-
 import static com.owncloud.android.utils.theme.CapabilityUtils.getCapability;
 
 /**
@@ -59,13 +57,4 @@ public int unchangedFontColor(Context context) {
             }
         }
     }
-
-    public int unchangedIconColor(Context context, int primaryColor) {
-        double hct = Hct.fromInt(primaryColor).getTone();
-        if (hct < 80.0) {
-            return Color.WHITE;
-        } else {
-            return context.getColor(R.color.grey_700_transparent);
-        }
-    }
 }

app/src/main/res/values/colors.xml

@@ -40,7 +40,7 @@
     <color name="grey_200">#EEEEEE</color>
     <color name="grey_400">#BDBDBD</color>
     <color name="grey_600">#666666</color>
-    <color name="grey_700_transparent">#B3000000</color>
+    <color name="grey_800_transparent">#CC000000</color>
 
     <!-- level colors for info notifications/visualisations -->
     <color name="infolevel_warning">#e9322d</color>