Beta5

.run/SecureFolderFS.run.xml

@@ -1,7 +1,7 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="SecureFolderFS (Desktop)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj" />
-    <option name="LAUNCH_PROFILE_TFM" value="net8.0-desktop" />
+    <option name="LAUNCH_PROFILE_TFM" value="net9.0-desktop" />
     <option name="LAUNCH_PROFILE_NAME" value="SecureFolderFS (Desktop)" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
@@ -16,7 +16,7 @@
   </configuration>
   <configuration default="false" name="SecureFolderFS (WinAppSDK Unpackaged)" type="LaunchSettings" factoryName=".NET Launch Settings Profile">
     <option name="LAUNCH_PROFILE_PROJECT_FILE_PATH" value="$PROJECT_DIR$/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj" />
-    <option name="LAUNCH_PROFILE_TFM" value="net8.0-windows10.0.19041.0" />
+    <option name="LAUNCH_PROFILE_TFM" value="net9.0-windows10.0.19041.0" />
     <option name="LAUNCH_PROFILE_NAME" value="SecureFolderFS (WinAppSDK Unpackaged)" />
     <option name="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />

global.json

@@ -1,6 +1,5 @@
 {
-  // To update the version of Uno please update the version of the Uno.Sdk here. See https://aka.platform.uno/upgrade-uno-packages for more information.
   "msbuild-sdks": {
-    "Uno.Sdk": "5.3.112"
+    "Uno.Sdk": "5.4.10"
   }
-}
+}

src/Platforms/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <DotNetVersion>net8.0</DotNetVersion>
+    <DotNetVersion>net9.0</DotNetVersion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -62,7 +62,7 @@
     <When Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
       <PropertyGroup>
         <IsMacCatalyst>true</IsMacCatalyst>
-        <SupportedOSPlatformVersion>14.0</SupportedOSPlatformVersion>
+        <SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
       </PropertyGroup>
     </When>
     <When Condition="$(TargetFramework.Contains('windows10'))">

src/Platforms/Directory.Packages.props

@@ -1,27 +1,27 @@
 <Project ToolsVersion="15.0">
   <ItemGroup>
-    <PackageVersion Include="AathifMahir.Maui.MauiIcons.Cupertino" Version="3.0.0" />
-    <PackageVersion Include="AathifMahir.Maui.MauiIcons.Material" Version="3.0.0" />
-    <PackageVersion Include="CommunityToolkit.Maui" Version="9.0.2" />
+    <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.WinUI.UI.Controls.Markdown" Version="7.1.2" />
-    <PackageVersion Include="IconPacks.Material" Version="1.0.8765.1-build" />
-    <PackageVersion Include="LiveChartsCore.SkiaSharpView.Uno.WinUI" Version="2.0.0-rc3.3" />
-    <PackageVersion Include="Material.Components.Maui" Version="0.2.1-preview" />
+    <PackageVersion Include="ContextMenuContainer" Version="1.2.3" />
+    <PackageVersion Include="H.NotifyIcon.Uno.WinUI" Version="2.1.4" />
+    <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="Microsoft.AppCenter.Analytics" Version="5.0.3" />
     <PackageVersion Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.Maui.Controls" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Maui.Core" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Maui.Essentials" Version="8.0.70" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <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.NET.ILLink.Analyzers" Version="7.0.100-1.23401.1" />
     <PackageVersion Include="Microsoft.Windows.Compatibility" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-    <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
     <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="Uno.CommunityToolkit.WinUI" Version="7.1.200" />
@@ -33,14 +33,8 @@
     <PackageVersion Include="Uno.Resizetizer" Version="1.6.0" />
     <PackageVersion Include="Uno.UI.Adapter.Microsoft.Extensions.Logging" Version="5.3.90" />
     <PackageVersion Include="Uno.UniversalImageLoader" Version="1.9.37" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap" Version="8.0.20" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.DevServer" Version="8.0.20" />
-    <PackageVersion Include="Uno.Wasm.Bootstrap.Server" Version="8.0.20" />
     <PackageVersion Include="Uno.WinUI" Version="5.3.90" />
     <PackageVersion Include="Uno.WinUI.Lottie" Version="5.3.90" />
-    <PackageVersion Include="Uno.WinUI.DevServer" Version="5.3.90" />
-    <PackageVersion Include="Uno.WinUI.Skia.Gtk" Version="5.3.90" />
-    <PackageVersion Include="Uno.WinUI.WebAssembly" Version="5.3.90" />
-    <PackageVersion Include="Vanara.PInvoke.ComCtl32" Version="4.0.2" />
+    <PackageVersion Include="Vanara.PInvoke.ComCtl32" Version="4.0.4" />
   </ItemGroup>
 </Project>

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

