Merge branch 'master' into sampleAppMediaFix

Author: azchohfi

Microsoft.Toolkit.HighPerformance/Extensions/NullableExtensions.cs

@@ -0,0 +1,55 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+// This extension is restricted to the .NET 5 because it shares the same BCL
+// across all targets, ensuring that the layout of our Nullable<T> mapping type
+// will be correct. Exposing this API on older targets (especially .NET Standard)
+// is not guaranteed to be correct and could result in invalid memory accesses.
+#if NET5_0
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.Toolkit.HighPerformance.Extensions
+{
+    /// <summary>
+    /// Helpers for working with the <see cref="Nullable{T}"/> type.
+    /// </summary>
+    public static class NullableExtensions
+    {
+        /// <summary>
+        /// Returns a reference to the value of the input <see cref="Nullable{T}"/> instance, regardless of whether
+        /// the <see cref="Nullable{T}.HasValue"/> property is returning <see langword="true"/> or not. If that is not
+        /// the case, this method will still return a reference to the underlying <see langword="default"/> value.
+        /// </summary>
+        /// <typeparam name="T">The type of the underlying value</typeparam>
+        /// <param name="value">The <see cref="Nullable{T}"/></param>
+        /// <returns>A reference to the underlying value from the input <see cref="Nullable{T}"/> instance.</returns>
+        /// <remarks>
+        /// Note that attempting to mutate the returned reference will not change the value returned by <see cref="Nullable{T}.HasValue"/>.
+        /// That means that reassigning the value of an empty instance will not make <see cref="Nullable{T}.HasValue"/> return <see langword="true"/>.
+        /// </remarks>
+        public static ref T DangerousGetValueOrDefaultReference<T>(this ref T? value)
+            where T : struct
+        {
+            return ref Unsafe.As<T?, RawNullableData<T>>(ref value).Value;
+        }
+
+        /// <summary>
+        /// Mapping type that reflects the internal layout of the <see cref="Nullable{T}"/> type.
+        /// See https://github.com/dotnet/runtime/blob/master/src/libraries/System.Private.CoreLib/src/System/Nullable.cs.
+        /// </summary>
+        /// <typeparam name="T">The value type wrapped by the current instance.</typeparam>
+        private struct RawNullableData<T>
+            where T : struct
+        {
+#pragma warning disable CS0649 // Unassigned fields
+            public bool HasValue;
+            public T Value;
+#pragma warning restore CS0649
+        }
+    }
+}
+
+#endif

Microsoft.Toolkit.Uwp.DeveloperTools/FocusTracker/FocusTracker.cs

@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Windows.System;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Controls;
@@ -45,7 +46,7 @@ private static void OnIsActiveChanged(DependencyObject d, DependencyPropertyChan
             }
         }
 
-        private DispatcherTimer updateTimer;
+        private DispatcherQueueTimer updateTimer;
         private TextBlock controlName;
         private TextBlock controlType;
         private TextBlock controlAutomationName;
@@ -72,7 +73,7 @@ private void Start()
         {
             if (updateTimer == null)
             {
-                updateTimer = new DispatcherTimer();
+                updateTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
                 updateTimer.Tick += UpdateTimer_Tick;
             }
 

Microsoft.Toolkit.Uwp.Input.GazeInteraction/GazePointer.cs

@@ -11,6 +11,7 @@
 using Windows.Devices.Input.Preview;
 using Windows.Foundation;
 using Windows.Foundation.Collections;
+using Windows.System;
 using Windows.UI;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
@@ -354,7 +355,7 @@ private GazePointer()
             _gazeCursor = new GazeCursor();
 
             // timer that gets called back if there gaze samples haven't been received in a while
-            _eyesOffTimer = new DispatcherTimer();
+            _eyesOffTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
             _eyesOffTimer.Tick += OnEyesOff;
 
             // provide a default of GAZE_IDLE_TIME microseconds to fire eyes off
@@ -860,7 +861,7 @@ private void OnDeviceRemoved(GazeDeviceWatcherPreview sender, GazeDeviceWatcherR
 
         private readonly List<int> _roots = new List<int>();
 
-        private readonly DispatcherTimer _eyesOffTimer;
+        private readonly DispatcherQueueTimer _eyesOffTimer;
 
         private readonly GazeCursor _gazeCursor;
 

Microsoft.Toolkit.Uwp.SampleApp/Data/PhotoDataItem.cs

@@ -11,5 +11,10 @@ public class PhotoDataItem
         public string Category { get; set; }
 
         public string Thumbnail { get; set; }
+
+        public override string ToString()
+        {
+            return Title;
+        }
     }
 }

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

