Merge branch 'master' into feature/new-bithelper-apis

Author: Sergio0694

.github/ISSUE_TEMPLATE/bug_report.md

@@ -42,13 +42,15 @@ Windows 10 Build Number:
 - [ ] April 2018 Update (17134)
 - [ ] October 2018 Update (17763)
 - [ ] May 2019 Update (18362)
+- [ ] May 2020 Update (19041)
 - [ ] Insider Build (build number: )
 
 App min and target version:
 - [ ] Fall Creators Update (16299)
 - [ ] April 2018 Update (17134)
 - [ ] October 2018 Update (17763)
 - [ ] May 2019 Update (18362)
+- [ ] May 2020 Update (19041)
 - [ ] Insider Build (xxxxx)
 
 Device form factor:

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,4 +1,5 @@
-## Fixes #<!-- Link to relevant issue (for ex: #1234) which will automatically close the issue once the PR is merged. -->
+## Fixes #
+<!-- Add the relevant issue number after the "#" mentioned above (for ex: Fixes #1234) which will automatically close the issue once the PR is merged. -->
 
 <!-- Add a brief overview here of the feature/bug & fix. -->
 

Microsoft.Toolkit.Parsers/Markdown/Blocks/YamlHeaderBlock.cs

@@ -78,7 +78,6 @@ internal static YamlHeaderBlock Parse(string markdown, int start, int end, out i
                 else if (end - pos >= 3 && markdown.Substring(pos, 3) == "---")
                 {
                     lockedFinalUnderline = true;
-                    realEndIndex = pos + 3;
                     break;
                 }
                 else if (startOfNextLine == pos + 1)
@@ -134,6 +133,7 @@ internal static YamlHeaderBlock Parse(string markdown, int start, int end, out i
                 return null;
             }
 
+            realEndIndex = pos + 3;
             return result;
         }
 

Microsoft.Toolkit.Services/Microsoft.Toolkit.Services.csproj

@@ -19,6 +19,11 @@
     <DefineConstants Condition="'$(DisableImplicitFrameworkDefines)' != 'true'">$(DefineConstants);WINRT</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net462'">
+    <UseWpf>true</UseWpf>
+    <EnableDefaultPageItems>false</EnableDefaultPageItems>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Microsoft.Toolkit.Parsers\Microsoft.Toolkit.Parsers.csproj" />
     <ProjectReference Include="..\Microsoft.Toolkit\Microsoft.Toolkit.csproj" />
@@ -40,28 +45,9 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)'=='net462'">
-    <Reference Include="System.Data" />
-    <Reference Include="System.ComponentModel" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows" />
-    <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <PackageReference Include="Microsoft.Toolkit.Wpf.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
     <PackageReference Include="Microsoft.Toolkit.Forms.UI.Controls.WebView" Version="[5.0.0-preview.gb86cb1c4cb,)" />
-    <Page Update="PlatformSpecific\NetFramework\PopupWPF.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Update="PlatformSpecific\NetFramework\PopupWPF.xaml.cs">
-      <DependentUpon>PlatformSpecific\NetFramework\PopupWPF.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
   </ItemGroup>
 
   <ItemGroup Condition="!('$(TargetFramework)'=='uap10.0.16299')">

Microsoft.Toolkit.Uwp.Notifications/Microsoft.Toolkit.Uwp.Notifications.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;uap10.0;native;net461;netcoreapp3.1</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
     <Title>Windows Community Toolkit Notifications</Title>
     <Description>

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationCode.bind

@@ -46,21 +46,29 @@ if (isTemplatePresent && inAppNotificationWithButtonsTemplate is DataTemplate)
     ExampleInAppNotification.Show(inAppNotificationWithButtonsTemplate as DataTemplate);
 }
 
+// Show notification using an object
+<controls:InAppNotification
+    x:Name="ExampleInAppNotification"
+    ContentTemplate="{StaticResource MyNotificationDataTemplate}" />
+
+var notificationData = new MyNotificationData("Title", "Message");
+ExampleInAppNotification.Show(notificationData, duration: 2000);
+
 // Dismiss notification
 ExampleInAppNotification.Dismiss();
 
 // ## C# - Handle button events
 
 private void YesButton_Click(object sender, RoutedEventArgs e)
 {
-	// TODO : Do something when user accepted
+    // TODO : Do something when user accepted
 
     ExampleInAppNotification.Dismiss();
 }
 
 private void NoButton_Click(object sender, RoutedEventArgs e)
 {
-	// TODO : Do something when user refused
+    // TODO : Do something when user refused
 
     ExampleInAppNotification.Dismiss();
 }

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationPage.xaml.cs

@@ -2,10 +2,11 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-using System;
-using System.Windows.Input;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.Toolkit.Uwp.UI.Extensions;
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -57,6 +58,15 @@ private void Load()
                 _exampleInAppNotification?.Show(GetRandomText(), NotificationDuration);
             });
 
