(V3) Vault recycle bin

global.json

@@ -1,5 +1,8 @@
 {
   "msbuild-sdks": {
-    "Uno.Sdk": "5.4.10"
+    "Uno.Sdk": "5.6.20"
+  },
+  "sdk": {
+	  "allowPrerelease": true
   }
 }

src/Platforms/Directory.Packages.props

@@ -2,31 +2,29 @@
   <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="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 +33,7 @@
     <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" />
   </ItemGroup>
-</Project>
+</Project>

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>

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,28 @@ public partial class App : Application
 #else
             null;
 #endif
-        
+
         public event EventHandler? AppResumed;
         public event EventHandler? AppPutToForeground;
 
         public App()
         {
             InitializeComponent();
 
+            // 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 +56,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;
         }

src/Platforms/SecureFolderFS.Maui/AppModels/ImageStream.cs

@@ -1,25 +1,37 @@
+using SecureFolderFS.Shared.ComponentModel;
 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();
         }
     }
 }

src/Platforms/SecureFolderFS.Maui/AppModels/OnDemandDisposableStream.cs

@@ -0,0 +1,16 @@
+namespace SecureFolderFS.Maui.AppModels
+{
+    internal sealed class OnDemandDisposableStream : MemoryStream
+    {
+        public void ForceClose()
+        {
+            base.Dispose(true);
+        }
+
+        /// <inheritdoc/>
+        protected override void Dispose(bool disposing)
+        {
+            _ = disposing;
+        }
+    }
+}

src/Platforms/SecureFolderFS.Maui/AppModels/VideoStreamServer.cs

@@ -32,7 +32,7 @@ public Task InitAsync(CancellationToken cancellationToken = default)
         {
             _httpListener.Start();
             _ = BeginListeningAsync();
-            
+
             return Task.CompletedTask;
 
             async Task BeginListeningAsync()
@@ -41,24 +41,29 @@ async Task BeginListeningAsync()
                 {
                     try
                     {
+                        var response = context.Response;
                         if (context.Request.RawUrl != "/video")
                         {
-                            context.Response.StatusCode = (int)HttpStatusCode.NotFound;
-                            context.Response.Close();   
+                            response.StatusCode = (int)HttpStatusCode.NotFound;
+                            response.Close();   
                             continue;
                         }
-
-                        context.Response.StatusCode = (int)HttpStatusCode.OK;
-                        context.Response.ContentType = _mimeType;
-                        context.Response.ContentLength64 = _videoStream.Length;
-                        context.Response.Headers["Accept-Ranges"] = "bytes";
 
-                        await _videoStream.CopyToAsync(context.Response.OutputStream, 64 * 1024, cancellationToken);
+                        response.ContentType = _mimeType;
+                        response.ContentLength64 = _videoStream.Length;
+                        response.Headers["Accept-Ranges"] = "bytes";
+
+                        await _videoStream.CopyToAsync(response.OutputStream, 64 * 1024, cancellationToken);
+                        await _videoStream.FlushAsync(cancellationToken);
                         _videoStream.Position = 0L;
-                        break;
+
+                        response.StatusCode = (int)HttpStatusCode.OK;
+                        response.StatusDescription = "OK";
+                        response.Close();
                     }
-                    catch (Exception)
+                    catch (Exception ex)
                     {
+                        _ = ex;
                         break;
                     }
                 }
@@ -72,7 +77,7 @@ public void Dispose()
             _videoStream.Dispose();
             _httpListener.Abort();
         }
-        
+
         private static int GetAvailablePort()
         {
             using var listener = new TcpListener(IPAddress.Loopback, 0);

src/Platforms/SecureFolderFS.Maui/AppShell.xaml.cs

@@ -15,6 +15,7 @@ public AppShell()
             Routing.RegisterRoute("LoginPage", typeof(LoginPage));
             Routing.RegisterRoute("OverviewPage", typeof(OverviewPage));
             Routing.RegisterRoute("BrowserPage", typeof(BrowserPage));
+            Routing.RegisterRoute("HealthPage", typeof(HealthPage));
         }
     }
 }

src/Platforms/SecureFolderFS.Maui/Extensions/IocExtensions.cs

