Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion VanArsdel/PropertyInspector/PropertyInspector.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
52 changes: 52 additions & 0 deletions VanArsdel/PropertyInspector/PropertyInspector.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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;
}
}
}
3 changes: 3 additions & 0 deletions VanArsdel/Resources/en-us/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -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>
16 changes: 15 additions & 1 deletion VanArsdel/Store/ProductConfigurationPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
5 changes: 5 additions & 0 deletions VanArsdel/Store/ProductConfigurationPage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
}
13 changes: 13 additions & 0 deletions VanArsdel/Store/StorePage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:VanArsdel"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:model="using:VanArsdel.Model"
mc:Ignorable="d">

Expand Down Expand Up @@ -158,6 +159,18 @@
<StaticResource x:Key="ButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
<winui:TeachingTip x:Name="StoreCustomizeTip"
Target="{x:Bind CustomizeButton}"
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 lamp!"
IsLightDismissEnabled="True">
</winui:TeachingTip> -->
</ResourceDictionary>
</Button.Resources>
</Button>
Expand Down
10 changes: 10 additions & 0 deletions VanArsdel/Store/StorePage.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -59,5 +59,15 @@ public StoreViewModel ViewModel
}

#endregion

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;
}
}
}
6 changes: 3 additions & 3 deletions VanArsdel/VanArsdel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down