Merge branch 'main' of https://github.com/iNKORE-NET/UI.WPF.Modern

iNKORE.UI.WPF.Modern.sln

@@ -53,7 +53,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconKeyFileMaker", "tools\I
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExamplePhotoTaker", "samples\ExamplePhotoTaker\ExamplePhotoTaker.csproj", "{194059C8-5CBF-4548-8216-3D251CE43236}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NavigationViewExample", "samples\NavigationViewExample\NavigationViewExample.csproj", "{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NavigationViewExample", "samples\NavigationViewExample\NavigationViewExample.csproj", "{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Acrylic10Example", "samples\Acrylic10Example\Acrylic10Example.csproj", "{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -349,6 +351,26 @@ Global
 		{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|x64.Build.0 = Release|Any CPU
 		{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|x86.ActiveCfg = Release|Any CPU
 		{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|x86.Build.0 = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|ARM.Build.0 = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|x64.Build.0 = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Debug|x86.Build.0 = Debug|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|ARM.ActiveCfg = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|ARM.Build.0 = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|ARM64.Build.0 = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|x64.ActiveCfg = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|x64.Build.0 = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|x86.ActiveCfg = Release|Any CPU
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -367,6 +389,7 @@ Global
 		{6561632F-0B5A-4869-8C82-E05238326B32} = {07337569-6CA9-4BB0-9C8F-962D981CB5F4}
 		{194059C8-5CBF-4548-8216-3D251CE43236} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 		{F9951C10-6C42-4E5F-BAB2-381C17D4DE35} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
+		{84C80EA6-0F9C-49CF-AB66-5696CC888CA7} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6251E140-0FAA-4DE9-B245-1C5BE188E578}

samples/Acrylic10Example/Acrylic10Example.csproj

@@ -0,0 +1,16 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <OutputType>WinExe</OutputType>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\source\iNKORE.UI.WPF.Modern.Controls\iNKORE.UI.WPF.Modern.Controls.csproj" />
+    <ProjectReference Include="..\..\source\Inkore.UI.WPF.Modern\iNKORE.UI.WPF.Modern.csproj" />
+  </ItemGroup>
+
+</Project>

samples/Acrylic10Example/App.xaml

@@ -0,0 +1,15 @@
+<Application x:Class="Acrylic10Example.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:local="clr-namespace:Acrylic10Example" 
+             xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             StartupUri="MainWindow.xaml">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ui:ThemeResources/>
+                <ui:XamlControlsResources />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Application.Resources>
+</Application>

samples/Acrylic10Example/App.xaml.cs

@@ -0,0 +1,14 @@
+using System.Configuration;
+using System.Data;
+using System.Windows;
+
+namespace Acrylic10Example
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+    }
+
+}

samples/Acrylic10Example/AssemblyInfo.cs

@@ -0,0 +1,10 @@
+using System.Windows;
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None,            //where theme specific resource dictionaries are located
+                                                //(used if a resource is not found in the page,
+                                                // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly   //where the generic resource dictionary is located
+                                                //(used if a resource is not found in the page,
+                                                // app, or any theme specific resource dictionaries)
+)]

samples/Acrylic10Example/MainWindow.xaml

@@ -0,0 +1,19 @@
+<Window x:Class="Acrylic10Example.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:Acrylic10Example"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="36"
+        mc:Ignorable="d"
+        Title="Welcome!" Height="450" Width="800"
+        Loaded="Window_Loaded">
+    <ui:SimpleStackPanel VerticalAlignment="Center" Spacing="5">
+        <TextBlock Text="Legacy Acrylic API" FontSize="24" FontWeight="Bold" TextAlignment="Center"/>
+        <TextBlock Text="This method will enable Acrylic in Windows 10 as well." FontSize="20" TextAlignment="Center"/>
+
+        <Button Content="Hello world!" HorizontalAlignment="Center" Margin="0,20,0,0"/>
+    </ui:SimpleStackPanel>
+</Window>

samples/Acrylic10Example/MainWindow.xaml.cs

@@ -0,0 +1,45 @@
+using iNKORE.UI.WPF.Modern.Controls.Helpers;
+using iNKORE.UI.WPF.Modern.Controls.Primitives;
+using iNKORE.UI.WPF.Modern.Helpers.Styles;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+namespace Acrylic10Example
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow : Window
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void Window_Loaded(object sender, RoutedEventArgs e)
+        {
+            WindowChrome.SetWindowChrome(this, new WindowChrome()
+            {
+                GlassFrameThickness = new Thickness(0, 1, 0, 0),
+                UseAeroCaptionButtons = false,
+                CornerRadius = new CornerRadius(0),
+                ResizeBorderThickness = new Thickness(4),
+                NonClientFrameEdges = NonClientFrameEdges.None,
+                CaptionHeight = 36d,
+
+            });
+
+            WindowHelper.SetApplyBackground(this, false);
+            AcrylicHelper.Apply(this, true);
+        }
+    }
+}

