Merge pull request #511 from BlisterBoy/master

Back button call menu in ButtonMapping Activities
EasyRPG · Jul 11, 2015 · 5aeea88 · 5aeea88
2 parents 1ad4125 + 5fc587a
commit 5aeea88
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/builds/android/res/menu/button_mapping_menu.xml b/builds/android/res/menu/button_mapping_menu.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/button_mapping_menu_save"
-        android:title="@string/save_button_mapping"/>
     <item android:id="@+id/button_mapping_menu_add_button"
         android:title="@string/add_a_button" />
     <item android:id="@+id/button_mapping_menu_reset"
         android:title="@string/reset_button_mapping" />
+    <item android:id="@+id/button_mapping_menu_exit_without_saving"
+        android:title="@string/exit_without_saving" />
+    <item android:id="@+id/button_mapping_menu_save_and_quit"
+        android:title="@string/save_and_quit" />
 </menu>
diff --git a/builds/android/res/values-fr/strings.xml b/builds/android/res/values-fr/strings.xml
@@ -35,7 +35,8 @@
 	<string name="region_modification_success">Région changée en $NAME</string>
 	<string name="region_modification_failed">Le changement de la région a échoué</string>
 	<string name="change_default_mapping">Changer les boutons virtuels</string>
-	<string name="save_button_mapping">Sauvegarder l\'agencement</string>
 	<string name="add_a_button">Ajouter un bouton</string>
 	<string name="reset_button_mapping">Réinitialiser l\'agencement</string>
+	<string name="exit_without_saving">Quitter sans sauvegarder</string>
+	<string name="save_and_quit">Sauvegarder et quitter</string>
 </resources>
diff --git a/builds/android/res/values/strings.xml b/builds/android/res/values/strings.xml
@@ -35,7 +35,8 @@
 	<string name="region_modification_success">Region changed to $NAME</string>
 	<string name="region_modification_failed">Changing region failed</string>
 	<string name="change_default_mapping">Change the default button mapping</string>
-	<string name="save_button_mapping">Save button mapping</string>
 	<string name="add_a_button">Add a button</string>
 	<string name="reset_button_mapping">Reset button mapping</string>
+	<string name="exit_without_saving">Exit without saving</string>
+	<string name="save_and_quit">Save and quit</string>
 </resources>
diff --git a/builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java b/builds/android/src/org/easyrpg/player/EasyRpgPlayerActivity.java
@@ -72,15 +72,6 @@ protected void onCreate(Bundle savedInstanceState) {
 		drawButtons();
 	}
 
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		// Alt-Test for working around ugly Xperia Play button mapping
-		if ((keyCode == KeyEvent.KEYCODE_BACK) && (!event.isAltPressed())) {
-			showEndGameDialog();
-		}
-		return super.onKeyDown(keyCode, event);
-	}
-
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
 		MenuInflater inflater = getMenuInflater();
@@ -113,6 +104,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			return super.onOptionsItemSelected(item);
 		}
 	}
+
+	@Override
+	public void onBackPressed(){
+		openOptionsMenu();
+	}
 
 	private void showEndGameDialog() {
 		AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);

diff --git a/builds/android/src/org/easyrpg/player/virtual_buttons/ButtonMappingActivity.java b/builds/android/src/org/easyrpg/player/virtual_buttons/ButtonMappingActivity.java
@@ -8,7 +8,6 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
-import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.KeyEvent;
@@ -60,14 +59,23 @@ public boolean onOptionsItemSelected(MenuItem item) {
 			bList = ButtonMappingModel.getDefaultButtonMapping(this);
 			drawButtons();
 			return true;
-		case R.id.button_mapping_menu_save:
+		case R.id.button_mapping_menu_exit_without_saving:
+			this.finish();
+			return true;
+		case R.id.button_mapping_menu_save_and_quit:
 			ButtonMappingModel.writeButtonMappingFile(bList);
+			this.finish();
 			return true;
 		default:
 			return super.onOptionsItemSelected(item);
 		}
 	}
 
+	@Override
+	public void onBackPressed(){
+		openOptionsMenu ();
+	}
+
 	public void showSupportedButton(){
 		final CharSequence[] items = {"Enter", "Cancel", "Shift", "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "+", "-", "*", "/"};
 		AlertDialog.Builder builder = new AlertDialog.Builder(this);