securefolderfs-community · d2dyno1 · Jan 22, 2025 · Jan 23, 2025 · Jan 24, 2025 · Jan 24, 2025
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@
 ApiKeys.Private.cs
 SecureFolderFS.WinUI/settings/
 SecureFolderFS.AvaloniaUI/settings/
+pdfjs53/
 
 # User-specific files
 *.rsuser

diff --git a/global.json b/global.json
@@ -1,5 +1,8 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "5.4.10"
+    "Uno.Sdk": "5.6.37"
+  },
+  "sdk": {
+    "allowPrerelease": true
   }
-}
+}
diff --git a/lib/Tmds.Fuse b/lib/Tmds.Fuse
diff --git a/lib/nwebdav b/lib/nwebdav
diff --git a/src/Platforms/Directory.Packages.props b/src/Platforms/Directory.Packages.props
@@ -2,31 +2,30 @@
   <ItemGroup>
     <PackageVersion Include="AathifMahir.Maui.MauiIcons.Cupertino" Version="4.0.0" />
     <PackageVersion Include="AathifMahir.Maui.MauiIcons.Material" Version="4.0.0" />
-    <PackageVersion Include="CommunityToolkit.Maui" Version="9.1.1" />
-    <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="4.1.2" />
-    <PackageVersion Include="CommunityToolkit.WinUI.UI.Animations" Version="7.1.2" />
+    <PackageVersion Include="CommunityToolkit.Maui" Version="11.2.0" />
+    <PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="6.0.2" />
+    <PackageVersion Include="CommunityToolkit.WinUI.Animations" Version="8.2.250402" />
     <PackageVersion Include="CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.2" />
     <PackageVersion Include="ContextMenuContainer" Version="1.2.3" />
-    <PackageVersion Include="H.NotifyIcon.Uno.WinUI" Version="2.1.4" />
+    <PackageVersion Include="H.NotifyIcon.Uno.WinUI" Version="2.3.0" />
     <PackageVersion Include="IconPacks.Material" Version="1.0.8940.2-build" />
-    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc4.5" />
-    <PackageVersion Include="Material.Components.Maui" Version="0.2.2-preview" />
+    <PackageVersion Include="LibVLCSharp.MAUI" Version="3.9.3" />
+    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc5.3" />
     <PackageVersion Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
     <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
-    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Maui.Core" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Maui.Controls" Version="9.0.50" />
+    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.50" />
+    <PackageVersion Include="Microsoft.Maui.Core" Version="9.0.50" />
+    <PackageVersion Include="Microsoft.Maui.Essentials" Version="9.0.50" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.4" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageVersion Include="Octokit" Version="13.0.1" />
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="2.88.9-preview.2.2" />
-    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
-    <PackageVersion Include="The49.Maui.BottomSheet" Version="8.0.3" />
+    <PackageVersion Include="Octokit" Version="14.0.0" />
+    <PackageVersion Include="Plugin.Maui.BottomSheet" Version="9.1.4" />
+    <PackageVersion Include="SkiaSharp" Version="3.116.1" />
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.4" />
     <PackageVersion Include="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
-    <PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Animations" Version="7.1.200" />
-    <PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.203" />
+    <PackageVersion Include="Uno.CommunityToolkit.WinUI.UI.Controls.Markdown" Version="7.1.204" />
     <PackageVersion Include="Uno.Core.Extensions.Logging" Version="4.1.1" />
     <PackageVersion Include="Uno.Core.Extensions.Logging.Singleton" Version="4.1.1" />
     <PackageVersion Include="Uno.Extensions.Logging.OSLog" Version="1.7.0" />
@@ -35,6 +34,9 @@
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.37" />
     <PackageVersion Include="Uno.WinUI" Version="5.3.90" />
     <PackageVersion Include="Uno.WinUI.Lottie" Version="5.3.90" />
