From 5df0f7e2d10680da55aee040562388a9880e0216 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 10 Oct 2013 02:27:58 -0400 Subject: [PATCH 1/2] [Android] Made DirectoryActivity extend a ListActivity, since that's basically what its purpose is - to act as a list view. --- android/phoenix/res/layout/line_list.xml | 2 +- .../retroarch/browser/diractivities/DirectoryActivity.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/phoenix/res/layout/line_list.xml b/android/phoenix/res/layout/line_list.xml index b86921a942..27d11ed953 100644 --- a/android/phoenix/res/layout/line_list.xml +++ b/android/phoenix/res/layout/line_list.xml @@ -1,6 +1,6 @@ diff --git a/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java index b99b79a77c..025269bd07 100644 --- a/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java +++ b/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java @@ -16,7 +16,7 @@ import android.widget.*; import android.view.*; -public class DirectoryActivity extends Activity implements AdapterView.OnItemClickListener { +public class DirectoryActivity extends ListActivity implements AdapterView.OnItemClickListener { private IconAdapter adapter; private File listedDirectory; @@ -80,7 +80,7 @@ public class DirectoryActivity extends Activity implements AdapterView.OnItemCli // Setup the list adapter = new IconAdapter(this, R.layout.line_list_item); - ListView list = (ListView) findViewById(R.id.list); + ListView list = getListView(); list.setAdapter(adapter); list.setOnItemClickListener(this); From 05f6226544cd51c99cba2d93f7e9115624635c73 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 10 Oct 2013 02:39:01 -0400 Subject: [PATCH 2/2] [Android] Made it unnecessary for HistorySelection.java, CoreSelection.java, and DirectoryActivity.java to implement an AdapterView. Since these now extend ListActivity, they can just override the method onListItemClick(). --- .../src/org/retroarch/browser/CoreSelection.java | 9 ++++----- .../src/org/retroarch/browser/HistorySelection.java | 10 ++++------ .../browser/diractivities/DirectoryActivity.java | 8 +++----- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/android/phoenix/src/org/retroarch/browser/CoreSelection.java b/android/phoenix/src/org/retroarch/browser/CoreSelection.java index c4758d1647..fb14d7ee28 100644 --- a/android/phoenix/src/org/retroarch/browser/CoreSelection.java +++ b/android/phoenix/src/org/retroarch/browser/CoreSelection.java @@ -15,7 +15,7 @@ import android.view.*; // JELLY_BEAN_MR1 = 17 -public final class CoreSelection extends Activity implements AdapterView.OnItemClickListener { +public final class CoreSelection extends ListActivity { private IconAdapter adapter; private static final String TAG = "CoreSelection"; @@ -37,9 +37,8 @@ public final class CoreSelection extends Activity implements AdapterView.OnItemC // Setup the list adapter = new IconAdapter(this, R.layout.line_list_item); - ListView list = (ListView) findViewById(R.id.list); + ListView list = getListView(); list.setAdapter(adapter); - list.setOnItemClickListener(this); setTitle(R.string.select_libretro_core); @@ -49,7 +48,7 @@ public final class CoreSelection extends Activity implements AdapterView.OnItemC for (final File lib : libs) { String libName = lib.getName(); - Log.i(TAG, "Libretro core: " + libName); + Log.i(TAG, "Libretro core: " + libName); // Allow both libretro-core.so and libretro_core.so. if (!libName.startsWith("libretroarch")) { @@ -65,7 +64,7 @@ public final class CoreSelection extends Activity implements AdapterView.OnItemC } @Override - public void onItemClick(AdapterView listView, View view, int position, long id) { + public void onListItemClick(ListView listView, View view, int position, long id) { final ModuleWrapper item = adapter.getItem(position); MainMenuActivity.getInstance().setModule(item.file.getAbsolutePath(), item.getText()); UserPreferences.updateConfigFile(this); diff --git a/android/phoenix/src/org/retroarch/browser/HistorySelection.java b/android/phoenix/src/org/retroarch/browser/HistorySelection.java index d9a2547668..94f52af3e0 100644 --- a/android/phoenix/src/org/retroarch/browser/HistorySelection.java +++ b/android/phoenix/src/org/retroarch/browser/HistorySelection.java @@ -9,16 +9,15 @@ import java.io.InputStreamReader; import org.retroarch.R; import org.retroarch.browser.preferences.UserPreferences; -import android.app.Activity; +import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; import android.provider.Settings; import android.view.View; -import android.widget.AdapterView; import android.widget.ListView; import android.widget.Toast; -public final class HistorySelection extends Activity implements AdapterView.OnItemClickListener { +public final class HistorySelection extends ListActivity { private IconAdapter adapter; @@ -30,9 +29,8 @@ public final class HistorySelection extends Activity implements AdapterView.OnIt // Setup the list adapter = new IconAdapter(this, R.layout.line_list_item); - ListView list = (ListView) findViewById(R.id.list); + ListView list = getListView(); list.setAdapter(adapter); - list.setOnItemClickListener(this); setTitle(R.string.recently_played_games); @@ -57,7 +55,7 @@ public final class HistorySelection extends Activity implements AdapterView.OnIt } @Override - public void onItemClick(AdapterView listView, View view, int position, long id) { + public void onListItemClick(ListView listView, View view, int position, long id) { final HistoryWrapper item = adapter.getItem(position); final String gamePath = item.getGamePath(); final String corePath = item.getCorePath(); diff --git a/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java index 025269bd07..c08b746824 100644 --- a/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java +++ b/android/phoenix/src/org/retroarch/browser/diractivities/DirectoryActivity.java @@ -16,7 +16,7 @@ import android.widget.*; import android.view.*; -public class DirectoryActivity extends ListActivity implements AdapterView.OnItemClickListener { +public class DirectoryActivity extends ListActivity { private IconAdapter adapter; private File listedDirectory; @@ -82,7 +82,6 @@ public class DirectoryActivity extends ListActivity implements AdapterView.OnIte adapter = new IconAdapter(this, R.layout.line_list_item); ListView list = getListView(); list.setAdapter(adapter); - list.setOnItemClickListener(this); // Load Directory if (savedInstanceState != null) { @@ -121,9 +120,8 @@ public class DirectoryActivity extends ListActivity implements AdapterView.OnIte } @Override - public void onItemClick(AdapterView aListView, View aView, - int aPosition, long aID) { - final FileWrapper item = adapter.getItem(aPosition); + public void onListItemClick(ListView listView, View aView, int position, long id) { + final FileWrapper item = adapter.getItem(position); if (item.parentItem && backStack.get(backStack.size() - 1).parentIsBack) { backStack.remove(backStack.size() - 1);