Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix icon uniqueId

Browse source
This commit is contained in:
Dima-1 2020-02-20 18:59:18 +02:00
parent 7c050800b8
commit dd1791a257
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
OsmAnd/src/net/osmand/plus/base/FavoriteImageDrawable.java
View file

@ -173,13 +173,14 @@ public class FavoriteImageDrawable extends Drawable {
private static TreeMap<String, FavoriteImageDrawable> cache = new TreeMap<>(); private static TreeMap<String, FavoriteImageDrawable> cache = new TreeMap<>();
private static FavoriteImageDrawable getOrCreate(Context ctx, int color, boolean withShadow, boolean synced, FavouritePoint point) { private static FavoriteImageDrawable getOrCreate(Context ctx, int color, boolean withShadow, boolean synced, FavouritePoint point) {
String iconName = ""; String uniqueId = "";
if (point != null) { if (point != null) {
iconName = point.getIconEntryName(ctx); uniqueId = point.getIconEntryName(ctx);
uniqueId += point.getBackType().name();
} }
color = color | 0xff000000; color = color | 0xff000000;
int hash = (color << 4) + ((withShadow ? 1 : 0) << 2) + ((synced ? 3 : 0) << 2); int hash = (color << 4) + ((withShadow ? 1 : 0) << 2) + ((synced ? 3 : 0) << 2);
String uniqueId = hash + iconName; uniqueId = hash + uniqueId;
FavoriteImageDrawable drawable = cache.get(uniqueId); FavoriteImageDrawable drawable = cache.get(uniqueId);
if (drawable == null) { if (drawable == null) {
drawable = new FavoriteImageDrawable(ctx, color, withShadow, synced, point); drawable = new FavoriteImageDrawable(ctx, color, withShadow, synced, point);