Merge pull request #9 from muak/survey/8

Nested dialogs #8

.gitignore

@@ -2,6 +2,7 @@
 ## files generated by popular Visual Studio add-ons.
 
 .vs/
+mono_crash.*
 
 # User-specific files
 *.suo

AiForms.Dialogs.Android/DialogImplementation.cs

@@ -7,13 +7,8 @@ namespace AiForms.Dialogs
     [Android.Runtime.Preserve(AllMembers = true)]
     public class DialogImplementation : IDialog
     {
-        public static readonly string ExtraDialogTag = "ExtraDialog";
-        internal ExtraPlatformDialog ExtraDialog;
-        FragmentManager FragmentManager => Dialogs.FragmentManager;
-
         public DialogImplementation()
         {
-            ExtraDialog = new ExtraPlatformDialog();
         }
 
         public IReusableDialog Create<TView>(object viewModel = null) where TView : DialogView
@@ -30,8 +25,6 @@ public IReusableDialog Create(DialogView view, object viewModel = null)
 
         public async Task<bool> ShowAsync<TView>(object viewModel = null) where TView : DialogView
         {
-            if (IsRunning()) return false;
-
             using (var dlg = Create<TView>(viewModel))
             {
                 return await dlg.ShowAsync();
@@ -40,19 +33,10 @@ public async Task<bool> ShowAsync<TView>(object viewModel = null) where TView :
 
         public async Task<bool> ShowAsync(DialogView view, object viewModel = null)
         {
-            if (IsRunning()) return false;
-
             using (var dlg = Create(view, viewModel))
             {
                 return await dlg.ShowAsync();
             }
         }
-
-        bool IsRunning()
-        {
-            var dialog = Dialogs.FragmentManager.FindFragmentByTag<ExtraPlatformDialog>(DialogImplementation.ExtraDialogTag);
-            return dialog != null;
-        }
-
     }
 }

AiForms.Dialogs.Android/ExtraPlatformDialog.cs

@@ -17,6 +17,11 @@ public class ExtraPlatformDialog : Android.App.DialogFragment
         DialogView _dialogView;
         ViewGroup _contentView;
 
+        public ExtraPlatformDialog() { }
+
+        // System Required!
+        public ExtraPlatformDialog(IntPtr handle, JniHandleOwnership transfer) :base(handle,transfer) { }
+
         public override Android.App.Dialog OnCreateDialog(Bundle savedInstanceState)
         {
             base.OnCreateDialog(savedInstanceState);

AiForms.Dialogs.Android/ReusableDialog.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using AiForms.Dialogs.Abstractions;
 using Android.App;
@@ -16,18 +17,18 @@ namespace AiForms.Dialogs
     [Android.Runtime.Preserve(AllMembers = true)]
     public class ReusableDialog:Java.Lang.Object, IReusableDialog, View.IOnKeyListener
     {
-        DialogImplementation _extraDialog;
-        ExtraPlatformDialog _platformDialog => _extraDialog.ExtraDialog;
+        ExtraPlatformDialog _platformDialog;
         FragmentManager FragmentManager => Dialogs.FragmentManager;
         DialogView _dlgView;
         IVisualElementRenderer _renderer;
         ViewGroup _contentView;
         Action OnceInitializeAction;
+        Guid _guid;
 
         public ReusableDialog(DialogView view)
         {
-            _dlgView = view;
-            _extraDialog = Dialog.Instance as DialogImplementation;
+            _dlgView = view;            
+            _guid = Guid.NewGuid();
 
             // Because the process can't be executed until application completely loads,
             // set the action here to execute later on.
@@ -125,7 +126,7 @@ void Initialize()
 
         public async Task<bool> ShowAsync()
         {
-            var dialog = FragmentManager.FindFragmentByTag<ExtraPlatformDialog>(DialogImplementation.ExtraDialogTag);
+            var dialog = FragmentManager.FindFragmentByTag<ExtraPlatformDialog>(_guid.ToString());
             if (dialog != null)
             {
                 return false;
@@ -148,7 +149,7 @@ async void complete(object sender, EventArgs e)
                 _dlgView.RunDismissalAnimation();
                 await Dismiss();
                 tcs.SetResult(true);
-            };
+            }
 
             _dlgView.DialogNotifierInternal.Canceled += cancel;
             _dlgView.DialogNotifierInternal.Completed += complete;
@@ -157,8 +158,9 @@ async void complete(object sender, EventArgs e)
             var payload = new ExtraDialogPayload(_dlgView,_contentView);
             var bundle = new Bundle();
             bundle.PutSerializable("extraDialogPayload", payload);
+            _platformDialog = new ExtraPlatformDialog();
             _platformDialog.Arguments = bundle;
-            _platformDialog.Show(FragmentManager, DialogImplementation.ExtraDialogTag);
+            _platformDialog.Show(FragmentManager, _guid.ToString());
 
             try
             {
@@ -171,6 +173,7 @@ async void complete(object sender, EventArgs e)
                 _dlgView.TearDown();
                 payload.Dispose();
                 bundle.Dispose();
+
             }
         }
 
@@ -190,16 +193,14 @@ protected override void Dispose(bool disposing)
                 if (!_renderer.View.IsDisposed())
                 {
                     _renderer.View.Dispose();
-                }
+                }                
 
                 _contentView.Dispose();
                 _contentView = null;
 
                 _renderer.Dispose();
                 _renderer = null;
 
-                _extraDialog = null;
-
                 OnceInitializeAction = null;
             }
             base.Dispose(disposing);           
@@ -256,9 +257,11 @@ void handler(object sender, Animation.AnimationEndEventArgs e)
             await tcs.Task;
             anim.AnimationEnd -= handler;
 
-            var dialog = FragmentManager.FindFragmentByTag<ExtraPlatformDialog>(DialogImplementation.ExtraDialogTag);
+            var dialog = FragmentManager.FindFragmentByTag<ExtraPlatformDialog>(_guid.ToString());
             dialog.Dismiss();
             _contentView.RemoveFromParent();
+            _platformDialog.Dispose();
+            _platformDialog = null;
 
             await Task.Delay(250); // wait for a bit time until the dialog is completely released.
         }

