Skip to content

Commit 200e4fe

Browse files
OnebeldOnebeld
authored
Merge pull request #17 from ghudulf/main
Add canary release workflow and add NoticeDialog control
2 parents e8eedc0 + dd20b07 commit 200e4fe

25 files changed

Lines changed: 2267 additions & 27 deletions

File tree

‎.github/workflows/canary-release.yml‎

Lines changed: 904 additions & 0 deletions
Large diffs are not rendered by default.

‎.github/workflows/release.yml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ jobs:
6262
echo "version=$VERSION" >> $GITHUB_OUTPUT
6363
echo "Detected version: $VERSION"
6464
65-
if [[ "$VERSION" == *-* ]]; then
65+
# Treat -fix suffix as stable bug fix release, other hyphenated versions as prerelease
66+
if [[ "$VERSION" == *-* ]] && [[ "$VERSION" != *-fix ]]; then
6667
echo "prerelease=true" >> $GITHUB_OUTPUT
6768
else
6869
echo "prerelease=false" >> $GITHUB_OUTPUT
@@ -620,7 +621,19 @@ jobs:
620621
'- After writing, mentally verify: does every input bullet appear somewhere in the output?' \
621622
> /tmp/prompt-final.txt
622623
623-
if [ "$IS_PRERELEASE" = 'true' ]; then
624+
if [[ "$VERSION" == *-fix ]]; then
625+
printf '%s\n' \
626+
'' \
627+
'## Release type: BUG FIX RELEASE' \
628+
"This is a bug fix release ($VERSION). Adjust the tone accordingly:" \
629+
'- Open with a clear statement that this is a bug fix release addressing specific issues.' \
630+
'- Focus on the Bug Fixes section — this should be the primary highlight.' \
631+
'- Use language like "fixes", "corrects", "resolves", "addresses".' \
632+
'- If there are improvements, frame them as refinements or stability improvements.' \
633+
'- Emphasize that no breaking changes are included (unless explicitly listed).' \
634+
'- This is a stable release suitable for production deployment.' \
635+
>> /tmp/prompt-final.txt
636+
elif [ "$IS_PRERELEASE" = 'true' ]; then
624637
printf '%s\n' \
625638
'' \
626639
'## Release type: PRE-RELEASE' \

‎build/Package.props‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,15 @@
44
<ImplicitUsings>enable</ImplicitUsings>
55
<Nullable>enable</Nullable>
66
<LangVersion>default</LangVersion>
7-
<PackageVersion>5.2.1-fix</PackageVersion>
7+
<PackageVersion>5.2.2</PackageVersion>
88
<Authors>Dmitry Zhutkov (Onebeld), Andrey Savich (pieckenst)</Authors>
99
<Copyright>Dmitry Zhutkov (Onebeld)</Copyright>
1010
<PackageTags>theme, design, xaml, library, ui, gui, control, csharp, styled-components, interface, dotnet, nuget, style, avalonia, controls, user-interface, styles, avaloniaui, pleasant, graphical-user-interface</PackageTags>
1111
<PackageDescription>PleasantUI is a cross-platform UI theme and control library for Avalonia, inspired by Microsoft Fluent Design and the WinUI/UWP visual language. It provides complete re-styled themes for all standard Avalonia controls — buttons, checkboxes, sliders, text boxes, data grids, calendars, combo boxes, and more — along with a suite of custom Pleasant controls including NavigationView, PleasantTabView, ProgressRing, OptionsDisplayItem, PleasantSnackbar, InformationBlock, ContentDialog, and a full theme editor with custom theme support. Supports light, dark, and multiple accent color themes out of the box, with a reactive localization system and desktop/mobile adaptive layouts.</PackageDescription>
1212
<Company>Onebeld</Company>
13-
<AssemblyVersion>5.2.1</AssemblyVersion>
14-
<FileVersion>5.2.1</FileVersion>
13+
<AssemblyVersion>5.2.2.0</AssemblyVersion>
14+
<FileVersion>5.2.2.0</FileVersion>
15+
<InformationalVersion>$(PackageVersion)</InformationalVersion>
1516
<IncludeAvaloniaGenerators>true</IncludeAvaloniaGenerators>
1617
<RepositoryUrl>https://github.com/Onebeld/PleasantUI</RepositoryUrl>
1718
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -21,6 +22,8 @@
2122
<RepositoryType>Public</RepositoryType>
2223
<PackageIcon>PleasantUIIcon.png</PackageIcon>
2324
<GenerateDocumentationFile>true</GenerateDocumentationFile>
25+
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
26+
2427
<PackageProjectUrl>https://github.com/Onebeld/PleasantUI</PackageProjectUrl>
2528
</PropertyGroup>
2629

