Fix gallery apis

iNKORE-NET · Jun 30, 2024 · e007b1f · e007b1f
1 parent 26dc022
commit e007b1f
Show file tree

Hide file tree

Showing 54 changed files with 226 additions and 176 deletions.
diff --git a/samples/FlyoutExample/FlyoutExample.csproj b/samples/FlyoutExample/FlyoutExample.csproj
@@ -10,8 +10,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.4" />
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.28" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.7.1" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/NavigationViewExample/NavigationViewExample.csproj b/samples/NavigationViewExample/NavigationViewExample.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.5" />
+    <PackageReference Include="iNKORE.UI.WPF" Version="1.2.7.1" />
     <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
   </ItemGroup>
 

diff --git a/samples/SettingsPageExample/SettingsPageExample.csproj b/samples/SettingsPageExample/SettingsPageExample.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.26.3" />
+    <PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
   </ItemGroup>
 
 </Project>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/App.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/App.xaml
@@ -5,6 +5,7 @@
     xmlns:common="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Common"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:presets="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.Presets"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -81,7 +82,7 @@
                 <Setter Property="sc:AutoPanningMode.IsEnabled" Value="True" />
             </Style>
 
-            <Style x:Key="OptionsPanelStyle" TargetType="ui:SimpleStackPanel">
+            <Style x:Key="OptionsPanelStyle" TargetType="ikw:SimpleStackPanel">
                 <Setter Property="Spacing" Value="12" />
                 <Style.Resources>
                     <Style BasedOn="{StaticResource {x:Type ComboBox}}" TargetType="ComboBox">
@@ -98,7 +99,7 @@
 
             <Thickness x:Key="ControlPageContentMargin">24,0,24,20</Thickness>
 
-            <Style x:Key="ControlPageContentPanelStyle" TargetType="ui:SimpleStackPanel">
+            <Style x:Key="ControlPageContentPanelStyle" TargetType="ikw:SimpleStackPanel">
                 <Setter Property="Margin" Value="{StaticResource ControlPageContentMargin}" />
                 <Setter Property="Spacing" Value="16" />
             </Style>

diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestContent.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestContent.xaml
@@ -5,20 +5,20 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
     <Grid Margin="12">
-        <ui:SimpleStackPanel
+        <ikw:SimpleStackPanel
             HorizontalAlignment="Left"
             VerticalAlignment="Center"
             Spacing="12">
             <Button Click="ShowDialog" Content="Show ContentDialog" />
             <Button Click="ShowParentedDialogPopup" Content="Show parented ContentDialog (Popup)" />
             <Button Click="ShowParentedDialogInPlace" Content="Show parented ContentDialog (InPlace)" />
             <Button Click="OpenNewWindow" Content="Open a new window" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
 
         <local:TestContentDialog x:Name="ParentedDialog" PrimaryButtonText="Toggle theme" />
     </Grid>

diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestWindow.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContentDialogTestWindow.xaml
@@ -5,19 +5,20 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     Title="Content Dialog Test Window"
     Width="800"
     Height="640"
     ui:WindowHelper.UseModernWindowStyle="True"
     Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
     mc:Ignorable="d">
     <Grid>
-        <ui:SimpleStackPanel
+        <ikw:SimpleStackPanel
             HorizontalAlignment="Center"
             VerticalAlignment="Center"
             Spacing="12">
             <Button Click="ShowDialogInThisWindow" Content="Show content dialog in this window" />
             <Button Click="ShowDialogInMainWindow" Content="Show content dialog in main window" />
-        </ui:SimpleStackPanel>
+        </ikw:SimpleStackPanel>
     </Grid>
 </Window>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContextMenuPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ContextMenuPage.xaml
@@ -6,10 +6,11 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="A ContextMenu with checkable MenuItems and Separator.">
             <Button Content="Options">
                 <Button.ContextMenu>
