Sample App Fluent Design & Dark Theme

Microsoft.Toolkit.Uwp.SampleApp/App.xaml.cs

@@ -6,6 +6,7 @@
 using Microsoft.Toolkit.Uwp.Helpers;
 using Microsoft.Toolkit.Uwp.SampleApp.Common;
 using Microsoft.Toolkit.Uwp.SampleApp.SamplePages;
+using Microsoft.Toolkit.Uwp.SampleApp.Styles;
 using Windows.ApplicationModel;
 using Windows.ApplicationModel.Activation;
 using Windows.System.Profile;
@@ -100,6 +101,8 @@ protected override void OnBackgroundActivated(BackgroundActivatedEventArgs args)
 
         private async System.Threading.Tasks.Task RunAppInitialization(string launchParameters)
         {
+            ThemeInjector.InjectThemeResources(Application.Current.Resources);
+
             // Go fullscreen on Xbox
             if (AnalyticsInfo.VersionInfo.GetDeviceFormFactor() == DeviceFormFactor.Xbox)
             {
@@ -167,4 +170,4 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
             deferral.Complete();
         }
     }
-}
+}

Microsoft.Toolkit.Uwp.SampleApp/Common/ISampleNavigation.cs

@@ -0,0 +1,17 @@
+// 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.
+
+namespace Microsoft.Toolkit.Uwp.SampleApp
+{
+    /// <summary>
+    /// Sample LifeCycle Events.
+    /// </summary>
+    public interface ISampleNavigation
+    {
+        /// <summary>
+        /// Callback to Clean up Resources while Navigating away.
+        /// </summary>
+        void NavigatingAway();
+    }
+}

Microsoft.Toolkit.Uwp.SampleApp/Controls/AadAuthControl.xaml

@@ -9,10 +9,10 @@
     mc:Ignorable="d"
     Visibility="{x:Bind Path=IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
     <Grid MaxWidth="800"
-          Background="{StaticResource Brush-Grey-05}">
+          Background="{ThemeResource Brush-Grey-05}">
         <Grid Margin="24"
-              Background="{StaticResource Brush-Grey-04}"
-              BorderBrush="#FFCCCCCC"
+              Background="{ThemeResource Brush-Grey-04}"
+              BorderBrush="#33CCCCCC"
               BorderThickness="1"
               CornerRadius="4">
             <Grid.RowDefinitions>
@@ -27,7 +27,7 @@
                     <RowDefinition Height="Auto"/>
                 </Grid.RowDefinitions>
 
-                <Grid Background="#FFCCCCCC">
+                <Grid Background="#33CCCCCC">
                     <Grid.ColumnDefinitions>
                         <ColumnDefinition Width="Auto" />
                         <ColumnDefinition />
@@ -36,7 +36,7 @@
                                        Margin="12,6"
                                        HorizontalAlignment="Left"
                                        VerticalAlignment="Center"
-                                       Foreground="{StaticResource Brush-Grey-01}"
+                                       Foreground="{ThemeResource Brush-Grey-01}"
                                        Text="Azure Active Directory v2.0 Configuration"/>
                 </Grid>
 

Microsoft.Toolkit.Uwp.SampleApp/Controls/AadAuthControl.xaml.cs

@@ -116,7 +116,7 @@ private void ClientId_TextChanged(object sender, TextChangedEventArgs e)
 
         private void GraphService_SignInFailed(object sender, Toolkit.Services.MicrosoftGraph.SignInFailedEventArgs e)
         {
-            Shell.Current.ShowExceptionNotification(e.Exception);
+            SampleController.Current.ShowExceptionNotification(e.Exception);
         }
 
         private string[] GetAdminPermissions()

Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.cs

@@ -24,10 +24,13 @@ public class CodeRenderer : Control
         private string _displayedText;
         private ILanguage _language;
         private bool _rendered;
