Added logic to ShowChooseDialog & ShowTexDialog methods to include a

Cancel button based on a new arg to indicate cancelable state.

Change-Id: Iff57b61e3f821b8e2d9d7d69e20e3fd5f8d4f241

appinventor/appengine/src/com/google/appinventor/client/youngandroid/YoungAndroidFormUpgrader.java

@@ -282,6 +282,9 @@ public final class YoungAndroidFormUpgrader {
       } else if (componentType.equals("Texting")) {
         srcCompVersion = upgradeTextingProperties(componentProperties, srcCompVersion);
         
+      }  else if (componentType.equals("Notifier")) {
+        srcCompVersion = upgradeNotifierProperties(componentProperties, srcCompVersion);
+
       } else if (componentType.equals("Twitter")) {
         srcCompVersion = upgradeTwitterProperties(componentProperties, srcCompVersion);
 
@@ -846,6 +849,16 @@ public final class YoungAndroidFormUpgrader {
     return srcCompVersion;
   }
 
+  private static int upgradeNotifierProperties(Map<String, JSONValue> componentProperties,
+                                                  int srcCompVersion) {
+    if (srcCompVersion < 2) {
+      // A new boolean socket was added to allow canceling out of ShowChooseDialog
+      // and ShowTextDialog
+      srcCompVersion = 2;
+    }
+    return srcCompVersion;
+  }
+
   private static int upgradeVideoPlayerProperties(Map<String, JSONValue> componentProperties,
       int srcCompVersion) {
     if (srcCompVersion < 2) {

appinventor/blockslib/src/openblocks/yacodeblocks/BlockSaveFile.java

@@ -463,6 +463,9 @@ public class BlockSaveFile {
       } else if (genus.equals("Texting")) {
         blkCompVersion = upgradeTextingBlocks(blkCompVersion, componentName);
 
+      }  else if (genus.equals("Notifier")) {
+        blkCompVersion = upgradeNotifierBlocks(blkCompVersion, componentName);
+
       } else if (genus.equals("TinyWebDB")) {
         blkCompVersion = upgradeTinyWebDBBlocks(blkCompVersion, componentName);
 
@@ -1054,6 +1057,30 @@ public class BlockSaveFile {
     return blkCompVersion;
   }
 
+  private int upgradeNotifierBlocks(int blkCompVersion, String componentName) {
+      final String NEW_ARG_WARNING = "The %s block has been changed to " +
+          "expect a new cancelable argument. Please replace this block by a new one from the Notifier drawer.";
+
+    if (blkCompVersion < 2) {
+        // Look for ShowChooseDialog method block for this component.
+        for (Element block : getAllMatchingMethodOrEventBlocks(componentName, "Notifier",
+          "ShowChooseDialog")) {
+          // Mark the block bad.
+          markBlockBad(block,NEW_ARG_WARNING );
+      }
+
+      // Look for ShowTextDialog method block for this component.
+      for (Element block : getAllMatchingMethodOrEventBlocks(componentName, "Notifier",
+          "ShowTextDialog")) {
+          // Mark the block bad.
+          markBlockBad(block,NEW_ARG_WARNING );
+      }
+
+      blkCompVersion = 2;
+    }
+    return blkCompVersion;
+  }
+
   private int upgradeTinyWebDBBlocks(int blkCompVersion, String componentName) {
     if (blkCompVersion < 2) {
       // Look for TinyWebDB-ShowAlert method blocks for this component.

appinventor/components/src/com/google/appinventor/components/common/YaVersion.java

@@ -211,8 +211,10 @@ public class YaVersion {
   // - IMAGEPICKER_COMPONENT_VERSION was incremented to 5.
   // For YOUNG_ANDROID_VERSION 70:
   // - TEXTING_COMPONENT_VERSION was incremented to 3.
+    // For YOUNG_ANDROID_VERSION 71:
+    // - NOTIFIER_COMPONENT_VERSION was incremented to 2.
 
-  public static final int YOUNG_ANDROID_VERSION = 70;
+  public static final int YOUNG_ANDROID_VERSION = 71;
 
   // ............................... Blocks Language Version Number ...............................
 
@@ -474,7 +476,9 @@ public class YaVersion {
   // - The TimeInterval and DistanceInterval properties were added.
   public static final int LOCATIONSENSOR_COMPONENT_VERSION = 2;
 
-  public static final int NOTIFIER_COMPONENT_VERSION = 1;
+  // For NOTIFIER_COMPONENT_VERSION 2:
+  // - To ShowChooseDialog and ShowTextDialog, new arg was added to indicate if dialog is cancelable
+  public static final int NOTIFIER_COMPONENT_VERSION = 2;
 
   // For ORIENTATIONSENSOR_COMPONENT_VERSION = 2:
   // - The Yaw property was renamed to Azimuth.

appinventor/components/src/com/google/appinventor/components/runtime/Notifier.java

@@ -100,22 +100,25 @@ public final class Notifier extends AndroidNonvisibleComponent implements Compon
 
 
   /**
-   * Display an alert with two buttons.   Raises the AfterChoosing event when the
-   * choice has been made.
+   * Displays an alert with two buttons that have specified text, and additional button
+   * marked CANCEL if cancelable is set.
+   * Raises the AfterChoosing event when the choice has been made, and returns the text of
+   * the button that was pressed.
    *
    * @param message the text in the alert box
    * @param title the title for the alert box
    * @param button1Text the text on the left-hand button
    * @param button2Text the text on the right-hand button
+   * @param cancelable indicates if additional CANCEL button should be added
    */
   @SimpleFunction
   public void ShowChooseDialog(String message, String title, String button1Text,
-      String button2Text) {
-    twoButtonAlert(message, title, button1Text, button2Text);
+      String button2Text, boolean cancelable) {
+    twoButtonAlert(message, title, button1Text, button2Text, cancelable);
   }
 
   private void twoButtonAlert(String message,  String title,
-       final String button1Text,  final String button2Text) {
+       final String button1Text,  final String button2Text, boolean cancelable) {
     Log.i(LOG_TAG, "ShowChooseDialog: " + message);
 
     AlertDialog alertDialog = new AlertDialog.Builder(activity).create();
@@ -123,26 +126,35 @@ public final class Notifier extends AndroidNonvisibleComponent implements Compon
     // prevents the user from escaping the dialog by hitting the Back button
     alertDialog.setCancelable(false);
     alertDialog.setMessage(message);
-    alertDialog.setButton(button1Text,
+    alertDialog.setButton(AlertDialog.BUTTON_POSITIVE, button1Text,
         new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         AfterChoosing(button1Text);
       }
     });
-    // TODO(halabelson): The android documentation says that setButton2 is deprecated and that one
-    // should use setButton(AlertDialog.BUTTON_NEGATIVE, ...) instead.  When I use that, everything
-    // compiles, but the application crashes immediately, in VFY.  Should we be using new a newer
-    // version of the installer?
-    alertDialog.setButton2(button2Text,
+
+        alertDialog.setButton(AlertDialog.BUTTON_NEUTRAL, button2Text,
         new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
         AfterChoosing(button2Text);
       }
     });
+
+      //If cancelable is true, then a 3rd button, with text of Cancel will be added
+      // and will raise AfterChoosing when pressed.
+      if (cancelable)  {
+            final String cancelButtonText="Cancel";
+            alertDialog.setButton(AlertDialog.BUTTON_NEGATIVE, cancelButtonText,
+              new DialogInterface.OnClickListener() {
+                  public void onClick(DialogInterface dialog, int which) {
+                      AfterChoosing(cancelButtonText);
+                  }
+              });
+      }
+
     alertDialog.show();
   }
 
-
   /**
    * Event after the user has made a selection for ShowChooseDialog.
    * @param choice is the text on the button the user pressed
@@ -155,21 +167,31 @@ public final class Notifier extends AndroidNonvisibleComponent implements Compon
   /**
    * Shows a dialog box in which the user can enter text, after which the
    * AfterTextInput event is raised.
+   * @param message the text in the alert box
+   * @param title the title for the alert box
+   * @param cancelable indicates whether the user should be able to cancel out of dialog.
+   *                   When true, an additional CANCEL button will be added allowing user to cancel
+   *                   out of dialog. On selection, will raise AfterTextInput with text of CANCEL.
    */
   @SimpleFunction
-  public void ShowTextDialog(String message, String title) {
-    textInputAlert(message, title);
+  public void ShowTextDialog(String message, String title, boolean cancelable) {
+    textInputAlert(message, title, cancelable);
   }
 
   /**
-   * Display an alert with a text entry.   Raises the AfterTextInput event when the
-   * text has been entered and the user presses "OK".
+   * Display an alert with a text entry. If cancelable is true, then also displays a "CANCEL"
+   * button, allowing user to cancel out of dialog.
+   * Raises the AfterTextInput event when the text has been entered and the user presses "OK".
+   * Raises the AfterTextInput event when users presses "CANCEL", passing CANCEL to AfterTextInput
    *
    * @param message the text in the alert box
    * @param title the title for the alert box
+   * @param cancelable indicates whether the user should be able to cancel out of dialog.
+   *                   When true, an additional CANCEL button will be added allowing user to cancel
+   *                   out of dialog. On selection, will raise AfterTextInput with text of CANCEL.
    */
-  private void textInputAlert(String message, String title) {
-    AlertDialog alertDialog = new AlertDialog.Builder(activity).create();
+  private void textInputAlert(String message, String title, boolean cancelable) {
+    final AlertDialog alertDialog = new AlertDialog.Builder(activity).create();
     alertDialog.setTitle(title);
     alertDialog.setMessage(message);
     // Set an EditText view to get user input
@@ -183,6 +205,19 @@ public final class Notifier extends AndroidNonvisibleComponent implements Compon
         AfterTextInput(input.getText().toString());
       }
     });
+
+      //If cancelable, then add the CANCEL button
+      if (cancelable)  {
+          final String cancelButtonText="CANCEL";
+          alertDialog.setButton(AlertDialog.BUTTON_NEGATIVE, cancelButtonText,
+              new DialogInterface.OnClickListener() {
+                  public void onClick(DialogInterface dialog, int which) {
+                      //User pressed CANCEL. Raise AfterTextInput with CANCEL
+                      AfterTextInput(cancelButtonText);
+                  }
+              });
+      }
+
     alertDialog.show();
   }
 
@@ -208,7 +243,6 @@ public final class Notifier extends AndroidNonvisibleComponent implements Compon
       }
     });
   }
-  
   // show a toast using a TextView, which allows us to set the
   // font size.  The default toast is too small.
   private void toastNow (String message) {