Skip to content

Gallery Revamp: Design Geometry Page #340

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GID0317 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Gallery Revamp: Design Geometry Page #340

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f506bbc
Upload Geometry Image Example
GID0317 Aug 28, 2025
bbd48b5
Add GeometryPage XAML for corner radius examples
GID0317 Aug 28, 2025
a850827
Add GeometryPage cs side to handle the logic on xaml side
GID0317 Aug 28, 2025
412965b
Add Geometry section to Controls.Foundation.json
GID0317 Aug 28, 2025
266b160
Add Geometry navigation handling in NavigationRootPage
GID0317 Aug 28, 2025
cd7a801
Add Geometry item in NavigationRootPage.xaml
GID0317 Aug 28, 2025
d316ce7
Add temporary image theme aware support
GID0317 Aug 28, 2025
4fbba96
Revert wrong change to include right one
GID0317 Aug 28, 2025
1a33793
Implement GeometryPage temporary theme aware image
GID0317 Aug 28, 2025
a8f8859
Merge branch 'iNKORE-NET:main' into Gallery-Revamp-Design-Geometry
GID0317 Sep 2, 2025
70bf653
Refactor GeometryPage layout and controls
GID0317 Sep 2, 2025
c7f76a5
Change DynamicResource to StaticResource for CornerRadius in the page…
GID0317 Sep 2, 2025
4832636
Merge branch 'iNKORE-NET:main' into Gallery-Revamp-Design-Geometry
GID0317 Sep 21, 2025
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
Binary file added source/iNKORE.UI.WPF.Modern.Gallery/Assets/Design/Geometry.dark.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added source/iNKORE.UI.WPF.Modern.Gallery/Assets/Design/Geometry.light.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
25 changes: 24 additions & 1 deletion source/iNKORE.UI.WPF.Modern.Gallery/DataModel/Data/Controls.Foundation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,29 @@
"Description": "Design guidance and resources",
"Items":
[
{
"UniqueId": "Geometry",
"Title": "Geometry",
"Subtitle": "Corner radius and geometry values",
"ImagePath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
"ImageIconPath": "ms-appx:///Assets/ControlIcons/DefaultIcon.png",
"Description": "",
"Content": "",
"IncludedInBuild": true,
"IsNew": false,
"IsUpdated": false,
"Docs": [
{
"Title": "Geometry in Windows 11",
"Uri": "https://learn.microsoft.com/windows/apps/design/signature-experiences/geometry"
},
{
"Title": "WinUI Theme Resources (GitHub)",
"Uri": "https://github.com/microsoft/microsoft-ui-xaml/blob/main/src/controls/dev/CommonStyles/Common_themeresources_any.xaml"
}
],
"RelatedControls": []
},
{
"UniqueId": "Typography",
"Title": "Typography",
Expand Down Expand Up @@ -68,4 +91,4 @@
]
}
]
}
}
8 changes: 8 additions & 0 deletions source/iNKORE.UI.WPF.Modern.Gallery/Navigation/NavigationRootPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,14 @@
<ui:FontIcon Glyph="&#xEB3C;" />
</ui:NavigationViewItem.Icon>
<ui:NavigationViewItem.MenuItems>
<ui:NavigationViewItem
x:Name="GeometryItem"
Content="Geometry"
Tag="Geometry">
<ui:NavigationViewItem.Icon>
<ui:FontIcon Glyph="&#xE743;" />
</ui:NavigationViewItem.Icon>
</ui:NavigationViewItem>
<ui:NavigationViewItem
x:Name="TypographyItem"
Content="Typography"
Expand Down
18 changes: 16 additions & 2 deletions source/iNKORE.UI.WPF.Modern.Gallery/Navigation/NavigationRootPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,19 +293,33 @@ private void OnNavigationViewSelectionChanged(NavigationView sender, NavigationV
_lastItem = item;
rootFrame.Navigate(item);
}
else if (selectedItem?.Tag?.ToString() == "Geometry")
{
var geometryId = "Geometry";
if (_lastItem?.ToString() == geometryId) return;
_lastItem = geometryId;
var geometryItem = ControlInfoDataSource.Instance.Realms
.SelectMany(r => r.Groups)
.SelectMany(g => g.Items)
.FirstOrDefault(i => i.UniqueId == "Geometry");
if (geometryItem != null)
{
rootFrame.Navigate(ItemPage.Create(geometryItem));
}
}
else if (selectedItem?.Tag?.ToString() == "Typography")
{
// Handle Typography navigation
var typographyId = "Typography";
if (_lastItem?.ToString() == typographyId) return;
_lastItem = typographyId;

// Find Typography item from the data source
var typographyItem = ControlInfoDataSource.Instance.Realms
.SelectMany(r => r.Groups)
.SelectMany(g => g.Items)
.FirstOrDefault(i => i.UniqueId == "Typography");

if (typographyItem != null)
{
rootFrame.Navigate(ItemPage.Create(typographyItem));
Expand Down
Loading
Loading