From acb8905dd64738c9e1b6d9a7987aff6500b31b3a Mon Sep 17 00:00:00 2001
From: Shyam Seshadri <shyamseshadri@gmail.com>
Date: Fri, 5 Oct 2018 19:09:52 +0530
Subject: [PATCH 1/3] feat: Add number inputType for prompt dialog

Add an inputType number to the PromptOptions for dialogs

Closes #6363
---
 tns-core-modules/ui/dialogs/dialogs-common.ts  |  5 +++++
 tns-core-modules/ui/dialogs/dialogs.android.ts |  2 ++
 tns-core-modules/ui/dialogs/dialogs.d.ts       | 11 ++++++++---
 tns-core-modules/ui/dialogs/dialogs.ios.ts     |  2 ++
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/tns-core-modules/ui/dialogs/dialogs-common.ts b/tns-core-modules/ui/dialogs/dialogs-common.ts
index 441c6a3661..4c3272703b 100644
--- a/tns-core-modules/ui/dialogs/dialogs-common.ts
+++ b/tns-core-modules/ui/dialogs/dialogs-common.ts
@@ -31,6 +31,11 @@ export module inputType {
      * Email input type.
      */
     export const email: string = "email";
+
+    /**
+     * Number input type
+     */
+    export const number: string = "number";
 }
 
 /**
diff --git a/tns-core-modules/ui/dialogs/dialogs.android.ts b/tns-core-modules/ui/dialogs/dialogs.android.ts
index 7d6c81d33e..033469ef2b 100644
--- a/tns-core-modules/ui/dialogs/dialogs.android.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.android.ts
@@ -184,6 +184,8 @@ export function prompt(arg: any): Promise<PromptResult> {
                     input.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_VARIATION_PASSWORD);
                 } else if (options.inputType === inputType.email) {
                     input.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
+                } else if (options.inputType === inputType.number) {
+                  input.setInputType(android.text.InputType.TYPE_CLASS_NUMBER);
                 }
 
                 switch (options.capitalizationType) {
diff --git a/tns-core-modules/ui/dialogs/dialogs.d.ts b/tns-core-modules/ui/dialogs/dialogs.d.ts
index 9921f8761d..ecdd4ed298 100644
--- a/tns-core-modules/ui/dialogs/dialogs.d.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.d.ts
@@ -21,6 +21,11 @@ export module inputType {
      * Email input type.
      */
     export var email: string;
+
+    /**
+     * Number input type.
+     */
+    export var number: string;
 }
 
 /**
@@ -81,7 +86,7 @@ export function prompt(message: string, defaultText?: string): Promise<PromptRes
 
 /**
  * The prompt() method displays a dialog box that prompts the visitor for input.
- * @param options The options for the dialog box. 
+ * @param options The options for the dialog box.
  */
 export function prompt(options: PromptOptions): Promise<PromptResult>;
 
@@ -95,7 +100,7 @@ export function login(message: string, userName?: string, password?: string): Pr
 
 /**
  * The login() method displays a login dialog box that prompts the visitor for user name and password.
- * @param options The options for the dialog box. 
+ * @param options The options for the dialog box.
  */
 export function login(options: LoginOptions): Promise<LoginResult>;
 
@@ -109,7 +114,7 @@ export function action(message: string, cancelButtonText: string, actions: Array
 
 /**
  * The action() method displays a action box that prompts the visitor to choose some action.
- * @param options The options for the dialog box. 
+ * @param options The options for the dialog box.
  */
 export function action(options: ActionOptions): Promise<string>;
 
diff --git a/tns-core-modules/ui/dialogs/dialogs.ios.ts b/tns-core-modules/ui/dialogs/dialogs.ios.ts
index bf748c09d5..5947c82210 100644
--- a/tns-core-modules/ui/dialogs/dialogs.ios.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.ios.ts
@@ -104,6 +104,8 @@ export function prompt(arg: any): Promise<PromptResult> {
 
                 if (options && options.inputType === inputType.email) {
                     arg.keyboardType = UIKeyboardType.EmailAddress;
+                } else if (options && options.inputType === inputType.number) {
+                    arg.keyboardType = UIKeyboardType.NumberPad;
                 }
 
                 let color = getTextFieldColor();

From f164f1b765a24b7abd25f6278b8419bfcdb2bbcf Mon Sep 17 00:00:00 2001
From: Shyam Seshadri <shyamseshadri@gmail.com>
Date: Sat, 6 Oct 2018 09:43:12 +0530
Subject: [PATCH 2/3] feat: Add inputType phone to prompt dialog

Add support for phone inputType to prompt dialog, and add both prompt
options to the dialogs test page.
---
 apps/app/ui-tests-app/dialogs/dialogs.xml     |  4 +-
 apps/app/ui-tests-app/dialogs/view-model.ts   | 40 +++++++++++++++++++
 apps/package.json                             |  2 +-
 tns-core-modules/ui/dialogs/dialogs-common.ts |  5 +++
 .../ui/dialogs/dialogs.android.ts             |  2 +
 tns-core-modules/ui/dialogs/dialogs.d.ts      |  5 +++
 tns-core-modules/ui/dialogs/dialogs.ios.ts    |  2 +
 7 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/apps/app/ui-tests-app/dialogs/dialogs.xml b/apps/app/ui-tests-app/dialogs/dialogs.xml
index b8a68129de..0ada85f9b6 100644
--- a/apps/app/ui-tests-app/dialogs/dialogs.xml
+++ b/apps/app/ui-tests-app/dialogs/dialogs.xml
@@ -7,7 +7,9 @@
     <Button text="login" tap="{{ loginName }}" />
     <Button text="promptText" tap="{{ promptText }}" />
     <Button text="promptPass" tap="{{ promptPass }}" />
-    <Button text="promptEmail" tap="{{ promptEmail }}" />   
+    <Button text="promptEmail" tap="{{ promptEmail }}" />
+    <Button text="promptNumber" tap="{{ promptNumber }}" />
+    <Button text="promptPhone" tap="{{ promptPhone }}" />
     <Button text="promptCapitalizationNone" tap="{{ promptCapitalizationNone }}" />
     <Button text="promptCapitalizationAll" tap="{{ promptCapitalizationAll }}" />
     <Button text="promptCapitalizationSentences" tap="{{ promptCapitalizationSentences }}" />
diff --git a/apps/app/ui-tests-app/dialogs/view-model.ts b/apps/app/ui-tests-app/dialogs/view-model.ts
index 2d5e81646b..3982752008 100644
--- a/apps/app/ui-tests-app/dialogs/view-model.ts
+++ b/apps/app/ui-tests-app/dialogs/view-model.ts
@@ -138,6 +138,46 @@ export class SettingsViewModel extends observable.Observable {
         });
     }
 
