diff --git a/LRReader.UWP/App.xaml.cs b/LRReader.UWP/App.xaml.cs index e885cb6..b140485 100644 --- a/LRReader.UWP/App.xaml.cs +++ b/LRReader.UWP/App.xaml.cs @@ -13,7 +13,7 @@ using Windows.UI.Xaml; using Windows.UI.Xaml.Media; using static LRReader.Shared.Services.Service; -using ColorHelper = Microsoft.Toolkit.Uwp.Helpers.ColorHelper; +using ColorHelper = CommunityToolkit.WinUI.Helpers.ColorHelper; using UnhandledExceptionEventArgs = Windows.UI.Xaml.UnhandledExceptionEventArgs; namespace LRReader.UWP diff --git a/LRReader.UWP/Extensions/Extensions.cs b/LRReader.UWP/Extensions/Extensions.cs index ddae3b8..961fb00 100644 --- a/LRReader.UWP/Extensions/Extensions.cs +++ b/LRReader.UWP/Extensions/Extensions.cs @@ -2,10 +2,10 @@ using System.Numerics; using System.Threading.Tasks; using System.Windows.Input; +using CommunityToolkit.WinUI; +using CommunityToolkit.WinUI.Animations; +using CommunityToolkit.WinUI.Media; using LRReader.Shared.Extensions; -using Microsoft.Toolkit.Uwp.UI; -using Microsoft.Toolkit.Uwp.UI.Animations; -using Microsoft.Toolkit.Uwp.UI.Media; using Windows.Foundation; using Windows.Graphics.Display; using Windows.System; diff --git a/LRReader.UWP/Init.cs b/LRReader.UWP/Init.cs index 90ac6ec..8434acc 100644 --- a/LRReader.UWP/Init.cs +++ b/LRReader.UWP/Init.cs @@ -3,8 +3,8 @@ using LRReader.UWP.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; -using Microsoft.Toolkit.Uwp.Helpers; using Microsoft.Web.WebView2.Core; +using Windows.System.Profile; namespace LRReader.UWP { @@ -35,7 +35,7 @@ public static void EarlyInit() public static bool CanUseWebView2() { - bool canUseWebView2 = SystemInformation.Instance.DeviceFamily.Equals("Windows.Desktop"); + bool canUseWebView2 = AnalyticsInfo.VersionInfo.DeviceFamily.Equals("Windows.Desktop"); if (canUseWebView2) { try diff --git a/LRReader.UWP/LRReader.UWP.csproj b/LRReader.UWP/LRReader.UWP.csproj index 49021fe..a60369b 100644 --- a/LRReader.UWP/LRReader.UWP.csproj +++ b/LRReader.UWP/LRReader.UWP.csproj @@ -412,18 +412,30 @@ + + 8.0.230907 + + + 8.0.230907 + + + 8.0.230907 + + + 8.0.230907 + + + 8.0.230907 + + + 8.0.230907 + 5.0.2 6.2.14 - - 7.1.3 - - - 7.1.3 - 7.1.3 @@ -433,9 +445,6 @@ 7.1.3 - - 7.1.3 - 2.8.2-prerelease.220830001 diff --git a/LRReader.UWP/Resources/Converters.xaml b/LRReader.UWP/Resources/Converters.xaml index 4148e1a..0cf8aca 100644 --- a/LRReader.UWP/Resources/Converters.xaml +++ b/LRReader.UWP/Resources/Converters.xaml @@ -1,7 +1,7 @@  diff --git a/LRReader.UWP/Resources/Templates.xaml b/LRReader.UWP/Resources/Templates.xaml index 81830c1..7c73f2f 100644 --- a/LRReader.UWP/Resources/Templates.xaml +++ b/LRReader.UWP/Resources/Templates.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:LRReader.UWP.Views.Controls" xmlns:items="using:LRReader.UWP.Views.Items" - xmlns:media="using:Microsoft.Toolkit.Uwp.UI.Media" + xmlns:media="using:CommunityToolkit.WinUI.Media" xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:services="using:LRReader.Shared.Services"> diff --git a/LRReader.UWP/Services/Dispatcher.cs b/LRReader.UWP/Services/Dispatcher.cs index a50750e..1dcfccd 100644 --- a/LRReader.UWP/Services/Dispatcher.cs +++ b/LRReader.UWP/Services/Dispatcher.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; +using CommunityToolkit.WinUI; using LRReader.Shared.Services; -using Microsoft.Toolkit.Uwp; using Windows.System; namespace LRReader.UWP.Services diff --git a/LRReader.UWP/Services/Updates.cs b/LRReader.UWP/Services/Updates.cs index ca4b0cb..1f17fc1 100644 --- a/LRReader.UWP/Services/Updates.cs +++ b/LRReader.UWP/Services/Updates.cs @@ -2,12 +2,12 @@ using System; using System.Linq; using System.Threading.Tasks; +using CommunityToolkit.WinUI.Helpers; using LRReader.Shared; using LRReader.Shared.Models; using LRReader.Shared.Services; using Microsoft.AppCenter.Crashes; using Microsoft.Extensions.Logging; -using Microsoft.Toolkit.Uwp.Connectivity; using RestSharp; using Windows.ApplicationModel; using Windows.Foundation; diff --git a/LRReader.UWP/Views/Content/Settings/About.xaml.cs b/LRReader.UWP/Views/Content/Settings/About.xaml.cs index 1f2d3ed..b4cd276 100644 --- a/LRReader.UWP/Views/Content/Settings/About.xaml.cs +++ b/LRReader.UWP/Views/Content/Settings/About.xaml.cs @@ -1,7 +1,7 @@ using System; +using CommunityToolkit.WinUI.Helpers; using LRReader.Shared.ViewModels; using LRReader.UWP.Views.Dialogs; -using Microsoft.Toolkit.Uwp.UI.Helpers; using Windows.ApplicationModel.Resources; using Windows.Storage; using Windows.UI.Xaml; diff --git a/LRReader.UWP/Views/Content/Settings/Reader.xaml b/LRReader.UWP/Views/Content/Settings/Reader.xaml index aba87a2..828e8af 100644 --- a/LRReader.UWP/Views/Content/Settings/Reader.xaml +++ b/LRReader.UWP/Views/Content/Settings/Reader.xaml @@ -3,7 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:controls="using:LRReader.UWP.Views.Controls" - xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:internal="using:LRReader.Internal" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/LRReader.UWP/Views/Content/Settings/Server.xaml.cs b/LRReader.UWP/Views/Content/Settings/Server.xaml.cs index e229246..a9dc9b5 100644 --- a/LRReader.UWP/Views/Content/Settings/Server.xaml.cs +++ b/LRReader.UWP/Views/Content/Settings/Server.xaml.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; +using CommunityToolkit.WinUI.Helpers; using LRReader.Shared.ViewModels; using LRReader.UWP.Views.Controls; -using Microsoft.Toolkit.Uwp.UI.Helpers; using Windows.Storage; using Windows.Storage.Pickers; using Windows.Storage.Provider; diff --git a/LRReader.UWP/Views/Content/Tools/Deduplicator.xaml.cs b/LRReader.UWP/Views/Content/Tools/Deduplicator.xaml.cs index a06fd4d..5d4d20d 100644 --- a/LRReader.UWP/Views/Content/Tools/Deduplicator.xaml.cs +++ b/LRReader.UWP/Views/Content/Tools/Deduplicator.xaml.cs @@ -1,11 +1,11 @@ #nullable enable using System; +using CommunityToolkit.WinUI.Animations; using LRReader.Shared.Models.Main; using LRReader.Shared.Services; using LRReader.Shared.ViewModels.Tools; using LRReader.UWP.Extensions; using LRReader.UWP.Views.Controls; -using Microsoft.Toolkit.Uwp.UI.Animations; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Controls.Primitives; diff --git a/LRReader.UWP/Views/Content/Tools/DeduplicatorHidden.xaml b/LRReader.UWP/Views/Content/Tools/DeduplicatorHidden.xaml index 5e7d2f3..4211d5f 100644 --- a/LRReader.UWP/Views/Content/Tools/DeduplicatorHidden.xaml +++ b/LRReader.UWP/Views/Content/Tools/DeduplicatorHidden.xaml @@ -2,7 +2,7 @@ x:Class="LRReader.UWP.Views.Content.Tools.DeduplicatorHidden" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:ext="using:LRReader.UWP.Extensions" xmlns:items="using:LRReader.Shared.Models.Main" diff --git a/LRReader.UWP/Views/Controls/ArchiveTags.xaml b/LRReader.UWP/Views/Controls/ArchiveTags.xaml index dd00738..3759de6 100644 --- a/LRReader.UWP/Views/Controls/ArchiveTags.xaml +++ b/LRReader.UWP/Views/Controls/ArchiveTags.xaml @@ -2,7 +2,7 @@ x:Class="LRReader.UWP.Views.Controls.ArchiveTags" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls" + xmlns:controls="using:CommunityToolkit.WinUI.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="using:LRReader.UWP.Views.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/LRReader.UWP/Views/Controls/ModernExpander.xaml b/LRReader.UWP/Views/Controls/ModernExpander.xaml index 03abb19..93cdfa6 100644 --- a/LRReader.UWP/Views/Controls/ModernExpander.xaml +++ b/LRReader.UWP/Views/Controls/ModernExpander.xaml @@ -2,7 +2,7 @@ x:Class="LRReader.UWP.Views.Controls.ModernExpander" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="using:LRReader.UWP.Views.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/LRReader.UWP/Views/Controls/ModernPageTab.xaml b/LRReader.UWP/Views/Controls/ModernPageTab.xaml index b749e6c..0b9d572 100644 --- a/LRReader.UWP/Views/Controls/ModernPageTab.xaml +++ b/LRReader.UWP/Views/Controls/ModernPageTab.xaml @@ -2,7 +2,7 @@ x:Class="LRReader.UWP.Views.Controls.ModernPageTab" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="using:LRReader.UWP.Views.Controls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/LRReader.UWP/Views/Dialogs/ValidateApiDialog.xaml b/LRReader.UWP/Views/Dialogs/ValidateApiDialog.xaml index ca2e607..abc8693 100644 --- a/LRReader.UWP/Views/Dialogs/ValidateApiDialog.xaml +++ b/LRReader.UWP/Views/Dialogs/ValidateApiDialog.xaml @@ -2,7 +2,7 @@ x:Class="LRReader.UWP.Views.Dialogs.ValidateApiDialog" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="using:LRReader.UWP.Views.Dialogs" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/LRReader.UWP/Views/Items/ArchiveImage.cs b/LRReader.UWP/Views/Items/ArchiveImage.cs index 9e57ec2..dc1fc19 100644 --- a/LRReader.UWP/Views/Items/ArchiveImage.cs +++ b/LRReader.UWP/Views/Items/ArchiveImage.cs @@ -1,12 +1,12 @@ #nullable enable using System; using System.Threading.Tasks; +using CommunityToolkit.WinUI.Animations; using LRReader.Shared.Models.Main; using LRReader.Shared.Services; using LRReader.Shared.ViewModels.Items; using LRReader.UWP.Extensions; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Toolkit.Uwp.UI.Animations; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Input; diff --git a/LRReader.UWP/Views/Items/GenericArchiveItem.cs b/LRReader.UWP/Views/Items/GenericArchiveItem.cs index 97f17ce..cba7034 100644 --- a/LRReader.UWP/Views/Items/GenericArchiveItem.cs +++ b/LRReader.UWP/Views/Items/GenericArchiveItem.cs @@ -3,13 +3,13 @@ using System.Collections.Generic; using System.Reflection; using System.Threading.Tasks; +using CommunityToolkit.WinUI.Animations; using LRReader.Shared; using LRReader.Shared.Models.Main; using LRReader.Shared.Services; using LRReader.Shared.ViewModels.Items; using LRReader.UWP.Extensions; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Toolkit.Uwp.UI.Animations; using Windows.Devices.Input; using Windows.Storage; using Windows.Storage.Pickers; diff --git a/LRReader.UWP/Views/Items/ReaderImage.xaml.cs b/LRReader.UWP/Views/Items/ReaderImage.xaml.cs index cdf99c2..109b2e2 100644 --- a/LRReader.UWP/Views/Items/ReaderImage.xaml.cs +++ b/LRReader.UWP/Views/Items/ReaderImage.xaml.cs @@ -2,10 +2,10 @@ using System; using System.Threading; using System.Threading.Tasks; +using CommunityToolkit.WinUI.Animations; using LRReader.Shared.Models.Main; using LRReader.Shared.Services; using LRReader.UWP.Extensions; -using Microsoft.Toolkit.Uwp.UI.Animations; using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/LRReader.UWP/Views/Tabs/ArchiveTab.xaml b/LRReader.UWP/Views/Tabs/ArchiveTab.xaml index af1fe9b..036cb6b 100644 --- a/LRReader.UWP/Views/Tabs/ArchiveTab.xaml +++ b/LRReader.UWP/Views/Tabs/ArchiveTab.xaml @@ -4,7 +4,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:content="using:LRReader.UWP.Views.Tabs.Content" xmlns:controls="using:LRReader.UWP.Views.Controls" - xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters" + xmlns:converters="using:CommunityToolkit.WinUI.Converters" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="using:LRReader.UWP.Views.Tabs" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/LRReader.UWP/Views/Tabs/Content/ArchiveEdit.xaml.cs b/LRReader.UWP/Views/Tabs/Content/ArchiveEdit.xaml.cs index 3ed8b4d..a5c4282 100644 --- a/LRReader.UWP/Views/Tabs/Content/ArchiveEdit.xaml.cs +++ b/LRReader.UWP/Views/Tabs/Content/ArchiveEdit.xaml.cs @@ -3,11 +3,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; +using CommunityToolkit.WinUI.Animations; using LRReader.Shared.Models.Main; using LRReader.Shared.Services; using LRReader.Shared.ViewModels; using LRReader.UWP.Extensions; -using Microsoft.Toolkit.Uwp.UI.Animations; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media.Animation; diff --git a/LRReader.UWP/Views/Tabs/Content/ArchiveTabContent.xaml.cs b/LRReader.UWP/Views/Tabs/Content/ArchiveTabContent.xaml.cs index fd9e144..29df3f0 100644 --- a/LRReader.UWP/Views/Tabs/Content/ArchiveTabContent.xaml.cs +++ b/LRReader.UWP/Views/Tabs/Content/ArchiveTabContent.xaml.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using CommunityToolkit.Mvvm.Input; +using CommunityToolkit.WinUI.Animations; using LRReader.Shared.Extensions; using LRReader.Shared.Models.Main; using LRReader.Shared.Services; @@ -13,7 +14,6 @@ using LRReader.UWP.Extensions; using LRReader.UWP.Views.Items; using Microsoft.Toolkit.Uwp.UI; -using Microsoft.Toolkit.Uwp.UI.Animations; using Windows.Devices.Input; using Windows.Foundation; using Windows.Storage;