From e1a671ebe3513315d18b00f83ba824704ff28767 Mon Sep 17 00:00:00 2001
From: Allan Ritchie <allan.ritchie@gmail.com>
Date: Fri, 6 May 2016 21:22:48 -0400
Subject: [PATCH] fix some uwp things and release

---
 nuspec/Acr.UserDialogs.nuspec                 |  5 +-
 readme.md                                     | 10 ++-
 .../Acr.UserDialogs.Interface.csproj          |  1 -
 src/Acr.UserDialogs.Interface/TimeConfig.cs   | 12 ----
 .../ProgressContentDialog.xaml                |  2 +-
 src/Acr.UserDialogs.Uwp/ProgressDialog.cs     | 70 ++++++++++++-------
 src/Acr.UserDialogs.Uwp/UserDialogsImpl.cs    | 47 ++++++++-----
 7 files changed, 88 insertions(+), 59 deletions(-)
 delete mode 100644 src/Acr.UserDialogs.Interface/TimeConfig.cs

diff --git a/nuspec/Acr.UserDialogs.nuspec b/nuspec/Acr.UserDialogs.nuspec
index 58bcc829..163746fa 100644
--- a/nuspec/Acr.UserDialogs.nuspec
+++ b/nuspec/Acr.UserDialogs.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Acr.UserDialogs</id>
-        <version>5.0.1</version>
+        <version>5.1.0</version>
         <title>ACR User Dialogs Plugin for Xamarin and Windows</title>
         <summary>Allows for messagebox style dialogs to be called from your shared/PCL/MVVM code</summary>
         <description>
@@ -64,6 +64,9 @@ Supported Platforms
 5.1
 [feature] date and time dialogs
 [feature] using BTProgressHUD and AndHUD from nuget (at last)!
+[fix][droid] launch on uithread
+[fix][ios] showsuccess/error now properly masks the background
+[fix][uwp] several bugfixes and improvements
 
 5.0.1
 [fix][ios] incorrect prompt result
diff --git a/readme.md b/readme.md
index cadae875..1438593a 100644
--- a/readme.md
+++ b/readme.md
@@ -15,11 +15,13 @@ Supports Android, iOS, and Unified Windows Platform (UWP, UAP)
 * Action Sheet (multiple choice menu)
 * Alert
 * Confirm
+* Date
 * Loading
 * Login
 * Progress
 * Prompt
 * Toasts