‎samples/PleasantUI.Example/Factories/ControlPageCardsFactory.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public AvaloniaList<ControlPageCard> CreatePleasantControlPageCards()
5353
new("CardTitle/TerminalPanel", MaterialIcons.ConsoleLine, "Card/TerminalPanel", new TerminalPanelPage(), _eventAggregator),
5454
new("CardTitle/TreeViewPanel", MaterialIcons.FileTreeOutline, "Card/TreeViewPanel", new TreeViewPanelPage(), _eventAggregator),
5555
new("CardTitle/ItemListPanel", MaterialIcons.FormatListBulletedType, "Card/ItemListPanel", new ItemListPanelPage(), _eventAggregator),
56-
new("CardTitle/StepDialog", MaterialIcons.OrderNumericAscending, "Card/StepDialog", new StepDialogPage(), _eventAggregator),
5756
new("CardTitle/PropertyGrid", MaterialIcons.TableColumnPlusAfter, "Card/PropertyGrid", new PropertyGridPage(), _eventAggregator),
5857
new("CardTitle/DownloadPanel", MaterialIcons.DownloadOutline, "Card/DownloadPanel", new DownloadPanelPage(), _eventAggregator),
5958
new("CardTitle/CrashReportDialog", MaterialIcons.BugOutline, "Card/CrashReportDialog", new CrashReportDialogPage(), _eventAggregator),
@@ -64,8 +63,10 @@ public AvaloniaList<ControlPageCard> CreateToolkitControlPageCards()
6463
{
6564
return
6665
[
67-
new("CardTitle/MessageBox", MaterialIcons.MessageOutline, "Card/MessageBox", new MessageBoxPage(), _eventAggregator),
68-
new("CardTitle/Docking", MaterialIcons.ViewDashboardOutline, "Card/Docking", new DockingPage(), _eventAggregator),
66+
new("CardTitle/MessageBox", MaterialIcons.MessageOutline, "Card/MessageBox", new MessageBoxPage(), _eventAggregator),
67+
new("CardTitle/NoticeDialog", MaterialIcons.InformationOutline, "Card/NoticeDialog", new NoticeDialogPage(), _eventAggregator),
68+
new("CardTitle/StepDialog", MaterialIcons.OrderNumericAscending, "Card/StepDialog", new StepDialogPage(), _eventAggregator),
69+
new("CardTitle/Docking", MaterialIcons.ViewDashboardOutline, "Card/Docking", new DockingPage(), _eventAggregator),
6970
];
7071
}
7172
}

‎samples/PleasantUI.Example/MainView.axaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,17 @@
5151
<NavigationViewItem Tag="TerminalPanel" Header="{Localize CardTitle/TerminalPanel}" Icon="{x:Static MaterialIcons.ConsoleLine}" />
5252
<NavigationViewItem Tag="TreeViewPanel" Header="{Localize CardTitle/TreeViewPanel}" Icon="{x:Static MaterialIcons.FileTreeOutline}" />
5353
<NavigationViewItem Tag="ItemListPanel" Header="{Localize CardTitle/ItemListPanel}" Icon="{x:Static MaterialIcons.FormatListBulletedType}" />
54-
<NavigationViewItem Tag="StepDialog" Header="{Localize CardTitle/StepDialog}" Icon="{x:Static MaterialIcons.OrderNumericAscending}" />
5554
<NavigationViewItem Tag="PropertyGrid" Header="{Localize CardTitle/PropertyGrid}" Icon="{x:Static MaterialIcons.TableColumnPlusAfter}" />
5655
<NavigationViewItem Tag="DownloadPanel" Header="{Localize CardTitle/DownloadPanel}" Icon="{x:Static MaterialIcons.DownloadOutline}" />
5756
<NavigationViewItem Tag="CrashReportDialog" Header="{Localize CardTitle/CrashReportDialog}" Icon="{x:Static MaterialIcons.BugOutline}" />
5857
</NavigationViewItem>
5958