@@ -272,6 +272,7 @@
     <Content Include="Icons\More.png" />
     <Content Include="Icons\Notifications.png" />
     <Content Include="Icons\Services.png" />
+    <Content Include="SamplePages\Primitives\SwitchPresenter.png" />
     <Content Include="SamplePages\TabbedCommandBar\TabbedCommandBar.png" />
     <Content Include="SamplePages\Animations\Effects\FadeBehavior.png" />
     <Content Include="SamplePages\ColorPicker\ColorPicker.png" />
@@ -495,6 +496,8 @@
     <Compile Include="SamplePages\ColorPicker\ColorPickerPage.xaml.cs">
       <DependentUpon>ColorPickerPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="SamplePages\EnumValuesExtension\Animal.cs" />
+    <Compile Include="SamplePages\EnumValuesExtension\AnimalToColorConverter.xaml.cs" />
     <Compile Include="SamplePages\EnumValuesExtension\EnumValuesExtensionPage.xaml.cs">
       <DependentUpon>EnumValuesExtensionPage.xaml</DependentUpon>
     </Compile>
@@ -614,6 +617,8 @@
     <Content Include="SamplePages\Animations\Behaviors\RotateBehaviorXaml.bind" />
     <Content Include="SamplePages\Animations\Effects\EffectAnimations.bind" />
     <Content Include="SamplePages\VisualEffectFactory\VisualEffectFactory.bind" />
+    <Content Include="SamplePages\Animations\Activities\InvokeActionsActivityCode.bind" />
+    <Content Include="SamplePages\Animations\Activities\StartAnimationActivityCode.bind" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="App.xaml.cs">
@@ -974,6 +979,9 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Content Include="SamplePages\Primitives\SwitchPresenter.bind">
+      <SubType>Designer</SubType>
+    </Content>
     <Page Include="SamplePages\TilesBrush\TilesBrushPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>

Microsoft.Toolkit.Uwp.SampleApp/Models/Sample.cs

@@ -16,6 +16,7 @@
 using System.Text.Json.Serialization;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+
 // TODO Reintroduce graph controls
 // using Microsoft.Toolkit.Graph.Converters;
 // using Microsoft.Toolkit.Graph.Providers;

Microsoft.Toolkit.Uwp.SampleApp/Pages/About.xaml

@@ -158,7 +158,7 @@
                               Grid.Column="1"
                               animations:Implicit.Animations="{StaticResource ImplicitOffset}">
                             <StackPanel>
-                                <TextBlock Style="{StaticResource AboutPageHeader}">Recent Activity</TextBlock>
+                                <TextBlock Style="{StaticResource AboutPageHeader}" Text="Recent Activity"/>
 
                                 <Grid Margin="0,16,0,0">
                                     <TextBlock FontFamily="Segoe UI"
@@ -195,7 +195,7 @@
 
                             <StackPanel x:Name="ReleaseNotesPanel"
                                         animations:Implicit.Animations="{StaticResource ImplicitOffset}">
-                                <TextBlock Style="{StaticResource AboutPageHeader}">Release Notes</TextBlock>
+                                <TextBlock Style="{StaticResource AboutPageHeader}" Text="Release Notes"/>
                                 <ItemsControl Margin="0,16,0,0"
                                               ItemTemplate="{StaticResource ReleaseNoteTemplate}"
                                               ItemsSource="{x:Bind GitHubReleases, Mode=OneWay}" />
@@ -254,7 +254,7 @@
                                          animations:Implicit.Animations="{StaticResource ImplicitOffset}"
                                          NavigateUri="https://go.microsoft.com/fwlink/?LinkId=521839"
                                          Style="{StaticResource AboutHyperlinkButtonStyle}">
