Merge pull request mopsicus#61 from oahceh/master

add ReturnKeyType.Send
ernonemacher · Feb 26, 2021 · bf25c4c · bf25c4c
2 parents c9c10ac + 2a55590
commit bf25c4c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 2 deletions.
diff --git a/Android/UnityMobileInput/mobileinput/src/main/java/ru/mopsicus/mobileinput/MobileInput.java b/Android/UnityMobileInput/mobileinput/src/main/java/ru/mopsicus/mobileinput/MobileInput.java
@@ -273,6 +273,8 @@ private void Create(int id, JSONObject data) {
                 imeOptions |= EditorInfo.IME_ACTION_DONE;
             } else if (returnKeyType.equals("Search")) {
                 imeOptions |= EditorInfo.IME_ACTION_SEARCH;
+            } else if (returnKeyType.equals("Send")) {
+                imeOptions |= EditorInfo.IME_ACTION_SEND;
             }
             edit.setImeOptions(imeOptions);
             edit.setGravity(gravity);

diff --git a/Unity/Assets/Plugins/iOS/MobileInput.mm b/Unity/Assets/Plugins/iOS/MobileInput.mm
@@ -391,6 +391,8 @@ - (void)create:(NSDictionary *)data {
         returnKeyType = UIReturnKeyDone;
     } else if ([returnKeyTypeString isEqualToString:@"Search"]) {
         returnKeyType = UIReturnKeySearch;
+    } else if ([returnKeyTypeString isEqualToString:@"Send"]) {
+        returnKeyType = UIReturnKeySend;
     }
     fontSize = fontSize / [UIScreen mainScreen].scale;
     UIFont *uiFont = [UIFont systemFontOfSize:fontSize];

diff --git a/Unity/Assets/Scripts/UnityMobileInput/Editor/MobileInputEditor.cs b/Unity/Assets/Scripts/UnityMobileInput/Editor/MobileInputEditor.cs
@@ -85,7 +85,7 @@ public override void OnInspectorGUI () {
             EditorGUI.BeginChangeCheck ();
             GUILayout.Space (OFFSET);
             GUILayout.Label ("Select type for Return button:");
-            _target.ReturnKey = (MobileInputField.ReturnKeyType) GUILayout.Toolbar ((int) _target.ReturnKey, new string[] { "Default", "Next", "Done", "Search" });
+            _target.ReturnKey = (MobileInputField.ReturnKeyType) GUILayout.Toolbar ((int) _target.ReturnKey, new string[] { "Default", "Next", "Done", "Search", "Send" });
             GUILayout.Space (OFFSET);
             GUILayout.Label ("Options:");
             GUILayout.Space (SPACE);

diff --git a/Unity/Assets/Scripts/UnityMobileInput/MobileInputField.cs b/Unity/Assets/Scripts/UnityMobileInput/MobileInputField.cs
@@ -44,7 +44,8 @@ public enum ReturnKeyType {
             Default,
             Next,
             Done,
-            Search
+            Search,
+            Send
         }
 
         /// <summary>
-Original file line number
+Diff line change
@@ Expand Up / @@ -44,7 +44,8 @@ public enum ReturnKeyType { @@
                 Default,
                 Next,
                 Done,
-                Search
+                Search,
+                Send
             }
             /// <summary>
@@ Expand Down @@