(Android) We now select a core first with 'Load Core', then select a game.

Opens the door for per-core config files - also remembers the core from the
last previous session

android/phoenix/res/xml/prefs.xml

@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="RetroArch 0.9.9.6 - Main Menu" >
+    android:title="RetroArch - Main Menu" >
 
     <PreferenceScreen android:title="TV Mode">
        <intent
           android:targetClass="org.retroarch.browser.RetroTVMode"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
-    <PreferenceScreen android:title="Load Game">
+    <PreferenceScreen android:title="Load Core">
        <intent
           android:targetClass="org.retroarch.browser.CoreSelection"
           android:targetPackage="org.retroarch" />
     </PreferenceScreen>
+    <PreferenceScreen android:title="Load Game">
+       <intent
+          android:targetClass="org.retroarch.browser.ROMActivity"
+          android:targetPackage="org.retroarch" />
+    </PreferenceScreen>
     <PreferenceScreen android:title="Load Game (History)">
        <intent
           android:targetClass="org.retroarch.browser.HistorySelection"

android/phoenix/src/org/retroarch/browser/CoreSelection.java

@@ -4,11 +4,9 @@ import org.retroarch.R;
 
 import java.io.*;
 
-import android.content.*;
 import android.app.*;
 import android.media.AudioManager;
 import android.os.*;
-import android.provider.Settings;
 import android.widget.*;
 import android.util.Log;
 import android.view.*;
@@ -18,8 +16,6 @@ import android.view.*;
 public class CoreSelection extends Activity implements
 		AdapterView.OnItemClickListener {
 	private IconAdapter<ModuleWrapper> adapter;
-	static private final int ACTIVITY_LOAD_ROM = 0;
-	static private String libretro_path;
 	static private final String TAG = "CoreSelection";
 
 	@Override
@@ -94,36 +90,8 @@ public class CoreSelection extends Activity implements
 	public void onItemClick(AdapterView<?> aListView, View aView,
 			int aPosition, long aID) {
 		final ModuleWrapper item = adapter.getItem(aPosition);
-		libretro_path = item.file.getAbsolutePath();
+		MainMenuActivity.getInstance().setModule(item.file.getAbsolutePath(), item.getText());
-
+		MainMenuActivity.getInstance().updateConfigFile();
-		Intent myIntent;
-		myIntent = new Intent(this, ROMActivity.class);
-		startActivityForResult(myIntent, ACTIVITY_LOAD_ROM);
-	}
-
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		Intent myIntent;
-		String current_ime = Settings.Secure.getString(getContentResolver(),
-				Settings.Secure.DEFAULT_INPUT_METHOD);
-
-		MainMenuActivity.updateConfigFile();
-
-		switch (requestCode) {
-		case ACTIVITY_LOAD_ROM:
-			if (data.getStringExtra("PATH") != null) {
-				Toast.makeText(this,
-						"Loading: [" + data.getStringExtra("PATH") + "]...",
-						Toast.LENGTH_SHORT).show();
-				myIntent = new Intent(this, RetroActivity.class);
-				myIntent.putExtra("ROM", data.getStringExtra("PATH"));
-				myIntent.putExtra("LIBRETRO", libretro_path);
-				myIntent.putExtra("CONFIGFILE",
-						MainMenuActivity.getDefaultConfigPath());
-				myIntent.putExtra("IME", current_ime);
-				startActivity(myIntent);
 		finish();
 	}
-			break;
-		}
-	}
 }

android/phoenix/src/org/retroarch/browser/HistorySelection.java

@@ -63,11 +63,13 @@ public class HistorySelection extends Activity implements
 		final String gamePath = item.getGamePath();
 		final String corePath = item.getCorePath();
 		
+		MainMenuActivity.getInstance().setModule(corePath, item.getCoreName());
+
 		Intent myIntent;
 		String current_ime = Settings.Secure.getString(getContentResolver(),
 				Settings.Secure.DEFAULT_INPUT_METHOD);
 
-		MainMenuActivity.updateConfigFile();
+		MainMenuActivity.getInstance().updateConfigFile();
 
 		Toast.makeText(this, "Loading: [" + gamePath + "] ...",
 				Toast.LENGTH_SHORT).show();

android/phoenix/src/org/retroarch/browser/MainMenuActivity.java

@@ -9,6 +9,7 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.content.res.AssetManager;
@@ -18,6 +19,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
+import android.provider.Settings;
 import android.util.Log;
 import android.view.Display;
 import android.view.WindowManager;
@@ -25,7 +27,10 @@ import android.widget.Toast;
 
 public class MainMenuActivity extends PreferenceActivity {
 	private static MainMenuActivity instance = null;
+	static private final int ACTIVITY_LOAD_ROM = 0;
 	static private final String TAG = "MainMenu";
+	static private String libretro_path;
+	static private String libretro_name;
 
 	@SuppressWarnings("deprecation")
 	@Override
@@ -66,6 +71,21 @@ public class MainMenuActivity extends PreferenceActivity {
 				alert.show();
 			}
 		}