@@ -132,5 +133,5 @@
         <local:ControlExample HeaderText="Text control ContextMenu.">
             <TextBox MinWidth="150" Text="Some text" />
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ControlPaletteTestContent.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/ControlPaletteTestContent.xaml
@@ -6,6 +6,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     x:Name="Root"
     Foreground="{DynamicResource SystemControlPageTextBaseHighBrush}"
     mc:Ignorable="d">
@@ -26,7 +27,7 @@
             </Setter>
         </Style>
 
-        <Style TargetType="ui:SimpleStackPanel">
+        <Style TargetType="ikw:SimpleStackPanel">
             <Setter Property="Spacing" Value="12" />
         </Style>
     </UserControl.Resources>
@@ -43,7 +44,7 @@
         </Border>
 
         <HeaderedContentControl Header="Buttons">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <Button x:Name="Button" Content="Enabled button" />
                 <Button Content="Disabled button" IsEnabled="False" />
                 <ToggleButton Content="Toggle button" />
@@ -53,11 +54,11 @@
                     Content="Disabled accent button"
                     IsEnabled="False"
                     Style="{DynamicResource AccentButtonStyle}" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Checkbox">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <CheckBox Content="Unchecked" />
                 <CheckBox Content="Checked" IsChecked="True" />
                 <CheckBox
@@ -68,11 +69,11 @@
                     Content="Disabled"
                     IsChecked="True"
                     IsEnabled="False" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Radio button">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <RadioButton
                     Content="Unchecked"
                     GroupName="Test1"
@@ -88,11 +89,11 @@
                     Initialized="RadioButton_Initialized"
                     IsChecked="True"
                     IsEnabled="False" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Combo box">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <ComboBox Width="200">
                     <ComboBoxItem Content="Item 1" IsSelected="True" />
                     <ComboBoxItem Content="Item 2" />
@@ -103,7 +104,7 @@
                     <ComboBoxItem Content="Editable item 2" />
                     <ComboBoxItem Content="Editable item 3" />
                 </ComboBox>
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Textbox">
@@ -114,10 +115,10 @@
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Toggle switch">
-            <ui:SimpleStackPanel>
+            <ikw:SimpleStackPanel>
                 <ui:ToggleSwitch IsOn="False" />
                 <ui:ToggleSwitch IsOn="True" />
-            </ui:SimpleStackPanel>
+            </ikw:SimpleStackPanel>
         </HeaderedContentControl>
 
         <HeaderedContentControl Header="Slider">

diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DataGridPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DataGridPage.xaml
@@ -7,6 +7,7 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
@@ -141,7 +142,7 @@
             </local:ControlExample.Example>
             <local:ControlExample.Options>
                 <ui:ScrollViewerEx Width="300" Margin="-16">
-                    <ui:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
+                    <ikw:SimpleStackPanel Margin="16" Style="{StaticResource OptionsPanelStyle}">
                         <TextBlock
                             x:Name="LoadTimeTextBlock"
                             MouseLeftButtonUp="LoadTimeTextBlock_MouseLeftButtonUp"
@@ -204,7 +205,7 @@
                             ui:ControlHelper.Header="SelectionMode"
                             ItemsSource="{Binding Source={x:Type DataGridSelectionMode}, Converter={StaticResource EnumValuesConverter}}"
                             SelectedItem="{Binding ElementName=dataGrid, Path=SelectionMode}" />
-                    </ui:SimpleStackPanel>
+                    </ikw:SimpleStackPanel>
                 </ui:ScrollViewerEx>
             </local:ControlExample.Options>
         </local:ControlExample>

diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DatePickerPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/DatePickerPage.xaml
@@ -5,11 +5,12 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sc="clr-namespace:SamplesCommon;assembly=SamplesCommon"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HeaderText="DatePicker with a header and placeholder text.">
             <local:ControlExample.Example>
                 <DatePicker
