Introduced a NotificationFlyoutPresenter to allow you to restyle/retemplate the flyout from within your UWP app

2021-02-06 17:38:39 +00:00
parent 3de9ceee0d
commit 3fdfcfaf21
26 changed files with 260 additions and 282 deletions
@@ -120,8 +120,9 @@
    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
  </PropertyGroup>
  <ItemGroup>
+    <Compile Include="NotificationFlyoutHost\NotificationFlyoutHost.cs" />
    <Compile Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.cs" />
-    <Compile Include="NotificationFlyoutPresenter\NotificationFlyoutPresenterTemplateSettings.cs" />
+    <Compile Include="NotificationFlyoutHost\NotificationFlyoutHostTemplateSettings.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
    <EmbeddedResource Include="Properties\NotificationFlyout.Uwp.UI.Controls.rd.xml" />
  </ItemGroup>
@@ -134,10 +135,14 @@
    </PackageReference>
  </ItemGroup>
  <ItemGroup>
-    <Page Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.xaml">
+    <Page Include="NotificationFlyoutHost\NotificationFlyoutHost.xaml">
      <SubType>Designer</SubType>
      <Generator>MSBuild:Compile</Generator>
    </Page>
+    <Page Include="NotificationFlyoutPresenter\NotificationFlyoutPresenter.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
    <Page Include="Themes\Generic.xaml">
      <Generator>MSBuild:Compile</Generator>
      <SubType>Designer</SubType>