6059
<NavigationViewItem Header="{Localize ToolKit}"
6160
Icon="{x:Static MaterialIcons.WrenchOutline}">
62-
<NavigationViewItem Tag="MessageBox" Header="{Localize CardTitle/MessageBox}" Icon="{x:Static MaterialIcons.MessageOutline}" />
63-
<NavigationViewItem Tag="Docking" Header="{Localize CardTitle/Docking}" Icon="{x:Static MaterialIcons.ViewDashboardOutline}" />
61+
<NavigationViewItem Tag="MessageBox" Header="{Localize CardTitle/MessageBox}" Icon="{x:Static MaterialIcons.MessageOutline}" />
62+
<NavigationViewItem Tag="NoticeDialog" Header="{Localize CardTitle/NoticeDialog}" Icon="{x:Static MaterialIcons.InformationOutline}" />
63+
<NavigationViewItem Tag="StepDialog" Header="{Localize CardTitle/StepDialog}" Icon="{x:Static MaterialIcons.OrderNumericAscending}" />
64+
<NavigationViewItem Tag="Docking" Header="{Localize CardTitle/Docking}" Icon="{x:Static MaterialIcons.ViewDashboardOutline}" />
6465
</NavigationViewItem>
6566
</NavigationViewItem>
6667

‎samples/PleasantUI.Example/MainView.axaml.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ private void OnNavigationSelectionChanged(object? sender, SelectionChangedEventA
8181
"TerminalPanel" => new TerminalPanelPage(),
8282
"TreeViewPanel" => new TreeViewPanelPage(),
8383
"ItemListPanel" => new ItemListPanelPage(),
84-
"StepDialog" => new StepDialogPage(),
8584
"PropertyGrid" => new PropertyGridPage(),
8685
"DownloadPanel" => new DownloadPanelPage(),
8786
"CrashReportDialog" => new CrashReportDialogPage(),
8887
// ToolKit
89-
"MessageBox" => new MessageBoxPage(),
90-
"Docking" => new DockingPage(),
88+
"MessageBox" => new MessageBoxPage(),
89+
"NoticeDialog" => new NoticeDialogPage(),
90+
"StepDialog" => new StepDialogPage(),
91+
"Docking" => new DockingPage(),
9192
_ => null
9293
};
9394

‎samples/PleasantUI.Example/Pages/ToolKit/NoticeDialogPage.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using Avalonia.Controls;
2+
using PleasantUI.Example.Views.Pages.ToolkitPages;
3+
4+
namespace PleasantUI.Example.Pages.Toolkit;
5+
6+
public class NoticeDialogPage : LocalizedPage
7+
{
8+
public override string TitleKey { get; } = "CardTitle/NoticeDialog";
9+
public override bool ShowTitle { get; } = true;
10+
protected override Control CreateContent() => new NoticeDialogPageView();
11+
}

samples/PleasantUI.Example/Pages/PleasantControls/StepDialogPage.cs renamed to samples/PleasantUI.Example/Pages/ToolKit/StepDialogPage.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Avalonia.Controls;
22
using PleasantUI.Example.Views.Pages.PleasantControlPages;
33

4-
namespace PleasantUI.Example.Pages.PleasantControls;
4+
namespace PleasantUI.Example.Pages.Toolkit;
55

66
public class StepDialogPage : LocalizedPage
77
{

0 commit comments

Comments
 (0)