Merge pull request #991 from Caliburn-Micro/bug/AvaloniaUI/968

Fix Avalonia UI feature conductor screen

Author: vb2ae

samples/features/Features.Avalonia/Bootstrapper.cs

@@ -19,10 +19,13 @@ public Bootstrapper()
 
             Initialize();
 
-            Task displayTask = DisplayRootViewFor<ShellViewModel>();
-            displayTask.Wait();
+            InitializeAsync();
         }
 
+        private async void InitializeAsync()
+        {
+            await DisplayRootViewFor<ShellViewModel>();
+        }
         protected override void Configure()
         {
             _container

samples/features/Features.Avalonia/Views/ConductorView.axaml

@@ -18,7 +18,7 @@
         </StackPanel>
 
 
-        <ListBox Name="Items" Grid.Row="1" Margin="40,0">
+        <ListBox Name="Items" Grid.Row="1" Margin="40,0" SelectedItem="{Binding ActiveItem, Mode=TwoWay}">
             <ListBox.ItemsPanel>
                 <ItemsPanelTemplate>
                     <VirtualizingStackPanel Orientation="Horizontal"/>
@@ -31,16 +31,8 @@
             </ListBox.ItemTemplate>
         </ListBox>
 
-        <Panel DataContext="{Binding ActiveItem}" Grid.Row="2" Margin="40">
-            <TextBlock  Text="{Binding DisplayName}" FontSize="24" Foreground="Blue"/>
-            <ItemsControl ItemsSource="{Binding Messages}" Margin="30">
-                <ItemsControl.ItemTemplate>
-                    <DataTemplate>
-                        <TextBlock Text="{Binding}"/>
-                    </DataTemplate>
-                </ItemsControl.ItemTemplate>
-            </ItemsControl>
-        </Panel>
+        <ContentControl cal:View.Model="{Binding ActiveItem}" Grid.Row="2" Margin="40">
+        </ContentControl>
 
     </Grid>
 </UserControl>

samples/features/Features.Avalonia/Views/TabView.axaml

@@ -4,13 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:Class="Features.CrossPlatform.Views.TabView">
-    <Grid>
+    <StackPanel>
+        <TextBlock Text="{Binding DisplayName}"></TextBlock>
         <ItemsControl ItemsSource="{Binding Messages}">
             <ItemsControl.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding DisplayName}"/>
+                        <TextBlock Text="{Binding}"/>
                 </DataTemplate>
             </ItemsControl.ItemTemplate>
         </ItemsControl>
-    </Grid>
+    </StackPanel>
 </UserControl>

samples/features/Features.CrossPlatform.Shared/ViewModels/ConductorViewModel.cs

@@ -13,11 +13,6 @@ public ConductorViewModel()
             Items.CollectionChanged += (s, e) => NotifyOfPropertyChange(() => CanCloseTab);
         }
 
-        protected override async Task OnActivateAsync(CancellationToken cancellationToken)
-        {
-            // Optionally perform any logic before activation here
-            await base.OnActivateAsync(cancellationToken);
-        }
         protected override async Task OnActivatedAsync(CancellationToken cancellationToken)
         {
             // Optionally perform any logic after activation here

src/Caliburn.Micro.Avalonia.Tests/ScreenExtenstionsTests.cs renamed to src/Caliburn.Micro.Avalonia.Tests/'ScreenExtensionsTests.cs

@@ -98,7 +98,7 @@ public override Task<bool> CanCloseAsync(CancellationToken cancellationToken = d
                 return Task.FromResult(IsClosable);
             }
 
-            [Obsolete("Use OnActivateAsync instead.")]
+            [Obsolete("Use OnActivatedAsync instead.")]
             protected override async Task OnActivateAsync(CancellationToken cancellationToken)
             {
                 if (deactivationDelay.HasValue)
@@ -115,7 +115,7 @@ protected override async Task OnActivateAsync(CancellationToken cancellationToke
 
             protected override async Task OnActivatedAsync(CancellationToken cancellationToken)
             {
-                //here
+
                 if (deactivationDelay.HasValue)
                 {
                     await Task.Delay(deactivationDelay.Value, cancellationToken).ConfigureAwait(false);

src/Caliburn.Micro.Platform/ActionMessage.cs

@@ -214,7 +214,6 @@ protected override void OnAttached()
                 if (View.ExecuteOnLoad(AssociatedObject, ElementLoaded))
                 {
 #if AVALONIA
-                    //string eventName = "AttachedToLogicalTree";
                     string eventName = "Loaded";
                     var trigger = Interaction.GetBehaviors(AssociatedObject)
                         .OfType<EventTrigger>()

src/Caliburn.Micro.Platform/ConventionManager.cs

@@ -340,6 +340,8 @@ static ConventionManager()
 #endif
 #if AVALONIA
             AddElementConvention<UserControl>(UserControl.IsVisibleProperty, "DataContext", loadedEvent);
+            AddElementConvention<ListBox>(ListBox.ItemsSourceProperty, "DataContext", loadedEvent);
+            AddElementConvention<Panel>(Panel.DataContextProperty, "DataContext", loadedEvent);
 #else
             AddElementConvention<UserControl>(UserControl.VisibilityProperty, "DataContext", loadedEvent);
 #endif

src/Caliburn.Micro.Platform/View.cs

@@ -234,13 +234,13 @@ public static bool ExecuteOnLoad(FrameworkElement element, RoutedEventHandler ha
 #if AVALONIA
         public static void ExecuteOnUnload(FrameworkElement element, EventHandler handler)
         {
-            EventHandler<LogicalTreeAttachmentEventArgs> unloaded = null;
+            EventHandler<RoutedEventArgs> unloaded = null;
             unloaded = (s, e) =>
             {
-                element.DetachedFromLogicalTree -= unloaded;
+                element.Unloaded -= unloaded;
                 handler(s, e);
             };
-            element.DetachedFromLogicalTree += unloaded;
+            element.Unloaded += unloaded;
         }
 #else
         public static void ExecuteOnUnload(FrameworkElement element, RoutedEventHandler handler)