Added tooltip notice for Beta

Author: d2dyno1

SecureFolderFS.Sdk/Services/SettingsPersistence/IAppSettings.cs

@@ -9,6 +9,11 @@ namespace SecureFolderFS.Sdk.Services.SettingsPersistence
     /// </summary>
     public interface IAppSettings : IPersistable, INotifyPropertyChanged
     {
+        /// <summary>
+        /// Gets or sets the value that determines whether the (first) notification about the beta program was shown.
+        /// </summary>
+        bool WasBetaNotificationShown1 { get; set; }
+
         /// <summary>
         /// Gets or sets the value that determines whether Out of Box Experience was shown.
         /// </summary>

SecureFolderFS.UI/ServiceImplementation/SettingsPersistence/AppSettings.cs

@@ -17,6 +17,13 @@ public AppSettings(IModifiableFolder settingsFolder)
             SettingsDatabase = new SingleFileDatabaseModel(Constants.LocalSettings.APPLICATION_SETTINGS_FILENAME, settingsFolder, DoubleSerializedStreamSerializer.Instance);
         }
 
+        /// <inheritdoc/>
+        public bool WasBetaNotificationShown1
+        {
+            get => GetSetting(() => false);
+            set => SetSetting(value);
+        }
+
         /// <inheritdoc/>
         public bool IsIntroduced
         {

SecureFolderFS.WinUI/App.xaml.cs

@@ -90,22 +90,22 @@ private IServiceProvider ConfigureServices(IModifiableFolder settingsFolder)
                 .AddSingleton<ISettingsService, SettingsService>(_ => new(settingsFolder))
                 .AddSingleton<IVaultPersistenceService, VaultPersistenceService>(_ => new(settingsFolder))
                 .AddSingleton<IVaultService, VaultService>()
-                .AddSingleton<IStorageService, NativeStorageService>()
                 .AddSingleton<IDialogService, DialogService>()
-                .AddSingleton<IApplicationService, ApplicationService>()
+                .AddSingleton<IClipboardService, ClipboardService>()
                 .AddSingleton<IThreadingService, ThreadingService>()
+                .AddSingleton<IStorageService, NativeStorageService>()
+                .AddSingleton<IApplicationService, ApplicationService>()
                 .AddSingleton<ILocalizationService, LocalizationService>()
                 .AddSingleton<IFileExplorerService, FileExplorerService>()
-                .AddSingleton<IClipboardService, ClipboardService>()
                 .AddSingleton<IUpdateService, MicrosoftStoreUpdateService>()
 
                 // Conditional (singleton) services
 #if DEBUG
-                .AddSingleton<ITelemetryService, DebugTelemetryService>()
                 .AddSingleton<IIapService, DebugIapService>()
+                .AddSingleton<ITelemetryService, DebugTelemetryService>()
 #else
+                .AddSingleton<IIapService, DebugIapService>() // .AddSingleton<IIapService, MicrosoftStoreIapService>() // TODO: Change in the future
                 .AddSingleton<ITelemetryService, AppCenterTelemetryService>()
-                .AddSingleton<IIapService, MicrosoftStoreIapService>()
 #endif
 
                 // Transient services

SecureFolderFS.WinUI/UserControls/InterfaceHost/MainAppHostControl.xaml

@@ -45,13 +45,15 @@
             <Grid
                 Width="{Binding Path=OpenPaneLength, ElementName=Sidebar}"
                 Padding="20,0,20,12"
-                HorizontalAlignment="Stretch">
+                HorizontalAlignment="Stretch"
+                RowSpacing="16">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="Auto" />
                     <ColumnDefinition />
                 </Grid.ColumnDefinitions>
 
                 <Button
+                    x:Name="StandardAddVaultButton"
                     Grid.Column="0"
                     HorizontalAlignment="Left"
                     VerticalAlignment="Center"
@@ -84,6 +86,7 @@
                 </Button>
 
                 <Button
+                    Grid.Row="1"
                     Grid.Column="1"
                     Width="36"
                     Height="36"
@@ -105,6 +108,18 @@
                         </AnimatedIcon.FallbackIconSource>
                     </AnimatedIcon>
                 </Button>
+
+                <TeachingTip
+                    x:Name="BetaTeachingTip"
+                    MaxWidth="100"
+                    CloseButtonClick="TeachingTip_CloseButtonClick"
+                    PreferredPlacement="Top"
+                    Subtitle="Adding more than two vaults is free during the beta period"
+                    Target="{Binding ElementName=StandardAddVaultButton}">
+                    <TeachingTip.IconSource>
+                        <FontIconSource Glyph="&#xE946;" />
+                    </TeachingTip.IconSource>
+                </TeachingTip>
             </Grid>
         </NavigationView.PaneFooter>
         <NavigationView.MenuItemTemplate>

SecureFolderFS.WinUI/UserControls/InterfaceHost/MainAppHostControl.xaml.cs

@@ -1,23 +1,27 @@
-using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.Mvvm.DependencyInjection;
+using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.UI.Xaml;
 using Microsoft.UI.Xaml.Controls;
 using SecureFolderFS.Sdk.Messages;
+using SecureFolderFS.Sdk.Services;
 using SecureFolderFS.Sdk.ViewModels.Controls.Sidebar;
 using SecureFolderFS.Sdk.ViewModels.Vault;
 using SecureFolderFS.Sdk.ViewModels.Views.Host;
 using SecureFolderFS.Sdk.ViewModels.Views.Vault;
+using SecureFolderFS.Shared.Extensions;
 using SecureFolderFS.UI.Helpers;
 using System.Linq;
 using System.Threading.Tasks;
-using SecureFolderFS.Shared.Extensions;
 
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.
 
 namespace SecureFolderFS.WinUI.UserControls.InterfaceHost
 {
-    public sealed partial class MainAppHostControl : UserControl, IRecipient<RemoveVaultMessage>
+    public sealed partial class MainAppHostControl : UserControl, IRecipient<RemoveVaultMessage>, IRecipient<AddVaultMessage>
     {
+        private ISettingsService SettingsService { get; } = Ioc.Default.GetRequiredService<ISettingsService>();
+
         public MainAppHostControl()
         {
             InitializeComponent();
@@ -30,6 +34,16 @@ public void Receive(RemoveVaultMessage message)
                 Navigation.ClearContent();
         }
 
+        /// <inheritdoc/>
+        public void Receive(AddVaultMessage message)
+        {
+            if (ViewModel.SidebarViewModel.SidebarItems.Count >= Sdk.Constants.Vault.MAX_FREE_AMOUNT_OF_VAULTS
+                && !SettingsService.AppSettings.WasBetaNotificationShown1)
+            {
+                BetaTeachingTip.IsOpen = true;
+            }
+        }
+
         private async Task NavigateToItem(VaultViewModel vaultViewModel)
         {
             // Find existing target or create new
@@ -43,7 +57,8 @@ private async Task NavigateToItem(VaultViewModel vaultViewModel)
         private async void MainAppHostControl_Loaded(object sender, RoutedEventArgs e)
         {
             ViewModel.NavigationService.SetupNavigation(Navigation);
-            WeakReferenceMessenger.Default.Register(this);
+            WeakReferenceMessenger.Default.Register<RemoveVaultMessage>(this);
+            WeakReferenceMessenger.Default.Register<AddVaultMessage>(this);
 
             await ViewModel.InitAsync();
             Sidebar.SelectedItem = ViewModel.SidebarViewModel.SelectedItem;
@@ -71,6 +86,12 @@ private async void SidebarSearchBox_TextChanged(AutoSuggestBox sender, AutoSugge
                 await ViewModel.SidebarViewModel.SearchViewModel.SubmitQuery(sender.Text);
         }
 
+        private async void TeachingTip_CloseButtonClick(TeachingTip sender, object args)
+        {
+            SettingsService.AppSettings.WasBetaNotificationShown1 = true;
+            await SettingsService.AppSettings.SaveAsync();
+        }
+
         public MainHostViewModel ViewModel
         {
             get => (MainHostViewModel)GetValue(ViewModelProperty);