+            SampleController.Current.RegisterNewCommand("Show notification with object", (sender, args) =>
+            {
+                _exampleVSCodeInAppNotification?.Dismiss();
+                SetDefaultControlTemplate();
+
+                var random = new Random();
+                _exampleInAppNotification?.Show(new KeyValuePair<int, string>(random.Next(1, 10), GetRandomText()), NotificationDuration);
+            });
+
             SampleController.Current.RegisterNewCommand("Show notification with buttons (without DataTemplate)", (sender, args) =>
             {
                 _exampleVSCodeInAppNotification?.Dismiss();

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/InAppNotification/InAppNotificationXaml.bind

@@ -153,7 +153,8 @@
                           <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
 
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                        <ContentPresenter x:Name="PART_Presenter"
+                                          HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                           HorizontalContentAlignment="Stretch"
                                           VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                           VerticalContentAlignment="Center"
@@ -333,7 +334,8 @@
                                     <ColumnDefinition Width="Auto" />
                                 </Grid.ColumnDefinitions>
 
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
+                                <ContentPresenter x:Name="PART_Presenter"
+                                                  HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                                                   HorizontalContentAlignment="Stretch"
                                                   VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                                   VerticalContentAlignment="Center"
@@ -376,7 +378,17 @@
                                     AnimationDuration="@[AnimationDuration:TimeSpan:100:0-5000]"
                                     VerticalOffset="@[VerticalOffset:DoubleSlider:100.0:-200.0-200.0]"
                                     HorizontalOffset="@[HorizontalOffset:DoubleSlider:0.0:-200.0-200.0]"
-                                    StackMode="@[StackMode:Enum:StackMode.Replace]" />
+                                    StackMode="@[StackMode:Enum:StackMode.Replace]">
+            <controls:InAppNotification.ContentTemplate>
+               <DataTemplate>
+                    <StackPanel>
+                        <TextBlock Text="{Binding Value}" Margin="0,0,0,8" />
+                        <TextBlock Text="{Binding Key}" Style="{ThemeResource CaptionTextBlockStyle}" Opacity="0.8" />
+                    </StackPanel>
+                </DataTemplate>
+            </controls:InAppNotification.ContentTemplate>
+        </controls:InAppNotification>
+          
 
         <controls:InAppNotification x:Name="ExampleCustomInAppNotification"
                                     Style="{StaticResource MSEdgeNotificationTemplate_NoDismissButton}"

Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Constants.cs

@@ -28,5 +28,10 @@ public partial class InAppNotification
         /// Key of the UI Element that dismiss the control
         /// </summary>
         private const string DismissButtonPart = "PART_DismissButton";
+
+        /// <summary>
+        /// Key of the UI Element that will display the notification content.
+        /// </summary>
+        private const string ContentPresenterPart = "PART_Presenter";
     }
 }

Microsoft.Toolkit.Uwp.UI.Controls/InAppNotification/InAppNotification.Events.cs

@@ -3,9 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using Microsoft.Toolkit.Uwp.Extensions;
 using Windows.UI.Xaml;
-using Windows.UI.Xaml.Automation;
 using Windows.UI.Xaml.Automation.Peers;
 
 namespace Microsoft.Toolkit.Uwp.UI.Controls
@@ -45,44 +43,39 @@ private void DismissTimer_Tick(object sender, object e)
             Dismiss(InAppNotificationDismissKind.Timeout);
         }
 
-        private void OpenAnimationTimer_Tick(object sender, object e)
+        private void OnCurrentStateChanged(object sender, VisualStateChangedEventArgs e)
         {
-            lock (_openAnimationTimer)
+            switch (e.NewState.Name)
             {
-                _openAnimationTimer.Stop();
-                Opened?.Invoke(this, EventArgs.Empty);
-                SetValue(AutomationProperties.NameProperty, StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_NameProperty", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources"));
-                if (ContentTemplateRoot != null)
-                {
-                    var peer = FrameworkElementAutomationPeer.CreatePeerForElement(ContentTemplateRoot);
-                    if (Content?.GetType() == typeof(string))
-                    {
-                        AutomateTextNotification(peer, Content.ToString());
-                    }
-                }
+                case StateContentVisible:
+                    OnNotificationVisible();
+                    break;
+                case StateContentCollapsed:
+                    OnNotificationCollapsed();
+                    break;
             }
         }
 
-        private void AutomateTextNotification(AutomationPeer peer, string message)
+        private void OnNotificationVisible()
         {
-            if (peer != null)
-            {
-                peer.SetFocus();
-                peer.RaiseNotificationEvent(
-                    AutomationNotificationKind.Other,
-                    AutomationNotificationProcessing.ImportantMostRecent,
-                    StringExtensions.GetLocalized("WindowsCommunityToolkit_InAppNotification_Events_NewNotificationMessage", "/Microsoft.Toolkit.Uwp.UI.Controls/Resources") + message,
-                    Guid.NewGuid().ToString());
-            }
+            Opened?.Invoke(this, EventArgs.Empty);
+        }
+
+        private void OnNotificationCollapsed()
+        {
+            Closed?.Invoke(this, new InAppNotificationClosedEventArgs(_lastDismissKind));
+            Visibility = Visibility.Collapsed;
         }
 
-        private void ClosingAnimationTimer_Tick(object sender, object e)
+        private void RaiseAutomationNotification()
         {
-            lock (_closingAnimationTimer)
+            if (!AutomationPeer.ListenerExists(AutomationEvents.LiveRegionChanged))
             {
-                _closingAnimationTimer.Stop();
-                Closed?.Invoke(this, new InAppNotificationClosedEventArgs(_lastDismissKind));
+                return;
             }
+
+            var peer = FrameworkElementAutomationPeer.CreatePeerForElement(this);
+            peer.RaiseAutomationEvent(AutomationEvents.LiveRegionChanged);
         }
     }
 }