Skip to content

Commit 971e346

Browse files
nlogozzonlogozzo
committed
fix: WinAppSDK
1 parent a3f592b commit 971e346

7 files changed

Lines changed: 61 additions & 112 deletions

File tree

‎Nickvision.Application.GNOME/Views/MainWindow.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
using System.Diagnostics.CodeAnalysis;
1414
using System.IO;
1515
using System.Linq;
16-
using System.Threading.Tasks;
1716

1817
namespace Nickvision.Application.GNOME.Views;
1918

‎Nickvision.Application.Shared/Controllers/PreferencesViewController.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public void Dispose()
7474

7575
public async Task SaveConfigurationAsync()
7676
{
77-
if(_transaction is not null)
77+
if (_transaction is not null)
7878
{
7979
await _transaction.CommitAsync();
8080
await _transaction.DisposeAsync();
@@ -83,7 +83,7 @@ public async Task SaveConfigurationAsync()
8383
}
8484
private void Dispose(bool disposing)
8585
{
86-
if(!disposing)
86+
if (!disposing)
8787
{
8888
return;
8989
}

‎Nickvision.Application.WinUI/App.xaml.cs‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
using Microsoft.Extensions.DependencyInjection;
22
using Microsoft.Extensions.Logging;
33
using Microsoft.UI.Xaml;
4-
using Microsoft.Windows.AppNotifications;
54
using Nickvision.Application.WinUI.Views;
65
using System;
7-
using System.Diagnostics;
8-
using System.IO;
9-
using Windows.System;
106

117
namespace Nickvision.Application.WinUI;
128

@@ -19,13 +15,6 @@ public App(IServiceProvider serviceProvider)
1915
{
2016
InitializeComponent();
2117
_serviceProvider = serviceProvider;
22-
AppNotificationManager.Default.NotificationInvoked += App_NotificationInvoked;
23-
AppNotificationManager.Default.Register();
24-
AppDomain.CurrentDomain.ProcessExit += async (_, _) =>
25-
{
26-
await AppNotificationManager.Default.RemoveAllAsync();
27-
AppNotificationManager.Default.UnregisterAll();
28-
};
2918
UnhandledException += (_, e) =>
3019
{
3120
_serviceProvider.GetRequiredService<ILogger<App>>().LogError(e.Exception, $"An unhandled exception occurred: {e.Message}");
@@ -40,23 +29,4 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
4029
}
4130
_window.Activate();
4231
}
43-
44-
private async void App_NotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args)
45-
{
46-
if (args.Arguments.ContainsKey("action") && args.Arguments["action"] == "OpenInExplorer" && args.Arguments.ContainsKey("param") && Directory.Exists(args.Arguments["param"]))
47-
{
48-
try
49-
{
50-
using var _ = Process.Start(new ProcessStartInfo()
51-
{
52-
FileName = args.Arguments["param"],
53-
UseShellExecute = true
54-
});
55-
}
56-
catch
57-
{
58-
await Launcher.LaunchFolderPathAsync(args.Arguments["param"]);
59-
}
60-
}
61-
}
6232
}

‎Nickvision.Application.WinUI/Nickvision.Application.WinUI.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
1515
<PublishProfile>win-$(Platform).pubxml</PublishProfile>
1616
<UseWinUI>true</UseWinUI>
17+
<WinUISDKReferences>false</WinUISDKReferences>
1718
<EnableMsixTooling>true</EnableMsixTooling>
1819
<WindowsPackageType>None</WindowsPackageType>
1920
<WindowsAppSdkSelfContained>true</WindowsAppSdkSelfContained>

‎Nickvision.Application.WinUI/Views/MainWindow.xaml.cs‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
using Microsoft.UI.Windowing;
44
using Microsoft.UI.Xaml;
55
using Microsoft.UI.Xaml.Controls;
6-
using Microsoft.Windows.AppNotifications;
7-
using Microsoft.Windows.AppNotifications.Builder;
86
using Microsoft.Windows.Storage.Pickers;
97
using Nickvision.Application.Shared.Controllers;
108
using Nickvision.Application.Shared.Events;
@@ -116,20 +114,6 @@ private void Window_Closing(AppWindow sender, AppWindowClosingEventArgs args)
116114

