Text Finished editing callback on android text field

Author: darvin

cocos2d-ui/Platform/Android/CCPlatformTextFieldAndroid.m

@@ -14,43 +14,6 @@
 #import "CCDirector.h"
 #import "CCEditText.h"
 
-extern void objc_retain(id);
-
-
-typedef void (^CCPlatformTextFieldAndroidTextViewOnEditorActionListenerCompletionBlock)(void);
-
-
-BRIDGE_CLASS("org.cocos2d.CCPlatformTextFieldAndroidTextViewOnEditorActionListener")
-@interface CCPlatformTextFieldAndroidTextViewOnEditorActionListener : JavaObject<AndroidTextViewOnEditorActionListener>
-- (BOOL)onEditorAction:(AndroidTextView *)v actionId:(int32_t)actionId keyEvent:(AndroidKeyEvent *)event;
-
-@end
-@implementation CCPlatformTextFieldAndroidTextViewOnEditorActionListener {
-    CCPlatformTextFieldAndroidTextViewOnEditorActionListenerCompletionBlock _completionBlock;
-}
-
-- (id) initWithCompletionBlock:(CCPlatformTextFieldAndroidTextViewOnEditorActionListenerCompletionBlock)completionBlock {
-    if (self = [super init]) {
-        _completionBlock = [completionBlock copy];
-    }
-    return self;
-    
-}
-
-@bridge(callback) onEditorAction:actionId:keyEvent: = onEditorAction;
-- (BOOL)onEditorAction:(AndroidTextView *)v actionId:(int32_t)actionId keyEvent:(AndroidKeyEvent *)event {
-    if (actionId == AndroidEditorInfoIME_ACTION_SEARCH ||
-       actionId == AndroidEditorInfoIME_ACTION_DONE
-//        || [event action] == KeyEvent.ACTION_DOWN && [event keyCode] == ANDROID_KEYCODE_ENTER
-        ) {
-        _completionBlock();
-    } else {
-        NSLog(@"nothing");
-    }
-    return NO;
-}
-
-@end
 
 @implementation CCPlatformTextFieldAndroid {
     CCEditText *_editText;
@@ -68,6 +31,11 @@ - (id) init {
     return self;
 }
 
+- (void)dealloc
+{
+    _editText = nil;
+}
+
 
 - (void)onEnterTransitionDidFinish {
     [super onEnterTransitionDidFinish];
@@ -106,13 +74,16 @@ - (void) positionInControl:(CCControl *)control padding:(float)padding {
         AndroidRelativeLayoutLayoutParams *params = [[AndroidRelativeLayoutLayoutParams alloc] initWithWidth:frame.size.width height:frame.size.height];
         [params setMargins:frame.origin.x top:frame.origin.y right:0 bottom:0];
         [_editText setLayoutParams:params];
+        [_editText setImeOptions:AndroidEditorInfoIME_FLAG_NO_EXTRACT_UI];
+        
 
-        [_editText setOnEditorActionListener:[[CCPlatformTextFieldAndroidTextViewOnEditorActionListener alloc] initWithCompletionBlock:^{
-            if ([[self delegate] respondsToSelector:@selector(platformTextFieldDidFinishEditing:)]) {
-                [[self delegate] platformTextFieldDidFinishEditing:self];
+        __weak id weakSelf = self;
+        [_editText setCompletionBlock:^{
+            if ([[weakSelf delegate] respondsToSelector:@selector(platformTextFieldDidFinishEditing:)]) {
+                [[weakSelf delegate] platformTextFieldDidFinishEditing:weakSelf];
             }
 
-        }]];
+        }];
     });
 }
 
@@ -153,4 +124,6 @@ - (void)setString:(NSString *)string {
 - (NSString *)string {
     return _editText.text;
 }
+
+
 @end

cocos2d-ui/Platform/Android/java/CCEditText.h

@@ -7,9 +7,14 @@
 //
 
 #import <BridgeKitV3/BridgeKit.h>
+
+
+typedef void (^CCEditTextCompletionBlock)(void);
+
 BRIDGE_CLASS("org.cocos2d.CCEditText")
 @interface CCEditText : AndroidEditText
 - (id)initWithContext:(AndroidContext *)context;
-
+- (BOOL)onKeyPreIme:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event;
 - (void)setTextSizeDouble:(double)textSize;
+- (void) setCompletionBlock:(CCEditTextCompletionBlock)completionBlock;
 @end

cocos2d-ui/Platform/Android/java/CCEditText.m

@@ -8,7 +8,33 @@
 
 #import "CCEditText.h"
 
-@implementation CCEditText
+@implementation CCEditText {
+    CCEditTextCompletionBlock _completionBlock;
+}
+
 @bridge (constructor) initWithContext:;
 @bridge (method, instance) setTextSizeDouble:=setTextSizeDouble;
+
+@bridge (callback) onKeyPreIme:keyEvent: = onKeyPreIme;
+- (BOOL)onKeyPreIme:(int32_t)keyCode keyEvent:(AndroidKeyEvent *)event {
+    if (keyCode == AndroidKeyEventKeycodeBack || [event action] == AndroidKeyEventActionUp) {
+        if (_completionBlock != nil) {
+            _completionBlock();
+        }
+        
+        return NO;
+    }
+    return [self dispatchKeyEvent:event];
+
+}
+
+
+- (void) setCompletionBlock:(CCEditTextCompletionBlock)completionBlock {
+    _completionBlock = [completionBlock copy];
+}
+
+- (void)dealloc {
+    [_completionBlock release];
+    [super dealloc];
+}
 @end

cocos2d-ui/Platform/Android/java/org/cocos2d/CCEditText.java

@@ -3,14 +3,17 @@
 import android.widget.EditText;
 import android.util.Log;
 import android.content.Context;
+import android.view.KeyEvent;
 
 public class CCEditText extends EditText {
     public CCEditText (Context context) {
         super(context);
     }
 
     public void setTextSizeDouble(double textSize) {
-        Log.d("TEXTFIELD", "setTextSizeDouble "+textSize);
         setTextSize((float)textSize);
     }
+    
+    public native boolean onKeyPreIme(int keyCode, KeyEvent event);
+
 }