Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
  • Loading branch information
NotYoojun committed Jun 5, 2024
2 parents b22cc1b + 7f94e21 commit f419d11
Show file tree
Hide file tree
Showing 18 changed files with 357 additions and 19 deletions.
27 changes: 25 additions & 2 deletions iNKORE.UI.WPF.Modern.sln
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WindowExample", "samples\Wi
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IconKeyFileMaker", "tools\IconKeyFileMaker\IconKeyFileMaker.csproj", "{6561632F-0B5A-4869-8C82-E05238326B32}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExamplePhotoTaker", "sample\ExamplePhotoTaker\ExamplePhotoTaker.csproj", "{194059C8-5CBF-4548-8216-3D251CE43236}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ExamplePhotoTaker", "samples\ExamplePhotoTaker\ExamplePhotoTaker.csproj", "{194059C8-5CBF-4548-8216-3D251CE43236}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Acrylic10Example", "samples\Acrylic10Example\Acrylic10Example.csproj", "{84C80EA6-0F9C-49CF-AB66-5696CC888CA7}"
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
Expand Down Expand Up @@ -329,6 +331,26 @@ Global
{194059C8-5CBF-4548-8216-3D251CE43236}.Release|x64.Build.0 = Release|Any CPU
{194059C8-5CBF-4548-8216-3D251CE43236}.Release|x86.ActiveCfg = Release|Any CPU
{194059C8-5CBF-4548-8216-3D251CE43236}.Release|x86.Build.0 = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|ARM.ActiveCfg = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|ARM.Build.0 = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|ARM64.Build.0 = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|x64.ActiveCfg = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|x64.Build.0 = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|x86.ActiveCfg = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Debug|x86.Build.0 = Debug|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|Any CPU.Build.0 = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|ARM.ActiveCfg = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|ARM.Build.0 = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|ARM64.ActiveCfg = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|ARM64.Build.0 = Release|Any CPU
{F9951C10-6C42-4E5F-BAB2-381C17D4DE35}.Release|x64.ActiveCfg = Release|Any CPU
{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
Expand Down Expand Up @@ -366,6 +388,7 @@ Global
{936F7656-B5E8-44A8-8560-D954E1E68383} = {A96F98E9-18B5-4863-8F28-9B7BDF70A128}
{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
Expand Down
8 changes: 8 additions & 0 deletions samples/ExamplePhotoTaker/ExamplePhotoTaker.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,17 @@
<UseWPF>true</UseWPF>
</PropertyGroup>

<ItemGroup>
<None Remove="david-van-dijk-3LTht2nxd34-unsplash.jpg" />
</ItemGroup>

<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>

<ItemGroup>
<Resource Include="david-van-dijk-3LTht2nxd34-unsplash.jpg" />
</ItemGroup>

</Project>
39 changes: 31 additions & 8 deletions samples/ExamplePhotoTaker/MainWindow.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ExamplePhotoTaker" xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d"
Title="MainWindow" Height="450" Width="800">
mc:Ignorable="d" ui:WindowHelper.UseModernWindowStyle="True"
Title="MainWindow" Height="450" Width="800" Language="en-US">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
Expand All @@ -17,12 +17,35 @@
<Border Grid.Row="1" Margin="10,0,10,10" Background="LightGray" BorderBrush="DimGray" Padding="10" BorderThickness="1">
<Viewbox>
<Viewbox x:Name="Viewbox_Viewport" Width="960">
<Border Background="White" Padding="10" Width="640" Height="320">
<ui:SimpleStackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
<Button>
<ui:IconAndText Icon="{x:Static ui:SegoeFluentIcons.Save}" Content="Save"/>
</Button>
</ui:SimpleStackPanel>
<Border Background="White" Padding="10" Width="680" Height="320">
<ui:NavigationView>
<ui:NavigationView.MenuItems>
<ui:NavigationViewItem Content="Home">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Home}"/>
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>

<ui:NavigationViewItem Content="Library">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.OEM}"/>
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>

<ui:NavigationViewItem Content="Games">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Game}"/>
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>


</ui:NavigationView.MenuItems>

<Border>
<TextBlock Text="Content Ae"/>
</Border>

</ui:NavigationView>
</Border>
</Viewbox>
</Viewbox>
Expand Down
8 changes: 0 additions & 8 deletions samples/ExamplePhotoTaker/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,6 @@ private void Button_SaveScreenshot_Click(object sender, RoutedEventArgs e)
}
}
}

private void HyperlinkButton_Click(object sender, RoutedEventArgs e)
{
Process.Start(new ProcessStartInfo("https://inkore.net/")
{
UseShellExecute = true
});
}
}