@@ -33,6 +33,8 @@ public App()
 
         protected override Window CreateWindow(IActivationState? activationState)
         {
+            APES.UI.XF.ContextMenuContainer.Init();
+
             var appShell = Task.Run(GetAppShellAsync).ConfigureAwait(false).GetAwaiter().GetResult();
             return new Window(appShell);
         }

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

@@ -0,0 +1,25 @@
+using IImage = SecureFolderFS.Shared.ComponentModel.IImage;
+
+namespace SecureFolderFS.Maui.AppModels
+{
+    /// <inheritdoc cref="IImage"/>
+    internal sealed class ImageStream : IImage
+    {
+        private readonly Stream _stream;
+
+        public StreamImageSource Source { get; }
+
+        public ImageStream(Stream stream)
+        {
+            _stream = stream;
+            Source = new();
+            Source.Stream = (cancellationToken) => Task.FromResult(stream);
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _stream.Dispose();
+        }
+    }
+}

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

@@ -0,0 +1,87 @@
+using System.Net;
+using System.Net.Sockets;
+using SecureFolderFS.Shared.ComponentModel;
+
+namespace SecureFolderFS.Maui.AppModels
+{
+    internal sealed class VideoStreamServer : IAsyncInitialize, IDisposable
+    {
+        private readonly HttpListener _httpListener;
+        private readonly Stream _videoStream;
+        private readonly string _mimeType;
+        private readonly int _port;
+        private bool _disposed;
+
+        public string BaseAddress => $"http://localhost:{_port}/video";
+
+        public VideoStreamServer(Stream videoStream, string mimeType)
+        {
+            _videoStream = videoStream;
+            _mimeType = mimeType;
+
+            // Automatically find a free port
+            _port = GetAvailablePort();
+
+            // Initialize the HttpListener with the free port
+            _httpListener = new HttpListener();
+            _httpListener.Prefixes.Add($"http://localhost:{_port}/");
+        }
+
+        /// <inheritdoc/>
+        public Task InitAsync(CancellationToken cancellationToken = default)
+        {
+            _httpListener.Start();
+            _ = BeginListeningAsync();
+
+            return Task.CompletedTask;
+
+            async Task BeginListeningAsync()
+            {
+                while (!_disposed && _httpListener.IsListening && await _httpListener.GetContextAsync() is var context)
+                {
+                    try
+                    {
+                        if (context.Request.RawUrl != "/video")
+                        {
+                            context.Response.StatusCode = (int)HttpStatusCode.NotFound;
+                            context.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);
+                        _videoStream.Position = 0L;
+                        break;
+                    }
+                    catch (Exception)
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+
+        /// <inheritdoc/>
+        public void Dispose()
+        {
+            _disposed = true;
+            _videoStream.Dispose();
+            _httpListener.Abort();
+        }
+
+        private static int GetAvailablePort()
+        {
+            using var listener = new TcpListener(IPAddress.Loopback, 0);
+            listener.Start();
+
+            var port = ((IPEndPoint)listener.LocalEndpoint).Port;
+            listener.Stop();
+
+            return port;
+        }
+    }
+}

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

@@ -14,6 +14,7 @@ public AppShell()
             // Register routes
             Routing.RegisterRoute("LoginPage", typeof(LoginPage));
             Routing.RegisterRoute("OverviewPage", typeof(OverviewPage));
+            Routing.RegisterRoute("BrowserPage", typeof(BrowserPage));
         }
     }
 }

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

@@ -13,6 +13,7 @@ public static IServiceCollection WithMauiServices(this IServiceCollection servic
         {
             return serviceCollection
                     .AddSingleton<ISettingsService, SettingsService>(_ => new(new MauiAppSettings(settingsFolder), new UserSettings(settingsFolder)))
+                    .AddSingleton<IMediaService, MauiMediaService>()
                     .AddSingleton<IOverlayService, MauiOverlayService>()
                     .AddTransient<INavigationService, MauiNavigationService>()
                     .AddSingleton<IClipboardService, MauiClipboardService>()

src/Platforms/SecureFolderFS.Maui/Localization/ResourceString.cs

@@ -12,16 +12,16 @@ internal sealed class ResourceString : IMarkupExtension
         /// <summary>
         /// Gets or sets the name identifier that is associated with a resource.
         /// </summary>
-        public string? Name { get; set; }
+        public string? Rid { get; set; }
 
         /// <inheritdoc/>
         public object ProvideValue(IServiceProvider serviceProvider)
         {
             LocalizationService ??= DI.OptionalService<ILocalizationService>();
             if (LocalizationService is null)
-                return $"{{{Name}}}";
+                return $"{{{Rid}}}";
 
-            return LocalizationService.TryGetString(Name ?? string.Empty) ?? $"{{{Name}}}";
+            return LocalizationService.TryGetString(Rid ?? string.Empty) ?? $"{{{Rid}}}";
         }
     }
 }

