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

Deprecation of IconsCacheMethods.

Browse source
This commit is contained in:
GaidamakUA 2016-03-31 11:42:10 +03:00
parent 47b71145da
commit a0f78e64a8
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
OsmAnd/src/net/osmand/plus/IconsCache.java
View file

@ -34,10 +34,12 @@ public class IconsCache {
return new BitmapDrawable(app.getResources(), bitmapResized); return new BitmapDrawable(app.getResources(), bitmapResized);
} }
@Deprecated
private Drawable getDrawable(@DrawableRes int resId, @ColorRes int clrId) { private Drawable getDrawable(@DrawableRes int resId, @ColorRes int clrId) {
return getDrawable(resId, clrId, 0); return getDrawable(resId, clrId, 0);
} }
@Deprecated
private Drawable getDrawable(@DrawableRes int resId, @ColorRes int clrId, float scale) { private Drawable getDrawable(@DrawableRes int resId, @ColorRes int clrId, float scale) {
long hash = ((long)resId << 31l) + clrId + (int)(scale * 10000f); long hash = ((long)resId << 31l) + clrId + (int)(scale * 10000f);
Drawable d = drawable.get(hash); Drawable d = drawable.get(hash);
@ -56,6 +58,7 @@ public class IconsCache {
return d; return d;
} }
@Deprecated
private Drawable getPaintedDrawable(@DrawableRes int resId, @ColorInt int color){ private Drawable getPaintedDrawable(@DrawableRes int resId, @ColorInt int color){
long hash = ((long)resId << 31l) + color; long hash = ((long)resId << 31l) + color;
Drawable d = drawable.get(hash); Drawable d = drawable.get(hash);
@ -68,18 +71,22 @@ public class IconsCache {
return d; return d;
} }
@Deprecated
public Drawable getPaintedContentIcon(@DrawableRes int id, @ColorInt int color){ public Drawable getPaintedContentIcon(@DrawableRes int id, @ColorInt int color){
return getPaintedDrawable(id, color); return getPaintedDrawable(id, color);
} }
@Deprecated
public Drawable getIcon(@DrawableRes int id, @ColorRes int colorId) { public Drawable getIcon(@DrawableRes int id, @ColorRes int colorId) {
return getDrawable(id, colorId); return getDrawable(id, colorId);
} }
@Deprecated
public Drawable getIcon(@DrawableRes int id, @ColorRes int colorId, float scale) { public Drawable getIcon(@DrawableRes int id, @ColorRes int colorId, float scale) {
return getDrawable(id, colorId, scale); return getDrawable(id, colorId, scale);
} }
@Deprecated
public Drawable getIcon(@DrawableRes int backgroundId, @DrawableRes int id, @ColorRes int colorId) { public Drawable getIcon(@DrawableRes int backgroundId, @DrawableRes int id, @ColorRes int colorId) {
Drawable b = getDrawable(backgroundId, 0); Drawable b = getDrawable(backgroundId, 0);
Drawable f = getDrawable(id, colorId); Drawable f = getDrawable(id, colorId);
@ -89,18 +96,22 @@ public class IconsCache {
return new LayerDrawable(layers); return new LayerDrawable(layers);
} }
@Deprecated
public Drawable getContentIcon(@DrawableRes int id) { public Drawable getContentIcon(@DrawableRes int id) {
return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color : 0); return getDrawable(id, app.getSettings().isLightContent() ? R.color.icon_color : 0);
} }
@Deprecated
public Drawable getContentIcon(@DrawableRes int id, boolean isLightContent) { public Drawable getContentIcon(@DrawableRes int id, boolean isLightContent) {
return getDrawable(id, isLightContent ? R.color.icon_color : 0); return getDrawable(id, isLightContent ? R.color.icon_color : 0);
} }
@Deprecated
public Drawable getIcon(@DrawableRes int id) { public Drawable getIcon(@DrawableRes int id) {
return getDrawable(id, 0); return getDrawable(id, 0);
} }
@Deprecated
public Drawable getIcon(@DrawableRes int id, boolean light) { public Drawable getIcon(@DrawableRes int id, boolean light) {
return getDrawable(id, light ? R.color.icon_color : 0); return getDrawable(id, light ? R.color.icon_color : 0);
} }