class VacationSpots : ObservableCollection<string>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions samples/NavigationViewExample/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<Application x:Class="NavigationViewExample.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:NavigationViewExample"
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>
14 changes: 14 additions & 0 deletions samples/NavigationViewExample/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Configuration;
using System.Data;
using System.Windows;

namespace NavigationViewExample
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}

}
10 changes: 10 additions & 0 deletions samples/NavigationViewExample/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -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)
)]
41 changes: 41 additions & 0 deletions samples/NavigationViewExample/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<Window x:Class="NavigationViewExample.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:NavigationViewExample"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d"
ui:WindowHelper.UseModernWindowStyle="True" ui:WindowHelper.SystemBackdropType="Mica"
Title="MainWindow" Height="450" Width="800"
Loaded="Window_Loaded">

<ui:NavigationView x:Name="NavigationView_Root" IsPaneOpen="False"
SelectionChanged="NavigationView_SelectionChanged">

<ui:NavigationView.MenuItems>
<ui:NavigationViewItem x:Name="NavigationViewItem_Home" Content="Home">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Home}"/>
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>

<ui:NavigationViewItem x:Name="NavigationViewItem_Apps" Content="Apps">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.OEM}"/>
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>

<ui:NavigationViewItem x:Name="NavigationViewItem_Games" Content="Games">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Icon="{x:Static ui:SegoeFluentIcons.Game}"/>
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>


</ui:NavigationView.MenuItems>

<ui:Frame x:Name="Frame_Main"/>

</ui:NavigationView>
</Window>
60 changes: 60 additions & 0 deletions samples/NavigationViewExample/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
using iNKORE.UI.WPF.Modern.Controls;
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 Page = iNKORE.UI.WPF.Modern.Controls.Page;

namespace NavigationViewExample
{
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : Window
{
public MainWindow()
{
InitializeComponent();
}

public Pages.AppsPage Page_Apps = new Pages.AppsPage();
public Pages.HomePage Page_Home = new Pages.HomePage();
public Pages.GamesPage Page_Games = new Pages.GamesPage();

private void NavigationView_SelectionChanged(NavigationView sender, NavigationViewSelectionChangedEventArgs args)
{
var item = sender.SelectedItem;
Page? page = null;

if(item == NavigationViewItem_Home)
{
page = Page_Home;
}
else if (item == NavigationViewItem_Games)
{
page = Page_Games;
}
else if (item == NavigationViewItem_Apps)
{
page = Page_Apps;
}

if(page != null)
{
NavigationView_Root.Header = page.Title;
Frame_Main.Navigate(page);
}
}

private void Window_Loaded(object sender, RoutedEventArgs e)
{
NavigationView_Root.SelectedItem = NavigationViewItem_Home;
}
}
}
17 changes: 17 additions & 0 deletions samples/NavigationViewExample/NavigationViewExample.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework>net6.0-windows10.0.18362.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="iNKORE.UI.WPF" Version="1.2.5" />
<PackageReference Include="iNKORE.UI.WPF.Modern" Version="0.9.29" />
</ItemGroup>

</Project>
15 changes: 15 additions & 0 deletions samples/NavigationViewExample/Pages/AppsPage.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<ui:Page x:Class="NavigationViewExample.Pages.AppsPage"
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:NavigationViewExample.Pages"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="Apps">

<Grid>
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0.5" FontSize="24">Current Page: Apps</TextBlock>
</Grid>
</ui:Page>
29 changes: 29 additions & 0 deletions samples/NavigationViewExample/Pages/AppsPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
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;
using Page = iNKORE.UI.WPF.Modern.Controls.Page;

namespace NavigationViewExample.Pages
{
/// <summary>
/// Interaction logic for AppsPage.xaml
/// </summary>
public partial class AppsPage : Page
{
public AppsPage()
{
InitializeComponent();
}
}
}
16 changes: 16 additions & 0 deletions samples/NavigationViewExample/Pages/GamesPage.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<ui:Page x:Class="NavigationViewExample.Pages.GamesPage"
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:NavigationViewExample.Pages"
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800"
Title="Games">

<Grid>
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" Opacity="0.5" FontSize="24">Current Page: Games</TextBlock>

</Grid>
</ui:Page>
30 changes: 30 additions & 0 deletions samples/NavigationViewExample/Pages/GamesPage.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
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;
using Page = iNKORE.UI.WPF.Modern.Controls.Page;


namespace NavigationViewExample.Pages
{
/// <summary>
/// Interaction logic for GamesPage.xaml
/// </summary>
public partial class GamesPage : Page
{
public GamesPage()
{
InitializeComponent();
}
}
}
Loading

0 comments on commit f419d11

Please sign in to comment.