@@ -19,7 +20,7 @@
                     ui:ControlHelper.PlaceholderText="Pick a date" />
             </local:ControlExample.Example>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <TextBox ui:ControlHelper.Header="Header" Text="{Binding ElementName=datePicker, Path=(ui:ControlHelper.Header), UpdateSourceTrigger=PropertyChanged}" />
 
                     <TextBox ui:ControlHelper.Header="PlaceholderText" Text="{Binding ElementName=datePicker, Path=(ui:ControlHelper.PlaceholderText), UpdateSourceTrigger=PropertyChanged}" />
@@ -37,9 +38,9 @@
                     <Button Click="BlackoutDatesInPast" Content="Blackout dates in the past" />
 
                     <CheckBox Content="IsEnabled" IsChecked="{Binding ElementName=datePicker, Path=IsEnabled}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/FlyoutPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/FlyoutPage.xaml
@@ -5,6 +5,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:sys="clr-namespace:System;assembly=mscorlib"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     Title="Flyout"
@@ -32,12 +33,12 @@
                 </ui:FlyoutService.Flyout>
             </Button>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <ui:RadioButtons
                         Header="Placement"
                         ItemsSource="{Binding Source={x:Type ui:FlyoutPlacementMode}, Converter={StaticResource EnumValuesConverter}}"
                         SelectedItem="{Binding ElementName=Flyout1, Path=Placement}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
             <local:ControlExample.Xaml>
                 <sys:String xml:space="preserve">

diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GridSplitterPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GridSplitterPage.xaml
@@ -5,10 +5,11 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
 
-    <ui:SimpleStackPanel>
+    <ikw:SimpleStackPanel>
         <local:ControlExample HorizontalContentAlignment="Stretch" HeaderText="A simple GridSplitter.">
             <Grid>
                 <Grid.ColumnDefinitions>
@@ -34,10 +35,10 @@
                     Text="Column 2" />
             </Grid>
             <local:ControlExample.Options>
-                <ui:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
+                <ikw:SimpleStackPanel Style="{StaticResource OptionsPanelStyle}">
                     <CheckBox Content="ShowsPreview" IsChecked="{Binding ElementName=ColumnGridSplitter, Path=ShowsPreview}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
             </local:ControlExample.Options>
         </local:ControlExample>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GroupBoxPage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/GroupBoxPage.xaml
@@ -4,6 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery.ControlPages"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     mc:Ignorable="d">
@@ -21,7 +22,7 @@
         </Style>
     </Page.Resources>
 
-    <ui:SimpleStackPanel
+    <ikw:SimpleStackPanel
         Width="404"
         HorizontalAlignment="Left"
         Spacing="0">
@@ -64,5 +65,5 @@
                 </ComboBox>
             </StackPanel>
         </GroupBox>
-    </ui:SimpleStackPanel>
+    </ikw:SimpleStackPanel>
 </ui:Page>
diff --git a/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/InfoBadgePage.xaml b/source/iNKORE.UI.WPF.Modern.Gallery/ControlPages/InfoBadgePage.xaml
@@ -6,6 +6,7 @@
     xmlns:local="clr-namespace:iNKORE.UI.WPF.Modern.Gallery"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:sys="clr-namespace:System;assembly=System.Runtime"
+    xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
     xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
     Title="InfoBadge Page"
     d:DesignHeight="450"
@@ -101,7 +102,7 @@
             HorizontalContentAlignment="Stretch"
             HeaderText="Different InfoBadge Styles">
             <local:ControlExample.Example>
-                <ui:SimpleStackPanel
+                <ikw:SimpleStackPanel
                     HorizontalAlignment="Center"
                     Orientation="Horizontal"
                     Spacing="20">
@@ -118,7 +119,7 @@
                         x:Name="infoBadge4"
                         VerticalAlignment="Center"
                         Style="{DynamicResource AttentionDotInfoBadgeStyle}" />
-                </ui:SimpleStackPanel>
+                </ikw:SimpleStackPanel>
 
             </local:ControlExample.Example>
             <local:ControlExample.Options>