117115
private void App_AppNotificationSent(object? sender, AppNotificationSentEventArgs args)
118116
{
119-
if (args.Notification is ShellNotification shellNotification)
120-
{
121-
var builder = new AppNotificationBuilder()
122-
.AddText(shellNotification.Title)
123-
.AddText(shellNotification.Message);
124-
if (shellNotification.Action == "open")
125-
{
126-
builder.AddButton(new AppNotificationButton(_translationService._("Open in Explorer"))
127-
.AddArgument("action", "OpenInExplorer")
128-
.AddArgument("param", shellNotification.ActionParam));
129-
}
130-
AppNotificationManager.Default.Show(builder.BuildNotification());
131-
return;
132-
}
133117
if (_notificationClickHandler is not null)
134118
{
135119
BtnInfoBar.Click -= _notificationClickHandler;

‎resources/po/application.pot‎

Lines changed: 27 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2026-04-29 19:56-0400\n"
11+
"POT-Creation-Date: 2026-04-29 20:49-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -90,41 +90,41 @@ msgid "Folder"
9090
msgstr ""
9191

9292
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:33
93-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:220
94-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:78
95-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:93
93+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:219
94+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:76
95+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:91
9696
msgid "Open Folder"
9797
msgstr ""
9898

9999
#: Nickvision.Application.GNOME/Blueprints/ShortcutsDialog.blp:38
100-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:79
100+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:77
101101
msgid "Close Folder"
102102
msgstr ""
103103

104-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:174
104+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:173
105105
msgid "Open in Files"
106106
msgstr ""
107107

108-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:181
108+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:180
109109
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:23
110-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:95
111-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:154
110+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:93
111+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:138
112112
msgid "Close"
113113
msgstr ""
114114

115-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:186
115+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:185
116116
msgid "View"
117117
msgstr ""
118118

119-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:202
119+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:201
120120
#, csharp-format
121121
msgid "There is {0} file in the folder."
122122
msgid_plural "There are {0} files in the folder"
123123
msgstr[0] ""
124124
msgstr[1] ""
125125

126-
#: Nickvision.Application.GNOME/Views/MainWindow.cs:256
127-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:85
126+
#: Nickvision.Application.GNOME/Views/MainWindow.cs:255
127+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:83
128128
msgid "GitHub Repo"
129129
msgstr ""
130130

@@ -239,7 +239,7 @@ msgid "Folder closed"
239239
msgstr ""
240240

241241
#: Nickvision.Application.WinUI/Controls/AboutDialog.xaml.cs:22
242-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:88
242+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:86
243243
#, csharp-format
244244
msgid "About {0}"
245245
msgstr ""
@@ -293,58 +293,54 @@ msgid ""
293293
"{3}"
294294
msgstr ""
295295

296-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:77
296+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:75
297297
msgid "File"
298298
msgstr ""
299299

300-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:80
300+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:78
301301
msgid "Exit"
302302
msgstr ""
303303

304-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:81
304+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:79
305305
msgid "Edit"
306306
msgstr ""
307307

308-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:82
309-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:94
308+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:80
309+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:92
310310
#: Nickvision.Application.WinUI/Views/SettingsPage.xaml.cs:24
311311
msgid "Settings"
312312
msgstr ""
313313

314-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:83
314+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:81
315315
msgid "Help"
316316
msgstr ""
317317

318-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:84
318+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:82
319319
msgid "Check for Updates"
320320
msgstr ""
321321

322-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:86
322+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:84
323323
msgid "Report a Bug"
324324
msgstr ""
325325

326-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:87
326+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:85
327327
msgid "Discussions"
328328
msgstr ""
329329

330-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:89
330+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:87
331331
#, csharp-format
332332
msgid "You are running a preview version of {0}"
333333
msgstr ""
334334

335-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:90
335+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:88
336336
msgid "Thank you for testing the upcoming features and changes! ❤️"
337337
msgstr ""
338338

339-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:126
340-
msgid "Open in Explorer"
341-
msgstr ""
342-
343-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:148
339+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:132
344340
msgid "Update"
345341
msgstr ""
346342

347-
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:262
343+
#: Nickvision.Application.WinUI/Views/MainWindow.xaml.cs:246
348344
#, csharp-format
349345
msgid "Downloading update: {0}%"
350346
msgstr ""

0 commit comments

Comments
 (0)