-                            <TextBlock>Privacy statement</TextBlock>
+                            <TextBlock Text="Privacy statement"/>
                         </HyperlinkButton>
                     </Grid>
                 </ScrollViewer>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Activities/InvokeActionsActivityCode.bind

@@ -0,0 +1,15 @@
+using Microsoft.Toolkit.Uwp.UI.Animations;
+
+// Fade out the TextBlock
+await AnimationBuilder
+    .Create()
+    .Opacity(from: 1, to: 0, duration: TimeSpan.FromSeconds(1), easingType: EasingType.Linear)
+    .StartAsync(MyText);
+
+// Change the text and the sound here...
+
+// Fade the TextBlock back in
+await AnimationBuilder
+    .Create()
+    .Opacity(to: 1, duration: TimeSpan.FromSeconds(1), easingType: EasingType.Linear)
+    .StartAsync(MyText);

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/Animations/Activities/StartAnimationActivityCode.bind

@@ -0,0 +1,40 @@
+using Microsoft.Toolkit.Uwp.UI.Animations;
+
+// Move the button down and then back up
+AnimationBuilder
+    .Create()
+    .Translation(Axis.Y).TimedKeyFrames(b => b
+        .KeyFrame(TimeSpan.Zero, 0)
+        .KeyFrame(TimeSpan.FromSeconds(3), 32, EasingType.Linear)
+        .KeyFrame(TimeSpan.FromSeconds(9), 32, EasingType.Linear)
+        .KeyFrame(TimeSpan.FromSeconds(12), 0, EasingType.Linear))
+    .Start(MyButton);
+
+// Fade the image out and then back in
+AnimationBuilder
+    .Create()
+    .Opacity().TimedKeyFrames(
+        delay: TimeSpan.FromSeconds(3),
+        build: b => b
+        .KeyFrame(TimeSpan.Zero, 1)
+        .KeyFrame(TimeSpan.FromSeconds(3), 0, EasingType.Linear)
+        .KeyFrame(TimeSpan.FromSeconds(6), 1, EasingType.Linear))
+    .Start(MyImage);
+    
+// Alternatively, a simpler but less efficient solution involves separate animations
+await AnimationBuilder
+    .Create()
+    .Translation(Axis.Y, to: 32, duration: TimeSpan.FromSeconds(3), easingType: EasingType.Linear)
+    .StartAsync(MyButton);
+await AnimationBuilder
+    .Create()
+    .Opacity(to: 0, duration: TimeSpan.FromSeconds(3), easingType: EasingType.Linear)
+    .StartAsync(MyImage);
+await AnimationBuilder
+    .Create()
+    .Opacity(to: 1, duration: TimeSpan.FromSeconds(3), easingType: EasingType.Linear)
+    .StartAsync(MyImage);
+await AnimationBuilder
+    .Create()
+    .Translation(Axis.Y, to: 0, duration: TimeSpan.FromSeconds(3), easingType: EasingType.Linear)
+    .StartAsync(MyButton);

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/CameraHelper/CameraHelperPage.xaml

@@ -17,11 +17,11 @@
         <ComboBox x:Name="FrameSourceGroupCombo" Header="Frame Source Group" HorizontalAlignment="Left" Width="Auto">
             <ComboBox.ItemTemplate>
                 <DataTemplate>
-                    <TextBlock Text="{Binding DisplayName}"></TextBlock>
+                    <TextBlock Text="{Binding DisplayName}"/>
                 </DataTemplate>
             </ComboBox.ItemTemplate>
         </ComboBox>
-        <TextBlock x:Name="CameraErrorTextBlock" Style="{StaticResource ErrorMessageStyle}"  Margin="0,0,0,10" Visibility="Collapsed"></TextBlock>
+        <TextBlock x:Name="CameraErrorTextBlock" Style="{StaticResource ErrorMessageStyle}"  Margin="0,0,0,10" Visibility="Collapsed"/>
         <Button x:Name="CaptureButton" Content="Capture Video Frame" Margin="0,10" Click="CaptureButton_Click"></Button>
         <Image x:Name="CurrentFrameImage" MinWidth="300" Width="400" HorizontalAlignment="Left"></Image>
     </StackPanel>