+		
+		if (prefs.getString("libretro_path", "").isEmpty() == false) {
+			libretro_path = prefs.getString("libretro_path", "");
+			setCoreTitle("No core");
+			
+			if (prefs.getString("libretro_name", "").isEmpty() == false) {
+				libretro_name = prefs.getString("libretro_name", "No core");
+				setCoreTitle(libretro_name);
+			}
+		}
+		else {
+			libretro_path = MainMenuActivity.getInstance().getApplicationInfo().nativeLibraryDir;
+			libretro_name = "No core";
+			setCoreTitle("No core");
+		}
 	}
 
 	public static MainMenuActivity getInstance() {
@@ -179,7 +199,7 @@ public class MainMenuActivity extends PreferenceActivity {
 			return "/mnt/sd/retroarch.cfg";
 	}
 
-	public static void updateConfigFile() {
+	public void updateConfigFile() {
 		ConfigFile config;
 		try {
 			config = new ConfigFile(new File(getDefaultConfigPath()));
@@ -190,8 +210,11 @@ public class MainMenuActivity extends PreferenceActivity {
 		SharedPreferences prefs = PreferenceManager
 				.getDefaultSharedPreferences(MainMenuActivity.getInstance()
 						.getBaseContext());
-		config.setString("libretro_path", MainMenuActivity.getInstance()
+		
-				.getApplicationInfo().nativeLibraryDir);
+		config.setString("libretro_path", libretro_path);
+		config.setString("libretro_name", libretro_name);
+		setCoreTitle(libretro_name);
+		
 		config.setBoolean("audio_rate_control",
 				prefs.getBoolean("audio_rate_control", true));
 		config.setInt("audio_out_rate",
@@ -444,6 +467,25 @@ public class MainMenuActivity extends PreferenceActivity {
 		dialog.show();
 	}
 	
+	public void setModule(String core_path, String core_name) {
+		libretro_path = core_path;	
+		libretro_name = core_name;	
+		File libretro_path_file = new File(core_path);
+		setCoreTitle((libretro_path_file.isDirectory() == true) ? "No core" : core_name);
+		
+		SharedPreferences prefs = PreferenceManager
+				.getDefaultSharedPreferences(getBaseContext());
+		SharedPreferences.Editor edit = prefs
+				.edit();
+		edit.putString("libretro_path", libretro_path);
+		edit.putString("libretro_name", libretro_name);
+		edit.commit();
+	}
+	
+	public void setCoreTitle(String core_name) {
+		setTitle("RetroArch : " + core_name);
+	}
+
 	boolean detectDevice(boolean show_dialog) {
 		boolean retval = false;
 		
@@ -558,4 +600,41 @@ public class MainMenuActivity extends PreferenceActivity {
 	protected void onStart() {
 		super.onStart();
 	}
+	
+    @Override
+    public void startActivity(Intent intent) {
+        if (intent.getComponent().getClassName().equals("org.retroarch.browser.ROMActivity")) {
+        	if (new File(libretro_path).isDirectory() == false) {
+            super.startActivityForResult(intent, ACTIVITY_LOAD_ROM);
+        	} else {
+				Toast.makeText(this,
+						"Go to 'Load Core' and select a core first.",
+						Toast.LENGTH_SHORT).show();
+        	}
+        } else {
+            super.startActivity(intent);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int reqCode, int resCode, Intent data) {
+        if (reqCode == ACTIVITY_LOAD_ROM) {
+        	if (data.getStringExtra("PATH") != null) {
+        		updateConfigFile();
+        		Intent myIntent;
+        		String current_ime = Settings.Secure.getString(getContentResolver(),
+        				Settings.Secure.DEFAULT_INPUT_METHOD);
+				Toast.makeText(this,
+						"Loading: [" + data.getStringExtra("PATH") + "]...",
+						Toast.LENGTH_SHORT).show();
+				myIntent = new Intent(this, RetroActivity.class);
+				myIntent.putExtra("ROM", data.getStringExtra("PATH"));
+				myIntent.putExtra("LIBRETRO", libretro_path);
+				myIntent.putExtra("CONFIGFILE",
+						MainMenuActivity.getDefaultConfigPath());
+				myIntent.putExtra("IME", current_ime);
+				startActivity(myIntent);
+			}
+        }
+    }
 }

android/phoenix/src/org/retroarch/browser/RetroTVMode.java

@@ -11,7 +11,7 @@ public class RetroTVMode extends Activity {
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
-		MainMenuActivity.updateConfigFile();
+		MainMenuActivity.getInstance().updateConfigFile();
 		
 		Intent myIntent = new Intent(this, RetroActivity.class);
 		String current_ime = Settings.Secure.getString(getContentResolver(), Settings.Secure.DEFAULT_INPUT_METHOD);