samples/FlyoutExample/FlyoutExample.csproj

@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.3.1" />
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.26.3" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.4" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.28" />
   </ItemGroup>
 
 </Project>

samples/FlyoutExample/MainWindow.xaml

@@ -48,7 +48,7 @@
                 <ui:CommandBar HorizontalAlignment="Center">
                     <ui:AppBarButton Label="Click me!" ChevronStyle="Down">
                         <ui:AppBarButton.Icon>
-                            <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.GiftboxOpen}"/>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.GiftboxOpen}"/>
                         </ui:AppBarButton.Icon>
                         <ui:AppBarButton.Flyout>
                             <ui:Flyout Placement="Bottom">
@@ -59,7 +59,7 @@
                     </ui:AppBarButton>
                     <ui:AppBarButton Label="Arrowless!">
                         <ui:AppBarButton.Icon>
-                            <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Hide}"/>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Hide}"/>
                         </ui:AppBarButton.Icon>
                         <ui:AppBarButton.Flyout>
                             <ui:Flyout Placement="Bottom">
@@ -71,7 +71,7 @@
 
                     <ui:AppBarButton Label="Right click" Click="DropDownButton_3_Click" ChevronStyle="Right" FlyoutOpeningMode="RightMouseButtonUp">
                         <ui:AppBarButton.Icon>
-                            <ui:FontIcon Glyph="{x:Static ui:SegoeFluentIcons.Forward}"/>
+                            <ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Forward}"/>
                         </ui:AppBarButton.Icon>
                         <ui:AppBarButton.Flyout>
                             <ui:Flyout Placement="Bottom">

source/iNKORE.UI.WPF.Modern.Controls/iNKORE.UI.WPF.Modern.Controls.csproj

@@ -10,9 +10,9 @@
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>False</GeneratePackageOnBuild>
 		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
-		<ApplicationIcon>..\..\assets\images\iNKORE.ico</ApplicationIcon>
+		<ApplicationIcon>..\..\assets\icons\WpfLibrary.ico</ApplicationIcon>
 		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>..\..\assets\misc\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
+		<AssemblyOriginatorKeyFile>..\..\assets\others\iNKORE.Pulic.snk</AssemblyOriginatorKeyFile>
 		<RootNamespace>iNKORE.UI.WPF.Modern</RootNamespace>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
 		<NoWarn>$(NoWarn);CS1591;1701;1702;CA1416;CS1573</NoWarn>

source/iNKORE.UI.WPF.Modern.Gallery/App.xaml.cs

@@ -1,6 +1,8 @@
 using iNKORE.UI.WPF.Modern.Gallery.DataModel;
 using System.Reflection;
 using System;
+using System.Diagnostics;
+using System.Windows;
 
 namespace iNKORE.UI.WPF.Modern.Gallery
 {
@@ -16,5 +18,18 @@ public static TEnum GetEnum<TEnum>(string text) where TEnum : struct
             }
             return (TEnum)Enum.Parse(typeof(TEnum), text);
         }
+
+        public static Process BrowseWeb(string path)
+        {
+            try
+            {
+                return Process.Start(new ProcessStartInfo(path) { UseShellExecute = true });
+            }
+            catch(Exception ex)
+            {
+                MessageBox.Show(ex.ToString());
+                return null;
+            }
+        }
     }
 }

source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/DocumentationPromotion.xaml

