From 77e38e06912eee63d5a249df032e7dea7d948adc Mon Sep 17 00:00:00 2001
From: Savoy Schuler <saschule@microsoft.com>
Date: Fri, 19 Apr 2019 11:43:23 -0700
Subject: [PATCH 1/6] Updated target to 19H1 and WinUI to version 2.1.

---
 VanArsdel/VanArsdel.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/VanArsdel/VanArsdel.csproj b/VanArsdel/VanArsdel.csproj
index 4714f08..b5cff31 100644
--- a/VanArsdel/VanArsdel.csproj
+++ b/VanArsdel/VanArsdel.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>VanArsdel</AssemblyName>
     <DefaultLanguage>en-US</DefaultLanguage>
     <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.17763.0</TargetPlatformVersion>
+    <TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.18295.0</TargetPlatformVersion>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
     <FileAlignment>512</FileAlignment>
@@ -604,10 +604,10 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.1.9</Version>
+      <Version>6.2.8</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.0.181018003.1</Version>
+      <Version>2.2.190416008-prerelease</Version>
     </PackageReference>
     <PackageReference Include="Win2D.uwp">
       <Version>1.23.0</Version>

From 7309af0d3ea18ddb93c9a853a2c15655cfe9d7f2 Mon Sep 17 00:00:00 2001
From: Savoy Schuler <saschule@microsoft.com>
Date: Sun, 21 Apr 2019 22:18:40 -0700
Subject: [PATCH 2/6] Added basic teaching tip to Store page's "Create your
 own" button.

---
 VanArsdel/Store/StorePage.xaml    | 6 ++++++
 VanArsdel/Store/StorePage.xaml.cs | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/VanArsdel/Store/StorePage.xaml b/VanArsdel/Store/StorePage.xaml
index 4930cec..589e9f3 100644
--- a/VanArsdel/Store/StorePage.xaml
+++ b/VanArsdel/Store/StorePage.xaml
@@ -6,6 +6,7 @@
     xmlns:local="using:VanArsdel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:model="using:VanArsdel.Model"
+    xmlns:winui="using:Microsoft.UI.Xaml.Controls"
     mc:Ignorable="d">
 
     <Grid>
@@ -158,6 +159,11 @@
                                 <StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
                             </ResourceDictionary>
                         </ResourceDictionary.ThemeDictionaries>
+                        <winui:TeachingTip x:Name="StoreCustomizeTip"
+                            Target="{x:Bind CustomizeButton}"
+                            Title="Start here!"
+                            Loaded="AutoSaveTip_Loaded">
+                        </winui:TeachingTip>
                     </ResourceDictionary>
                 </Button.Resources>
             </Button>
diff --git a/VanArsdel/Store/StorePage.xaml.cs b/VanArsdel/Store/StorePage.xaml.cs
index dce3a9e..613d46d 100644
--- a/VanArsdel/Store/StorePage.xaml.cs
+++ b/VanArsdel/Store/StorePage.xaml.cs
@@ -59,5 +59,10 @@ public StoreViewModel ViewModel
         }
 
         #endregion
+
+        private void AutoSaveTip_Loaded(object sender, RoutedEventArgs e)
+        {
+            StoreCustomizeTip.IsOpen = true;
+        }
     }
 }

From 97c377bfe4fbb3167cc282360c0209c6e9b3f3b2 Mon Sep 17 00:00:00 2001
From: Savoy Schuler <saschule@microsoft.com>
Date: Sun, 21 Apr 2019 22:58:29 -0700
Subject: [PATCH 3/6] Added tips about engraving and compact forms.

---
 VanArsdel/Store/ProductConfigurationPage.xaml    | 16 +++++++++++++++-
 VanArsdel/Store/ProductConfigurationPage.xaml.cs |  5 +++++
 VanArsdel/Store/StorePage.xaml                   | 11 +++++++++--
 VanArsdel/Store/StorePage.xaml.cs                |  7 ++++++-
 4 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/VanArsdel/Store/ProductConfigurationPage.xaml b/VanArsdel/Store/ProductConfigurationPage.xaml
index 42149e4..15c25e8 100644
--- a/VanArsdel/Store/ProductConfigurationPage.xaml
+++ b/VanArsdel/Store/ProductConfigurationPage.xaml
@@ -10,6 +10,7 @@
     xmlns:devices="using:VanArsdel.Devices"
     xmlns:local="using:VanArsdel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:winui="using:Microsoft.UI.Xaml.Controls"
     xmlns:shared="using:VanArsdel"
     d:DesignHeight="968"
     d:DesignWidth="1920"
