From 85e72b0ee01e180f37fc8b0f5ae08ab87d07d372 Mon Sep 17 00:00:00 2001 From: d2dyno <53011783+d2dyno1@users.noreply.github.com> Date: Fri, 20 Mar 2026 00:37:12 +0100 Subject: [PATCH 01/32] Minor improvements around widgets insertion --- .../Validators/StructureContentsValidator.cs | 1 + .../UserControls/IntroductionSlide.xaml | 2 +- .../SecureFolderFS.Maui/Views/IntroductionPage.xaml | 5 +++-- .../UserControls/Widgets/AggregatedDataWidget.xaml | 2 +- .../Controls/Widgets/WidgetsListViewModel.cs | 11 ++++++++++- .../ViewModels/Views/Vault/VaultHealthViewModel.cs | 3 +++ 6 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/Core/SecureFolderFS.Core.FileSystem/Validators/StructureContentsValidator.cs b/src/Core/SecureFolderFS.Core.FileSystem/Validators/StructureContentsValidator.cs index 63fa5c6eb..d619238eb 100644 --- a/src/Core/SecureFolderFS.Core.FileSystem/Validators/StructureContentsValidator.cs +++ b/src/Core/SecureFolderFS.Core.FileSystem/Validators/StructureContentsValidator.cs @@ -38,6 +38,7 @@ public override async Task ValidateResultAsync((IFolder, IProgress - + diff --git a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs index 66ce9c1be..5157ec3f2 100644 --- a/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs +++ b/src/Platforms/SecureFolderFS.Uno/UserControls/InterfaceHost/MainAppHostControl.xaml.cs @@ -25,7 +25,7 @@ namespace SecureFolderFS.Uno.UserControls.InterfaceHost { - public sealed partial class MainAppHostControl : UserControl, IRecipient, IRecipient + public sealed partial class MainAppHostControl : UserControl, IRecipient #if WINDOWS , IRecipient #endif @@ -47,18 +47,6 @@ public void Receive(VaultRemovedMessage message) Navigation?.ClearContent(); } - /// - public void Receive(VaultAddedMessage message) - { -#if WINDOWS - if (ViewModel?.VaultListViewModel.Items.Count >= SecureFolderFS.Sdk.Constants.Vault.MAX_FREE_AMOUNT_OF_VAULTS - && !SettingsService.AppSettings.WasBetaNotificationShown1) - { - BetaTeachingTip.IsOpen = true; - } -#endif - } - #if WINDOWS /// public void Receive(VaultSelectionRequestedMessage message) @@ -160,7 +148,6 @@ private void RenameBox_LostFocus(object sender, RoutedEventArgs e) private async void MainAppHostControl_Loaded(object sender, RoutedEventArgs e) { WeakReferenceMessenger.Default.Register(this); - WeakReferenceMessenger.Default.Register(this); #if WINDOWS WeakReferenceMessenger.Default.Register(this); #endif @@ -190,12 +177,6 @@ private async void SidebarSearchBox_TextChanged(AutoSuggestBox sender, AutoSugge await ViewModel!.VaultListViewModel.SearchViewModel.SubmitQueryAsync(sender.Text); } - private async void TeachingTip_CloseButtonClick(TeachingTip sender, object args) - { - SettingsService.AppSettings.WasBetaNotificationShown1 = true; - await SettingsService.AppSettings.TrySaveAsync(); - } - #region Drag and Drop private void Sidebar_DragOver(object sender, DragEventArgs e) diff --git a/src/Sdk/SecureFolderFS.Sdk/Services/Settings/IAppSettings.cs b/src/Sdk/SecureFolderFS.Sdk/Services/Settings/IAppSettings.cs index 5a343b7c5..3a64ba6af 100644 --- a/src/Sdk/SecureFolderFS.Sdk/Services/Settings/IAppSettings.cs +++ b/src/Sdk/SecureFolderFS.Sdk/Services/Settings/IAppSettings.cs @@ -9,11 +9,6 @@ namespace SecureFolderFS.Sdk.Services.Settings /// public interface IAppSettings : IPersistable, INotifyPropertyChanged { - /// - /// Gets or sets the value that determines whether the (first) notification about the beta program was shown. - /// - bool WasBetaNotificationShown1 { get; set; } - /// /// Gets or sets the value that determines whether the explanation of vault folder was shown. ///