Update NuGet packages

jerry08 · Nov 3, 2023 · 939fade · 939fade
1 parent f939f4e
commit 939fade
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 41 deletions.
diff --git a/Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj b/Yosu.Youtube.Converter/Yosu.Youtube.Converter.csproj
@@ -21,7 +21,7 @@
   <ItemGroup>
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="CliWrap" Version="3.6.4" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.4" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.6" />
     <PackageReference Include="PolySharp" Version="1.13.2" PrivateAssets="all" />
   </ItemGroup>
 

diff --git a/Yosu.Youtube.Core/Yosu.Youtube.Core.csproj b/Yosu.Youtube.Core/Yosu.Youtube.Core.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="SixLabors.ImageSharp" Version="3.0.2" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.4" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.6" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Yosu/MauiProgram.cs b/Yosu/MauiProgram.cs
@@ -1,15 +1,13 @@
-using System.Linq;
+using Berry.Maui;
 using CommunityToolkit.Maui;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.Maui;
 using Microsoft.Maui.Controls;
 using Microsoft.Maui.Controls.Compatibility.Hosting;
 using Microsoft.Maui.Controls.Hosting;
 using Microsoft.Maui.Hosting;
 using Microsoft.Maui.LifecycleEvents;
 using Plugin.ContextMenuContainer;
-using Plugin.MauiTouchEffect.Effects;
 using SkiaSharp.Views.Maui.Controls.Hosting;
 using Woka;
 using Yosu.Handlers;
@@ -46,24 +44,17 @@ public static MauiApp CreateMauiApp()
                 fonts.AddFont("fa-solid-900.ttf", "FaSolid");
             })
             .UseSkiaSharp()
+            .UseBerry()
             .UseMauiCompatibility()
             .ConfigureMauiHandlers(handlers =>
             {
-                // Register ALL handlers in the assembly
-                handlers.AddCompatibilityRenderers(typeof(TouchEffect).Assembly);
-
 #if ANDROID
                 handlers.AddHandler<CheckBox, MaterialCheckBoxHandler>();
                 handlers.AddHandler<Switch, MaterialSwitchHandler>();
 #endif
 
                 handlers.AddHandler(typeof(ContextMenuContainer), typeof(ContextMenuContainerRenderer));
             })
-            .ConfigureEffects(effects =>
-            {
-                effects.AddCompatibilityEffects(typeof(TouchEffect).Assembly);
-                effects.Add(typeof(TouchEffect), typeof(PlatformTouchEffect));
-            })
             .ConfigureWorkarounds()
             .ConfigureLifecycleEvents(events =>
             {
@@ -89,21 +80,6 @@ public static MauiApp CreateMauiApp()
         builder.Logging.AddDebug();
 #endif
 
-        // Workaround for TouchEffect being lost when navigating multiple times or
-        // when closing the app (with OnBackButtonPressed()) and reopening the cached view.
-        Microsoft.Maui.Handlers.ElementHandler.ElementMapper.AppendToMapping("YosuElement", (handler, e) =>
-        {
-            if (e is Element element)
-            {
-                var touchEffects = element.Effects.OfType<TouchEffect>().ToList();
-                for (int i = 0; i < touchEffects.Count; i++)
-                {
-                    element.Effects.Remove(touchEffects[i]);
-                    element.Effects.Add(touchEffects[i]);
-                }
-            }
-        });
-
         // Views
         builder.Services.AddTransient<MainPage>();
         builder.Services.AddTransient<SettingsPage>();

diff --git a/Yosu/Yosu.csproj b/Yosu/Yosu.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Yosu</RootNamespace>
     <UseMaui>true</UseMaui>
     <!-- Rollback MAUI version because of bug (https://github.com/dotnet/maui/issues/14520) -->
-    <MauiVersion>7.0.59</MauiVersion>
+    <!--<MauiVersion>7.0.59</MauiVersion>-->
     <SingleProject>true</SingleProject>
 
     <!-- Display name -->
@@ -47,29 +47,26 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Remove="Platforms\Android\Services\DownloadService_org.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Plugin.MauiTouchEffect\Plugin.MauiTouchEffect.csproj" />
     <ProjectReference Include="..\Yosu.Soundcloud.Core\Yosu.Soundcloud.Core.csproj" />
     <ProjectReference Include="..\Yosu.Spotify.Core\Yosu.Spotify.Core.csproj" />
     <ProjectReference Include="..\Yosu.Youtube.Core\Yosu.Youtube.Core.csproj" />
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Berry.Maui" Version="1.0.13" />
     <PackageReference Include="Acr.UserDialogs" Version="8.0.1" />
-    <PackageReference Include="Cogwheel" Version="2.0.3" />
-    <PackageReference Include="CommunityToolkit.Maui" Version="5.3.0" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageReference Include="Cogwheel" Version="2.0.4" />
+    <PackageReference Include="CommunityToolkit.Maui" Version="6.0.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
     <PackageReference Include="Gress" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
-    <PackageReference Include="Octokit" Version="7.1.0" />
+    <PackageReference Include="Octokit" Version="9.0.0" />
     <PackageReference Include="Plugin.ContextMenuContainer" Version="1.0.3" />
     <PackageReference Include="PropertyChanged.Fody" Version="4.1.0" PrivateAssets="all" />
-    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.5" />
-    <PackageReference Include="Woka" Version="1.0.11" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.4" />
+    <PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
+    <!--<PackageReference Include="The49.Maui.BottomSheet" Version="1.0.4" />-->
+    <PackageReference Include="Woka" Version="1.0.14" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.6" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">