Merge pull request #211 from CommunityToolkit/llama/port-notifications

🧪 Bring over StackedNotificationsBehavior from Toolkit
CommunityToolkit · Nov 18, 2022 · 3882ace · 3882ace
2 parents ccc5935 + 4bb8fd1
commit 3882ace
Show file tree

Hide file tree

Showing 45 changed files with 1,763 additions and 10 deletions.
diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/Markdown/MarkdownTextBlock.cs b/common/CommunityToolkit.Labs.Shared/Renderers/Markdown/MarkdownTextBlock.cs
@@ -23,4 +23,15 @@ namespace CommunityToolkit.Labs.Shared.Renderers;
 /// </summary>
 public partial class MarkdownTextBlock : ToolkitMTB
 {
+#if HAS_UNO
+    //// Polyfill dummy for event callback
+    #pragma warning disable CS0067 // Unused on purpose for polyfill
+    public event EventHandler<LinkClickedEventArgs>? LinkClicked;
+    #pragma warning restore CS0067 // Unused on purpose for polyfill
+#endif
 }
+
+#if HAS_UNO
+//// Polyfill dummy for event callback
+public class LinkClickedEventArgs : EventArgs { }
+#endif
diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml
@@ -18,6 +18,7 @@
         <DataTemplate x:Key="DocumentTemplate"
                       x:DataType="x:String">
             <renderer:MarkdownTextBlock Background="Transparent"
+                                        LinkClicked="MarkdownTextBlock_LinkClicked"
                                         Text="{Binding}"
                                         TextWrapping="WrapWholeWords" />
         </DataTemplate>

diff --git a/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs b/common/CommunityToolkit.Labs.Shared/Renderers/ToolkitDocumentationRenderer.xaml.cs
@@ -5,6 +5,15 @@
 using CommunityToolkit.Labs.Core.SourceGenerators;
 using CommunityToolkit.Labs.Core.SourceGenerators.Metadata;
 using Windows.Storage;
+using Windows.System;
+
+#if !HAS_UNO
+#if !WINAPPSDK
+using Microsoft.Toolkit.Uwp.UI.Controls;
+#else
+using CommunityToolkit.WinUI.UI.Controls;
+#endif
+#endif
 
 namespace CommunityToolkit.Labs.Shared.Renderers;
 
@@ -113,8 +122,12 @@ private async Task LoadData()
                 index = match.Index + match.Length;
             }
 
-            // Put rest of text at end
-            DocsAndSamples.Add(doctext.Substring(index));
+            var rest = doctext.Substring(index).Trim();
+            // Put rest of text at end (if any)
+            if (rest.Length > 0)
+            {
+                DocsAndSamples.Add(rest);
+            }
         }
     }
 
@@ -174,4 +187,30 @@ private static async Task<string> GetDocumentationFileContents(ToolkitFrontMatte
             return $"Exception Encountered Loading file '{fileUri}':\n{e.Message}\n{e.StackTrace}";
         }
     }
+
+
+#if HAS_UNO
+    private void MarkdownTextBlock_LinkClicked(object sender, LinkClickedEventArgs e)
+    {
+        // No-op - TODO: See https://github.com/CommunityToolkit/Labs-Windows/issues/151
+    }
+#elif !HAS_UNO
+    private async void MarkdownTextBlock_LinkClicked(object sender, LinkClickedEventArgs e)
+    {
+        if (!Uri.IsWellFormedUriString(e.Link, UriKind.Absolute))
+        {
+            await new ContentDialog
+            {
+                Title = "Windows Community Toolkit Labs Sample App",
+                Content = $"Link {e.Link} was malformed.",
+                CloseButtonText = "Close",
+                XamlRoot = XamlRoot // TODO: For UWP this is only on 1903+
+            }.ShowAsync();
+        }
+        else
+        {
+            await Launcher.LaunchUriAsync(new Uri(e.Link));
+        }
+    }
+#endif
 }
diff --git a/common/Labs.Head.Uwp.props b/common/Labs.Head.Uwp.props
@@ -1,4 +1,4 @@
-<Project>  
+<Project>
   <Import Project="$(RepositoryDirectory)common\Labs.Uwp.Base.props" />
   <Import Project="$(RepositoryDirectory)common\Labs.Head.Uwp.Dependencies.props" />
 

diff --git a/common/Labs.Uno.props b/common/Labs.Uno.props
@@ -4,6 +4,9 @@
     <ItemGroup Condition="'$(IsUno)' == 'true'">
         <PackageReference Include="Uno.UI" Version="4.6.18" />
     </ItemGroup>
+    <PropertyGroup Condition="'$(IsUno)' == 'true'">
+        <UnoUIUseRoslynSourceGenerators>true</UnoUIUseRoslynSourceGenerators>
+    </PropertyGroup>
 
     <ItemGroup Condition="'$(IsWasm)' == 'true' OR '$(IsWpf)' == 'true' OR '$(IsGtk)' == 'true'">
         <PackageReference Include="Uno.UI.RemoteControl" Version="4.6.18" Condition="'$(Configuration)'=='Debug'" />

diff --git a/common/Labs.Uwp.Base.props b/common/Labs.Uwp.Base.props
@@ -8,6 +8,10 @@
     <IncludeContentInPack>false</IncludeContentInPack>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+  </PropertyGroup>
+
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
@@ -44,7 +48,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
@@ -69,7 +72,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
@@ -82,7 +84,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
@@ -95,7 +96,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
@@ -120,7 +120,6 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj b/labs/CanvasLayout/src/CommunityToolkit.Labs.WinUI.CanvasLayout.csproj
@@ -18,7 +18,7 @@
     <Description>
       This package contains a CanvasLayout Layout for ItemsRepeater.
     </Description>
-    <Version>0.0.1</Version>
+    <Version>0.0.2</Version>
   </PropertyGroup>
 
   <!-- XAML Pages are automatically included, and don't need to be specified here. -->

diff --git a/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj b/labs/SizerBase/src/CommunityToolkit.Labs.WinUI.SizerBase.csproj
@@ -18,7 +18,7 @@
     <Description>
       This package contains SizerBase.
     </Description>
-    <Version>0.0.2</Version>
+    <Version>0.0.3</Version>
   </PropertyGroup>
 
   <!-- XAML Pages are automatically included, and don't need to be specified here. -->