#585 Move conductor logic to Screen

Caliburn-Micro · Mar 31, 2019 · d0fd1d8 · d0fd1d8
1 parent c18470a
commit d0fd1d8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 36 deletions.
diff --git a/src/Caliburn.Micro.Core/Screen.cs b/src/Caliburn.Micro.Core/Screen.cs
@@ -157,13 +157,16 @@ public virtual Task<bool> CanCloseAsync(CancellationToken cancellationToken)
         /// Also provides an opportunity to pass a dialog result to it's corresponding view.
         /// </summary>
         /// <param name="dialogResult">The dialog result.</param>
-        public virtual Task TryCloseAsync(bool? dialogResult = null)
+        public virtual async Task TryCloseAsync(bool? dialogResult = null)
         {
-            var closeAction = PlatformProvider.Current.GetViewCloseAction(this, Views.Values, dialogResult);
+            if (Parent is IConductor conductor)
+            {
+                await conductor.CloseItemAsync(this, CancellationToken.None);
+            }
 
-            Execute.OnUIThreadAsync(async () => await closeAction(CancellationToken.None));
+            var closeAction = PlatformProvider.Current.GetViewCloseAction(this, Views.Values, dialogResult);
 
-            return Task.FromResult(true);
+            await Execute.OnUIThreadAsync(async () => await closeAction(CancellationToken.None));
         }
 
         /// <summary>

diff --git a/src/Caliburn.Micro.Platform/Platforms/Android/AndroidPlatformProvider.cs b/src/Caliburn.Micro.Platform/Platforms/Android/AndroidPlatformProvider.cs
@@ -163,18 +163,6 @@ public virtual void ExecuteOnLayoutUpdated(object view, Action<object> handler)
         /// <returns>An <see cref="Action"/> to close the view model.</returns>
         public virtual Func<CancellationToken, Task> GetViewCloseAction(object viewModel, ICollection<object> views, bool? dialogResult)
         {
-            var child = viewModel as IChild;
-
-            if (child != null)
-            {
-                var conductor = child.Parent as IConductor;
-
-                if (conductor != null)
-                {
-                    return ct => conductor.CloseItemAsync(viewModel, ct);
-                }
-            }
-
             return ct =>
             {
                 LogManager.GetLog(typeof(Screen)).Info("TryClose requires a parent IConductor or a view with a Close method or IsOpen property.");

diff --git a/src/Caliburn.Micro.Platform/Platforms/iOS/iOSPlatformProvider.cs b/src/Caliburn.Micro.Platform/Platforms/iOS/iOSPlatformProvider.cs
@@ -152,18 +152,6 @@ public virtual void ExecuteOnLayoutUpdated(object view, Action<object> handler)
         /// <returns>An <see cref="Action"/> to close the view model.</returns>
         public virtual Func<CancellationToken, Task> GetViewCloseAction(object viewModel, ICollection<object> views, bool? dialogResult)
         {
-            var child = viewModel as IChild;
-
-            if (child != null)
-            {
-                var conductor = child.Parent as IConductor;
-
-                if (conductor != null)
-                {
-                    return ct => conductor.CloseItemAsync(viewModel, ct);
-                }
-            }
-
             return ct =>
             {
                 LogManager.GetLog(typeof(Screen)).Info("TryClose requires a parent IConductor or a view with a Close method or IsOpen property.");

diff --git a/src/Caliburn.Micro.Platform/XamlPlatformProvider.cs b/src/Caliburn.Micro.Platform/XamlPlatformProvider.cs
@@ -169,14 +169,6 @@ public virtual void ExecuteOnLayoutUpdated(object view, Action<object> handler)
         /// <exception cref="System.NotImplementedException"></exception>
         public virtual Func<CancellationToken, Task> GetViewCloseAction(object viewModel, ICollection<object> views, bool? dialogResult)
         {
-            var child = viewModel as IChild;
-            if (child != null) {
-                var conductor = child.Parent as IConductor;
-                if (conductor != null) {
-                    return ct => conductor.CloseItemAsync(viewModel, ct);
-                }
-            }
-
             foreach (var contextualView in views) {
                 var viewType = contextualView.GetType();
 #if WINDOWS_UWP