Sample/Sample/ViewModels/DialogTestViewModel.cs

@@ -76,7 +76,7 @@ string GetHAlignString()
 
         string GetVAlignString()
         {
-            switch (HorizontalLayoutAlignment)
+            switch (VerticalLayoutAlignment)
             {
                 case LayoutAlignment.Start:
                     return "Top";

Sample/Sample/ViewModels/SurveyPageViewModel.cs

@@ -0,0 +1,26 @@
+using System;
+using AiForms.Dialogs.Abstractions;
+using Prism.Mvvm;
+using Reactive.Bindings;
+using Sample.Views;
+using Sample.Views.Dialogs;
+
+namespace Sample.ViewModels
+{
+    public class SurveyPageViewModel:BindableBase
+    {
+        public ReactiveCommand ShowDialogCommand { get; } = new ReactiveCommand();
+        public SurveyPageViewModel()
+        {
+            var dialog = AiForms.Dialogs.Dialog.Instance;
+            ShowDialogCommand.Subscribe(async _ =>
+            {
+                var ret = await dialog.ShowAsync<TestDialog>();
+                if (ret)
+                {
+                    //await dialog.ShowAsync<DialogTestView>();
+                }
+            });
+        }
+    }
+}

Sample/Sample/Views/Dialogs/TestDialog.xaml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<extra:DialogView
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    xmlns:extra="clr-namespace:AiForms.Dialogs.Abstractions;assembly=AiForms.Dialogs.Abstractions"
+    x:Class="Sample.Views.Dialogs.TestDialog">
+
+    <Button Text="OK" Clicked="Button_Clicked" />
+
+</extra:DialogView>

Sample/Sample/Views/Dialogs/TestDialog.xaml.cs

@@ -0,0 +1,33 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using AiForms.Dialogs.Abstractions;
+using Xamarin.Forms;
+
+namespace Sample.Views.Dialogs
+{
+    public partial class TestDialog : DialogView
+    {
+        public TestDialog()
+        {
+            InitializeComponent();
+        }
+
+        void Button_Clicked(System.Object sender, System.EventArgs e)
+        {
+            Device.BeginInvokeOnMainThread(() =>
+            {
+                //(this.Parent as Page).DisplayAlert("", "Hoge","OK");
+                //(this.Parent as Page).DisplayAlert("", "Fuga", "OK");
+                AiForms.Dialogs.Dialog.Instance.ShowAsync<DialogTestView>();
+            });
+            //DialogNotifier.Complete();
+
+        }
+
+        public override void Destroy()
+        {
+
+        }
+    }
+}

Sample/Sample/Views/IndexPage.xaml

@@ -10,5 +10,6 @@
         <Button Text="AutoTest" Command="{Binding GoToTest}"  CommandParameter="AutoTest" />
         <Button Text="ManualTest" Command="{Binding GoToTest}"  CommandParameter="ManualTest" />
         <Button Text="MainPage" Command="{Binding GoToTest}"  CommandParameter="MainPage" />
+        <Button Text="SurveyPage" Command="{Binding GoToTest}" CommandParameter="SurveyPage" />
     </StackLayout>
 </ContentPage>

Sample/Sample/Views/SurveyPage.xaml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ContentPage
+    xmlns="http://xamarin.com/schemas/2014/forms"
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+    x:Class="Sample.Views.SurveyPage">
+    <Button Text="Show" Command="{Binding ShowDialogCommand}" />
+</ContentPage>

Sample/Sample/Views/SurveyPage.xaml.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+using Xamarin.Forms;
+
+namespace Sample.Views
+{
+    public partial class SurveyPage : ContentPage
+    {
+        public SurveyPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

nuget/AzurePipelines.nuspec

@@ -14,7 +14,9 @@
         </description>
         <summary></summary>
         <releaseNotes>
-First Release.
+## Changes
+
+* [Dialog][Android] Nested dialogs are now supported. #8
         </releaseNotes>
         <tags>Xamarin.Forms Xamarin dialog toast loading progress popup xaml netstandard ios android</tags>
         <language>en-US</language>