Skip to content

Feature: Added GlowUI #113

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

Merged
Lamparter merged 10 commits into from
Mar 12, 2025
Merged

Feature: Added GlowUI #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d54c6f1
Added Generic.xaml back for Riverside.Toolkit.Icons
Lamparter Mar 11, 2025
efc8d9b
Added a filler generic.xaml for wpf (Riverside.Toolkit.Icons)
Lamparter Mar 11, 2025
6539ea9
Rename Riverside.Toolkit.Brushes to Riverside.Toolkit.Media
Lamparter Mar 11, 2025
606d4f4
Reorder SLN and remove WPF icons generic.xaml
Lamparter Mar 11, 2025
9efc37e
Added `Riverside.Toolkit.Media`
Lamparter Mar 11, 2025
a45522f
Add back `Generic.xaml` for TitleBarEx
Lamparter Mar 11, 2025
f724550
Add GlowUI
Lamparter Mar 11, 2025
b09a3e9
Add GlowUI projects build to CI
Lamparter Mar 11, 2025
452c759
Format XAML
Lamparter Mar 11, 2025
3e80957
Removed legacy GlowUI projects
Lamparter Mar 12, 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
8 changes: 6 additions & 2 deletions .github/scripts/BuildProject.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@ param (
# Calculate the fully qualified project name
if ($Project -eq "Riverside.Extensions.WinUI") {
$FullyQualifiedName = "Riverside.Extensions.$Head"
} else {
} elseif ($Project -like "Riverside.Toolkit.*") {
$FullyQualifiedName = "$($Project -replace '\.Toolkit\.', ".Toolkit.$Head.")"
} elseif ($Project -like "Riverside.GlowUI.*") {
$FullyQualifiedName = "$($Project -replace '\.GlowUI\.', ".GlowUI.$Head.")"
} else {
$FullyQualifiedName = $Project
}

# Define the project directory
Expand All @@ -19,7 +23,7 @@ $ProjectDirectory = Join-Path -Path $ProjectRoot -ChildPath "src\platforms\$Full
# Check if the project directory exists
if (-Not (Test-Path -Path $ProjectDirectory)) {
# Check in src\extensions if not found in src\platforms
$ProjectDirectory = Join-Path -Path $ProjectRoot -ChildPath "src\extensions\$Project"
$ProjectDirectory = Join-Path -Path $ProjectRoot -ChildPath "src\extensions\$FullyQualifiedName"
if (-Not (Test-Path -Path $ProjectDirectory)) {
Write-Output "Project directory '$ProjectDirectory' does not exist, skipping build."
exit 0
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
fail-fast: false
matrix:
configuration: [Debug, Release]
core: [Riverside.Extensions.Accountability, Riverside.Extensions.PInvoke, Riverside.Extensions.Primitives, Riverside.Extensions.UAP, Riverside.Extensions.Versioning, Riverside.Extensions.WinUI, Riverside.Toolkit.Animations, Riverside.Toolkit.Brushes, Riverside.Toolkit.Controls.Primitives, Riverside.Toolkit.Controls.TitleBar, Riverside.Toolkit.Converters, Riverside.Toolkit.Extensions, Riverside.Toolkit.Helpers, Riverside.Toolkit.Icons, Riverside.Toolkit.Services]
core: [Riverside.Extensions.Accountability, Riverside.Extensions.PInvoke, Riverside.Extensions.Primitives, Riverside.Extensions.UAP, Riverside.Extensions.Versioning, Riverside.GlowUI.Styles, Riverside.Extensions.WinUI, Riverside.Toolkit.Animations, Riverside.Toolkit.Media, Riverside.Toolkit.Controls.Primitives, Riverside.Toolkit.Controls.TitleBar, Riverside.Toolkit.Controls.Crimson, Riverside.Toolkit.Converters, Riverside.Toolkit.Extensions, Riverside.Toolkit.Helpers, Riverside.Toolkit.Icons, Riverside.Toolkit.Services]
head: [Uno, Wpf, WinUI, Uwp]
exclude: # Exclude known failing configurations
- core: Riverside.Toolkit.Controls.TitleBar
Expand Down
16 changes: 13 additions & 3 deletions CubeKit.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,16 @@
<Folder Name="/src/" />
<Folder Name="/src/core/" Id="8d626ea8-cb54-bc41-363a-217881beba6e">
<Project Path="src/core/Riverside.Extensions.WinUI/Riverside.Extensions.WinUI.shproj" />
<Project Path="src/core/Riverside.GlowUI.Styles/Riverside.GlowUI.Styles.shproj" Id="0c0c40c2-ce7b-4478-a571-fd5595511996" />
<Project Path="src/core/Riverside.Toolkit.Animations/Riverside.Toolkit.Animations.shproj" />
<Project Path="src/core/Riverside.Toolkit.Brushes/Riverside.Toolkit.Brushes.shproj" />
<Project Path="src/core/Riverside.Toolkit.Controls.Crimson/Riverside.Toolkit.Controls.Crimson.shproj" Id="f2ca66e2-ab46-45c2-88f1-a2ad68cf8c66" />
<Project Path="src/core/Riverside.Toolkit.Controls.Primitives/Riverside.Toolkit.Controls.Primitives.shproj" />
<Project Path="src/core/Riverside.Toolkit.Controls.TitleBar/Riverside.Toolkit.Controls.TitleBar.shproj" />
<Project Path="src/core/Riverside.Toolkit.Converters/Riverside.Toolkit.Converters.shproj" />
<Project Path="src/core/Riverside.Toolkit.Extensions/Riverside.Toolkit.Extensions.shproj" />
<Project Path="src/core/Riverside.Toolkit.Helpers/Riverside.Toolkit.Helpers.shproj" />
<Project Path="src/core/Riverside.Toolkit.Icons/Riverside.Toolkit.Icons.shproj" />
<Project Path="src/core/Riverside.Toolkit.Media/Riverside.Toolkit.Media.shproj" Id="7917502f-95de-544f-61cd-fe140de8e83f" />
<Project Path="src/core/Riverside.Toolkit.Services/Riverside.Toolkit.Services.shproj" />
</Folder>
<Folder Name="/src/extensions/" Id="f23f25d0-9df9-18e8-03ac-e66b5ef618a6">
Expand All @@ -56,6 +58,10 @@
</Project>
<Project Path="src/platforms/Riverside.Extensions.WinUI/Riverside.Extensions.WinUI.csproj" />
<Project Path="src/platforms/Riverside.Extensions.Wpf/Riverside.Extensions.Wpf.csproj" />
<Project Path="src/platforms/Riverside.GlowUI.Uwp.Styles/Riverside.GlowUI.Uwp.Styles.csproj" Id="e01e4129-3aed-4963-ac44-bf2e63c8f11e">
<Platform Solution="Release|*" Project="x64" />
</Project>
<Project Path="src/platforms/Riverside.GlowUI.WinUI.Styles/Riverside.GlowUI.WinUI.Styles.csproj" Id="14a51f57-a0de-4539-aa52-53aad65380b5" />
<Project Path="src/platforms/Riverside.Toolkit.Uno.Controls.Primitives/Riverside.Toolkit.Uno.Controls.Primitives.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.Uno.Converters/Riverside.Toolkit.Uno.Converters.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.Uno.Extensions/Riverside.Toolkit.Uno.Extensions.csproj" />
Expand All @@ -65,7 +71,7 @@
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Animations/Riverside.Toolkit.Uwp.Animations.csproj">
<Platform Solution="Release|*" Project="x64" />
</Project>
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Brushes/Riverside.Toolkit.Uwp.Brushes.csproj">
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Controls.Crimson/Riverside.Toolkit.Uwp.Controls.Crimson.csproj" Id="db37c9a2-67c2-4e83-b04b-0631856d447d">
<Platform Solution="Release|*" Project="x64" />
</Project>
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Controls.Primitives/Riverside.Toolkit.Uwp.Controls.Primitives.csproj">
Expand All @@ -83,17 +89,21 @@
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Icons/Riverside.Toolkit.Uwp.Icons.csproj">
<Platform Solution="Release|*" Project="x64" />
</Project>
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Media/Riverside.Toolkit.Uwp.Media.csproj" Id="fedd4b69-9f81-d25c-5cc0-abd4592fdb00">
<Platform Solution="Release|*" Project="x64" />
</Project>
<Project Path="src/platforms/Riverside.Toolkit.Uwp.Services/Riverside.Toolkit.Uwp.Services.csproj">
<Platform Solution="Release|*" Project="x64" />
</Project>
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Animations/Riverside.Toolkit.WinUI.Animations.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Brushes/Riverside.Toolkit.WinUI.Brushes.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Controls.Crimson/Riverside.Toolkit.WinUI.Controls.Crimson.csproj" Id="e50ac24a-5e97-4309-9197-1a3bed5f0505" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Controls.Primitives/Riverside.Toolkit.WinUI.Controls.Primitives.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Controls.TitleBar/Riverside.Toolkit.WinUI.Controls.TitleBar.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Converters/Riverside.Toolkit.WinUI.Converters.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Extensions/Riverside.Toolkit.WinUI.Extensions.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Helpers/Riverside.Toolkit.WinUI.Helpers.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Icons/Riverside.Toolkit.WinUI.Icons.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Media/Riverside.Toolkit.WinUI.Media.csproj" Id="7d45c125-262a-3434-6bd3-40e7731294f8" />
<Project Path="src/platforms/Riverside.Toolkit.WinUI.Services/Riverside.Toolkit.WinUI.Services.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.Wpf.Converters/Riverside.Toolkit.Wpf.Converters.csproj" />
<Project Path="src/platforms/Riverside.Toolkit.Wpf.Extensions/Riverside.Toolkit.Wpf.Extensions.csproj" />
Expand Down
1 change: 1 addition & 0 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.2.2" />
<!-- This is kept only for Riverside.Toolkit.Flyouts and will be removed at a later date -->
<PackageVersion Include="CommunityToolkit.Uwp.Media" Version="8.2.250129-preview2" />
<PackageVersion Include="CommunityToolkit.WinUI.Media" Version="8.2.250129-preview2" />
<PackageVersion Include="DependencyPropertyGenerator" Version="1.4.0" />
<PackageVersion Include="H.NotifyIcon" Version="2.0.108" />
<PackageVersion Include="iNKORE.UI.WPF.Modern" Version="0.10.0" />
Expand Down
13 changes: 0 additions & 13 deletions dev/Riverside.GlowUI.Materials/AuroraLite.xaml.cs
View file
Open in desktop

This file was deleted.

14 changes: 0 additions & 14 deletions dev/Riverside.GlowUI.Materials/BloomView.xaml
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions dev/Riverside.GlowUI.Materials/BloomView.xaml.cs
View file
Open in desktop

This file was deleted.

18 changes: 0 additions & 18 deletions dev/Riverside.GlowUI.Materials/Mica10DeepBackground.xaml
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions dev/Riverside.GlowUI.Materials/Mica10DeepBackground.xaml.cs
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions dev/Riverside.GlowUI.Materials/Riverside.GlowUI.Materials.csproj
View file
Open in desktop

This file was deleted.

Loading
Loading