src/Platforms/SecureFolderFS.Maui/MauiProgram.cs

@@ -1,3 +1,4 @@
+using APES.UI.XF;
 using CommunityToolkit.Maui;
 using Microsoft.Extensions.Logging;
 using The49.Maui.BottomSheet;
@@ -25,12 +26,14 @@ public static MauiApp CreateMauiApp()
                 })
 
                 // Plugins
-                .UseMauiCommunityToolkit()      // https://github.com/CommunityToolkit/Maui
-                .UseBottomSheet()               // https://github.com/the49ltd/The49.Maui.BottomSheet
+                .UseMauiCommunityToolkitMediaElement()  // https://github.com/CommunityToolkit/Maui
+                .UseMauiCommunityToolkit()              // https://github.com/CommunityToolkit/Maui
+                .UseBottomSheet()                       // https://github.com/the49ltd/The49.Maui.BottomSheet
+                .ConfigureContextMenuContainer()        // https://github.com/anpin/ContextMenuContainer
 
 #if ANDROID
-                .UseMaterialMauiIcons()         // https://github.com/AathifMahir/MauiIcons
-                .UseMaterialComponents()        // https://github.com/mdc-maui/mdc-maui
+                .UseMaterialMauiIcons()                 // https://github.com/AathifMahir/MauiIcons
+                .UseMaterialComponents()                // https://github.com/mdc-maui/mdc-maui
 #elif IOS
                 .UseCupertinoMauiIcons()
 #endif
@@ -42,11 +45,8 @@ public static MauiApp CreateMauiApp()
                     handlers.AddHandler<ContentPageExtended, Handlers.ContentPageExHandler>();
 #endif
                 })
-                ;
-
-#if DEBUG
-            builder.Logging.AddDebug();
-#endif
+
+                ; // Finish initialization
 
             return builder.Build();
         }

src/Platforms/SecureFolderFS.Maui/Platforms/Android/AndroidManifest.xml

@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-	<application android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true"></application>
+	<application android:usesCleartextTraffic="true" android:allowBackup="true" android:icon="@mipmap/appicon" android:supportsRtl="true">
+    <service android:name="communityToolkit.maui.media.services" android:exported="false" android:enabled="true" android:foregroundServiceType="mediaPlayback">
+      <intent-filter>
+        <action android:name="android.intent.action.MEDIA_BUTTON" />
+      </intent-filter>
+      <intent-filter>
+        <action android:name="androidx.media3.session.MediaSessionService"/>
+      </intent-filter>
+    </service>
+  </application>
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 	<uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+  <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+  <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PLAYBACK" />
+  <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" />
 	<uses-sdk />
-</manifest>
+</manifest>

src/Platforms/SecureFolderFS.Maui/Platforms/Android/Helpers/AndroidLifecycleHelper.cs

@@ -17,15 +17,14 @@ internal sealed class AndroidLifecycleHelper : BaseLifecycleHelper
         protected override string AppDirectory { get; } = Microsoft.Maui.Storage.FileSystem.Current.AppDataDirectory;
 
         /// <inheritdoc/>
-        public override async Task InitAsync(CancellationToken cancellationToken = default)
+        public override Task InitAsync(CancellationToken cancellationToken = default)
         {
-            // Request permissions
-            //await RequestPermissionsAsync<Permissions.StorageWrite>();
-
             // Initialize settings
             var settingsFolderPath = Path.Combine(AppDirectory, SecureFolderFS.UI.Constants.FileNames.SETTINGS_FOLDER_NAME);
             var settingsFolder = new SystemFolder(Directory.CreateDirectory(settingsFolderPath));
             ConfigureServices(settingsFolder);
+
+            return Task.CompletedTask;
         }
 
         /// <inheritdoc/>
@@ -40,8 +39,9 @@ protected override IServiceCollection ConfigureServices(IModifiableFolder settin
             return base.ConfigureServices(settingsFolder)
                     //.AddSingleton<IPrinterService, WindowsPrinterService>()
                     .AddSingleton<IApplicationService, AndroidApplicationService>()
-                    .AddSingleton<IVaultService, AndroidVaultService>()
-                    .AddSingleton<IVaultManagerService, AndroidVaultManagerService>()
+                    .AddSingleton<ISystemService, AndroidSystemService>()
+                    .AddSingleton<IVaultCredentialsService, AndroidVaultCredentialsService>()
+                    .AddSingleton<IVaultFileSystemService, AndroidVaultFileSystemService>()
                     .AddSingleton<IStorageService, AndroidStorageService>()
                     .AddSingleton<IFileExplorerService, AndroidFileExplorerService>()
                     .AddSingleton<ITelemetryService, DebugTelemetryService>()