Merge pull request #24 from Panda-Sharp/develop

Add teaching tip events to runtime directives

Yugen.Mosaic.Uwp/Properties/Default.rd.xml

@@ -16,13 +16,25 @@
 -->
 
 <Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
+	<Application>
+		<!--
       An Assembly element with Name="*Application*" applies to all assemblies in
       the application package. The asterisks are not wildcards.
     -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
+		<Assembly Name="*Application*" Dynamic="Required All" />
 
-    <!-- Add your application specific runtime directives here. -->
-  </Application>
+		<!-- Add your application specific runtime directives here. -->
+		<!--<Type Name="Microsoft.UI.Xaml.Controls.TeachingTip.Closed" Dynamic="Required Public"/>-->
+		<!--<Type Name="Microsoft.UI.Xaml.Controls.ItemInvoked" Browse="Required Public"/>-->
+
+		<Type Name="Windows.Foundation.TypedEventHandler{Microsoft.UI.Xaml.Controls.TeachingTip,Microsoft.UI.Xaml.Controls.TeachingTipClosedEventArgs}" MarshalObject="Public" />
+		<Type Name="Microsoft.UI.Xaml.Controls.TeachingTip">
+			<Event Name="Closed" Dynamic="Required"/>
+		</Type>
+
+		<Type Name="Windows.Foundation.TypedEventHandler{Microsoft.UI.Xaml.Controls.TeachingTip,Microsoft.UI.Xaml.Controls.TeachingTipClosingEventArgs}" MarshalObject="Public" />
+		<Type Name="Microsoft.UI.Xaml.Controls.TeachingTip">
+			<Event Name="Closing" Dynamic="Required"/>
+		</Type>
+	</Application>
 </Directives>

Yugen.Mosaic.Uwp/ViewModels/MainViewModel.cs

@@ -77,8 +77,8 @@ public MainViewModel(IMosaicService mosaicService, IProgressService progressServ
             WhatsNewCommand = new AsyncRelayCommand(WhatsNewCommandBehavior);
             SettingsCommand = new AsyncRelayCommand(SettingsCommandBehavior);
             TeachingTipActionButtonCommand = new RelayCommand(TeachingTipActionButtonCommandBehavior);
-            //TeachingTipClosingCommand = new RelayCommand(TeachingTipClosingCommandBehavior);
-            //TeachingTipClosedCommand = new RelayCommand(TeachingTipClosedCommandBehavior);
+            TeachingTipClosingCommand = new RelayCommand(TeachingTipClosingCommandBehavior);
+            TeachingTipClosedCommand = new RelayCommand(TeachingTipClosedCommandBehavior);
         }
 
         public bool IsAddMasterUIVisible
@@ -238,9 +238,9 @@ public int Progress
 
         public ICommand TeachingTipActionButtonCommand { get; }
 
-        //public ICommand TeachingTipClosingCommand { get; }
+        public ICommand TeachingTipClosingCommand { get; }
 
-        //public ICommand TeachingTipClosedCommand { get; }
+        public ICommand TeachingTipClosedCommand { get; }
 
         private Size OutputSize => new Size(_outputWidth, _outputHeight);
 
@@ -277,15 +277,15 @@ public void TeachingTipActionButtonCommandBehavior()
             IsTeachingTipOpen = false;
         }
 
-        public void TeachingTip_Closing(TeachingTip sender, TeachingTipClosingEventArgs args)
+        public void TeachingTipClosingCommandBehavior()
         {
             TeachingTipTitle = "";
             TeachingTipSubTitle = "";
             TeachingTipTarget = null;
             IsTeachingTipOpen = false;
         }
 
-        public void TeachingTip_Closed(TeachingTip sender, TeachingTipClosedEventArgs args) => ShowTeachingTip();
+        public void TeachingTipClosedCommandBehavior() => ShowTeachingTip();
 
         private async Task AddMasterImageCommandBehavior()
         {

Yugen.Mosaic.Uwp/Views/MainPage.xaml

@@ -424,21 +424,19 @@
         </Grid>
 
         <muxc:TeachingTip x:Uid="MainTeachingTip"
-                          Closing="{x:Bind ViewModel.TeachingTip_Closing}"
-                          Closed="{x:Bind ViewModel.TeachingTip_Closed}"
                           IsOpen="{x:Bind ViewModel.IsTeachingTipOpen, Mode=OneWay}"
                           Target="{x:Bind ViewModel.TeachingTipTarget, Mode=OneWay}"
                           Title="{x:Bind ViewModel.TeachingTipTitle, Mode=OneWay}"
                           Subtitle="{x:Bind ViewModel.TeachingTipSubTitle, Mode=OneWay}"
                           ActionButtonCommand="{x:Bind ViewModel.TeachingTipActionButtonCommand}">
-            <!--<interactivity:Interaction.Behaviors>
+            <interactivity:Interaction.Behaviors>
                 <core:EventTriggerBehavior EventName="Closed">
                     <core:InvokeCommandAction Command="{x:Bind ViewModel.TeachingTipClosedCommand}" />
                 </core:EventTriggerBehavior>
                 <core:EventTriggerBehavior EventName="Closing">
                     <core:InvokeCommandAction Command="{x:Bind ViewModel.TeachingTipClosingCommand}" />
                 </core:EventTriggerBehavior>
-            </interactivity:Interaction.Behaviors>-->
+            </interactivity:Interaction.Behaviors>
         </muxc:TeachingTip>
     </Grid>
 </Page>