+* Time
 * [examples](https://github.com/aritchie/userdialogs/blob/master/src/Samples/Samples/MainPage.cs)
 
 ## Support Platforms
@@ -62,6 +64,9 @@ All config objects contain static vars that contain defaults which are basically
     - DefaultNo
     - DefaultOkText
     - DefaultCancelText
+- DatePromptConfig
+    - DefaultOkText
+    - DefaultCancelText
 - LoginConfig
     - DefaultTitle
     - DefaultOkText
@@ -89,7 +94,10 @@ All config objects contain static vars that contain defaults which are basically
     - ErrorBackgroundColor
     - ErrorTextColor
     - DefaultDuration
-
+- TimePromptConfig
+    - DefaultOkText
+    - DefaultCancelText
+    - DefaultMinuteInterval
 
 ## FAQ
 
diff --git a/src/Acr.UserDialogs.Interface/Acr.UserDialogs.Interface.csproj b/src/Acr.UserDialogs.Interface/Acr.UserDialogs.Interface.csproj
index e2232a4e..31d743da 100644
--- a/src/Acr.UserDialogs.Interface/Acr.UserDialogs.Interface.csproj
+++ b/src/Acr.UserDialogs.Interface/Acr.UserDialogs.Interface.csproj
@@ -56,7 +56,6 @@
     <Compile Include="PromptConfig.cs" />
     <Compile Include="PromptResult.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TimeConfig.cs" />
     <Compile Include="TimeResult.cs" />
     <Compile Include="ToastConfig.cs" />
   </ItemGroup>
diff --git a/src/Acr.UserDialogs.Interface/TimeConfig.cs b/src/Acr.UserDialogs.Interface/TimeConfig.cs
deleted file mode 100644
index 3b4d579c..00000000
--- a/src/Acr.UserDialogs.Interface/TimeConfig.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Acr.UserDialogs
-{
-    public class TimeConfig
-    {
-    }
-}
diff --git a/src/Acr.UserDialogs.Uwp/ProgressContentDialog.xaml b/src/Acr.UserDialogs.Uwp/ProgressContentDialog.xaml
index 1cd73b34..65d29782 100644
--- a/src/Acr.UserDialogs.Uwp/ProgressContentDialog.xaml
+++ b/src/Acr.UserDialogs.Uwp/ProgressContentDialog.xaml
@@ -11,7 +11,7 @@
 
     <ContentDialog.Content>
         <StackPanel>
-            <TextBlock Text="{Binding Title}" FontSize="17" Foreground="White" HorizontalAlignment="Center" />
+            <TextBlock Text="{Binding Title}" FontSize="17" Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" />
             <ProgressBar x:Name="ProgressBar" Value="{Binding PercentComplete}" HorizontalAlignment="Stretch" IsIndeterminate="{Binding IsIndeterministic}" />
             <TextBlock Text="{Binding PercentComplete}" HorizontalAlignment="Center" FontSize="17" Foreground="White" Visibility="{Binding TextPercentVisibility}" />
             <Button Visibility="{Binding CancelVisibility}" HorizontalAlignment="Center" Content="{Binding CancelText}" Command="{Binding Cancel}" />
diff --git a/src/Acr.UserDialogs.Uwp/ProgressDialog.cs b/src/Acr.UserDialogs.Uwp/ProgressDialog.cs
index a1dda2e7..44956fca 100644
--- a/src/Acr.UserDialogs.Uwp/ProgressDialog.cs
+++ b/src/Acr.UserDialogs.Uwp/ProgressDialog.cs
@@ -2,18 +2,21 @@
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 using System.Windows.Input;
+using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
 
 
-namespace Acr.UserDialogs {
-
-    public class ProgressDialog : IProgressDialog, INotifyPropertyChanged {
+namespace Acr.UserDialogs
+{
+    public class ProgressDialog : IProgressDialog, INotifyPropertyChanged
+    {
         readonly ProgressContentDialog dialog;
         Action cancelAction;
 
 
-        public ProgressDialog() {
+        public ProgressDialog()
+        {
             this.CancelVisibility = Visibility.Collapsed;
             this.IsIndeterministic = true;
             this.dialog = new ProgressContentDialog { DataContext = this };
@@ -24,9 +27,11 @@ public ProgressDialog() {
         public bool IsIndeterministic { get; private set; }
 
         bool deter;
-        public bool IsDeterministic {
+        public bool IsDeterministic
+        {
             get { return this.deter; }
-            set {
+            set
+            {
                 this.deter = value;
                 this.IsIndeterministic = !value;
                 this.TextPercentVisibility = value
@@ -45,9 +50,11 @@ public bool IsDeterministic {
 
 
         int percent;
-        public int PercentComplete {
+        public int PercentComplete
+        {
             get { return this.percent; }
-            set {
+            set
+            {
                 if (value > 100)
                     this.percent = 100;
                 else if (value < 0)
@@ -60,9 +67,11 @@ public int PercentComplete {
 
 
         Visibility textVis;
-        public Visibility TextPercentVisibility {
+        public Visibility TextPercentVisibility
+        {
             get { return this.textVis; }
-            private set {
+            private set
+            {
                 this.textVis = value;
                 this.Change();
             }
@@ -70,21 +79,25 @@ private set {
 
 
         string title;
-        public string Title {
+        public string Title
+        {
             get { return this.title; }
-            set {
+            set
+            {
                 this.title = value;
                 this.Change();
             }
         }
 
 
-        public void Dispose() {
+        public void Dispose()
+        {
             this.Hide();
         }
 
 
-        public void Hide() {
+        public void Hide()
+        {
             if (!this.IsShowing)
                 return;
 
@@ -93,14 +106,16 @@ public void Hide() {
         }
 
 
-        public void SetCancel(Action onCancel, string cancelText = "Cancel") {
+        public void SetCancel(Action onCancel, string cancelText = "Cancel")
+        {
             this.CancelVisibility = Visibility.Visible;
             this.cancelAction = onCancel;
             this.CancelText = cancelText;
         }
 
 
-        public void Show() {
+        public void Show()
+        {
             if (this.IsShowing)
                 return;
 
@@ -109,7 +124,8 @@ public void Show() {
         }
 
 
-        void Change([CallerMemberName] string property = null) {
+        void Change([CallerMemberName] string property = null)
+        {
             this.PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(property));
         }
 
@@ -118,9 +134,11 @@ void Change([CallerMemberName] string property = null) {
 
 
         string cancelText;
-        public string CancelText {
+        public string CancelText
+        {
             get { return this.cancelText; }
-            set {
+            set
+            {
                 this.cancelText = value;
                 this.Change();
             }
@@ -128,9 +146,11 @@ public string CancelText {
 
 
         Visibility cancelVisible;
-        public Visibility CancelVisibility {
+        public Visibility CancelVisibility
+        {
             get { return this.cancelVisible; }
-            private set {
+            private set
+            {
                 this.cancelVisible = value;
                 this.Change();
             }
@@ -140,11 +160,9 @@ private set {
         public event PropertyChangedEventHandler PropertyChanged;
 
 
-        protected virtual void Dispatch(Action action) {
-            CoreWindow
-                .GetForCurrentThread()
-                .Dispatcher
-                .RunAsync(CoreDispatcherPriority.Normal, () => action());
+        protected virtual void Dispatch(Action action)
+        {
+            CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action());
         }
     }
 }
diff --git a/src/Acr.UserDialogs.Uwp/UserDialogsImpl.cs b/src/Acr.UserDialogs.Uwp/UserDialogsImpl.cs
index 6f1f4187..8c731351 100644
--- a/src/Acr.UserDialogs.Uwp/UserDialogsImpl.cs
+++ b/src/Acr.UserDialogs.Uwp/UserDialogsImpl.cs
@@ -1,11 +1,12 @@
 using System;
-using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Threading.Tasks;
-using Windows.Foundation.Collections;
+using Windows.ApplicationModel.Core;
 using Windows.UI.Core;
 using Windows.UI.Popups;
+using Windows.UI.Text;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Controls.Primitives;
@@ -18,7 +19,6 @@ namespace Acr.UserDialogs
 {
     public class UserDialogsImpl : AbstractUserDialogs
     {
-
         public override void Alert(AlertConfig config)
         {
             var dialog = new MessageDialog(config.Message, config.Title ?? String.Empty);
@@ -219,7 +219,7 @@ public override void Prompt(PromptConfig config)
 
         public override void ShowImage(IBitmap image, string message, int timeoutMillis)
         {
-            this.Show(null, message, ToastConfig.SuccessBackgroundColor, timeoutMillis);
+            this.Show(image, message, ToastConfig.SuccessBackgroundColor, timeoutMillis);
         }
 
 
@@ -319,21 +319,36 @@ protected virtual void SetDefaultPrompt(ContentDialog dialog, StackPanel stack,
 
         protected virtual void Show(IBitmap image, string message, Color bgColor, int timeoutMillis)
         {
+            var stack = new StackPanel
+            {
+                HorizontalAlignment = HorizontalAlignment.Center,
+                VerticalAlignment = VerticalAlignment.Center,
+                Opacity = 0.7
+            };
+            if (image != null)
+            {
+                var source = image.ToNative();
+                stack.Children.Add(new Image { Source = source });
+            }
+            stack.Children.Add(new TextBlock
+            {
+                Text = message,
+                FontSize = 24f,
+                TextAlignment = TextAlignment.Center,
+                FontWeight = FontWeights.Bold
+            });
+
             var cd = new ContentDialog
             {
                 Background = new SolidColorBrush(bgColor.ToNative()),
-                Content = new TextBlock { Text = message }
+                BorderBrush = new SolidColorBrush(bgColor.ToNative()),
+                Content = stack
             };
+            stack.Tapped += (sender, args) => cd.Hide();
+
             this.Dispatch(() => cd.ShowAsync());
             Task.Delay(TimeSpan.FromMilliseconds(timeoutMillis))
-                .ContinueWith(x =>
-                {
-                    try
-                    {
-                        this.Dispatch(() => cd.Hide());
-                    }
-                    catch { }
-                });
+                .ContinueWith(x => this.Dispatch(cd.Hide));
         }
 
 
@@ -345,10 +360,8 @@ protected override IProgressDialog CreateDialogInstance()
 
         protected virtual void Dispatch(Action action)
         {
-            CoreWindow
-                .GetForCurrentThread()
-                .Dispatcher
-                .RunAsync(CoreDispatcherPriority.Normal, () => action());
+            //this.UiDispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action());
+            CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => action());
         }
 
 #endregion