#20 Click event

src/android/nl/xservices/plugins/Toast.java

@@ -2,9 +2,12 @@ package nl.xservices.plugins;
 
 import android.os.Build;
 import android.view.Gravity;
+import android.view.MotionEvent;
+import android.view.View;
 
 import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaPlugin;
+import org.apache.cordova.PluginResult;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -77,9 +80,31 @@ public class Toast extends CordovaPlugin {
             return;
           }
 
+          toast.getView().setOnTouchListener(new View.OnTouchListener() {
+            @Override
+            public boolean onTouch(View view, MotionEvent motionEvent) {
+              if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
+                JSONObject json = new JSONObject();
+                try {
+                  json.put("event", "touch");
+                  json.put("message", message);
+                } catch (JSONException e) {
+                  e.printStackTrace();
+                }
+                callbackContext.success(json);
+                return true;
+              } else {
+                return false;
+              }
+            }
+          });
+
           toast.show();
           mostRecentToast = toast;
-          callbackContext.success();
+
+          PluginResult pr = new PluginResult(PluginResult.Status.OK);
+          pr.setKeepCallback(true);
+          callbackContext.sendPluginResult(pr);
         }
       });
 

src/ios/Toast+UIView.h

@@ -1,11 +1,12 @@
 #import <Foundation/Foundation.h>
+#import <Cordova/CDV.h>
 
 @interface UIView (Toast)
 
 // each makeToast method creates a view and displays it as toast
 - (void)makeToast:(NSString *)message;
 - (void)makeToast:(NSString *)message duration:(NSTimeInterval)interval position:(id)position;
-- (void)makeToast:(NSString *)message duration:(NSTimeInterval)duration position:(id)position addPixelsY:(int)addPixelsY;
+- (void)makeToast:(NSString *)message duration:(NSTimeInterval)duration position:(id)position addPixelsY:(int)addPixelsY commandDelegate:(id <CDVCommandDelegate>)commandDelegate callbackId:(NSString *)callbackId;
 - (void)makeToast:(NSString *)message duration:(NSTimeInterval)interval position:(id)position image:(UIImage *)image;
 - (void)makeToast:(NSString *)message duration:(NSTimeInterval)interval position:(id)position title:(NSString *)title;
 - (void)makeToast:(NSString *)message duration:(NSTimeInterval)interval position:(id)position title:(NSString *)title image:(UIImage *)image;

src/ios/Toast+UIView.m

@@ -48,6 +48,11 @@ static const NSString * CSToastActivityViewKey  = @"CSToastActivityViewKey";
 
 static UIView *prevToast = NULL;
 
+// doesn't matter these are static
+static id commandDelegate;
+static id callbackId;
+static id msg;
+
 @interface UIView (ToastPrivate)
 
 - (void)hideToast:(UIView *)toast;
@@ -56,7 +61,6 @@ static UIView *prevToast = NULL;
 - (CGPoint)centerPointForPosition:(id)position withToast:(UIView *)toast withAddedPixelsY:(int) addPixelsY;
 - (UIView *)viewForMessage:(NSString *)message title:(NSString *)title image:(UIImage *)image;
 - (CGSize)sizeForString:(NSString *)string font:(UIFont *)font constrainedToSize:(CGSize)constrainedSize lineBreakMode:(NSLineBreakMode)lineBreakMode;
-
 @end
 
 
@@ -73,7 +77,10 @@ static UIView *prevToast = NULL;
     [self showToast:toast duration:duration position:position];
 }
 
-- (void)makeToast:(NSString *)message duration:(NSTimeInterval)duration position:(id)position addPixelsY:(int)addPixelsY {
+- (void)makeToast:(NSString *)message duration:(NSTimeInterval)duration position:(id)position addPixelsY:(int)addPixelsY commandDelegate:(id <CDVCommandDelegate>)_commandDelegate callbackId:(NSString *)_callbackId {
+  commandDelegate = _commandDelegate;
+  callbackId = _callbackId;
+  msg = message;
   UIView *toast = [self viewForMessage:message title:nil image:nil];
   [self showToast:toast duration:duration position:position addedPixelsY:addPixelsY];
 }
@@ -101,12 +108,13 @@ static UIView *prevToast = NULL;
   [self showToast:toast duration:CSToastDefaultDuration position:CSToastDefaultPosition addedPixelsY:0];
 }
 
-- (void)showToast:(UIView *)toast duration:(NSTimeInterval)duration position:(id)point addedPixelsY:(int) addPixelsY  {
+- (void)showToast:(UIView *)toast duration:(NSTimeInterval)duration position:(id)point addedPixelsY:(int) addPixelsY {
     [self hideToast];
     prevToast = toast;
     toast.center = [self centerPointForPosition:point withToast:toast withAddedPixelsY:addPixelsY];
     toast.alpha = 0.0;
 
+    // note that we changed this to be always true
     if (CSToastHidesOnTap) {
         UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:toast action:@selector(handleToastTapped:)];
         [toast addGestureRecognizer:recognizer];
@@ -168,6 +176,11 @@ static UIView *prevToast = NULL;
     [timer invalidate];
 
     [self hideToast:recognizer.view];
+  
+    // also send an event back to JS
+    NSDictionary *dict = [[NSDictionary alloc] initWithObjectsAndKeys:msg, @"message", @"touch", @"event", nil];
+    CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK messageAsDictionary:dict];
+    [commandDelegate sendPluginResult:pluginResult callbackId:callbackId];
 }
 
 #pragma mark - Toast Activity Methods

src/ios/Toast.m

@@ -30,9 +30,15 @@
     return;
   }
 
-  [self.webView makeToast:message duration:durationInt position:position addPixelsY:addPixelsY == nil ? 0 : [addPixelsY intValue]];
+  [self.webView makeToast:message
+                 duration:durationInt
+                 position:position
+               addPixelsY:addPixelsY == nil ? 0 : [addPixelsY intValue]
+          commandDelegate:self.commandDelegate
+               callbackId:command.callbackId];
 
   CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
+  pluginResult.keepCallback = [NSNumber numberWithBool:YES];
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }