From 748dcf27ca74dd227d0d4ecd8f88bbe392c92ecb Mon Sep 17 00:00:00 2001 From: Mateusz Skoczek Date: Thu, 16 Apr 2026 22:33:35 +0200 Subject: [PATCH] SimpleToolkit.* packages replacement --- VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs | 2 +- .../Home/HomeVideoCollectionViewModel.cs | 2 +- .../VDownload.Core.ViewModels.csproj | 3 +-- VDownload.Core/VDownload.Core.Views/BaseWindow.xaml | 2 +- .../VDownload.Core.Views/Home/HomeVideoCollectionView.xaml | 2 +- VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml | 2 +- .../VDownload.Core.Views/VDownload.Core.Views.csproj | 4 ++-- .../NotificationsService.cs | 3 +-- .../VDownload.Services.UI.Notifications.csproj | 1 - .../VDownload.Sources.Twitch.Models/TwitchClipStream.cs | 2 +- .../VDownload.Sources.Twitch.Models.csproj | 2 +- VDownload/Dictionaries/Converters.xaml | 2 +- VDownload/VDownload.csproj | 2 +- 13 files changed, 13 insertions(+), 16 deletions(-) diff --git a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs index 4c36354..81d69f1 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs @@ -10,7 +10,7 @@ using VDownload.Core.ViewModels.Authentication; using VDownload.Core.ViewModels.Home; using VDownload.Core.ViewModels.Settings; using VDownload.Services.UI.DictionaryResources; -using SimpleToolkit.UI.Models; +using MSEssentials.UI.Common.MVVM; using VDownload.Core.ViewModels.About; using VDownload.Core.ViewModels.Subscriptions; using VDownload.Core.Strings; diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs index 430cb2b..351e046 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs @@ -14,7 +14,7 @@ using VDownload.Models; using VDownload.Services.Data.Settings; using VDownload.Services.UI.StoragePicker; using VDownload.Sources.Twitch.Configuration.Models; -using SimpleToolkit.MVVM; +using MSEssentials.UI.Common.MVVM; using System.Text.RegularExpressions; using VDownload.Services.Utility.Filename; using VDownload.Services.UI.Dialogs; diff --git a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj index c9118f2..b526bad 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj +++ b/VDownload.Core/VDownload.Core.ViewModels/VDownload.Core.ViewModels.csproj @@ -15,8 +15,7 @@ - - + diff --git a/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml b/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml index 47ac369..0493818 100644 --- a/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml +++ b/VDownload.Core/VDownload.Core.Views/BaseWindow.xaml @@ -7,7 +7,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:ic="using:Microsoft.Xaml.Interactions.Core" - xmlns:cb="using:SimpleToolkit.UI.WinUI.Behaviors" + xmlns:cb="using:MSEssentials.UI.WinUI.Behaviors" mc:Ignorable="d"> diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml index 1a23e19..d3e90ab 100644 --- a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml +++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml @@ -12,7 +12,7 @@ xmlns:ct="using:CommunityToolkit.WinUI" xmlns:ctc="using:CommunityToolkit.WinUI.Controls" xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls" - xmlns:c="using:SimpleToolkit.UI.WinUI.Controls" + xmlns:c="using:MSEssentials.UI.WinUI.Controls" mc:Ignorable="d" Background="{ThemeResource ViewBackgroundColor}" x:Name="Root"> diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml index aa19d58..9bec8da 100644 --- a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml +++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoView.xaml @@ -12,7 +12,7 @@ xmlns:ct="using:CommunityToolkit.WinUI" xmlns:ctc="using:CommunityToolkit.WinUI.Controls" xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls" - xmlns:c="using:SimpleToolkit.UI.WinUI.Controls" + xmlns:c="using:MSEssentials.UI.WinUI.Controls" mc:Ignorable="d" Background="{ThemeResource ViewBackgroundColor}"> diff --git a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj index d474079..65280a1 100644 --- a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj +++ b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj @@ -24,8 +24,8 @@ - - + + diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs index 527dbd2..34088f7 100644 --- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs +++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/NotificationsService.cs @@ -2,7 +2,6 @@ using Microsoft.UI.Xaml; using Microsoft.Windows.AppNotifications; using Microsoft.Windows.AppNotifications.Builder; -using SimpleToolkit.UI.WinUI.Helpers; using System; using System.Collections.Generic; using System.Linq; @@ -71,7 +70,7 @@ namespace VDownload.Services.UI.Notifications #region PRIVATE METHODS - private void NotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args) => WindowHelper.ShowWindow(_window); + private void NotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args) => _window.AppWindow.Show(true); #endregion } diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj index 5076463..302746a 100644 --- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj +++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.Notifications/VDownload.Services.UI.Notifications.csproj @@ -14,7 +14,6 @@ - diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchClipStream.cs b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchClipStream.cs index b075bdc..6972d2a 100644 --- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchClipStream.cs +++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/TwitchClipStream.cs @@ -1,4 +1,4 @@ -using SimpleToolkit.Extensions; +using MSEssentials.Extensions; using System; using System.Collections.Generic; using System.Globalization; diff --git a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj index b97cba7..86eaec8 100644 --- a/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj +++ b/VDownload.Sources/VDownload.Sources.Twitch/VDownload.Sources.Twitch.Models/VDownload.Sources.Twitch.Models.csproj @@ -7,7 +7,7 @@ - + diff --git a/VDownload/Dictionaries/Converters.xaml b/VDownload/Dictionaries/Converters.xaml index 350aef3..02a759e 100644 --- a/VDownload/Dictionaries/Converters.xaml +++ b/VDownload/Dictionaries/Converters.xaml @@ -3,7 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:v="using:VDownload.Core.Views" - xmlns:lt="using:SimpleToolkit.UI.WinUI.Converters" + xmlns:lt="using:MSEssentials.UI.WinUI.Converters" xmlns:ct="using:CommunityToolkit.WinUI.Converters"> diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj index d9993c8..b015b92 100644 --- a/VDownload/VDownload.csproj +++ b/VDownload/VDownload.csproj @@ -174,7 +174,7 @@ - +