Skip to content

Commit f230175

Browse files
committed
Critical bugfix. Error caused by removed assets
1 parent fb24722 commit f230175

10 files changed

Lines changed: 13 additions & 15 deletions

File tree

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ props.each { key, val ->
2626

2727
def versionMajor = 2
2828
def versionMinor = 0
29-
def versionPatch = 8
29+
def versionPatch = 85
3030
def versionBuild = 10
3131

3232
android {

app/src/main/java/com/njlabs/showjava/modals/Item.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ public class Item implements Comparable<Item> {
88
private String data;
99
private String date;
1010
private String path;
11-
private String image;
11+
private int image;
1212

13-
public Item(String n, String d, String dt, String p, String img) {
13+
public Item(String n, String d, String dt, String p, int img) {
1414
name = n;
1515
data = d;
1616
date = dt;
@@ -34,7 +34,7 @@ public String getPath() {
3434
return path;
3535
}
3636

37-
public String getImage() {
37+
public int getImage() {
3838
return image;
3939
}
4040

app/src/main/java/com/njlabs/showjava/ui/JavaExplorer.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -97,18 +97,18 @@ private void fill(File f) {
9797
String num_item = String.valueOf(buf);
9898
if (buf == 0) num_item = num_item + " item";
9999
else num_item = num_item + " items";
100-
dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), "viewer_folder"));
100+
dir.add(new Item(ff.getName(), num_item, date_modify, ff.getAbsolutePath(), R.drawable.viewer_folder));
101101
} else {
102102
String extension = FilenameUtils.getExtension(ff.getName());
103103
String fileSize = StringUtils.humanReadableByteCount(ff.length(), true);
104104
if (extension.equalsIgnoreCase("java")) {
105-
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), "viewer_java"));
105+
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), R.drawable.viewer_java));
106106
} else if (extension.equalsIgnoreCase("xml")) {
107-
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), "viewer_xml"));
107+
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), R.drawable.viewer_xml));
108108
} else if (extension.equalsIgnoreCase("txt")) {
109-
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), "viewer_summary"));
109+
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(),R.drawable.viewer_summary));
110110
} else if (extension.equalsIgnoreCase("png") | extension.equalsIgnoreCase("jpg")) {
111-
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), "viewer_image"));
111+
fls.add(new Item(ff.getName(), fileSize, date_modify, ff.getAbsolutePath(), R.drawable.viewer_image));
112112
}
113113
}
114114
}
@@ -120,14 +120,14 @@ private void fill(File f) {
120120
dir.addAll(fls);
121121

122122
if (!f.equals(new File(sourceDir)))
123-
dir.add(0, new Item("..", "Parent Directory", "", f.getParent(), "directory_up"));
123+
dir.add(0, new Item("..", "Parent Directory", "", f.getParent(), R.drawable.directory_up));
124124

125125
adapter = new FileArrayAdapter(JavaExplorer.this, R.layout.java_explorer_list_item, dir);
126126
lv.setAdapter(adapter);
127127
lv.setOnItemClickListener(new OnItemClickListener() {
128128
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
129129
Item o = adapter.getItem(position);
130-
if (o.getImage().equalsIgnoreCase("viewer_folder") || o.getImage().equalsIgnoreCase("directory_up")) {
130+
if (o.getImage() == R.drawable.viewer_folder || o.getImage() == R.drawable.directory_up) {
131131
currentDir = new File(o.getPath());
132132
fill(currentDir);
133133
} else {

app/src/main/java/com/njlabs/showjava/utils/FileArrayAdapter.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
4949
TextView fileSizeView = (TextView) v.findViewById(R.id.file_size);
5050

5151
ImageView fileIconView = (ImageView) v.findViewById(R.id.file_icon);
52-
String uri = "drawable/" + o.getImage();
53-
int imageResource = context.getResources().getIdentifier(uri, null, context.getPackageName());
54-
//noinspection deprecation
55-
Drawable image = context.getResources().getDrawable(imageResource);
52+
53+
Drawable image = context.getResources().getDrawable(o.getImage());
5654

5755
if (FilenameUtils.getExtension(o.getPath()).equals("png") || FilenameUtils.getExtension(o.getPath()).equals("jpg")) {
5856
image = Drawable.createFromPath(o.getPath());
24 KB
Loading
1.2 KB
Loading
2.46 KB
Loading
12.6 KB
Loading
5.36 KB
Loading
4.87 KB
Loading

0 commit comments

Comments
 (0)