Merge with EddyVerbruggen/master

LICENSE

@@ -0,0 +1,19 @@
+[The MIT License (MIT)](http://www.opensource.org/licenses/mit-license.html)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

README.md

@@ -25,7 +25,6 @@ If you like this plugin and want to say thanks please send a PR or donation. Bot
   4. [Styling](#styling)
 5. [Credits](#5-credits)
 6. [Changelog](#6-changelog)
-7. [License](#7-license)
 
 ## 1. Description
 
@@ -141,7 +140,7 @@ Toast.js is brought in automatically. There is no need to change or add anything
 ### Showing a Toast
 You have two choices to make when showing a Toast: where to show it and for how long.
 * show(message, duration, position)
-* duration: 'short', 'long'
+* duration: 'short', 'long', '3000', 900 (the latter are milliseconds)
 * position: 'top', 'center', 'bottom'
 
 You can also use any of these convenience methods:
@@ -167,7 +166,7 @@ function showBottom() {
   window.plugins.toast.showWithOptions(
     {
       message: "hey there",
-      duration: "short",
+      duration: "short", // which is 2000 ms. "long" is 4000. Or specify the nr of ms yourself.
       position: "bottom",
       addPixelsY: -40  // added a negative value to move it up a bit (default 0)
     },
@@ -196,7 +195,7 @@ called again. You can distinguish between those events of course:
   window.plugins.toast.showWithOptions(
     {
       message: "hey there",
-      duration: "short",
+      duration: 1500, // ms
       position: "bottom",
       addPixelsY: -40,  // (optional) added a negative value to move it up a bit (default 0)
       data: {'foo':'bar'} // (optional) pass in a JSON object here (it will be sent back in the success callback below)
@@ -224,12 +223,13 @@ Note that on WP this object is currently ignored.
 ```js
   window.plugins.toast.showWithOptions({
     message: "hey there",
-    duration: "short",
+    duration: "short", // 2000 ms
     position: "bottom",
     styling: {
       opacity: 0.75, // 0.0 (transparent) to 1.0 (opaque). Default 0.8
       backgroundColor: '#FF0000', // make sure you use #RRGGBB. Default #333333
       textColor: '#FFFF00', // Ditto. Default #FFFFFF
+      textSize: 20.5, // Default is approx. 13.
       cornerRadius: 16, // minimum is 0 (square). iOS default 20, Android default 100
       horizontalPadding: 20, // iOS default 16, Android default 50
       verticalPadding: 16 // iOS default 12, Android default 30
@@ -254,6 +254,8 @@ The Android code was entirely created by me.
 For iOS most credits go to this excellent [Toast for iOS project by Charles Scalesse] (https://github.com/scalessec/Toast).
 
 ## 6. CHANGELOG
+- 2.5.1: You can now specify the `textSize` used in the font for iOS and Android.
+- 2.5.0: By popular demand: Specify the duration of the Toast on iOS and Android. Pass in `short` (2000ms), `long` (4000ms), or any nr of milliseconds: `900`.
 - 2.4.2: You can now also set the Toast `opacity` for iOS.
 - 2.4.1: As an addition to 2.4.0, [Sino](https://github.com/SinoBoeckmann) added the option to change the text color!
 - 2.4.0: You can now style the Toast with a number of properties. See
@@ -262,25 +264,3 @@ For iOS most credits go to this excellent [Toast for iOS project by Charles Scal
 - 2.0.1: iOS messages are hidden when another one is shown. [Thanks Richie Min!](https://github.com/EddyVerbruggen/Toast-PhoneGap-Plugin/pull/13)
 - 2.0: WP8 support
 - 1.0: initial version supporting Android and iOS
-
-## 7. License
-
-[The MIT License (MIT)](http://www.opensource.org/licenses/mit-license.html)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-x-toast",
-  "version": "2.4.2",
+  "version": "2.5.1",
   "description": "This plugin allows you to show a Toast. A Toast is a little non intrusive buttonless popup which automatically disappears.",
   "cordova": {
     "id": "cordova-plugin-x-toast",

plugin.xml

@@ -2,7 +2,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
         xmlns:android="http://schemas.android.com/apk/res/android"
         id="cordova-plugin-x-toast"
-        version="2.4.2">
+        version="2.5.1">
 
   <name>Toast</name>
 

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

@@ -3,6 +3,11 @@ package nl.xservices.plugins;
 import android.graphics.Color;
 import android.graphics.drawable.GradientDrawable;
 import android.os.Build;
+import android.os.CountDownTimer;
+import android.text.Layout;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.style.AlignmentSpan;
 import android.view.Gravity;
 import android.view.MotionEvent;
 import android.view.View;
@@ -16,16 +21,6 @@ import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-/*
-    // TODO nice way for the Toast plugin to offer a longer delay than the default short and long options
-    // TODO also look at https://github.com/JohnPersano/Supertoasts
-    new CountDownTimer(6000, 1000) {
-      public void onTick(long millisUntilFinished) {toast.show();}
-      public void onFinish() {toast.show();}
-    }.start();
-
-    Also, check https://github.com/JohnPersano/SuperToasts
- */
 public class Toast extends CordovaPlugin {
 
   private static final String ACTION_SHOW_EVENT = "show";
@@ -47,43 +42,55 @@ public class Toast extends CordovaPlugin {
 
   private String currentMessage;
   private JSONObject currentData;
+  private static CountDownTimer _timer;
 
   @Override
   public boolean execute(String action, JSONArray args, final CallbackContext callbackContext) throws JSONException {
     if (ACTION_HIDE_EVENT.equals(action)) {
-      if (mostRecentToast != null) {
+      returnTapEvent("hide", currentMessage, currentData, callbackContext);
-        mostRecentToast.cancel();
+      hide();
-        getViewGroup().setOnTouchListener(null);
-        returnTapEvent("hide", currentMessage, currentData, callbackContext);
-        mostRecentToast = null;
-      }
       callbackContext.success();
       return true;
 
     } else if (ACTION_SHOW_EVENT.equals(action)) {
-
       if (this.isPaused) {
         return true;
       }
 
       final JSONObject options = args.getJSONObject(0);
+      final String msg = options.getString("message");
+      final Spannable message = new SpannableString(msg);
+      message.setSpan(
+          new AlignmentSpan.Standard(Layout.Alignment.ALIGN_CENTER),
+          0,
+          msg.length() - 1,
+          Spannable.SPAN_INCLUSIVE_INCLUSIVE);
 
-      final String message = options.getString("message");
       final String duration = options.getString("duration");
       final String position = options.getString("position");
       final int addPixelsY = options.has("addPixelsY") ? options.getInt("addPixelsY") : 0;
       final JSONObject data = options.has("data") ? options.getJSONObject("data") : null;
       final JSONObject styling = options.optJSONObject("styling");
 
-      currentMessage = message;
+      currentMessage = msg;
       currentData = data;
 
       cordova.getActivity().runOnUiThread(new Runnable() {
         public void run() {
+          int hideAfterMs;
+          if ("short".equalsIgnoreCase(duration)) {
+            hideAfterMs = 2000;
+          } else if ("long".equalsIgnoreCase(duration)) {
+            hideAfterMs = 4000;
+          } else {
+            // assuming a number of ms
+            hideAfterMs = Integer.parseInt(duration);
+          }
           final android.widget.Toast toast = android.widget.Toast.makeText(
               IS_AT_LEAST_LOLLIPOP ? cordova.getActivity().getWindow().getContext() : cordova.getActivity().getApplicationContext(),
               message,
-              "short".equals(duration) ? android.widget.Toast.LENGTH_SHORT : android.widget.Toast.LENGTH_LONG);
+              android.widget.Toast.LENGTH_LONG // actually controlled by a timer further down
+          );
 
           if ("top".equals(position)) {
             toast.setGravity(GRAVITY_TOP, 0, BASE_TOP_BOTTOM_OFFSET + addPixelsY);
@@ -102,6 +109,7 @@ public class Toast extends CordovaPlugin {
             // the defaults mimic the default toast as close as possible
             final String backgroundColor = styling.optString("backgroundColor", "#333333");
             final String textColor = styling.optString("textColor", "#ffffff");
+            final Double textSize = styling.optDouble("textSize", -1);
             final double opacity = styling.optDouble("opacity", 0.8);
             final int cornerRadius = styling.optInt("cornerRadius", 100);
             final int horizontalPadding = styling.optInt("horizontalPadding", 50);
@@ -112,11 +120,14 @@ public class Toast extends CordovaPlugin {
             shape.setAlpha((int)(opacity * 255)); // 0-255, where 0 is an invisible background
             shape.setColor(Color.parseColor(backgroundColor));
             toast.getView().setBackground(shape);
-            
+
             final TextView toastTextView;
             toastTextView = (TextView) toast.getView().findViewById(android.R.id.message);
             toastTextView.setTextColor(Color.parseColor(textColor));
-            
+            if (textSize > -1) {
+              toastTextView.setTextSize(textSize.floatValue());
+            }
+
             toast.getView().setPadding(horizontalPadding, verticalPadding, horizontalPadding, verticalPadding);
 
             // this gives the toast a very subtle shadow on newer devices
@@ -168,39 +179,25 @@ public class Toast extends CordovaPlugin {
                 final boolean tapped = tapX >= startX && tapX <= endX &&
                     tapY >= startY && tapY <= endY;
 
-                if (tapped) {
+                return tapped && returnTapEvent("touch", msg, data, callbackContext);
-                  getViewGroup().setOnTouchListener(null);
-                  return returnTapEvent("touch", message, data, callbackContext);
-                }
-                return false;
               }
             });
           } else {
             toast.getView().setOnTouchListener(new View.OnTouchListener() {
               @Override
               public boolean onTouch(View view, MotionEvent motionEvent) {
-                return motionEvent.getAction() == MotionEvent.ACTION_DOWN && returnTapEvent("touch", message, data, callbackContext);
+                return motionEvent.getAction() == MotionEvent.ACTION_DOWN && returnTapEvent("touch", msg, data, callbackContext);
               }
             });
           }
+          // trigger show every 2500 ms for as long as the requested duration
+          _timer = new CountDownTimer(hideAfterMs, 2500) {
+            public void onTick(long millisUntilFinished) {toast.show();}
+            public void onFinish() {toast.cancel();}
+          }.start();
 
-          Thread thread = new Thread(){
-            @Override
-            public void run() {
-                 try {
-                    Thread.sleep("short".equals(duration) ? 2000 : 3500);
-                    if (mostRecentToast != null) {
-                      returnTapEvent("hide", message, data, callbackContext);
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-             }  
-           };
-
-          toast.show();
-          thread.start();
           mostRecentToast = toast;
+          toast.show();
 
           PluginResult pr = new PluginResult(PluginResult.Status.OK);
           pr.setKeepCallback(true);
@@ -215,6 +212,17 @@ public class Toast extends CordovaPlugin {
     }
   }
 
+
+  private void hide() {
+    if (mostRecentToast != null) {
+      mostRecentToast.cancel();
+      getViewGroup().setOnTouchListener(null);
+    }
+    if (_timer != null) {
+      _timer.cancel();
+    }
+  }
+
   private boolean returnTapEvent(String eventName, String message, JSONObject data, CallbackContext callbackContext) {
     final JSONObject json = new JSONObject();
     try {
@@ -238,10 +246,7 @@ public class Toast extends CordovaPlugin {
 
   @Override
   public void onPause(boolean multitasking) {
-    if (mostRecentToast != null) {
+    hide();
-      mostRecentToast.cancel();
-      getViewGroup().setOnTouchListener(null);
-    }
     this.isPaused = true;
   }
 
@@ -249,4 +254,4 @@ public class Toast extends CordovaPlugin {
   public void onResume(boolean multitasking) {
     this.isPaused = false;
   }
-}
+}

src/ios/Toast+UIView.m

@@ -332,10 +332,14 @@ static id styling;
     UIColor *theColor = backgroundColor == nil ? [UIColor blackColor] : [self colorFromHexString:backgroundColor];
 
     NSNumber * horizontalPadding = styling[@"horizontalPadding"];
-    NSNumber * verticalPadding = styling[@"verticalPadding"];
     CGFloat theHorizontalPadding = horizontalPadding == nil ? CSToastHorizontalPadding : [horizontalPadding floatValue];
+
+    NSNumber * verticalPadding = styling[@"verticalPadding"];
     CGFloat theVerticalPadding = verticalPadding == nil ? CSToastVerticalPadding : [verticalPadding floatValue];
     
+    NSNumber * textSize = styling[@"textSize"];
+    CGFloat theTextSize = textSize == nil ? CSToastFontSize : [textSize floatValue];
+
     wrapperView.backgroundColor = theColor;
 
     if(image != nil) {
@@ -361,8 +365,8 @@ static id styling;
 
         titleLabel = [[UILabel alloc] init];
         titleLabel.numberOfLines = CSToastMaxTitleLines;
-        titleLabel.font = [UIFont boldSystemFontOfSize:CSToastFontSize];
+        titleLabel.font = [UIFont boldSystemFontOfSize:theTextSize];
-        titleLabel.textAlignment = NSTextAlignmentLeft;
+        titleLabel.textAlignment = NSTextAlignmentCenter;
         titleLabel.lineBreakMode = NSLineBreakByWordWrapping;
         titleLabel.textColor = theTitleLabelTextColor;
         titleLabel.backgroundColor = [UIColor clearColor];
@@ -381,8 +385,9 @@ static id styling;
 
         messageLabel = [[UILabel alloc] init];
         messageLabel.numberOfLines = CSToastMaxMessageLines;
-        messageLabel.font = [UIFont systemFontOfSize:CSToastFontSize];
+        messageLabel.font = [UIFont systemFontOfSize:theTextSize];
         messageLabel.lineBreakMode = NSLineBreakByWordWrapping;
+        messageLabel.textAlignment = NSTextAlignmentCenter;
         messageLabel.textColor = theMessageLabelTextColor;
         messageLabel.backgroundColor = [UIColor clearColor];
         messageLabel.alpha = 1.0;

src/ios/Toast.m

@@ -5,42 +5,38 @@
 @implementation Toast
 
 - (void)show:(CDVInvokedUrlCommand*)command {
-
   NSDictionary* options = [command argumentAtIndex:0];
-
   NSString *message  = options[@"message"];
   NSString *duration = options[@"duration"];
   NSString *position = options[@"position"];
   NSDictionary *data = options[@"data"];
   NSNumber *addPixelsY = options[@"addPixelsY"];
   NSDictionary *styling = options[@"styling"];
-
+  
   if (![position isEqual: @"top"] && ![position isEqual: @"center"] && ![position isEqual: @"bottom"]) {
     CDVPluginResult * pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"invalid position. valid options are 'top', 'center' and 'bottom'"];
     [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
     return;
   }
-
+  
-  NSInteger durationInt;
+  NSTimeInterval durationMS;
-  if ([duration isEqual: @"short"]) {
+  if ([duration.lowercaseString isEqualToString: @"short"]) {
-    durationInt = 2;
+    durationMS = 2000;
-  } else if ([duration isEqual: @"long"]) {
+  } else if ([duration.lowercaseString isEqualToString: @"long"]) {
-    durationInt = 5;
+    durationMS = 4000;
   } else {
-    CDVPluginResult * pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_ERROR messageAsString:@"invalid duration. valid options are 'short' and 'long'"];
+    durationMS = [duration intValue];
-    [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
-    return;
   }
-
+  
   [self.webView makeToast:message
-                 duration:durationInt
+                 duration:durationMS / 1000
                  position:position
                addPixelsY:addPixelsY == nil ? 0 : [addPixelsY intValue]
                      data:data
                   styling:styling
           commandDelegate:self.commandDelegate
                callbackId:command.callbackId];
-
+  
   CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   pluginResult.keepCallback = [NSNumber numberWithBool:YES];
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
@@ -48,7 +44,7 @@
 
 - (void)hide:(CDVInvokedUrlCommand*)command {
   [self.webView hideToast];
-
+  
   CDVPluginResult* pluginResult = [CDVPluginResult resultWithStatus:CDVCommandStatus_OK];
   [self.commandDelegate sendPluginResult:pluginResult callbackId:command.callbackId];
 }

src/wp8/Toast.cs

@@ -126,10 +126,10 @@ namespace WPCordovaClassLib.Cordova.Commands
                             return;
                         }
 
-                        int hideDelay = 2800;
+                        int hideDelay = 2500;
                         if ("long".Equals(duration))
                         {
-                            hideDelay = 5500;
+                            hideDelay = 5000;
                         }
                         else if (!"short".Equals(duration))
                         {

www/Toast.js

@@ -11,12 +11,12 @@ Toast.prototype.optionsBuilder = function () {
 
   return {
     withMessage: function(m) {
-      message = m;
+      message = m.toString();
       return this;
     },
 
     withDuration: function(d) {
-      duration = d;
+      duration = d.toString();
       return this;
     },
 
@@ -36,13 +36,15 @@ Toast.prototype.optionsBuilder = function () {
         duration: duration,
         position: position,
         addPixelsY: addPixelsY
-      }
+      };
     }
-  }
+  };
 };
 
 
 Toast.prototype.showWithOptions = function (options, successCallback, errorCallback) {
+  options.duration = (options.duration === undefined ? 'long' : options.duration.toString());
+  options.message = options.message.toString();
   cordova.exec(successCallback, errorCallback, "Toast", "show", [options]);
 };