Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
75d9a34
Add new navigation bar minimal example
marticliment Mar 28, 2025
952ac48
Add WIinUIEx titlebar controlo
marticliment Mar 29, 2025
82dfac1
Proper InfoBadges on menubar
marticliment Mar 29, 2025
163a2ab
Make FiltersPanel use SplitPane instead of raw grid resizing
marticliment Mar 29, 2025
c25747a
Reimplement panel resizing
marticliment Mar 29, 2025
c16559b
Improvements to how the filter pane shows
marticliment Mar 29, 2025
a03fdf1
Better size responsiveness for filtering pane
marticliment Mar 30, 2025
3a3d7c1
Improvements to flyout menu bar, improvements to layout adaptation
marticliment Mar 30, 2025
0b4c57c
Change Filter button to be on top of the filter pane
marticliment Mar 30, 2025
f950108
Improvements to NavigationBar
marticliment Mar 30, 2025
2a67779
Keep user's choice regarding the menubar being expanded or not when w…
marticliment Mar 30, 2025
77b487d
Better contrast for overlapping filtering panel
marticliment Mar 31, 2025
f1f2b9a
Unround some borders
marticliment Mar 31, 2025
e6e699c
Remove comments
marticliment Mar 31, 2025
c6a74bc
improve accent color
marticliment Mar 31, 2025
1e3e718
Fix a bug where the filters panel would show the wrong style
marticliment Apr 4, 2025
d0a32a9
Add a "loading" indicator to the navbar
marticliment Apr 4, 2025
c672759
code changes
marticliment Apr 4, 2025
b36119a
Fix another bug where the filters pane would show with the incorrect …
marticliment Apr 4, 2025
055b435
Merge branch 'main' into new-navbar
marticliment Apr 4, 2025
79b8acb
Remove empty code
marticliment Apr 4, 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
3 changes: 3 additions & 0 deletions src/UniGetUI.Core.Data/Licenses.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ public static class LicenseData
{"NancyFx", "MIT"},
{"PhotoSauce.MagicScaler", "MIT"},
{"YamlDotNet", "MIT"},
{"WinUIEx", "MIT"},
{"InnoDependencyInstaller", "CPOL 1.02" },

// Package managers and related
Expand Down Expand Up @@ -47,6 +48,7 @@ public static class LicenseData
{"NancyFx", new Uri("https://github.com/NancyFx/Nancy/blob/master/license.txt")},
{"PhotoSauce.MagicScaler", new Uri("https://github.com/saucecontrol/PhotoSauce/blob/master/license")},
{"YamlDotNet", new Uri("https://github.com/aaubry/YamlDotNet/blob/master/LICENSE.txt") },
{"WinUIEx", new Uri("https://github.com/dotMorten/WinUIEx/blob/main/LICENSE") },
{"InnoDependencyInstaller", new Uri("https://github.com/DomGries/InnoDependencyInstaller/blob/master/LICENSE.md") },

// Package managers and related
Expand Down Expand Up @@ -81,6 +83,7 @@ public static class LicenseData
{"NancyFx", new Uri("https://github.com/NancyFx/Nancy/")},
{"PhotoSauce.MagicScaler", new Uri("https://github.com/saucecontrol/PhotoSauce/")},
{"YamlDotNet", new Uri("https://github.com/aaubry/YamlDotNet/") },
{"WinUIEx", new Uri("https://github.com/dotMorten/WinUIEx/") },
{"InnoDependencyInstaller", new Uri("https://github.com/DomGries/InnoDependencyInstaller")},

// Package managers and related
Expand Down
95 changes: 95 additions & 0 deletions src/UniGetUI/Controls/CustomNavViewItem.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
using Microsoft.UI.Text;
using Microsoft.UI.Xaml;
using Microsoft.UI.Xaml.Controls;
using Microsoft.UI.Xaml.Documents;
using UniGetUI.Core.Tools;
using UniGetUI.Interface;
using UniGetUI.Interface.Enums;
using UniGetUI.Interface.Widgets;
using UniGetUI.PackageEngine.Managers.WingetManager;
using Windows.ApplicationModel.VoiceCommands;
using Windows.Devices.Bluetooth.Advertisement;
using Windows.UI.WebUI;
using YamlDotNet.Core.Tokens;
using static System.Net.Mime.MediaTypeNames;

namespace UniGetUI.Controls;
internal class CustomNavViewItem : NavigationViewItem
{
int _iconSize = 28;
public IconType LocalIcon
{
set => base.Icon = new LocalIcon(value);

}
public string GlyphIcon
{
set => base.Icon = new FontIcon() { Glyph = value };
}
public new IconElement Icon
{
set => base.Icon = value;
}

public bool IsLoading
{
set
{
base.Icon.Margin = new Thickness(value ? 6 : 0);
_progressRing.Visibility = value? Visibility.Visible: Visibility.Collapsed;
}
}

public int IconSize
{
set => Resources["NavigationViewItemOnLeftIconBoxHeight"] = _iconSize = value;
}

public string Text
{
set => _textBlock.Text = CoreTools.Translate(value);
}

private readonly TextBlock _textBlock;
private readonly ProgressRing _progressRing;

private PageType _pageType;
public new PageType Tag
{
set => _pageType = value;
get => _pageType;
}

public CustomNavViewItem()
{
Height = 60;
Resources["NavigationViewItemOnLeftIconBoxHeight"] = _iconSize;
Resources["NavigationViewItemContentPresenterMargin"] = new Thickness(0);

var grid = new Grid { Height = 50 };

_progressRing = new ProgressRing
{
Margin = new Thickness(-46, 0, 0, 0),
HorizontalAlignment = HorizontalAlignment.Left,
VerticalAlignment = VerticalAlignment.Center,
IsIndeterminate = true,
Visibility = Visibility.Collapsed,
};

_textBlock = new TextBlock
{
VerticalAlignment = VerticalAlignment.Center,
};

grid.Children.Add(_progressRing);
grid.Children.Add(_textBlock);
base.Content = grid;
}
}
170 changes: 0 additions & 170 deletions src/UniGetUI/Controls/NavButton.xaml

This file was deleted.

53 changes: 0 additions & 53 deletions src/UniGetUI/Controls/NavButton.xaml.cs

This file was deleted.

Loading
Loading