kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-20 07:44:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert change on ResourceDrawableIdHelper

Browse Source 
Reviewed By: donyu

Differential Revision: D3494715

fbshipit-source-id: 807f3ea3db42a17e6f2eed63a72e0bccfc371a58
This commit is contained in:
Martín Bigio
2016-06-28 15:46:30 -07:00
committed by Facebook Github Bot 8
parent 8b803c6143
commit 1762426e9c
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ReactAndroid/src/main/java/com/facebook/react/views/imagehelper/ResourceDrawableIdHelper.java
View File

@@ -7,6 +7,7 @@ import javax.annotation.Nullable;
import java.util.HashMap;
import java.util.Map;
import android.content.ContentResolver;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.net.Uri;
@@ -18,7 +19,6 @@ public class ResourceDrawableIdHelper {
private Map<String, Integer> mResourceDrawableIdMap;
private static final String LOCAL_RESOURCE_SCHEME = "res";
private static ResourceDrawableIdHelper sResourceDrawableIdHelper;
private ResourceDrawableIdHelper() {
@@ -45,9 +45,9 @@ public class ResourceDrawableIdHelper {
return mResourceDrawableIdMap.get(name);
}
int id = context.getResources().getIdentifier(
name,
"drawable",
context.getPackageName());
name,
"drawable",
context.getPackageName());
mResourceDrawableIdMap.put(name, id);
return id;
}
@@ -58,10 +58,16 @@ public class ResourceDrawableIdHelper {
}
public Uri getResourceDrawableUri(Context context, @Nullable String name) {
int resId = getResourceDrawableId(context, name);
return resId > 0 ? new Uri.Builder()
.scheme(LOCAL_RESOURCE_SCHEME)
.path(String.valueOf(resId))
.build() : Uri.EMPTY;
if (name == null || name.isEmpty()) {
return null;
}
int resId = ResourceDrawableIdHelper.getInstance().getResourceDrawableId(context, name);
return new Uri.Builder()
.scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)
.authority(context.getPackageName())
.path(String.valueOf(resId))
.build();
}
}