From 8efc98c1811dbc3fc40e4036957335d7d0f3782f Mon Sep 17 00:00:00 2001 From: d2dyno <53011783+d2dyno1@users.noreply.github.com> Date: Wed, 9 Oct 2024 15:22:35 +0200 Subject: [PATCH 001/133] Align asset naming --- global.json | 3 +- src/Platforms/Directory.Packages.props | 2 +- .../AppIcon/{appicon.svg => app_icon.svg} | 0 .../SecureFolderFS.Maui.csproj | 2 +- .../AppAssets/{AppIcon.ico => app_icon.ico} | Bin .../AppAssets/{AppIcon.png => app_icon.png} | Bin .../Assets/AppAssets/app_icon.svg | 179 ++++++++++++++++++ .../AppAssets/{AppTitle.png => app_title.png} | Bin .../AppAssets/{AppTitle.svg => app_title.svg} | 0 .../{GreenShield.png => green_shield.png} | Bin .../{GreenShield.svg => green_shield.svg} | 0 src/Platforms/SecureFolderFS.UI/Constants.cs | 2 +- .../SecureFolderFS.UI.csproj | 36 ++-- src/Platforms/SecureFolderFS.Uno/App.xaml.cs | 3 +- .../Assets/Icons/app_icon.svg | 179 ++++++++++++++++++ .../Assets/Icons/icon_background.svg | 42 ++++ .../Dialogs/PaymentDialog.xaml | 2 +- .../SecureFolderFS.Uno/Package.appxmanifest | 2 +- .../ResourceDictionaries/ImageResources.xaml | 4 +- .../SecureFolderFS.Uno.csproj | 35 +++- .../Introduction/WelcomeScreen.xaml | 2 +- .../UserControls/Widgets/HealthWidget.xaml | 4 +- .../PrintPages/RecoveryKeyPrintPage.xaml | 4 +- .../Views/Settings/AboutSettingsPage.xaml | 6 +- 24 files changed, 471 insertions(+), 36 deletions(-) rename src/Platforms/SecureFolderFS.Maui/Resources/AppIcon/{appicon.svg => app_icon.svg} (100%) rename src/Platforms/SecureFolderFS.UI/Assets/AppAssets/{AppIcon.ico => app_icon.ico} (100%) rename src/Platforms/SecureFolderFS.UI/Assets/AppAssets/{AppIcon.png => app_icon.png} (100%) create mode 100644 src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg rename src/Platforms/SecureFolderFS.UI/Assets/AppAssets/{AppTitle.png => app_title.png} (100%) rename src/Platforms/SecureFolderFS.UI/Assets/AppAssets/{AppTitle.svg => app_title.svg} (100%) rename src/Platforms/SecureFolderFS.UI/Assets/AppAssets/{GreenShield.png => green_shield.png} (100%) rename src/Platforms/SecureFolderFS.UI/Assets/AppAssets/{GreenShield.svg => green_shield.svg} (100%) create mode 100644 src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.svg create mode 100644 src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_background.svg diff --git a/global.json b/global.json index 9c6830bea..158f153ed 100644 --- a/global.json +++ b/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" } -} \ No newline at end of file +} diff --git a/src/Platforms/Directory.Packages.props b/src/Platforms/Directory.Packages.props index b41f0b9b5..b2b22fad8 100644 --- a/src/Platforms/Directory.Packages.props +++ b/src/Platforms/Directory.Packages.props @@ -30,7 +30,7 @@ - + diff --git a/src/Platforms/SecureFolderFS.Maui/Resources/AppIcon/appicon.svg b/src/Platforms/SecureFolderFS.Maui/Resources/AppIcon/app_icon.svg similarity index 100% rename from src/Platforms/SecureFolderFS.Maui/Resources/AppIcon/appicon.svg rename to src/Platforms/SecureFolderFS.Maui/Resources/AppIcon/app_icon.svg diff --git a/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj b/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj index 744662399..630c21d3d 100644 --- a/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj +++ b/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj @@ -41,7 +41,7 @@ - + diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.ico b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.ico similarity index 100% rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.ico rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.ico diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.png similarity index 100% rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppIcon.png rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.png diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg new file mode 100644 index 000000000..796cc7f6f --- /dev/null +++ b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_icon.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.png similarity index 100% rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.png rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.png diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.svg similarity index 100% rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/AppTitle.svg rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/app_title.svg diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.png b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/green_shield.png similarity index 100% rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.png rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/green_shield.png diff --git a/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.svg b/src/Platforms/SecureFolderFS.UI/Assets/AppAssets/green_shield.svg similarity index 100% rename from src/Platforms/SecureFolderFS.UI/Assets/AppAssets/GreenShield.svg rename to src/Platforms/SecureFolderFS.UI/Assets/AppAssets/green_shield.svg diff --git a/src/Platforms/SecureFolderFS.UI/Constants.cs b/src/Platforms/SecureFolderFS.UI/Constants.cs index 0ad0b4959..816628517 100644 --- a/src/Platforms/SecureFolderFS.UI/Constants.cs +++ b/src/Platforms/SecureFolderFS.UI/Constants.cs @@ -19,7 +19,7 @@ public static class FileNames public const string APPLICATION_SETTINGS_FILENAME = "application_settings.json"; public const string SAVED_VAULTS_FILENAME = "saved_vaults.json"; public const string USER_SETTINGS_FILENAME = "user_settings.json"; - public const string ICON_ASSET_PATH = "Assets/AppAssets/AppIcon.ico"; + public const string ICON_ASSET_PATH = "Assets/AppAssets/app_icon.ico"; } public static class AppThemes diff --git a/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj b/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj index 5192031db..3dc27fcf8 100644 --- a/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj +++ b/src/Platforms/SecureFolderFS.UI/SecureFolderFS.UI.csproj @@ -9,12 +9,12 @@ - - - - - - + + + + + + @@ -22,30 +22,30 @@ - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - + PreserveNewest - - + + PreserveNewest - + PreserveNewest @@ -147,7 +147,11 @@ PreserveNewest - + + PreserveNewest + + + PreserveNewest diff --git a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs index 3c05fb6e8..9cf38faa2 100644 --- a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs +++ b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs @@ -13,6 +13,7 @@ using SecureFolderFS.UI.Helpers; using SecureFolderFS.Uno.UserControls.InterfaceRoot; using Uno.UI; +using Uno.Resizetizer; using Windows.ApplicationModel; namespace SecureFolderFS.Uno @@ -131,7 +132,7 @@ private static void EnsureEarlyWindow(Window window) boundsManager.MinHeight = 572; #else - _ = window; + window.SetWindowIcon(); #endif } diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.svg new file mode 100644 index 000000000..796cc7f6f --- /dev/null +++ b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_background.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_background.svg new file mode 100644 index 000000000..a15af53aa --- /dev/null +++ b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_background.svg @@ -0,0 +1,42 @@ + + + + + + diff --git a/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml b/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml index 7aa63c760..36584554e 100644 --- a/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml +++ b/src/Platforms/SecureFolderFS.Uno/Dialogs/PaymentDialog.xaml @@ -27,7 +27,7 @@ + Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_icon.png" /> diff --git a/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml b/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml index 1647efddc..2fe2ebc69 100644 --- a/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml +++ b/src/Platforms/SecureFolderFS.Uno/ResourceDictionaries/ImageResources.xaml @@ -3,12 +3,12 @@ diff --git a/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj b/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj index 9cc2cd78b..0e2ef7298 100644 --- a/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj +++ b/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj @@ -12,7 +12,7 @@ - + Exe true @@ -50,6 +50,7 @@ + @@ -60,6 +61,16 @@ + + + + + app_icon.svg + icon_background.png + #FFFFFF + + + <_RequiresILLinkPack>true <_ComputeManagedAssemblyToLink>true @@ -72,6 +83,7 @@ + @@ -107,7 +119,7 @@ Never - + x86|x64|arm64 False True @@ -475,4 +487,23 @@ + + + + PreserveNewest + Assets\AppAssets\icon_background.svg + + + PreserveNewest + Assets\AppAssets\app_icon.svg + + + PreserveNewest + Assets\Icons\app_icon.svg + + + PreserveNewest + Assets\Icons\icon_background.svg + + diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml b/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml index d294c896b..66bc0f475 100644 --- a/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml +++ b/src/Platforms/SecureFolderFS.Uno/UserControls/Introduction/WelcomeScreen.xaml @@ -18,7 +18,7 @@ Height="56" HorizontalAlignment="Center" VerticalAlignment="Bottom" - Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppIcon.png" /> + Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_icon.png" /> - + diff --git a/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml index 12803d6db..b261143b9 100644 --- a/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml +++ b/src/Platforms/SecureFolderFS.Uno/Views/PrintPages/RecoveryKeyPrintPage.xaml @@ -32,13 +32,13 @@ + Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_icon.png" /> + Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_title.png" /> diff --git a/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml b/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml index b8a61c453..7a262e2c1 100644 --- a/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml +++ b/src/Platforms/SecureFolderFS.Uno/Views/Settings/AboutSettingsPage.xaml @@ -36,12 +36,12 @@ Width="230" HorizontalAlignment="Left" VerticalAlignment="Center" - Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/AppTitle.svg" /> + Source="ms-appx://SecureFolderFS.UI/Assets/AppAssets/app_title.svg" /> + Source="/Assets/AppAssets/app_title.png" /> Date: Wed, 9 Oct 2024 21:51:02 +0200 Subject: [PATCH 002/133] Remove redundant packages --- src/Platforms/Directory.Packages.props | 20 ++------------ .../SecureFolderFS.Maui.csproj | 1 - src/Platforms/SecureFolderFS.Uno/App.xaml.cs | 9 +++---- .../Windows/Helpers/WindowsLifecycleHelper.cs | 2 +- .../SecureFolderFS.Uno.csproj | 26 +++++++------------ 5 files changed, 17 insertions(+), 41 deletions(-) diff --git a/src/Platforms/Directory.Packages.props b/src/Platforms/Directory.Packages.props index b2b22fad8..91d2dc639 100644 --- a/src/Platforms/Directory.Packages.props +++ b/src/Platforms/Directory.Packages.props @@ -10,37 +10,21 @@ - - - - - - + - - - + - - - - - - - - - diff --git a/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj b/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj index 630c21d3d..927f29af1 100644 --- a/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj +++ b/src/Platforms/SecureFolderFS.Maui/SecureFolderFS.Maui.csproj @@ -69,7 +69,6 @@ - diff --git a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs index 9cf38faa2..333b5f73a 100644 --- a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs +++ b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs @@ -13,7 +13,6 @@ using SecureFolderFS.UI.Helpers; using SecureFolderFS.Uno.UserControls.InterfaceRoot; using Uno.UI; -using Uno.Resizetizer; using Windows.ApplicationModel; namespace SecureFolderFS.Uno @@ -94,7 +93,7 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args) private static void EnsureEarlyWindow(Window window) { window.Content = new MainWindowRootControl(); - + //global::Uno.Resizetizer.SetWindowIcon(); #if WINDOWS #if !UNPACKAGED // Set icon @@ -132,7 +131,7 @@ private static void EnsureEarlyWindow(Window window) boundsManager.MinHeight = 572; #else - window.SetWindowIcon(); + //window.SetWindowIcon(); #endif } @@ -173,9 +172,9 @@ public static void InitializeLogging() var factory = LoggerFactory.Create(builder => { #if __WASM__ - builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider()); + builder.AddProvider(new global::Uno.Extensions.Logging.WebAssembly.WebAssemblyConsoleLoggerProvider()); #elif __IOS__ || __MACCATALYST__ - builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider()); + builder.AddProvider(new global::Uno.Extensions.Logging.OSLogLoggerProvider()); #else builder.AddConsole(); #endif diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs index a7a61b88a..b57046a19 100644 --- a/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs +++ b/src/Platforms/SecureFolderFS.Uno/Platforms/Windows/Helpers/WindowsLifecycleHelper.cs @@ -26,7 +26,7 @@ internal sealed class WindowsLifecycleHelper : BaseLifecycleHelper { /// protected override string AppDirectory { get; } = -#if UNPACKAGED +#if UNPACKAGED || HAS_UNO_SKIA Directory.GetCurrentDirectory(); #else ApplicationData.Current.LocalFolder.Path; diff --git a/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj b/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj index 0e2ef7298..a63082a33 100644 --- a/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj +++ b/src/Platforms/SecureFolderFS.Uno/SecureFolderFS.Uno.csproj @@ -19,22 +19,25 @@ disable SecureFolderFS.Uno - - SecureFolderFS + 0.6.0.0 1.0 1 + + + SecureFolderFS com.securefolderfs.SecureFolderFS + d2dyno + - @@ -50,7 +53,6 @@ - @@ -65,12 +67,11 @@ - app_icon.svg + - <_RequiresILLinkPack>true <_ComputeManagedAssemblyToLink>true @@ -83,7 +84,6 @@ - @@ -132,6 +132,8 @@ 10.0.22621.3233 4.2.2 + + 10.0.19041.38 Language=en-US;pl-PL;de-DE;es-ES;da-DK;uk-UA;pt-PT;ms-MY;id-ID;hi-IN @@ -489,14 +491,6 @@ - - PreserveNewest - Assets\AppAssets\icon_background.svg - - - PreserveNewest - Assets\AppAssets\app_icon.svg - PreserveNewest Assets\Icons\app_icon.svg From fefdca77fa49953aa3197994caa4b3ebc213ab54 Mon Sep 17 00:00:00 2001 From: d2dyno006 <53011783+d2dyno006@users.noreply.github.com> Date: Wed, 9 Oct 2024 23:56:10 +0200 Subject: [PATCH 003/133] Update Package.appxmanifest --- src/Platforms/SecureFolderFS.Uno/Package.appxmanifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest b/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest index 8afd57914..5eb1e3d16 100644 --- a/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest +++ b/src/Platforms/SecureFolderFS.Uno/Package.appxmanifest @@ -44,7 +44,7 @@ DisplayName="SecureFolderFS" Description="SecureFolderFS lets you securely access your files. With strong AES encryption, you can be assured your files stay protected, and with advanced on-fly encryption/decryption you can continue to work uninterruptibly." Square150x150Logo="Assets\AppIcon\MediumTile.png" - Square44x44Logo="Assets\AppIcon\app_icon.png" + Square44x44Logo="Assets\AppIcon\AppIcon.png" BackgroundColor="transparent"> From f89dac096219af840f99696839029d9f92b1a3b1 Mon Sep 17 00:00:00 2001 From: d2dyno006 <53011783+d2dyno006@users.noreply.github.com> Date: Sat, 12 Oct 2024 01:27:20 +0200 Subject: [PATCH 004/133] Re-add some package versions --- src/Platforms/Directory.Packages.props | 9 ++++++++- src/Platforms/SecureFolderFS.Uno/App.xaml.cs | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/Platforms/Directory.Packages.props b/src/Platforms/Directory.Packages.props index 91d2dc639..76002917a 100644 --- a/src/Platforms/Directory.Packages.props +++ b/src/Platforms/Directory.Packages.props @@ -16,15 +16,22 @@ + + - + + + + + + diff --git a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs index 333b5f73a..f95c52b53 100644 --- a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs +++ b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs @@ -1,4 +1,5 @@ using System; +using System.Diagnostics; using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; @@ -130,6 +131,9 @@ private static void EnsureEarlyWindow(Window window) boundsManager.MinWidth = 662; boundsManager.MinHeight = 572; + // TODO: Temporary, set starting size on Windows (until window position store is implemented) + window.AppWindow.MoveAndResize(new(100, 100, 976, 680)); + #else //window.SetWindowIcon(); #endif From 68088e81d4328808b4ba313ab27e355119b5c2e6 Mon Sep 17 00:00:00 2001 From: d2dyno006 <53011783+d2dyno006@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:05:36 +0200 Subject: [PATCH 005/133] Update App.xaml.cs --- src/Platforms/SecureFolderFS.Uno/App.xaml.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs index f95c52b53..68cbf4a34 100644 --- a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs +++ b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs @@ -1,5 +1,4 @@ using System; -using System.Diagnostics; using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.DependencyInjection; @@ -132,7 +131,7 @@ private static void EnsureEarlyWindow(Window window) boundsManager.MinHeight = 572; // TODO: Temporary, set starting size on Windows (until window position store is implemented) - window.AppWindow.MoveAndResize(new(100, 100, 976, 680)); + window.AppWindow.MoveAndResize(new(100, 100, 1050, 680)); #else //window.SetWindowIcon(); From d2129baa00f027c692310cf95ba8dd1a4f343afb Mon Sep 17 00:00:00 2001 From: d2dyno006 <53011783+d2dyno006@users.noreply.github.com> Date: Sat, 12 Oct 2024 02:45:21 +0200 Subject: [PATCH 006/133] Change icon names --- .../Assets/Icons/{icon_background.svg => icon.svg} | 0 .../Assets/Icons/{app_icon.svg => icon_foreground.svg} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/Platforms/SecureFolderFS.Uno/Assets/Icons/{icon_background.svg => icon.svg} (100%) rename src/Platforms/SecureFolderFS.Uno/Assets/Icons/{app_icon.svg => icon_foreground.svg} (100%) diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_background.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon.svg similarity index 100% rename from src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_background.svg rename to src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon.svg diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_foreground.svg similarity index 100% rename from src/Platforms/SecureFolderFS.Uno/Assets/Icons/app_icon.svg rename to src/Platforms/SecureFolderFS.Uno/Assets/Icons/icon_foreground.svg From 64121d0f3b50327f6ef754e5c7884c697ecbb2ac Mon Sep 17 00:00:00 2001 From: d2dyno <53011783+d2dyno1@users.noreply.github.com> Date: Sat, 12 Oct 2024 03:18:40 +0200 Subject: [PATCH 007/133] plist changes --- src/Platforms/SecureFolderFS.Uno/App.xaml.cs | 3 +- .../Assets/Splash/icon_foreground.svg | 179 ++++++++++++++++++ .../Assets/Splash/splash_screen.svg | 137 -------------- .../Platforms/MacCatalyst/Info.plist | 2 +- 4 files changed, 181 insertions(+), 140 deletions(-) create mode 100644 src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg delete mode 100644 src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg diff --git a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs index 68cbf4a34..379b93132 100644 --- a/src/Platforms/SecureFolderFS.Uno/App.xaml.cs +++ b/src/Platforms/SecureFolderFS.Uno/App.xaml.cs @@ -93,7 +93,6 @@ protected override async void OnLaunched(LaunchActivatedEventArgs args) private static void EnsureEarlyWindow(Window window) { window.Content = new MainWindowRootControl(); - //global::Uno.Resizetizer.SetWindowIcon(); #if WINDOWS #if !UNPACKAGED // Set icon @@ -134,7 +133,7 @@ private static void EnsureEarlyWindow(Window window) window.AppWindow.MoveAndResize(new(100, 100, 1050, 680)); #else - //window.SetWindowIcon(); + global::Uno.Resizetizer.WindowExtensions.SetWindowIcon(window); #endif } diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg new file mode 100644 index 000000000..796cc7f6f --- /dev/null +++ b/src/Platforms/SecureFolderFS.Uno/Assets/Splash/icon_foreground.svg @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg b/src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg deleted file mode 100644 index 8ffc41ae3..000000000 --- a/src/Platforms/SecureFolderFS.Uno/Assets/Splash/splash_screen.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist index 1bb02ddcd..5a4053db4 100644 --- a/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist +++ b/src/Platforms/SecureFolderFS.Uno/Platforms/MacCatalyst/Info.plist @@ -15,7 +15,7 @@ UIInterfaceOrientationLandscapeRight XSAppIconAssets - Assets.xcassets/icon.appiconset + Assets.xcassets/iconapp.appiconset - + diff --git a/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml b/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml index ac286dd3f..35391b382 100644 --- a/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml +++ b/src/Platforms/SecureFolderFS.Maui/UserControls/RecoveryPreviewControl.xaml @@ -22,7 +22,7 @@