@@ -0,0 +1,68 @@
+<UserControl x:Class="iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls.DocumentationPromotion"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+             d:DesignWidth="640"
+             mc:Ignorable="d" >
+    <Grid>
+        <Border Background="{DynamicResource {x:Static ui:ThemeKeys.LayerFillColorDefaultBrushKey}}"
+                                BorderBrush="{DynamicResource {x:Static ui:ThemeKeys.CardStrokeColorDefaultBrushKey}}"
+                                CornerRadius="8" BorderThickness="1" Padding="12, 10" TextElement.FontSize="14">
+
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                    <RowDefinition Height="Auto"/>
+                </Grid.RowDefinitions>
+
+                <ui:SimpleStackPanel Orientation="Horizontal" Spacing="8" TextElement.Foreground="{DynamicResource {x:Static ui:ThemeKeys.AccentTextFillColorPrimaryBrushKey}}"
+                                                     Margin="0,3,0,0">
+                    <ui:FontIcon Icon="{x:Static ui:FluentSystemIcons.TextBulletListSquareEdit_24_Regular}" FontSize="24"/>
+                    <TextBlock FontSize="16" VerticalAlignment="Center" FontWeight="SemiBold">It's time for a brand-new docmentation set!</TextBlock>
+                </ui:SimpleStackPanel>
+
+                <ui:SimpleStackPanel Orientation="Vertical" Spacing="12" Grid.Row="1" Margin="5,10">
+                    <FrameworkElement.Resources>
+                        <Style TargetType="TextBlock">
+                            <Setter Property="LineHeight" Value="21"/>
+                            <Setter Property="TextWrapping" Value="Wrap"/>
+                            <Setter Property="TextAlignment" Value="Justify"/>
+                        </Style>
+                    </FrameworkElement.Resources>
+
+                    <TextBlock>
+                                        <Run>We are looking for passionate volunteers to help us write and improve the documentation for the iNKORE.UI.WPF.Modern library. Your contributions will be invaluable in making this project more accessible and user-friendly for the entire community.</Run>
+                    </TextBlock>
+                    <TextBlock>
+                                        <Run>Whether you are an experienced developer or just enthusiastic about contributing to open-source, we welcome your help!</Run>
+                    </TextBlock>
+
+                    <TextBlock>
+                                        <Run>It's very easy to join us! You can create a PR in our</Run>
+                                        <Hyperlink x:Name="Hyperlink_DoucmentationRepo" Click="Hyperlink_DoucmentationRepo_Click">Doucmentation repository</Hyperlink>
+                                        <Run>when you're free. You can also join our</Run>
+                                        <Hyperlink x:Name="Hyperlink_Discord" Click="Hyperlink_Discord_Click">Discord server</Hyperlink>
+                                        <Run>and</Run>
+                                        <Hyperlink x:Name="Hyperlink_Telegram" Click="Hyperlink_Telegram_Click">Telegram group</Hyperlink>
+                                        <Run>to hang out with us.</Run>
+                    </TextBlock>
+                    <Separator Opacity="0.2"/>
+                </ui:SimpleStackPanel>
+
+                <ui:SimpleStackPanel Grid.Row="3" Orientation="Horizontal" Spacing="10">
+
+                    <ui:HyperlinkButton x:Name="HyperlinkButton_Repository" Content="Repository" Click="HyperlinkButton_Repository_Click"/>
+                    <ui:HyperlinkButton x:Name="HyperlinkButton_Package" Content="Package" Click="HyperlinkButton_Package_Click"/>
+
+                    <ui:HyperlinkButton x:Name="HyperlinkButton_DocRepository" Content="Docs Repository" Click="Hyperlink_DoucmentationRepo_Click"/>
+                    <ui:HyperlinkButton x:Name="HyperlinkButton_Facebook" Content="Follow us on Facebook!" Click="HyperlinkButton_Facebook_Click"/>
+
+                </ui:SimpleStackPanel>
+            </Grid>
+        </Border>
+
+    </Grid>
+</UserControl>

source/iNKORE.UI.WPF.Modern.Gallery/Controls/UserControls/DocumentationPromotion.xaml.cs

@@ -0,0 +1,60 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace iNKORE.UI.WPF.Modern.Gallery.Controls.UserControls
+{
+    /// <summary>
+    /// DocumentationPromotion.xaml 的交互逻辑
+    /// </summary>
+    public partial class DocumentationPromotion : UserControl
+    {
+        public DocumentationPromotion()
+        {
+            InitializeComponent();
+        }
+
+        private void HyperlinkButton_Repository_Click(object sender, RoutedEventArgs e)
+        {
+            App.BrowseWeb(ThemeManager.Link_GithubRepo);
+        }
+
+        private void HyperlinkButton_Package_Click(object sender, RoutedEventArgs e)
+        {
+            App.BrowseWeb(ThemeManager.Link_NugetPackage);
+        }
+
+        private void Hyperlink_DoucmentationRepo_Click(object sender, RoutedEventArgs e)
+        {
+            App.BrowseWeb("https://github.com/iNKORE-NET/Documentation/tree/main/data/docs/ui.wpf.modern");
+        }
+
+        private void Hyperlink_Discord_Click(object sender, RoutedEventArgs e)
+        {
+            App.BrowseWeb(ThemeManager.Link_DiscordServer);
+        }
+
+        private void Hyperlink_Telegram_Click(object sender, RoutedEventArgs e)
+        {
+            App.BrowseWeb(ThemeManager.Link_TelegramGroup);
+
+        }
+
+        private void HyperlinkButton_Facebook_Click(object sender, RoutedEventArgs e)
+        {
+            App.BrowseWeb(ThemeManager.Link_FacebookPage);
+        }
+
+    }
+}