Merge branch 'release/v1.3.2'

tor4kichi · Feb 14, 2022 · 3723eaf · 3723eaf
2 parents be16012 + 682d592
commit 3723eaf
Show file tree

Hide file tree

Showing 82 changed files with 499 additions and 698 deletions.
diff --git a/Hohoema.Models/FixPrism/BindableBaseWithFix.cs b/Hohoema.Models/FixPrism/BindableBaseWithFix.cs
diff --git a/Hohoema.Models/FixPrism/DispatchObservableCollection{T}.cs b/Hohoema.Models/FixPrism/DispatchObservableCollection{T}.cs
diff --git a/Hohoema.Models/Hohoema.Models.csproj b/Hohoema.Models/Hohoema.Models.csproj
@@ -122,8 +122,6 @@
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="FixPrism\BindableBaseWithFix.cs" />
-    <Compile Include="FixPrism\DispatchObservableCollection{T}.cs" />
     <Compile Include="IsExternalInit.cs" />
     <Compile Include="Models.Domain\Application\AppearanceSettings.cs" />
     <Compile Include="Models.Domain\Application\AppFlagsRepository.cs" />
@@ -207,7 +205,6 @@
     <Compile Include="Models.Domain\Notification\InAppNotificationMessage.cs" />
     <Compile Include="Models.Domain\Notification\LiteNotificationMessage.cs" />
     <Compile Include="Models.Domain\PageNavigation\HohoemaPageType.cs" />
-    <Compile Include="Models.Domain\PageNavigation\IPageNavigatable.cs" />
     <Compile Include="Models.Domain\PageNavigation\IPinablePage.cs" />
     <Compile Include="Models.Domain\PageNavigation\ISearchHistory.cs" />
     <Compile Include="Models.Domain\PageNavigation\ITitleUpdatablePage.cs" />
@@ -364,9 +361,6 @@
     <PackageReference Include="System.Threading.Tasks.Extensions">
       <Version>4.5.4</Version>
     </PackageReference>
-    <PackageReference Include="Uno.Prism.Unity.Uno">
-      <Version>7.1.0-pre.4</Version>
-    </PackageReference>
     <PackageReference Include="XTSSharp.NetStandard">
       <Version>1.0.0</Version>
     </PackageReference>
@@ -380,6 +374,7 @@
       <Name>NiconicoToolkit.UWP</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup />
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/Hohoema.Models/Models.Domain/Application/AppearanceSettings.cs b/Hohoema.Models/Models.Domain/Application/AppearanceSettings.cs
@@ -86,7 +86,7 @@ public ElementTheme ApplicationTheme
                     Save(internal_theme);
 
                     _Theme = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }
@@ -121,7 +121,7 @@ public NavigationViewPaneDisplayMode MenuPaneDisplayMode
                     Save(internal_theme);
 
                     _menuPaneDisplayMode = value;
-                    RaisePropertyChanged();
+                    OnPropertyChanged();
                 }
             }
         }

diff --git a/Hohoema.Models/Models.Domain/Application/BackupManager.cs b/Hohoema.Models/Models.Domain/Application/BackupManager.cs
@@ -1,4 +1,4 @@
-using Hohoema.FixPrism;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using Hohoema.Models.Domain.Niconico.NicoRepo;
 using Hohoema.Models.Domain.Niconico.Video;
 using Hohoema.Models.Domain.PageNavigation;

diff --git a/Hohoema.Models/Models.Domain/LocalMylist/LocalPlaylist.cs b/Hohoema.Models/Models.Domain/LocalMylist/LocalPlaylist.cs
@@ -5,7 +5,7 @@
 using Microsoft.Toolkit.Mvvm.Messaging;
 using Microsoft.Toolkit.Mvvm.Messaging.Messages;
 using NiconicoToolkit.Video;
-using Prism.Mvvm;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -56,7 +56,7 @@ public bool Equals(IPlaylistSortOption other)
         }
     }
 
-    public sealed class LocalPlaylist : FixPrism.BindableBase, IUserManagedPlaylist
+    public sealed class LocalPlaylist : ObservableObject, IUserManagedPlaylist
     {
         public static LocalPlaylistSortOption[] SortOptions { get; } = new LocalPlaylistSortOption[]
 {
@@ -124,7 +124,7 @@ private set
                 if (SetProperty(ref _count, value))
                 {
                     UpdatePlaylistInfo();
-                    RaisePropertyChanged(nameof(IUserManagedPlaylist.TotalCount));
+                    OnPropertyChanged(nameof(IUserManagedPlaylist.TotalCount));
                 }
             }
         }

diff --git a/Hohoema.Models/Models.Domain/Niconico/Follow/FollowItemInfo.cs b/Hohoema.Models/Models.Domain/Niconico/Follow/FollowItemInfo.cs
@@ -1,4 +1,4 @@
-using Prism.Mvvm;
+using Microsoft.Toolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.Generic;
 using System.Linq;