@@ -93,7 +94,20 @@
                             Margin="0,0,0,8"
                             HorizontalAlignment="Stretch"
                             Click="{x:Bind ViewModel.OnBeginPurchase}"
-                            Style="{StaticResource AccentButtonStyle}" />
+                            Style="{StaticResource AccentButtonStyle}">
+                            <Button.Resources>
+                                <ResourceDictionary>
+                                    <winui:TeachingTip x:Name="BuyButtonTip"
+                                        Target="{x:Bind BuyButton}"
+                                        Title="Power user tip"
+                                        PreferredPlacement="Left"
+                                        Subtitle="Hold Shift while clicking to open up the form in compact view."
+                                        IsLightDismissEnabled="True"
+                                        Loaded="BuyButton_Loaded">
+                                    </winui:TeachingTip>
+                                </ResourceDictionary>
+                            </Button.Resources>
+                        </Button>
                         <Button
                             x:Name="CancelButton"
                             x:Uid="CancelProductConfigurationButton"
diff --git a/VanArsdel/Store/ProductConfigurationPage.xaml.cs b/VanArsdel/Store/ProductConfigurationPage.xaml.cs
index e746e0e..fd3b4f0 100644
--- a/VanArsdel/Store/ProductConfigurationPage.xaml.cs
+++ b/VanArsdel/Store/ProductConfigurationPage.xaml.cs
@@ -158,5 +158,10 @@ private void NightRadioButton_Checked(object sender, RoutedEventArgs e)
             DeviceLayout.DayMode = false;
             DayNightSelectionPanel.RequestedTheme = ElementTheme.Dark;
         }
+
+        private void BuyButton_Loaded(object sender, RoutedEventArgs e)
+        {
+            BuyButtonTip.IsOpen = true;
+        }
     }
 }
\ No newline at end of file
diff --git a/VanArsdel/Store/StorePage.xaml b/VanArsdel/Store/StorePage.xaml
index 589e9f3..22d423d 100644
--- a/VanArsdel/Store/StorePage.xaml
+++ b/VanArsdel/Store/StorePage.xaml
@@ -5,8 +5,8 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="using:VanArsdel"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:model="using:VanArsdel.Model"
     xmlns:winui="using:Microsoft.UI.Xaml.Controls"
+    xmlns:model="using:VanArsdel.Model"
     mc:Ignorable="d">
 
     <Grid>
@@ -162,7 +162,14 @@
                         <winui:TeachingTip x:Name="StoreCustomizeTip"
                             Target="{x:Bind CustomizeButton}"
                             Title="Start here!"
-                            Loaded="AutoSaveTip_Loaded">
+                            IsLightDismissEnabled="True"
+                            Loaded="StoreCustomizeTip_Loaded"
+                            Closing="StoreCustomizeTip_Closing">
+                        </winui:TeachingTip>
+                        <winui:TeachingTip 
+                            x:Name="EngraveTextTip"
+                            Title="Don't forget to engrave your creation!"
+                            IsLightDismissEnabled="True">
                         </winui:TeachingTip>
                     </ResourceDictionary>
                 </Button.Resources>
diff --git a/VanArsdel/Store/StorePage.xaml.cs b/VanArsdel/Store/StorePage.xaml.cs
index 613d46d..5c1e762 100644
--- a/VanArsdel/Store/StorePage.xaml.cs
+++ b/VanArsdel/Store/StorePage.xaml.cs
@@ -60,9 +60,14 @@ public StoreViewModel ViewModel
 
         #endregion
 
-        private void AutoSaveTip_Loaded(object sender, RoutedEventArgs e)
+        private void StoreCustomizeTip_Loaded(object sender, RoutedEventArgs e)
         {
             StoreCustomizeTip.IsOpen = true;
         }
+
+        private void StoreCustomizeTip_Closing(Microsoft.UI.Xaml.Controls.TeachingTip sender, Microsoft.UI.Xaml.Controls.TeachingTipClosingEventArgs args)
+        {
+            EngraveTextTip.IsOpen = true;
+        }
     }
 }