@@ -1,6 +1,9 @@
 using OwlCore.Storage;
+using Plugin.Maui.BottomSheet.Hosting;
+using Plugin.Maui.BottomSheet.Navigation;
 using SecureFolderFS.Maui.ServiceImplementation;
 using SecureFolderFS.Maui.ServiceImplementation.Settings;
+using SecureFolderFS.Maui.Sheets;
 using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.UI.ServiceImplementation;
 using SecureFolderFS.UI.ServiceImplementation.Settings;
@@ -14,10 +17,12 @@ public static IServiceCollection WithMauiServices(this IServiceCollection servic
             return serviceCollection
                     .AddSingleton<ISettingsService, SettingsService>(_ => new(new MauiAppSettings(settingsFolder), new UserSettings(settingsFolder)))
                     .AddSingleton<IMediaService, MauiMediaService>()
+                    .AddSingleton<IShareService, MauiShareService>()
                     .AddSingleton<IOverlayService, MauiOverlayService>()
-                    .AddTransient<INavigationService, MauiNavigationService>()
                     .AddSingleton<IClipboardService, MauiClipboardService>()
-                    //.AddSingleton<IThreadingService, ThreadingService>()
+                    .AddSingleton<IBottomSheetNavigationService, BottomSheetNavigationService>()
+                    .AddTransient<INavigationService, MauiNavigationService>()
+                    .AddBottomSheet<ViewOptionsSheet>(nameof(ViewOptionsSheet))
                 ;
         }
     }

src/Platforms/SecureFolderFS.Maui/Extensions/Mappers/CustomMappers.Entry.cs

@@ -0,0 +1,38 @@
+using Microsoft.Maui.Handlers;
+using Microsoft.Maui.Platform;
+using SecureFolderFS.Maui.UserControls.Common;
+
+#if ANDROID
+using Android.Graphics.Drawables.Shapes;
+using Paint = Android.Graphics.Paint;
+using ShapeDrawable = Android.Graphics.Drawables.ShapeDrawable;
+#endif
+
+namespace SecureFolderFS.Maui.Extensions.Mappers
+{
+    public static partial class CustomMappers
+    {
+        public static void AddEntryMappers()
+        {
+            EntryHandler.Mapper.AppendToMapping($"{nameof(CustomMappers)}.{nameof(Entry)}", (handler, view) =>
+            {
+                if (view is not ModernEntry)
+                    return;
+#if ANDROID
+                var outerRadii = Enumerable.Range(1, 8).Select(_ => 24f).ToArray();
+                var roundRectShape = new RoundRectShape(outerRadii, null, null);
+                var shape = new ShapeDrawable(roundRectShape);
+
+                shape.Paint!.Color = (App.Instance.Resources["BorderLightColor"] as Color)!.ToPlatform();
+                shape.Paint.StrokeWidth = 4;
+                shape.Paint.SetStyle(Paint.Style.Stroke);
+                handler.PlatformView.Background = shape;
+                handler.PlatformView.SetPadding(40, 32,40, 32);
+#elif IOS
+                handler.PlatformView.Layer.BorderColor = (App.Current.Resources["BorderLightColor"] as Color).ToPlatform().CGColor;
+                handler.PlatformView.BorderStyle = UIKit.UITextBorderStyle.RoundedRect;
+#endif
+            });
+        }
+    }
+}

src/Platforms/SecureFolderFS.Maui/Extensions/Mappers/CustomMappers.Label.cs

@@ -0,0 +1,21 @@
+using Microsoft.Maui.Handlers;
+using SecureFolderFS.Maui.UserControls.Common;
+
+namespace SecureFolderFS.Maui.Extensions.Mappers
+{
+    public static partial class CustomMappers
+    {
+        public static void AddLabelMappers()
+        {
+            LabelHandler.Mapper.AppendToMapping($"{nameof(CustomMappers)}.{nameof(Label)}", (handler, view) =>
+            {
+                if (view is not SelectableLabel)
+                    return;
+
+#if ANDROID
+                handler.PlatformView.SetTextIsSelectable(true);
+#endif
+            });
+        }
+    }
+}