Android: Add selection dialog (drop down/combo box) (#13814)

- The handling of IGUIComboBox uses the new setAndSendSelected() method.
- getDialogState() is now getInputDialogState() and returns the state of the input dialog.
- getLastDialogType() is added and returns current/last shown dialog's type.
- getInputDialogState() now returns an enum instead of int.
- getAndroidUIInput() now returns void instead of bool.
- New data types (enum) are added:
  (1) GameActivity.DialogType (Java) and porting::AndroidDialogType (C++)
  (2) GameActivity.DialogState (Java) and porting::AndroidDialogState (C++)
- When showing a text input dialog, there is no custom accept button text any more.
- showDialog()/showDialogUI() for text input is now showTextInputDialog()/showTextInputDialogUI().
- showInputDialog()/showDialogUI() for text input is now showTextInputDialog()/showTextInputDialogUI().
- getDialogValue()/getInputDialogValue() is now getDialogMessage()/getInputDialogMessage().


Co-authored-by: Gregor Parzefall <82708541+grorp@users.noreply.github.com>

src/porting_android.h

@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #pragma once
 
 #ifndef __ANDROID__
-#error this include has to be included on android port only!
+#error This header has to be included on Android port only!
 #endif
 
 #include <jni.h>
@@ -30,22 +30,28 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <string>
 
 namespace porting {
-// java app
+// Java app
 extern android_app *app_global;
 
-// java <-> c++ interaction interface
+// Java <-> C++ interaction interface
 extern JNIEnv *jnienv;
 
 /**
- * show text input dialog in java
- * @param acceptButton text to display on accept button
- * @param hint hint to show
- * @param current initial value to display
- * @param editType type of texfield
- * (1==multiline text input; 2==single line text input; 3=password field)
+ * Show a text input dialog in Java
+ * @param hint Hint to be shown
+ * @param current Initial value to be displayed
+ * @param editType Type of the text field
+ * (1 = multi-line text input; 2 = single-line text input; 3 = password field)
  */
-void showInputDialog(const std::string &acceptButton,
-					const std::string &hint, const std::string &current, int editType);
+void showTextInputDialog(const std::string &hint, const std::string &current, int editType);
+
+/**
+ * Show a selection dialog in Java
+ * @param optionList The list of options
+ * @param listSize Size of the list
+ * @param selectedIdx Selected index
+ */
+void showComboBoxDialog(const std::string optionList[], s32 listSize, s32 selectedIdx);
 
 /**
  * Opens a share intent to the file at path
@@ -54,17 +60,48 @@ void showInputDialog(const std::string &acceptButton,
  */
 void shareFileAndroid(const std::string &path);
 
-/**
- * WORKAROUND for not working callbacks from java -> c++
- * get current state of input dialog
+/*
+ * Types of Android input dialog:
+ * 1. Text input (single/multi-line text and password field)
+ * 2. Selection input (combo box)
  */
-int getInputDialogState();
+enum AndroidDialogType { TEXT_INPUT, SELECTION_INPUT };
 
-/**
- * WORKAROUND for not working callbacks from java -> c++
- * get text in current input dialog
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the type of the last input dialog
  */
-std::string getInputDialogValue();
+AndroidDialogType getLastInputDialogType();
+
+/*
+ * States of Android input dialog:
+ * 1. The dialog is currently shown.
+ * 2. The dialog has its input sent.
+ * 3. The dialog is canceled/dismissed.
+ */
+enum AndroidDialogState { DIALOG_SHOWN, DIALOG_INPUTTED, DIALOG_CANCELED };
+
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the state of the input dialog
+ */
+AndroidDialogState getInputDialogState();
+
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the text in the current/last input dialog
+ * This function clears the dialog state (set to canceled). Make sure to save
+ * the dialog state before calling this function.
+ */
+std::string getInputDialogMessage();
+
+/*
+ * WORKAROUND for not working callbacks from Java -> C++
+ * Get the selection in the current/last input dialog
+ * This function clears the dialog state (set to canceled). Make sure to save
+ * the dialog state before calling this function.
+ */
+int getInputDialogSelection();
 
 #ifndef SERVER
 float getDisplayDensity();