+    public promptNumber(args: observable.EventData) {
+      dialogs.prompt({
+          title: "Name",
+          message: "Enter a number:",
+          cancelButtonText: "Cancel",
+          neutralButtonText: "Ignore",
+          okButtonText: "OK",
+          defaultText: "1234",
+          inputType: dialogs.inputType.number
+      }).then((promptResult) => {
+          console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
+          if (promptResult.result) {
+              this.set("name", promptResult.text);
+          }
+          else {
+              this.set("name", "1234");
+          }
+      });
+    }
+
+    public promptPhone(args: observable.EventData) {
+      dialogs.prompt({
+          title: "Name",
+          message: "Enter a phone:",
+          cancelButtonText: "Cancel",
+          neutralButtonText: "Ignore",
+          okButtonText: "OK",
+          defaultText: "1234",
+          inputType: dialogs.inputType.phone
+      }).then((promptResult) => {
+          console.log("### Result: " + promptResult.result + ", Text: " + promptResult.text);
+          if (promptResult.result) {
+              this.set("name", promptResult.text);
+          }
+          else {
+              this.set("name", "1234");
+          }
+      });
+    }
+
     public promptCapitalizationNone(args: observable.EventData) {
         dialogs.prompt({
             title: "Name",
diff --git a/apps/package.json b/apps/package.json
index 70c68f9843..d01c602b1a 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -6,7 +6,7 @@
   "nativescript": {
     "id": "org.nativescript.apps",
     "tns-android": {
-      "version": "next"
+      "version": "5.0.0-2018-10-05-115742-01"
     },
     "tns-ios": {
       "version": "next"
diff --git a/tns-core-modules/ui/dialogs/dialogs-common.ts b/tns-core-modules/ui/dialogs/dialogs-common.ts
index 4c3272703b..84847036af 100644
--- a/tns-core-modules/ui/dialogs/dialogs-common.ts
+++ b/tns-core-modules/ui/dialogs/dialogs-common.ts
@@ -36,6 +36,11 @@ export module inputType {
      * Number input type
      */
     export const number: string = "number";
+
+    /**
+     * Phone input type
+     */
+    export const phone: string = "phone";
 }
 
 /**
diff --git a/tns-core-modules/ui/dialogs/dialogs.android.ts b/tns-core-modules/ui/dialogs/dialogs.android.ts
index 033469ef2b..adf18020d1 100644
--- a/tns-core-modules/ui/dialogs/dialogs.android.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.android.ts
@@ -186,6 +186,8 @@ export function prompt(arg: any): Promise<PromptResult> {
                     input.setInputType(android.text.InputType.TYPE_CLASS_TEXT | android.text.InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
                 } else if (options.inputType === inputType.number) {
                   input.setInputType(android.text.InputType.TYPE_CLASS_NUMBER);
+                } else if (options.inputType === inputType.phone) {
+                  input.setInputType(android.text.InputType.TYPE_CLASS_PHONE);
                 }
 
                 switch (options.capitalizationType) {
diff --git a/tns-core-modules/ui/dialogs/dialogs.d.ts b/tns-core-modules/ui/dialogs/dialogs.d.ts
index ecdd4ed298..0c2a685215 100644
--- a/tns-core-modules/ui/dialogs/dialogs.d.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.d.ts
@@ -26,6 +26,11 @@ export module inputType {
      * Number input type.
      */
     export var number: string;
+
+    /**
+     * Phone input type.
+     */
+    export var phone: string;
 }
 
 /**
diff --git a/tns-core-modules/ui/dialogs/dialogs.ios.ts b/tns-core-modules/ui/dialogs/dialogs.ios.ts
index 5947c82210..39e9bad005 100644
--- a/tns-core-modules/ui/dialogs/dialogs.ios.ts
+++ b/tns-core-modules/ui/dialogs/dialogs.ios.ts
@@ -106,6 +106,8 @@ export function prompt(arg: any): Promise<PromptResult> {
                     arg.keyboardType = UIKeyboardType.EmailAddress;
                 } else if (options && options.inputType === inputType.number) {
                     arg.keyboardType = UIKeyboardType.NumberPad;
+                } else if (options && options.inputType === inputType.phone) {
+                    arg.keyboardType = UIKeyboardType.PhonePad;
                 }
 
                 let color = getTextFieldColor();

From 902ee517aba776a3670d06f2322099d2c7382f3b Mon Sep 17 00:00:00 2001
From: Manol Donev <manol.donev@gmail.com>
Date: Tue, 6 Nov 2018 17:17:07 +0200
Subject: [PATCH 3/3] revert apps package.json change

---
 apps/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/package.json b/apps/package.json
index d01c602b1a..70c68f9843 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -6,7 +6,7 @@
   "nativescript": {
     "id": "org.nativescript.apps",
     "tns-android": {
-      "version": "5.0.0-2018-10-05-115742-01"
+      "version": "next"
     },
     "tns-ios": {
       "version": "next"