From f28ca3a60712d5c742c24d344dd9ddcd9aa02572 Mon Sep 17 00:00:00 2001
From: Savoy Schuler <saschule@microsoft.com>
Date: Sun, 21 Apr 2019 23:01:47 -0700
Subject: [PATCH 4/6] Added longer text to "Create your own" button tip.

---
 VanArsdel/Store/StorePage.xaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/VanArsdel/Store/StorePage.xaml b/VanArsdel/Store/StorePage.xaml
index 22d423d..e7a5636 100644
--- a/VanArsdel/Store/StorePage.xaml
+++ b/VanArsdel/Store/StorePage.xaml
@@ -161,14 +161,14 @@
                         </ResourceDictionary.ThemeDictionaries>
                         <winui:TeachingTip x:Name="StoreCustomizeTip"
                             Target="{x:Bind CustomizeButton}"
-                            Title="Start here!"
+                            Title="Start building your own creations here!"
                             IsLightDismissEnabled="True"
                             Loaded="StoreCustomizeTip_Loaded"
                             Closing="StoreCustomizeTip_Closing">
                         </winui:TeachingTip>
                         <winui:TeachingTip 
                             x:Name="EngraveTextTip"
-                            Title="Don't forget to engrave your creation!"
+                            Title="Don't forget to engrave your lamp!"
                             IsLightDismissEnabled="True">
                         </winui:TeachingTip>
                     </ResourceDictionary>

From 9bbf7d92d6caa4b8e63b1dc3adedcb02d1ed0916 Mon Sep 17 00:00:00 2001
From: Savoy Schuler <saschule@microsoft.com>
Date: Sun, 21 Apr 2019 23:33:00 -0700
Subject: [PATCH 5/6] Commenting out engraving tip for the time being.

---
 VanArsdel/Store/StorePage.xaml    | 4 ++--
 VanArsdel/Store/StorePage.xaml.cs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VanArsdel/Store/StorePage.xaml b/VanArsdel/Store/StorePage.xaml
index e7a5636..72f5790 100644
--- a/VanArsdel/Store/StorePage.xaml
+++ b/VanArsdel/Store/StorePage.xaml
@@ -166,11 +166,11 @@
                             Loaded="StoreCustomizeTip_Loaded"
                             Closing="StoreCustomizeTip_Closing">
                         </winui:TeachingTip>
-                        <winui:TeachingTip 
+                        <!-- <winui:TeachingTip 
                             x:Name="EngraveTextTip"
                             Title="Don't forget to engrave your lamp!"
                             IsLightDismissEnabled="True">
-                        </winui:TeachingTip>
+                        </winui:TeachingTip> -->
                     </ResourceDictionary>
                 </Button.Resources>
             </Button>
diff --git a/VanArsdel/Store/StorePage.xaml.cs b/VanArsdel/Store/StorePage.xaml.cs
index 5c1e762..a729e07 100644
--- a/VanArsdel/Store/StorePage.xaml.cs
+++ b/VanArsdel/Store/StorePage.xaml.cs
@@ -67,7 +67,7 @@ private void StoreCustomizeTip_Loaded(object sender, RoutedEventArgs e)
 
         private void StoreCustomizeTip_Closing(Microsoft.UI.Xaml.Controls.TeachingTip sender, Microsoft.UI.Xaml.Controls.TeachingTipClosingEventArgs args)
         {
-            EngraveTextTip.IsOpen = true;
+            //EngraveTextTip.IsOpen = true;
         }
     }
 }

From 3a35ae2946f20a54140aa456f80bbc4ed3bc41a8 Mon Sep 17 00:00:00 2001
From: Yulia Klein <yulikl@microsoft.com>
Date: Thu, 25 Apr 2019 12:11:31 -0700
Subject: [PATCH 6/6] Added a custom Share button to the Engrave REB in the
 "create your own" flow

---
 .../PropertyInspector/PropertyInspector.xaml  |  4 +-
 .../PropertyInspector.xaml.cs                 | 52 +++++++++++++++++++
 VanArsdel/Resources/en-us/Resources.resw      |  3 ++
 3 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/VanArsdel/PropertyInspector/PropertyInspector.xaml b/VanArsdel/PropertyInspector/PropertyInspector.xaml
