From 37bc13bd0aa45ff5c151a375c16698f1f20ef787 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Sua=CC=81rez?= <javiersuarezruiz@hotmail.com>
Date: Mon, 10 Jul 2023 15:52:07 +0200
Subject: [PATCH 1/2] Fix Keyboard.Numeric issue on DisplayPromptAsync on
 Android

---
 .../Pages/Core/AlertsPage.xaml                | 78 +++++++++++--------
 .../Pages/Core/AlertsPage.xaml.cs             | 15 +++-
 .../Android/LocalizedDigitsKeyListener.cs     |  2 +-
 3 files changed, 59 insertions(+), 36 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml
index 204eeb050e15..39132d07ed73 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml
@@ -6,39 +6,49 @@
     xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
     Title="Alerts">
     <views:BasePage.Content>
-        <StackLayout
-            Margin="12">
-            <Label
-                Text="Display Alert"
-                Style="{StaticResource Headline}"/>
-            <Button 
-                Text="Alert Simple" 
-                Clicked="OnAlertSimpleClicked" />
-            <Button 
-                Text="Alert Yes/No" 
-                Clicked="OnAlertYesNoClicked" />
-            <Label
-                Text="Display ActionSheet"
-                Style="{StaticResource Headline}"/>
-            <Button 
-                Text="ActionSheet Simple" 
-                Clicked="OnActionSheetSimpleClicked" />
-            <Button 
-                Text="ActionSheet Cancel/Delete" 
-                Clicked="OnActionSheetCancelDeleteClicked" />
-            <Label
-                Text="Display Prompt"
-                Style="{StaticResource Headline}"/>
-            <Button 
-                Text="Question 1"
-                Clicked="OnQuestion1ButtonClicked" />
-            <Label 
-                x:Name="question1ResultLabel" />
-            <Button 
-                Text="Question 2"
-                Clicked="OnQuestion2ButtonClicked" />
-            <Label 
-                x:Name="question2ResultLabel" />
-        </StackLayout>
+        <ScrollView>
+            <StackLayout
+                Margin="12">
+                <Label
+                    Text="Display Alert"
+                    Style="{StaticResource Headline}"/>
+                <Button 
+                    Text="Alert Simple" 
+                    Clicked="OnAlertSimpleClicked" />
+                <Button 
+                    Text="Alert Yes/No" 
+                    Clicked="OnAlertYesNoClicked" />
+                <Label
+                    Text="Display ActionSheet"
+                    Style="{StaticResource Headline}"/>
+                <Button 
+                    Text="ActionSheet Simple" 
+                    Clicked="OnActionSheetSimpleClicked" />
+                <Button 
+                    Text="ActionSheet Cancel/Delete" 
+                    Clicked="OnActionSheetCancelDeleteClicked" />
+                <Label
+                    Text="Display Prompt"
+                    Style="{StaticResource Headline}"/>
+                <Button 
+                    Text="Question 1"
+                    Clicked="OnQuestion1ButtonClicked" />
+                <Label 
+                    x:Name="question1ResultLabel" />
+                <Button 
+                    Text="Question 2"
+                    Clicked="OnQuestion2ButtonClicked" />
+                <Label 
+                    x:Name="question2ResultLabel" />
+                <Label
+                    Text="Display Prompt (Decimal)"
+                    Style="{StaticResource Headline}"/>
+                <Button 
+                    Text="Question 3"
+                    Clicked="OnQuestion3ButtonClicked" />
+                <Label 
+                    x:Name="question3ResultLabel" />
+            </StackLayout>
+        </ScrollView>
     </views:BasePage.Content>
 </views:BasePage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs
index 5e7fc768eaf8..d47d1414532d 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using Microsoft.Maui;
 
 namespace Maui.Controls.Sample.Pages
@@ -52,7 +53,7 @@ async void OnQuestion1ButtonClicked(object sender, EventArgs e)
 
 		async void OnQuestion2ButtonClicked(object sender, EventArgs e)
 		{
-			string result = await DisplayPromptAsync("Question 2", "What's 5 + 5?", initialValue: "10", maxLength: 2, keyboard: Keyboard.Numeric);
+			string result = await DisplayPromptAsync("Question 2", "What's 5 + 5?", initialValue: string.Empty, maxLength: 2, keyboard: Keyboard.Numeric);
 
 			if (!string.IsNullOrWhiteSpace(result))
 			{
@@ -60,5 +61,17 @@ async void OnQuestion2ButtonClicked(object sender, EventArgs e)
 				question2ResultLabel.Text = number == 10 ? "Correct." : "Incorrect.";
 			}
 		}
+
+		async void OnQuestion3ButtonClicked(object sender, EventArgs e)
+		{
+			string result = await DisplayPromptAsync("Question 3", "What's 2.5 + 5?", initialValue: string.Empty, maxLength: 3, keyboard: Keyboard.Numeric);
+
+			if (!string.IsNullOrWhiteSpace(result))
+			{
+				float number = float.Parse(result, CultureInfo.CurrentCulture.NumberFormat);
+
+				question3ResultLabel.Text = number == 7.5f ? "Correct." : "Incorrect.";
+			}
+		}
 	}
 }
\ No newline at end of file
diff --git a/src/Core/src/Platform/Android/LocalizedDigitsKeyListener.cs b/src/Core/src/Platform/Android/LocalizedDigitsKeyListener.cs
index 3fd09783f99f..2ceb5c097ae1 100644
--- a/src/Core/src/Platform/Android/LocalizedDigitsKeyListener.cs
+++ b/src/Core/src/Platform/Android/LocalizedDigitsKeyListener.cs
@@ -215,7 +215,7 @@ bool IsDecimalPointChar(char c)
 				}
 			}
 
