From e3ca04cde7aa07210279fd1ea1c280628b2548ac Mon Sep 17 00:00:00 2001
From: Zukero <kpochat@gmail.com>
Date: Thu, 9 Nov 2017 16:52:57 +0100
Subject: [PATCH] 'More' button in item info view to go back and forth between
 simple click and long click menus in the inventory.

---
 AndorsTrail/res/layout/iteminfo.xml                 |  7 +++++++
 AndorsTrail/res/values/strings.xml                  |  1 +
 .../rpg/AndorsTrail/activity/ItemInfoActivity.java  | 13 +++++++++++++
 .../fragment/HeroinfoActivity_Inventory.java        |  4 ++++
 4 files changed, 25 insertions(+)

diff --git a/AndorsTrail/res/layout/iteminfo.xml b/AndorsTrail/res/layout/iteminfo.xml
index b32ae5a8a..8fe79c1d6 100644
--- a/AndorsTrail/res/layout/iteminfo.xml
+++ b/AndorsTrail/res/layout/iteminfo.xml
@@ -88,6 +88,13 @@
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:text="@string/dialog_close" />
+        
+        <Button
+            android:id="@+id/iteminfo_more"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/dialog_more" />
     </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/AndorsTrail/res/values/strings.xml b/AndorsTrail/res/values/strings.xml
index 5e3b1a4f0..953a31d01 100644
--- a/AndorsTrail/res/values/strings.xml
+++ b/AndorsTrail/res/values/strings.xml
@@ -21,6 +21,7 @@
 	<string name="dialog_loading_failed_incorrectversion">Andor\'s Trail was unable to load the savegame file. This savegame file is created with a newer version than what is currently running.</string>
 
 	<string name="dialog_close">Close</string>
+	<string name="dialog_more">More</string>
 
 	<string name="dialog_monsterencounter_title">Encounter</string>
 	<string name="dialog_monsterencounter_message">Do you want to attack?\nDifficulty: %1$s</string>
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
index 5f30aa5cf..ca53123bf 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/ItemInfoActivity.java
@@ -22,6 +22,8 @@ public final class ItemInfoActivity extends Activity {
 	public static enum ItemInfoAction {
 		none, use, equip, unequip, buy, sell
 	}
+	
+	public static final int RESULT_MORE_ACTIONS = Activity.RESULT_FIRST_USER; 
 
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
@@ -76,6 +78,17 @@ public final class ItemInfoActivity extends Activity {
 				ItemInfoActivity.this.finish();
 			}
 		});
+		
+		b = (Button) findViewById(R.id.iteminfo_more);
+		b.setOnClickListener(new OnClickListener() {
+			@Override
+			public void onClick(View arg0) {
+				Intent result = new Intent();
+				result.putExtras(intent);
+				setResult(RESULT_MORE_ACTIONS, intent);
+				ItemInfoActivity.this.finish();
+			}
+		});
 
 		b = (Button) findViewById(R.id.iteminfo_action);
 		if (buttonText != null && buttonText.length() > 0) {
diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
index fa38cf0a8..634830de5 100644
--- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
+++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/activity/fragment/HeroinfoActivity_Inventory.java
@@ -179,6 +179,10 @@ public final class HeroinfoActivity_Inventory extends Fragment implements Custom
 		super.onActivityResult(requestCode, resultCode, data);
 		switch (requestCode) {
 		case INTENTREQUEST_ITEMINFO:
+			if (resultCode == ItemInfoActivity.RESULT_MORE_ACTIONS) {
+				showContextMenuForItem( world.itemTypes.getItemType(data.getExtras().getString("itemTypeID")));
+				break;
+			}
 			if (resultCode != Activity.RESULT_OK) break;
 
 			ItemType itemType = world.itemTypes.getItemType(data.getExtras().getString("itemTypeID"));