Skip to content

Free, open-source Windows optimization tool for performance, privacy, and simplicity.

feat(titlebar): enhance MainWindow with ViewModel and new title bar UI

fatDucke735db8f1d0f
diff --git a/optimizerDuck/App.xaml.cs b/optimizerDuck/App.xaml.cs
index 1e6b9bf..3eaad79 100644
--- a/optimizerDuck/App.xaml.cs
+++ b/optimizerDuck/App.xaml.cs
@@ -11,6 +11,7 @@ using optimizerDuck.Services.Managers;
using optimizerDuck.Services.OptimizationServices;
using optimizerDuck.UI.Pages;
using optimizerDuck.UI.ViewModels.Pages;
+using optimizerDuck.UI.ViewModels.Windows;
using optimizerDuck.UI.Windows;
using Serilog;
using Serilog.Events;
@@ -147,6 +148,7 @@ public partial class App : Application
// Windows
services.AddSingleton<MainWindow>();
+ services.AddSingleton<MainWindowViewModel>();
// Pages
services.AddSingleton<DashboardViewModel>();
diff --git a/optimizerDuck/Common/Helpers/Shared.cs b/optimizerDuck/Common/Helpers/Shared.cs
index e803c07..8761801 100644
--- a/optimizerDuck/Common/Helpers/Shared.cs
+++ b/optimizerDuck/Common/Helpers/Shared.cs
@@ -17,11 +17,11 @@ public static class Shared
""";
- public const string DiscordInviteURL = "https://discord.gg/GqvJYQsgSm";
+ public const string DiscordInviteURL = "https://discord.gg/tDUBDCYw9Q";
public const string WebsiteURL = "https://optimizerduck.vercel.app/";
public const string GitHubRepoURL = "https://github.com/itsfatduck/optimizerDuck";
public const string CommunityURL = "https://optimizerduck.vercel.app/docs/community";
- public const string ContributeURL = "https://github.com/itsfatduck/optimizerDuck/blob/master/.github/CONTRIBUTING.md";
+ public const string ContributeURL = "https://optimizerduck.vercel.app/docs/contribute/overview";
public const string AcknowledgementsURL =
"https://github.com/itsfatduck/optimizerDuck/blob/master/THIRD-PARTY-NOTICES.md";
diff --git a/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.cs b/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.cs
new file mode 100644
index 0000000..771acdb
--- /dev/null
+++ b/optimizerDuck/UI/ViewModels/Windows/MainWindowViewModel.cs
@@ -0,0 +1,54 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
+using optimizerDuck.Common.Helpers;
+using System.Diagnostics;
+
+namespace optimizerDuck.UI.ViewModels.Windows;
+
+public partial class MainWindowViewModel : ObservableObject
+{
+ /// <summary>
+ /// Gets the application version displayed in the title bar.
+ /// </summary>
+ public string Version => $"[v{Shared.FileVersion}]";
+
+ /// <summary>
+ /// Opens the support/donation link in the default browser.
+ /// </summary>
+ [RelayCommand]
+ private static void OpenSupportLink()
+ {
+ try
+ {
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = Shared.ContributeURL,
+ UseShellExecute = true
+ });
+ }
+ catch
+ {
+ // Silently fail - link opening is a non-critical action
+ }
+ }
+
+ /// <summary>
+ /// Opens the Discord invite link in the default browser.
+ /// </summary>
+ [RelayCommand]
+ private static void OpenDiscordLink()
+ {
+ try
+ {
+ Process.Start(new ProcessStartInfo
+ {
+ FileName = Shared.DiscordInviteURL,
+ UseShellExecute = true
+ });
+ }
+ catch
+ {
+ // Silently fail - link opening is a non-critical action
+ }
+ }
+}
\ No newline at end of file
diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml b/optimizerDuck/UI/Windows/MainWindow.xaml
index 3a328dc..ba6162e 100644
--- a/optimizerDuck/UI/Windows/MainWindow.xaml
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml
@@ -8,11 +8,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:pages="clr-namespace:optimizerDuck.UI.Pages"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
+ xmlns:viewmodels="clr-namespace:optimizerDuck.UI.ViewModels.Windows"
xmlns:windows="clr-namespace:optimizerDuck.UI.Windows"
Title="optimizerDuck"
Width="1350"
Height="800"
- d:DataContext="{d:DesignInstance windows:MainWindow}"
+ d:DataContext="{d:DesignInstance viewmodels:MainWindowViewModel}"
ui:Design.Background="Black"
ui:Design.Foreground="White"
ExtendsContentIntoTitleBar="True"
@@ -38,6 +39,7 @@
<ui:NavigationView.MenuItems>
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Dashboard}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon Home24}"
TargetPageType="{x:Type pages:DashboardPage}" />
@@ -45,6 +47,7 @@
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Optimize}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon Rocket24}"
TargetPageType="{x:Type pages:OptimizePage}" />
@@ -55,6 +58,7 @@
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Bloatware}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon Delete24}"
TargetPageType="{x:Type pages:BloatwarePage}" />
@@ -62,16 +66,19 @@
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.StartupManager}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon WindowArrowUp24}"
TargetPageType="{x:Type pages:StartupManagerPage}" />
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.ScheduledTasks}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon CalendarLtr24}"
TargetPageType="{x:Type pages:ScheduledTasksPage}" />
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.DiskCleanup}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon HardDrive20}"
TargetPageType="{x:Type pages:DiskCleanupPage}" />
</ui:NavigationView.MenuItems>
@@ -80,6 +87,7 @@
<ui:NavigationViewItemSeparator Margin="0,2,0,2" />
<controls:FilledNavigationViewItem
Content="{extensions:Loc Sidebar.Settings}"
+ Cursor="Hand"
Icon="{ui:SymbolIcon Settings24}"
TargetPageType="{x:Type pages:SettingsPage}" />
</ui:NavigationView.FooterMenuItems>
@@ -91,10 +99,51 @@
</ui:NavigationView.ContentOverlay>
</ui:NavigationView>
- <ui:TitleBar x:Name="TitleBar" Title="optimizerDuck">
- <ui:TitleBar.Icon>
- <ui:ImageIcon Source="pack://application:,,,/Resources/Images/Duck.png" />
- </ui:TitleBar.Icon>
+ <ui:TitleBar x:Name="TitleBar">
+ <ui:TitleBar.Header>
+ <StackPanel
+ Margin="10,0,0,0"
+ VerticalAlignment="Center"
+ Orientation="Horizontal">
+ <ui:SymbolIcon
+ FontSize="16"
+ Foreground="{DynamicResource TextFillColorDisabledBrush}"
+ Symbol="Shield24" />
+ <ui:ImageIcon
+ Height="25"
+ Margin="7,0,5,0"
+ VerticalAlignment="Center"
+ Source="pack://application:,,,/Resources/Images/Duck.png" />
+ <ui:TextBlock
+ Margin="0,0,5,0"
+ VerticalAlignment="Center"
+ FontTypography="Body"
+ Text="optimizerDuck" />
+ <ui:TextBlock
+ VerticalAlignment="Center"
+ Appearance="Disabled"
+ FontTypography="Body"
+ Text="{Binding Version, Mode=OneWay}" />
+ </StackPanel>
+ </ui:TitleBar.Header>
+
+ <ui:TitleBar.TrailingContent>
+ <StackPanel VerticalAlignment="Center" Orientation="Horizontal">
+ <ui:Button
+ Margin="0,0,5,0"
+ Appearance="Transparent"
+ Command="{Binding OpenSupportLinkCommand}"
+ Icon="{ui:SymbolIcon Heart24}">
+ Support the project
+ </ui:Button>
+ <ui:Button
+ Appearance="Transparent"
+ Command="{Binding OpenDiscordLinkCommand}"
+ Icon="{ui:SymbolIcon Link24}">
+ Join our Discord
+ </ui:Button>
+ </StackPanel>
+ </ui:TitleBar.TrailingContent>
</ui:TitleBar>
<ui:ContentDialogHost x:Name="RootContentDialogPresenter" />
diff --git a/optimizerDuck/UI/Windows/MainWindow.xaml.cs b/optimizerDuck/UI/Windows/MainWindow.xaml.cs
index 0cc187f..1e8b2a1 100644
--- a/optimizerDuck/UI/Windows/MainWindow.xaml.cs
+++ b/optimizerDuck/UI/Windows/MainWindow.xaml.cs
@@ -6,6 +6,7 @@ using optimizerDuck.Services;
using optimizerDuck.Services.Managers;
using optimizerDuck.UI.Dialogs;
using optimizerDuck.UI.Pages;
+using optimizerDuck.UI.ViewModels.Windows;
using System.Windows;
using Wpf.Ui;
using Wpf.Ui.Abstractions;
@@ -19,7 +20,7 @@ public partial class MainWindow : IWindow
private readonly IOptionsMonitor<AppSettings> _appOptionsMonitor;
private readonly ConfigManager _configManager;
- public MainWindow(ConfigManager configManager, INavigationService navigationService, IContentDialogService contentDialogService,
+ public MainWindow(MainWindowViewModel viewModel, ConfigManager configManager, INavigationService navigationService, IContentDialogService contentDialogService,
INavigationViewPageProvider pageProvider, IOptionsMonitor<AppSettings> appOptionsMonitor, ISnackbarService snackbarService, FeatureRegistry featureRegistry)
{
_contentDialogService = contentDialogService;
@@ -27,6 +28,8 @@ public partial class MainWindow : IWindow
_configManager = configManager;
InitializeComponent();
+ DataContext = viewModel;
+
snackbarService.SetSnackbarPresenter(SnackbarPresenter);
contentDialogService.SetDialogHost(RootContentDialogPresenter);
navigationService.SetNavigationControl(RootNavigation);