-			return stripped ?? filterFormatted ?? new String("");
+			return stripped ?? filterFormatted;
 		}
 #pragma warning restore CS8602 // Dereference of a possibly null reference.
 	}

From f80b6a822836c6d4d6a7718669032689ea2b31ff Mon Sep 17 00:00:00 2001
From: Rachel Kang <rachel.j.kang@gmail.com>
Date: Wed, 23 Aug 2023 10:40:21 -0400
Subject: [PATCH 2/2] Remove AlertsPage sample

---
 .../Pages/Core/AlertsPage.xaml                | 78 ++++++++-----------
 .../Pages/Core/AlertsPage.xaml.cs             | 15 +---
 2 files changed, 35 insertions(+), 58 deletions(-)

diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml
index 39132d07ed73..204eeb050e15 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml
@@ -6,49 +6,39 @@
     xmlns:views="clr-namespace:Maui.Controls.Sample.Pages.Base"
     Title="Alerts">
     <views:BasePage.Content>
-        <ScrollView>
-            <StackLayout
-                Margin="12">
-                <Label
-                    Text="Display Alert"
-                    Style="{StaticResource Headline}"/>
-                <Button 
-                    Text="Alert Simple" 
-                    Clicked="OnAlertSimpleClicked" />
-                <Button 
-                    Text="Alert Yes/No" 
-                    Clicked="OnAlertYesNoClicked" />
-                <Label
-                    Text="Display ActionSheet"
-                    Style="{StaticResource Headline}"/>
-                <Button 
-                    Text="ActionSheet Simple" 
-                    Clicked="OnActionSheetSimpleClicked" />
-                <Button 
-                    Text="ActionSheet Cancel/Delete" 
-                    Clicked="OnActionSheetCancelDeleteClicked" />
-                <Label
-                    Text="Display Prompt"
-                    Style="{StaticResource Headline}"/>
-                <Button 
-                    Text="Question 1"
-                    Clicked="OnQuestion1ButtonClicked" />
-                <Label 
-                    x:Name="question1ResultLabel" />
-                <Button 
-                    Text="Question 2"
-                    Clicked="OnQuestion2ButtonClicked" />
-                <Label 
-                    x:Name="question2ResultLabel" />
-                <Label
-                    Text="Display Prompt (Decimal)"
-                    Style="{StaticResource Headline}"/>
-                <Button 
-                    Text="Question 3"
-                    Clicked="OnQuestion3ButtonClicked" />
-                <Label 
-                    x:Name="question3ResultLabel" />
-            </StackLayout>
-        </ScrollView>
+        <StackLayout
+            Margin="12">
+            <Label
+                Text="Display Alert"
+                Style="{StaticResource Headline}"/>
+            <Button 
+                Text="Alert Simple" 
+                Clicked="OnAlertSimpleClicked" />
+            <Button 
+                Text="Alert Yes/No" 
+                Clicked="OnAlertYesNoClicked" />
+            <Label
+                Text="Display ActionSheet"
+                Style="{StaticResource Headline}"/>
+            <Button 
+                Text="ActionSheet Simple" 
+                Clicked="OnActionSheetSimpleClicked" />
+            <Button 
+                Text="ActionSheet Cancel/Delete" 
+                Clicked="OnActionSheetCancelDeleteClicked" />
+            <Label
+                Text="Display Prompt"
+                Style="{StaticResource Headline}"/>
+            <Button 
+                Text="Question 1"
+                Clicked="OnQuestion1ButtonClicked" />
+            <Label 
+                x:Name="question1ResultLabel" />
+            <Button 
+                Text="Question 2"
+                Clicked="OnQuestion2ButtonClicked" />
+            <Label 
+                x:Name="question2ResultLabel" />
+        </StackLayout>
     </views:BasePage.Content>
 </views:BasePage>
\ No newline at end of file
diff --git a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs
index d47d1414532d..5e7fc768eaf8 100644
--- a/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs
+++ b/src/Controls/samples/Controls.Sample/Pages/Core/AlertsPage.xaml.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Globalization;
 using Microsoft.Maui;
 
 namespace Maui.Controls.Sample.Pages
@@ -53,7 +52,7 @@ async void OnQuestion1ButtonClicked(object sender, EventArgs e)
 
 		async void OnQuestion2ButtonClicked(object sender, EventArgs e)
 		{
-			string result = await DisplayPromptAsync("Question 2", "What's 5 + 5?", initialValue: string.Empty, maxLength: 2, keyboard: Keyboard.Numeric);
+			string result = await DisplayPromptAsync("Question 2", "What's 5 + 5?", initialValue: "10", maxLength: 2, keyboard: Keyboard.Numeric);
 
 			if (!string.IsNullOrWhiteSpace(result))
 			{
@@ -61,17 +60,5 @@ async void OnQuestion2ButtonClicked(object sender, EventArgs e)
 				question2ResultLabel.Text = number == 10 ? "Correct." : "Incorrect.";
 			}
 		}
-
-		async void OnQuestion3ButtonClicked(object sender, EventArgs e)
-		{
-			string result = await DisplayPromptAsync("Question 3", "What's 2.5 + 5?", initialValue: string.Empty, maxLength: 3, keyboard: Keyboard.Numeric);
-
-			if (!string.IsNullOrWhiteSpace(result))
-			{
-				float number = float.Parse(result, CultureInfo.CurrentCulture.NumberFormat);
-
-				question3ResultLabel.Text = number == 7.5f ? "Correct." : "Incorrect.";
-			}
-		}
 	}
 }
\ No newline at end of file