+        private ElementTheme _theme;
 
         public CodeRenderer()
         {
             DefaultStyleKey = typeof(CodeRenderer);
+            _theme = SystemTheme();
+            SampleController.Current.ThemeChanged += Current_ThemeChanged;
         }
 
         /// <summary>
@@ -84,8 +87,8 @@ protected override void OnApplyTemplate()
 
         private void RenderDocument()
         {
-            _codeView.Blocks.Clear();
-            _formatter = new RichTextBlockFormatter();
+            _codeView?.Blocks?.Clear();
+            _formatter = new RichTextBlockFormatter(_theme);
             _formatter.FormatRichTextBlock(_displayedText, _language, _codeView);
             _rendered = true;
         }
@@ -101,13 +104,15 @@ private void CopyButton_Click(object sender, RoutedEventArgs e)
 
         private async void PrintButton_Click(object sender, RoutedEventArgs e)
         {
-            Shell.Current.DisplayWaitRing = true;
+            SampleController.Current.DisplayWaitRing = true;
 
             var printblock = new RichTextBlock
             {
-                FontFamily = _codeView.FontFamily
+                FontFamily = _codeView.FontFamily,
+                RequestedTheme = ElementTheme.Light
             };
-            _formatter.FormatRichTextBlock(_displayedText, _language, printblock);
+            var printFormatter = new RichTextBlockFormatter(ElementTheme.Light);
+            printFormatter.FormatRichTextBlock(_displayedText, _language, printblock);
 
             _printHelper = new PrintHelper(_container);
             _printHelper.AddFrameworkElementToPrint(printblock);
@@ -127,7 +132,7 @@ private void ReleasePrintHelper()
 
             _printHelper.Dispose();
 
-            Shell.Current.DisplayWaitRing = false;
+            SampleController.Current.DisplayWaitRing = false;
         }
 
         private async void PrintHelper_OnPrintSucceeded()
@@ -148,5 +153,33 @@ private void PrintHelper_OnPrintCanceled()
         {
             ReleasePrintHelper();
         }
+
+        private void Current_ThemeChanged(object sender, Models.ThemeChangedArgs e)
+        {
+            // Only Handle System Theme Changes.
+            if (e.CustomSet)
+            {
+                return;
+            }
+
+            _theme = SystemTheme();
+            try
+            {
+                _rendered = false;
+                RenderDocument();
+            }
+            catch
+            {
+            }
+        }
+
+        /// <summary>
+        /// Casts Application Theme to Element Theme, as Formatter accepts ElementTheme.
+        /// </summary>
+        /// <returns>Element Theme</returns>
+        private ElementTheme SystemTheme()
+        {
+            return SampleController.Current.SystemTheme() == ApplicationTheme.Dark ? ElementTheme.Dark : ElementTheme.Light;
+        }
     }
 }

Microsoft.Toolkit.Uwp.SampleApp/Controls/CodeRenderer.xaml

@@ -0,0 +1,42 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:Microsoft.Toolkit.Uwp.SampleApp.Controls"
+    xmlns:local="using:Microsoft.Toolkit.Uwp.SampleApp.Controls">
+
+    <Style TargetType="controls:CodeRenderer">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:CodeRenderer">
+                    <Grid>
+                        <Grid.RowDefinitions>
+                            <RowDefinition />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Grid x:Name="Container"
+                                  Grid.RowSpan="2"
+                                  Opacity="0" />
+                        <ScrollViewer
+                                          Grid.Row="0"
+                                          HorizontalScrollMode="Auto"
+                                          HorizontalScrollBarVisibility="Auto">
+                            <RichTextBlock Name="codeView"
+                                               FontFamily="Consolas"
+                                               Padding="10" />
+                        </ScrollViewer>
+                        <StackPanel Grid.Row="1"
+                                        HorizontalAlignment="Center"
+                                        Orientation="Horizontal">
+                            <Button x:Name="CopyButton"
+                                        Margin="5"
+                                        Content="Copy" />
+                            <Button x:Name="PrintButton"
+                                        Margin="5"
+                                        Content="Print" />
+                        </StackPanel>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>