Merge pull request muak#12 from muak/development

Development
sawankumarbundelkhandi · Jun 6, 2020 · 7ef8672 · 7ef8672
2 parents 397c754 + 96e9558
commit 7ef8672
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 6 deletions.
diff --git a/AiForms.Dialogs.Android/DialogImplementation.cs b/AiForms.Dialogs.Android/DialogImplementation.cs
@@ -19,7 +19,10 @@ public IReusableDialog Create<TView>(object viewModel = null) where TView : Dial
 
         public IReusableDialog Create(DialogView view, object viewModel = null)
         {
-            view.BindingContext = viewModel;
+            if (viewModel != null)
+            {
+                view.BindingContext = viewModel;
+            }            
             return new ReusableDialog(view);
         }
 

diff --git a/AiForms.Dialogs.Android/LoadingImplementation.cs b/AiForms.Dialogs.Android/LoadingImplementation.cs
@@ -33,7 +33,10 @@ public IReusableLoading Create<TView>(object viewModel = null) where TView : Loa
 
         public IReusableLoading Create(LoadingView view, object viewModel = null)
         {
-            view.BindingContext = viewModel;
+            if(viewModel != null)
+            {
+                view.BindingContext = viewModel;
+            }            
             return new ReusableLoading(view,LoadingDialog);
         }
 

diff --git a/AiForms.Dialogs.Android/ToastImplementation.cs b/AiForms.Dialogs.Android/ToastImplementation.cs
@@ -26,7 +26,10 @@ public void Show<TView>(object viewModel = null) where TView : ToastView
         public void Show(ToastView view, object viewModel = null)
         {
             view.Parent = XF.Application.Current.MainPage;
-            view.BindingContext = viewModel;
+            if(viewModel != null)
+            {
+                view.BindingContext = viewModel;
+            }            
 
             var toast = new Android.Widget.Toast(Dialogs.Context);
 

diff --git a/AiForms.Dialogs.iOS/DialogImplementation.cs b/AiForms.Dialogs.iOS/DialogImplementation.cs
@@ -21,7 +21,10 @@ public IReusableDialog Create<TView>(object viewModel = null) where TView : Dial
 
         public IReusableDialog Create(DialogView view, object viewModel = null)
         {
-            view.BindingContext = viewModel;
+            if(viewModel != null)
+            {
+                view.BindingContext = viewModel;
+            }            
             return new ReusableDialog(view);
         }
 

diff --git a/AiForms.Dialogs.iOS/LoadingImplementation.cs b/AiForms.Dialogs.iOS/LoadingImplementation.cs
@@ -32,7 +32,10 @@ public IReusableLoading Create<TView>(object viewModel = null) where TView : Loa
 
         public IReusableLoading Create(LoadingView view, object viewModel = null)
         {
-            view.BindingContext = viewModel;
+            if(viewModel != null)
+            {
+                view.BindingContext = viewModel;
+            }           
             return new ReusableLoading(view);
         }
 

diff --git a/AiForms.Dialogs.iOS/ToastImplementation.cs b/AiForms.Dialogs.iOS/ToastImplementation.cs
@@ -21,7 +21,10 @@ public void Show<TView>(object viewModel = null) where TView : ToastView
 
         public void Show(ToastView view, object viewModel = null)
         {
-            view.BindingContext = viewModel;
+            if(viewModel != null)
+            {
+                view.BindingContext = viewModel;
+            }            
             view.Parent = Application.Current.MainPage;
 
             var renderer = Dialogs.CreateNativeView(view);

diff --git a/nuget/AzurePipelines.nuspec b/nuget/AzurePipelines.nuspec
@@ -16,6 +16,7 @@
         <releaseNotes>
 ## Changes
 
+* [All] If a ViewModel is specified to null, View's BindingContext is not now overwritten.
 * [Dialog][Android] Nested dialogs are now supported. #8
         </releaseNotes>
         <tags>Xamarin.Forms Xamarin dialog toast loading progress popup xaml netstandard ios android</tags>