index 2ea0719..8c54773 100644
--- a/VanArsdel/PropertyInspector/PropertyInspector.xaml
+++ b/VanArsdel/PropertyInspector/PropertyInspector.xaml
@@ -222,7 +222,9 @@
                 HorizontalAlignment="Stretch"
                 dls:RichEditBoxAttachedProperties.BindableText="{x:Bind Path=Value, Mode=OneWay}"
                 Header="{x:Bind Path=Header, Mode=OneWay}"
-                TextChanged="{x:Bind Path=RichEditBox_TextChanged, Mode=OneWay}" />
+                TextChanged="{x:Bind Path=RichEditBox_TextChanged, Mode=OneWay}" 
+                Loaded="RichEditBox_Loaded"
+                Unloaded="RichEditBox_Unloaded"/>
         </DataTemplate>
 
         <devices:PropertyTemplateSelector
diff --git a/VanArsdel/PropertyInspector/PropertyInspector.xaml.cs b/VanArsdel/PropertyInspector/PropertyInspector.xaml.cs
index 95e4606..326fb4a 100644
--- a/VanArsdel/PropertyInspector/PropertyInspector.xaml.cs
+++ b/VanArsdel/PropertyInspector/PropertyInspector.xaml.cs
@@ -5,11 +5,15 @@
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 using VanArsdel.Devices;
+using Windows.UI.Xaml.Input;
+using Windows.Foundation.Metadata;
+using Windows.ApplicationModel.DataTransfer;
 
 namespace VanArsdel
 {
     public sealed partial class PropertyInspector : UserControl
     {
+        private RichEditBox _engraveREB;
         public PropertyInspector()
         {
             this.InitializeComponent();
@@ -119,5 +123,53 @@ private void UserControl_Loaded(object sender, RoutedEventArgs e)
                 OuterGrid.Visibility = Visibility.Visible;
             }
         }
+
+        private void Menu_Opening(object sender, object e)
+        {
+            CommandBarFlyout myFlyout = sender as CommandBarFlyout;
+            AppBarButton shareButton = new AppBarButton();
+            shareButton.Command = new StandardUICommand(StandardUICommandKind.Share);
+            shareButton.Click += ShareButton_Click;
+            myFlyout.PrimaryCommands.Add(shareButton);
+        }
+
+        private void ShareButton_Click(object sender, RoutedEventArgs e)
+        {
+            DataTransferManager dataTransferManager = DataTransferManager.GetForCurrentView();
+            dataTransferManager.DataRequested += DataTransferManager_DataRequested;
+
+            DataTransferManager.ShowShareUI();
+        }
+
+        private void DataTransferManager_DataRequested(DataTransferManager sender, DataRequestedEventArgs args)
+        {
+            DataRequest request = args.Request;
+            request.Data.SetText(_engraveREB.TextDocument.ToString());
+            request.Data.SetRtf(_engraveREB.Document.ToString());
+            request.Data.Properties.Title = new StringProvider(Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView()).GetString("ShareDataPropertyTitle");
+        }
+
+        private void RichEditBox_Loaded(object sender, RoutedEventArgs e)
+        {
+            _engraveREB = sender as RichEditBox;
+
+            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+            {
+                (sender as RichEditBox).SelectionFlyout.Opening += Menu_Opening;
+                (sender as RichEditBox).ContextFlyout.Opening += Menu_Opening;
+            }
+        }
+
+        private void RichEditBox_Unloaded(object sender, RoutedEventArgs e)
+        {
+            // Prior to UniversalApiContract 7, RichEditBox did not have a default ContextFlyout set.
+            if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 7))
+            {
+                (sender as RichEditBox).SelectionFlyout.Opening -= Menu_Opening;
+                (sender as RichEditBox).ContextFlyout.Opening -= Menu_Opening;
+            }
+
+            _engraveREB = null;
+        }
     }
 }
diff --git a/VanArsdel/Resources/en-us/Resources.resw b/VanArsdel/Resources/en-us/Resources.resw
index d18177a..ad94278 100644
--- a/VanArsdel/Resources/en-us/Resources.resw
+++ b/VanArsdel/Resources/en-us/Resources.resw
@@ -307,4 +307,7 @@
   <data name="CreditCardExpirationDateYearSelector.Header" xml:space="preserve">
     <value>Year</value>
   </data>
+  <data name="ShareDataPropertyTitle" xml:space="preserve">
+    <value>Engraving</value>
+  </data>
 </root>
\ No newline at end of file