diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-11 03:56:27 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-07-11 03:57:24 -0500 |
| commit | 33ca0101155389e45cca46c7b41c0b05a6a77c6d (patch) | |
| tree | 6b3473105ae43668f8c0691d80cc41318cdbfe6e /Source/Android/src | |
| parent | 1aca5fe79894e4688197233a64da5e70cead4e62 (diff) | |
[Android] Derp Squad. Show compressed files in the browse folder dialog. Show in red text and if one clicks on it. Say we don't support compressed file formats.
Diffstat (limited to 'Source/Android/src')
5 files changed, 29 insertions, 8 deletions
diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java index 613523c8dd..5725651c9b 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/AboutActivity.java @@ -24,7 +24,7 @@ public class AboutActivity extends ListActivity { List<GameListItem> Input = new ArrayList<GameListItem>(); int a = 0; - Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), "")); + Input.add(a++, new GameListItem(getApplicationContext(), "Build Revision", NativeLibrary.GetVersionString(), "", true)); adapter = new FolderBrowserAdapter(this, R.layout.folderbrowser, Input); setListAdapter(adapter); } diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java index d0e16e67a5..471278e50c 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowser.java @@ -9,6 +9,7 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.ListView; +import android.widget.Toast; import java.io.File; import java.util.ArrayList; @@ -31,16 +32,22 @@ public class FolderBrowser extends ListActivity { { if (ff.getName().charAt(0) != '.') if(ff.isDirectory()) - dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath())); + dir.add(new GameListItem(getApplicationContext(), ff.getName(),"Folder",ff.getAbsolutePath(), true)); else + { if (ff.getName().toLowerCase().contains(".gcm") || ff.getName().toLowerCase().contains(".iso") || ff.getName().toLowerCase().contains(".wbfs") || ff.getName().toLowerCase().contains(".gcz") || ff.getName().toLowerCase().contains(".dol") || ff.getName().toLowerCase().contains(".elf")) - fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath())); - } + fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true)); + else if (ff.getName().toLowerCase().contains(".zip") || + ff.getName().toLowerCase().contains(".rar") || + ff.getName().toLowerCase().contains(".7z")) + fls.add(new GameListItem(getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), false)); + } + } } catch(Exception e) { @@ -50,7 +57,7 @@ public class FolderBrowser extends ListActivity { Collections.sort(fls); dir.addAll(fls); if (!f.getPath().equalsIgnoreCase("/")) - dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent())); + dir.add(0, new GameListItem(getApplicationContext(), "..", "Parent Directory", f.getParent(), true)); adapter = new FolderBrowserAdapter(this,R.layout.folderbrowser,dir); this.setListAdapter(adapter); @@ -65,7 +72,10 @@ public class FolderBrowser extends ListActivity { Fill(currentDir); } else - FolderSelected(); + if (o.isValid()) + FolderSelected(); + else + Toast.makeText(this, "Can not use compressed file types.", Toast.LENGTH_LONG).show(); } @Override diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java index b201125a62..30c1747781 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/FolderBrowserAdapter.java @@ -22,6 +22,7 @@ public class FolderBrowserAdapter extends ArrayAdapter<GameListItem>{ id = textViewResourceId; items = objects; } + public GameListItem getItem(int i) { return items.get(i); @@ -39,7 +40,11 @@ public class FolderBrowserAdapter extends ArrayAdapter<GameListItem>{ TextView t2 = (TextView) v.findViewById(R.id.FolderSubTitle); if(t1!=null) + { t1.setText(o.getName()); + if (!o.isValid()) + t1.setTextColor(0xFFFF0000); + } if(t2!=null) t2.setText(o.getData()); diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java index 4d2e0d4236..e7b7c25c33 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListFragment.java @@ -58,7 +58,7 @@ public class GameListFragment extends Fragment ff.getName().toLowerCase().contains(".dol") || ff.getName().toLowerCase().contains(".elf") || ff.getName().toLowerCase().contains(".dff")) - fls.add(new GameListItem(mMe.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath())); + fls.add(new GameListItem(mMe.getApplicationContext(), ff.getName(),"File Size: "+ff.length(),ff.getAbsolutePath(), true)); } } catch(Exception ignored) diff --git a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java index 6e5bfea66f..427cd132f8 100644 --- a/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java +++ b/Source/Android/src/org/dolphinemu/dolphinemu/GameListItem.java @@ -13,12 +13,14 @@ public class GameListItem implements Comparable<GameListItem>{ private String data; private String path; private Bitmap image; + private boolean m_valid; - public GameListItem(Context ctx, String n,String d,String p) + public GameListItem(Context ctx, String n,String d,String p, boolean valid) { name = n; data = d; path = p; + m_valid = valid; File file = new File(path); if (!file.isDirectory() && !path.equals("")) { @@ -58,6 +60,10 @@ public class GameListItem implements Comparable<GameListItem>{ { return image; } + public boolean isValid() + { + return m_valid; + } public int compareTo(GameListItem o) { |