-    <PackageVersion Include="Vanara.PInvoke.ComCtl32" Version="4.0.4" />
+    <PackageVersion Include="Vanara.PInvoke.ComCtl32" Version="4.1.2" />
+    <PackageVersion Include="Vanara.PInvoke.Shell32" Version="4.1.2" />
+    <PackageVersion Include="VideoLAN.LibVLC.Android" Version="3.5.3" />
+    <PackageVersion Include="VideoLAN.LibVLC.iOS" Version="3.3.18" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/Platforms/SecureFolderFS.Maui/App.xaml b/src/Platforms/SecureFolderFS.Maui/App.xaml
@@ -1,17 +1,14 @@
 <Application
     x:Class="SecureFolderFS.Maui.App"
     xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:mds="clr-namespace:Material.Components.Maui.Styles;assembly=Material.Components.Maui">
+    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml">
 
     <Application.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
+                <ResourceDictionary Source="Resources/Styles/ColorStyles.xaml" />
+                <ResourceDictionary Source="Resources/Styles/ButtonStyles.xaml" />
                 <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
-
-                <!--  Platform styles for Android  -->
-                <mds:MaterialStyles Dark="#1791ff" Light="#158de0" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

diff --git a/src/Platforms/SecureFolderFS.Maui/App.xaml.cs b/src/Platforms/SecureFolderFS.Maui/App.xaml.cs
@@ -1,13 +1,15 @@
-using CommunityToolkit.Mvvm.DependencyInjection;
+using APES.UI.XF;
+using SecureFolderFS.Maui.Extensions.Mappers;
+using SecureFolderFS.Maui.Helpers;
 using SecureFolderFS.Shared;
 using SecureFolderFS.UI.Helpers;
 
 namespace SecureFolderFS.Maui
 {
     public partial class App : Application
     {
-        public static App Instance => (App)Application.Current!;
-        
+        public static App Instance => (App)Current!;
+
         public IServiceProvider? ServiceProvider { get; private set; }
 
         public BaseLifecycleHelper ApplicationLifecycle { get; } =
@@ -18,23 +20,33 @@ public partial class App : Application
 #else
             null;
 #endif
-        
+
         public event EventHandler? AppResumed;
         public event EventHandler? AppPutToForeground;
 
         public App()
         {
             InitializeComponent();
 
+#if ANDROID
+            // Load Android-specific resource dictionaries
+            Resources.MergedDictionaries.Add(new Platforms.Android.Templates.AndroidDataTemplates());
+#endif
+
+            // Configure mappers
+            CustomMappers.AddEntryMappers();
+            CustomMappers.AddLabelMappers();
+            CustomMappers.AddPickerMappers();
+
             // Configure exception handlers
             AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
             TaskScheduler.UnobservedTaskException += TaskScheduler_UnobservedTaskException;
         }
 
         protected override Window CreateWindow(IActivationState? activationState)
         {
-            APES.UI.XF.ContextMenuContainer.Init();
-            
+            ContextMenuContainer.Init();
+
             var appShell = Task.Run(GetAppShellAsync).ConfigureAwait(false).GetAwaiter().GetResult();
             return new Window(appShell);
         }
@@ -49,10 +61,13 @@ private async Task<Page> GetAppShellAsync()
 
             // Register IoC
             DI.Default.SetServiceProvider(ServiceProvider);
-            
+
             // Create and initialize AppShell
             var appShell = new AppShell();
-            await appShell.MainViewModel.InitAsync();
+            await appShell.MainViewModel.InitAsync().ConfigureAwait(false);
+
+            // Initialize ThemeHelper
+            await MauiThemeHelper.Instance.InitAsync().ConfigureAwait(false);
 
             return appShell;
         }

diff --git a/src/Platforms/SecureFolderFS.Maui/AppModels/CorrectedPanGestureRecognizer.cs b/src/Platforms/SecureFolderFS.Maui/AppModels/CorrectedPanGestureRecognizer.cs
@@ -0,0 +1,49 @@
+// Some parts of the following code were used from https://github.com/dotnet/maui/issues/20772#issuecomment-2030914069
+
+using Microsoft.Maui.Platform;
+
+namespace SecureFolderFS.Maui.AppModels
+{
+    internal sealed class CorrectedPanGestureRecognizer : PanGestureRecognizer, IPanGestureController
+    {
+#if ANDROID
+        // Index 0 is X, index 1 is Y
+        private readonly int[] startingLocation = new int[2];
+        private readonly int[] currentLocation = new int[2];
+#endif
+        public new event EventHandler<PanUpdatedEventArgs>? PanUpdated;
+
+        void IPanGestureController.SendPan(Element sender, double totalX, double totalY, int gestureId)
+        {
+#if ANDROID
+            ArgumentNullException.ThrowIfNull(sender.Handler.MauiContext?.Context);
+            Android.Views.View view = sender.ToPlatform(sender.Handler.MauiContext);
+            view.GetLocationOnScreen(currentLocation);
+            totalX += sender.Handler.MauiContext.Context.FromPixels(currentLocation[0] - startingLocation[0]);
+            totalY += sender.Handler.MauiContext.Context.FromPixels(currentLocation[1] - startingLocation[1]);
+
+#endif
+            PanUpdated?.Invoke(sender, new PanUpdatedEventArgs(GestureStatus.Running, gestureId, totalX, totalY));
+        }
+
+        void IPanGestureController.SendPanCanceled(Element sender, int gestureId)
+        {
+            PanUpdated?.Invoke(sender, new PanUpdatedEventArgs(GestureStatus.Canceled, gestureId));
+        }
+
+        void IPanGestureController.SendPanCompleted(Element sender, int gestureId)
+        {
+            PanUpdated?.Invoke(sender, new PanUpdatedEventArgs(GestureStatus.Completed, gestureId));
+        }
+
+        void IPanGestureController.SendPanStarted(Element sender, int gestureId)
+        {
+#if ANDROID
+            ArgumentNullException.ThrowIfNull(sender.Handler.MauiContext);
+            Android.Views.View view = sender.ToPlatform(sender.Handler.MauiContext);
+            view.GetLocationOnScreen(startingLocation);
+#endif
+            PanUpdated?.Invoke(sender, new PanUpdatedEventArgs(GestureStatus.Started, gestureId));
+        }
+    }
+}
diff --git a/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs b/src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs
@@ -1,25 +1,38 @@
+using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Models;
 using IImage = SecureFolderFS.Shared.ComponentModel.IImage;
 
 namespace SecureFolderFS.Maui.AppModels
 {
     /// <inheritdoc cref="IImage"/>
-    internal sealed class ImageStream : IImage
+    internal sealed class ImageStream : IImageStream
     {
-        private readonly Stream _stream;
-        
+        public Stream Stream { get; }
+
         public StreamImageSource Source { get; }
 
         public ImageStream(Stream stream)
         {
-            _stream = stream;
+            Stream = stream;
             Source = new();
-            Source.Stream = (cancellationToken) => Task.FromResult(stream);
+            Source.Stream = (ct) => Task.FromResult(stream);
+        }
+
+        /// <inheritdoc/>
+        public async Task CopyToAsync(Stream destination, CancellationToken cancellationToken = default)
+        {
+            var savedPosition = Stream.Position;
+            await Stream.CopyToAsync(destination, cancellationToken);
+            Stream.Position = savedPosition;
         }
 
         /// <inheritdoc/>
         public void Dispose()
         {
-            _stream.Dispose();
+            if (Stream is OnDemandDisposableStream onDemandDisposableStream)
+                onDemandDisposableStream.ForceClose();
+            else
+                Stream.Dispose();
         }
     }
 }
+2 −2		NWebDav.Server/Handlers/GetAndHeadHandler.cs
+1 −1		NWebDav.Server/Handlers/LockHandler.cs
+3 −3		NWebDav.Server/Locking/ILockingManager.cs
+3 −3		NWebDav.Server/NWebDav.Server.csproj
+1 −1		NWebDav.Server/Props/DavTypedProperties.cs
+2 −2		NWebDav.Server/Stores/RootDiskStore.cs