@@ -0,0 +1,72 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+
+namespace NotificationFlyout.Uwp.UI.Controls
+{
+    public class NotificationFlyoutHost : Control
+    {
+        public static readonly DependencyProperty FlyoutPresenterProperty =
+            DependencyProperty.Register(nameof(FlyoutPresenter),
+                typeof(NotificationFlyoutPresenter), typeof(NotificationFlyoutHost),
+                new PropertyMetadata(null));
+
+        public static readonly DependencyProperty TemplateSettingsProperty =
+            DependencyProperty.Register(nameof(TemplateSettings),
+                typeof(NotificationFlyoutHostTemplateSettings), typeof(NotificationFlyoutHost),
+                new PropertyMetadata(null));
+
+        private readonly NotificationFlyoutHostTemplateSettings _templateSettings;
+        private Grid _root;
+
+        public NotificationFlyoutHost()
+        {
+            DefaultStyleKey = typeof(NotificationFlyoutHost);
+
+            _templateSettings = new NotificationFlyoutHostTemplateSettings();
+            SetValue(TemplateSettingsProperty, _templateSettings);
+        }
+
+        public NotificationFlyoutPresenter FlyoutPresenter
+        {
+            get => (NotificationFlyoutPresenter)GetValue(FlyoutPresenterProperty);
+            set => SetValue(FlyoutPresenterProperty, value);
+        }
+
+        public NotificationFlyoutHostTemplateSettings TemplateSettings
+        {
+            get => (NotificationFlyoutHostTemplateSettings)GetValue(TemplateSettingsProperty);
+            set => SetValue(TemplateSettingsProperty, value);
+        }
+
+        public void HideFlyout()
+        {
+            if (_root == null) return;
+            FlyoutBase flyout = FlyoutBase.GetAttachedFlyout(_root);
+            flyout.Hide();
+        }
+
+        public void SetOffset(double verticalOffset, double horizontalOffset)
+        {
+            if (_templateSettings == null) return;
+            _templateSettings.FromVerticalOffset = verticalOffset;
+            _templateSettings.FromHorizontalOffset = horizontalOffset;
+        }
+
+        public void ShowFlyout(FlyoutPlacementMode placementMode)
+        {
+            if (_root == null) return;
+            var flyout = FlyoutBase.GetAttachedFlyout(_root);
+            flyout.ShowAt(_root, new FlyoutShowOptions
+            {
+                Placement = placementMode,
+                ShowMode = FlyoutShowMode.Standard
+            });
+        }
+
+        protected override void OnApplyTemplate()
+        {
+            _root = GetTemplateChild("Root") as Grid;
+        }
+    }
+}
@@ -0,0 +1,29 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="using:NotificationFlyout.Uwp.UI.Controls">
+    <Style TargetType="controls:NotificationFlyoutHost">
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="controls:NotificationFlyoutHost">
+                    <Grid x:Name="Root">
+                        <FlyoutBase.AttachedFlyout>
+                            <Flyout AreOpenCloseAnimationsEnabled="False" ShouldConstrainToRootBounds="False">
+                                <Flyout.FlyoutPresenterStyle>
+                                    <Style TargetType="FlyoutPresenter">
+                                        <Setter Property="BorderThickness" Value="0" />
+                                        <Setter Property="Background" Value="Transparent" />
+                                        <Setter Property="IsDefaultShadowEnabled" Value="False" />
+                                        <Setter Property="Padding" Value="0" />
+                                        <Setter Property="Margin" Value="0" />
+                                    </Style>
+                                </Flyout.FlyoutPresenterStyle>
+                                <ContentControl Content="{TemplateBinding FlyoutPresenter}" />
+                            </Flyout>
+                        </FlyoutBase.AttachedFlyout>
+                    </Grid>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+</ResourceDictionary>
@@ -2,16 +2,16 @@

 namespace NotificationFlyout.Uwp.UI.Controls
 {
-    public class NotificationFlyoutPresenterTemplateSettings : DependencyObject
+    public class NotificationFlyoutHostTemplateSettings : DependencyObject
    {
        public static readonly DependencyProperty FromHorizontalOffsetProperty =
            DependencyProperty.Register(nameof(FromHorizontalOffset),
-                typeof(double), typeof(NotificationFlyoutPresenterTemplateSettings),
+                typeof(double), typeof(NotificationFlyoutHostTemplateSettings),
                new PropertyMetadata(0d));

        public static readonly DependencyProperty FromVerticalOffsetProperty =
            DependencyProperty.Register(nameof(FromVerticalOffset),
-                typeof(double), typeof(NotificationFlyoutPresenterTemplateSettings),
+                typeof(double), typeof(NotificationFlyoutHostTemplateSettings),
                new PropertyMetadata(0d));

        public double FromHorizontalOffset
@@ -1,71 +1,12 @@
-using Windows.UI.Popups;
-using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Controls;

 namespace NotificationFlyout.Uwp.UI.Controls
 {
    public class NotificationFlyoutPresenter : ContentControl
    {
-        public static readonly DependencyProperty TemplateSettingsProperty =
-            DependencyProperty.Register(nameof(TemplateSettings),
-                typeof(NotificationFlyoutPresenterTemplateSettings), typeof(NotificationFlyoutPresenter),
-                new PropertyMetadata(null));
-
-        private Grid _root;
-        private NotificationFlyoutPresenterTemplateSettings _templateSettings;
-
        public NotificationFlyoutPresenter()
        {
            DefaultStyleKey = typeof(NotificationFlyoutPresenter);
-
-            _templateSettings = new NotificationFlyoutPresenterTemplateSettings();
-            SetValue(TemplateSettingsProperty, _templateSettings);
-
-            UISettings uiSettings = new UISettings();
-            uiSettings.ColorValuesChanged += UiSettings_ColorValuesChanged;
-        }
-
-        private void UiSettings_ColorValuesChanged(UISettings sender, object args)
-        {
-            MessageDialog d = new MessageDialog("", "");
-        }
-
-        public NotificationFlyoutPresenterTemplateSettings TemplateSettings
-        {
-            get => (NotificationFlyoutPresenterTemplateSettings)GetValue(TemplateSettingsProperty);
-            set => SetValue(TemplateSettingsProperty, value);
-        }
-
-        public void SetOffset(double verticalOffset, double horizontalOffset)
-        {
-            if (_templateSettings == null) return;
-            _templateSettings.FromVerticalOffset = verticalOffset;
-            _templateSettings.FromHorizontalOffset = horizontalOffset;
-        }
-
-        public void HideFlyout()
-        {
-            if (_root == null) return;
-            FlyoutBase flyout = FlyoutBase.GetAttachedFlyout(_root);
-            flyout.Hide();
-        }
-
-        public void ShowFlyout(FlyoutPlacementMode placementMode)
-        {
-            if (_root == null) return;
-            var flyout = FlyoutBase.GetAttachedFlyout(_root);
-            flyout.ShowAt(_root, new FlyoutShowOptions 
-            { 
-                Placement = placementMode, 
-                ShowMode = FlyoutShowMode.Standard 
-            });
-        }
-
-        protected override void OnApplyTemplate()
-        {
-            _root = GetTemplateChild("Root") as Grid;
        }
    }
 }
@@ -7,50 +7,35 @@
        <Setter Property="Template">
            <Setter.Value>
                <ControlTemplate TargetType="controls:NotificationFlyoutPresenter">
-                    <Grid x:Name="Root">
-                        <FlyoutBase.AttachedFlyout>
-                            <Flyout AreOpenCloseAnimationsEnabled="False" ShouldConstrainToRootBounds="False">
-                                <Flyout.FlyoutPresenterStyle>
-                                    <Style TargetType="FlyoutPresenter">
-                                        <Setter Property="BorderThickness" Value="0" />
-                                        <Setter Property="Background" Value="Transparent" />
-                                        <Setter Property="IsDefaultShadowEnabled" Value="False" />
-                                        <Setter Property="Padding" Value="0" />
-                                        <Setter Property="Margin" Value="0" />
-                                    </Style>
-                                </Flyout.FlyoutPresenterStyle>
-                                <Border
-                                    Padding="{TemplateBinding Padding}"
-                                    Background="{TemplateBinding Background}"
-                                    BackgroundSizing="OuterBorderEdge"
-                                    BorderBrush="{TemplateBinding BorderBrush}"
-                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                    CornerRadius="{TemplateBinding CornerRadius}">
-                                    <Border.Transitions>
-                                        <TransitionCollection>
-                                            <EntranceThemeTransition FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.FromHorizontalOffset, Mode=TwoWay}" FromVerticalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.FromVerticalOffset, Mode=TwoWay}" />
-                                        </TransitionCollection>
-                                    </Border.Transitions>
-                                    <ScrollViewer
-                                        x:Name="ScrollViewer"
-                                        AutomationProperties.AccessibilityView="Raw"
-                                        HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
-                                        HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
-                                        VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
-                                        VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
-                                        ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
-                                        <ContentPresenter
-                                            Margin="{TemplateBinding Padding}"
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            Content="{TemplateBinding Content}"
-                                            ContentTemplate="{TemplateBinding ContentTemplate}"
-                                            ContentTransitions="{TemplateBinding ContentTransitions}" />
-                                    </ScrollViewer>
-                                </Border>
-                            </Flyout>
-                        </FlyoutBase.AttachedFlyout>
-                    </Grid>
+                    <Border
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BackgroundSizing="OuterBorderEdge"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <Border.Transitions>
+                            <TransitionCollection>
+                                <EntranceThemeTransition FromHorizontalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.FromHorizontalOffset, Mode=TwoWay}" FromVerticalOffset="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.FromVerticalOffset, Mode=TwoWay}" />
+                            </TransitionCollection>
+                        </Border.Transitions>
+                        <ScrollViewer
+                            x:Name="ScrollViewer"
+                            AutomationProperties.AccessibilityView="Raw"
+                            HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
+                            HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}"
+                            VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}"
+                            VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}"
+                            ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}">
+                            <ContentPresenter
+                                Margin="{TemplateBinding Padding}"
+                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTransitions="{TemplateBinding ContentTransitions}" />
+                        </ScrollViewer>
+                    </Border>
                </ControlTemplate>
            </Setter.Value>
        </Setter>
@@ -1,9 +1,6 @@
 using System.Reflection;
 using System.Runtime.InteropServices;

-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
 [assembly: AssemblyTitle("NotificationFlyout.Uwp.UI.Controls")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -12,17 +9,6 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyCopyright("Copyright ©  2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]
@@ -1,6 +1,6 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutHost/NotificationFlyoutHost.xaml" />
        <ResourceDictionary Source="ms-appx:///NotificationFlyout.Uwp.UI.Controls/NotificationFlyoutPresenter/NotificationFlyoutPresenter.xaml" />
    </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>