karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Actionbar icons are now shown (still tinting programmatically).

Browse Source
This commit is contained in:
Dennis Guse
2019-07-18 07:07:11 +02:00
parent 39433f94cb
commit 6dcdd93195
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
myTracks/src/main/java/com/google/android/apps/mytracks/util/TrackIconUtils.java
+6 -10
View File
@@ -19,7 +19,9 @@ package com.google.android.apps.mytracks.util;
import android.content.Context; import android.content.Context;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.graphics.ColorMatrixColorFilter; import android.graphics.Color;
import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.util.Pair; import android.util.Pair;
import android.view.Menu; import android.view.Menu;
@@ -90,13 +92,6 @@ public class TrackIconUtils {
MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_track_boat)); MAP.put(BOAT, new Pair<>(R.string.activity_type_boat, R.drawable.ic_track_boat));
} }
private static final float[] REVERT_COLOR_MATRIX = {
-1.0f, 0, 0, 0, 255, // red
0, -1.0f, 0, 0, 255, // green
0, 0, -1.0f, 0, 255, // blue
0, 0, 0, 1.0f, 0 // alpha
};
private TrackIconUtils() {} private TrackIconUtils() {}
/** /**
@@ -218,7 +213,7 @@ public class TrackIconUtils {
int size = menu.size(); int size = menu.size();
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
MenuItem menuitem = menu.getItem(i); MenuItem menuitem = menu.getItem(i);
revertMenuIconColor(menuitem); setMenuIconColor(menuitem);
} }
} }
@@ -239,7 +234,8 @@ public class TrackIconUtils {
private static void revertMenuIconColor(MenuItem menuitem) { private static void revertMenuIconColor(MenuItem menuitem) {
Drawable drawable = menuitem.getIcon(); Drawable drawable = menuitem.getIcon();
if (drawable != null) { if (drawable != null) {
drawable.setColorFilter(new ColorMatrixColorFilter(REVERT_COLOR_MATRIX)); final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(Color.rgb(255, 255, 255), PorterDuff.Mode.MULTIPLY);
drawable.setColorFilter(colorFilter);
} }
} }
} }