Merge pull request #3056 from windows-toolkit/mhawker/sample-6.0

Sample App Update 6.0

Author: azchohfi

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

@@ -13,7 +13,7 @@
 
     <!-- This is a temporary workaround for https://github.com/dotnet/sdk/issues/955 -->
     <DebugType>Full</DebugType>
-    <NoWarn>CS8002</NoWarn>
+    <NoWarn>CS8002;CS0618</NoWarn>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'uap10.0.16299'">

Microsoft.Toolkit.Services/Services/MicrosoftGraph/MicrosoftGraphService.cs

@@ -15,6 +15,7 @@ namespace Microsoft.Toolkit.Services.MicrosoftGraph
     /// <summary>
     ///  Class for connecting to Office 365 Microsoft Graph
     /// </summary>
+    [Obsolete("Please use the Microsoft Graph SDK or our new providers at https://aka.ms/wgt")]
     public class MicrosoftGraphService
     {
         private readonly SemaphoreSlim _readLock = new SemaphoreSlim(1, 1);

Microsoft.Toolkit.Services/Services/MicrosoftGraph/WinForms/GraphLoginComponent.cs

@@ -16,6 +16,7 @@ namespace Microsoft.Toolkit.Services.WinForms
     /// It is implemented as a Windows Forms Component for a drag and drop experience from the toolbox.
     /// </summary>
     /// <seealso cref="IComponent" />
+    [Obsolete("Please use the new LoginButton control through XAML Islands from https://aka.ms/wgt")]
     public partial class GraphLoginComponent : Component
     {
         /// <summary>
@@ -93,6 +94,7 @@ public async Task<bool> LoginAsync()
             }
 
             // Initialize the MicrosoftGraphService
+            #pragma warning disable CS0618 // Type or member is obsolete
             if (!MicrosoftGraphService.Instance.Initialize(ClientId, delegatedPermissionScopes: Scopes))
             {
                 // error
@@ -128,6 +130,7 @@ public async Task<bool> LoginAsync()
 
             // return Microsoft.Graph.GraphServiceClient from the MicrosoftGraphService.Instance.GraphProvider
             GraphServiceClient = MicrosoftGraphService.Instance.GraphProvider;
+            #pragma warning restore CS0618 // Type or member is obsolete
             return true;
         }
     }

Microsoft.Toolkit.Services/Services/OneDrive/OneDriveService.cs

@@ -12,6 +12,7 @@ namespace Microsoft.Toolkit.Services.OneDrive
     /// <summary>
     ///  Class using OneDrive API
     /// </summary>
+    [Obsolete("Please use the Microsoft Graph SDK or our new providers at https://aka.ms/wgt")]
     public class OneDriveService
     {
         /// <summary>
@@ -57,6 +58,7 @@ public class OneDriveService
         /// <summary>
         /// Gets a reference to an instance of the underlying data provider.
         /// </summary>
+        #pragma warning disable CS0618 // Type or member is obsolete
         public MicrosoftGraphService Provider
         {
             get
@@ -69,6 +71,7 @@ public MicrosoftGraphService Provider
                 return MicrosoftGraphService.Instance;
             }
         }
+        #pragma warning restore CS0618 // Type or member is obsolete
 
         /// <summary>
         /// Intializes OneDrive service.

Microsoft.Toolkit.Uwp.SampleApp/Assets/Photos/Backgrounds/HERO.jpg

@@ -0,0 +1,85 @@
+// 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.
+
+using System;
+using System.Text.RegularExpressions;
+using Microsoft.Toolkit.Uwp.UI.Behaviors;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Documents;
+using Windows.UI.Xaml.Media;
+
+namespace Microsoft.Toolkit.Uwp.SampleApp.Common
+{
+    public class TextBlockHyperlinkBehavior : BehaviorBase<TextBlock>
+    {
+        //// From: http://urlregex.com/
+        private static readonly Regex UrlRegex = new Regex(@"(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_]*)?", RegexOptions.Compiled);
+
+        private long? _textChangedRegistration;
+
+        public Brush Foreground { get; set; }
+
+        protected override bool Initialize()
+        {
+            if (_textChangedRegistration == null)
+            {
+                _textChangedRegistration = AssociatedObject.RegisterPropertyChangedCallback(TextBlock.TextProperty, Text_PropertyChanged);
+            }
+
+            return base.Initialize();
+        }
+
+        protected override void OnDetaching()
+        {
+            if (AssociatedObject != null && _textChangedRegistration != null && _textChangedRegistration.HasValue)
+            {
+                AssociatedObject.UnregisterPropertyChangedCallback(TextBlock.TextProperty, _textChangedRegistration.Value);
+            }
+
+            base.OnDetaching();
+        }
+
+        private void Text_PropertyChanged(DependencyObject sender, DependencyProperty dp)
+        {
+            if (AssociatedObject != null && !string.IsNullOrWhiteSpace(AssociatedObject.Text))
+            {
+                var first = true;
+                var text = AssociatedObject.Text;
+                var last_index = 0;
+
+                foreach (Match match in UrlRegex.Matches(text))
+                {
+                    if (first)
+                    {
+                        AssociatedObject.Inlines.Clear();
+
+                        first = false;
+                    }
+
+                    var left_text = text.Substring(last_index, match.Index - last_index);
+                    last_index = match.Index + match.Length;
+
+                    AssociatedObject.Inlines.Add(new Run() { Text = left_text });
+                    AssociatedObject.Inlines.Add(new Hyperlink()
+                    {
+                        Foreground = this.Foreground,
+                        NavigateUri = new Uri(match.Value),
+                        Inlines =
+                        {
+                            new Run() { Text = match.Value }
+                        }
+                    });
+                }
+
+                if (!first && last_index < text.Length)
+                {
+                    var right_text = text.Substring(last_index);
+
+                    AssociatedObject.Inlines.Add(new Run() { Text = right_text });
+                }
+            }
+        }
+    }
+}