Maintenance and font adjustments (#86)

#84 adjust font sizes
fix height on properties page
add fallback for user logged in status
fix typo in readme

KeyVaultExplorer/KeyVaultExplorer.csproj

@@ -102,6 +102,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
+	  <Compile Update="Views\CustomControls\UserStatusTag.axaml.cs">
+	    <DependentUpon>UserStatusTag.axaml</DependentUpon>
+	  </Compile>
 	  <Compile Update="Views\Pages\PropertiesDialogs\CreateNewSecretVersion.axaml.cs">
 	    <DependentUpon>CreateNewSecretVersion.axaml</DependentUpon>
 	  </Compile>

KeyVaultExplorer/Resources/PercentageConverter.cs

@@ -11,7 +11,8 @@ public object Convert(object value, Type targetType, object parameter, CultureIn
         if (value is double width)
         {
             var calculatedWidth = width * 0.25;
-            return calculatedWidth < 310 ? 310 : calculatedWidth;
+            var minWidth = calculatedWidth < 310 ? 310 : calculatedWidth;
+            return minWidth > 550 ? 550 : minWidth;
         }
         return value;
     }

KeyVaultExplorer/Resources/Resources.axaml

@@ -28,6 +28,9 @@
         <ResourceDictionary x:Key="Light">
             <StaticResource x:Key="TabViewBorderBrush" ResourceKey="AccentFillColorTertiaryBrush" />
 
+            <StaticResource x:Key="IconForegroundColor" ResourceKey="IconForegroundColorBrush" />
+            <SolidColorBrush x:Key="IconForegroundColorBrush" Color="Transparent" />
+
             <SolidColorBrush
                 x:Key="AccentFillColorTertiaryBrush"
                 Opacity="0.15"
@@ -41,7 +44,8 @@
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <StaticResource x:Key="TabViewBorderBrush" ResourceKey="AccentFillColorTertiaryBrush" />
-
+            <StaticResource x:Key="IconForegroundColor" ResourceKey="IconForegroundColorBrush" />
+            <SolidColorBrush x:Key="IconForegroundColorBrush" Color="#9a2e00" />
             <SolidColorBrush
                 x:Key="AccentFillColorTertiaryBrush"
                 Opacity="0.15"

KeyVaultExplorer/Resources/Styles.axaml

@@ -113,35 +113,38 @@
     <!--  Datagrid styles  -->
 
     <Style Selector="DataGridColumnHeader">
-        <Setter Property="MinHeight" Value="25" />
-        <Setter Property="Height" Value="25" />
+        <Setter Property="MinHeight" Value="27" />
+        <Setter Property="Height" Value="27" />
     </Style>
     <Style Selector="DataGridRowGroupHeader">
-        <Setter Property="MinHeight" Value="25" />
-        <Setter Property="Height" Value="25" />
-    </Style>
-    <Style Selector="DataGrid DataGridRow:nth-child(2n)">
-        <Setter Property="Background" Value="rgba(148, 148, 148, 0.04)" />
+        <Setter Property="MinHeight" Value="27" />
+        <Setter Property="Height" Value="27" />
     </Style>
+
     <Style Selector="DataGridRow">
-        <Setter Property="Height" Value="25" />
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+        <Setter Property="Height" Value="27" />
+        <Setter Property="FontSize" Value="14" />
     </Style>
     <Style Selector="DataGridCell">
-        <Setter Property="Height" Value="22" />
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+        <Setter Property="Height" Value="27" />
+        <Setter Property="FontSize" Value="14" />
     </Style>
 
     <Style Selector="DataGridRow">
-        <Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />
+        <!--<Setter Property="FontSize" Value="{DynamicResource FontSizeNormal}" />-->
+        <Setter Property="FontSize" Value="14" />
         <Setter Property="Focusable" Value="False" />
     </Style>
 
     <Style Selector="DataGridCell/template/ Grid#PART_CellRoot">
-        <Setter Property="Height" Value="25" />
+        <Setter Property="Height" Value="27" />
     </Style>
 
 
+    <Style Selector="DataGrid DataGridRow:nth-child(2n)">
+        <Setter Property="Background" Value="rgba(148, 148, 148, 0.04)" />
+    </Style>
+
     <Style Selector="DataGrid:focus DataGridCell:current /template/ Grid#FocusVisual">
         <Setter Property="IsVisible" Value="False" />
         <Setter Property="Background" Value="Transparent" />

KeyVaultExplorer/Services/ServiceCollectionExtension.cs

@@ -14,7 +14,7 @@ public static void AddCommonServices(this IServiceCollection collection)
         collection.AddSingleton<AuthService>();
         collection.AddSingleton<VaultService>();
         collection.AddSingleton<TabViewPageViewModel>();
-        collection.AddSingleton<ToolBarViewModel>();
+        //collection.AddSingleton<ToolBarViewModel>();
         collection.AddSingleton<KeyVaultTreeListViewModel>();
         collection.AddSingleton<SettingsPageViewModel>();
         collection.AddSingleton<MainViewModel>();

KeyVaultExplorer/ViewModels/MainViewModel.cs

@@ -68,57 +68,3 @@ private async Task SignOut()
         AuthenticatedUserClaims = null;
     }
 }
-
-public class NavigationFactory : INavigationPageFactory
-{
-    // Do this to avoid needing Activator.CreateInstance to create from type info
-    // and to avoid a ridiculous amount of 'ifs'
-    private readonly Control[] _pages =
-    {
-        new MainPage(),
-        new SubscriptionsPage(),
-        new SettingsPage(),
-    };
-
-    private readonly Dictionary<string, Func<Control>> CorePages = new Dictionary<string, Func<Control>>
-    {
-        { "MainPage", () => new MainPage() },
-        { "SubscriptionsPage", () => new SubscriptionsPage() },
-        { "SettingsPage", () => new SettingsPage() },
-    };
-
-    public NavigationFactory()
-    {
-        Instance = this;
-    }
-
-    private static NavigationFactory? Instance { get; set; }
-
-    public static Control[] GetPages()
-    {
-        return Instance!._pages;
-    }
-
-    // Create a page based on a Type, but you can create it however you want
-    public Control? GetPage(Type srcType)
-    {
-        // Return null here because we won't use this method at all
-        CorePages.TryGetValue(srcType.FullName, out var func);
-        Control page = null;
-        page = func();
-        return page;
-    }
-
-    // Create a page based on an object, such as a view model
-    public Control? GetPageFromObject(object target)
-    {
-        return target switch
-        {
-            MainPage => _pages[0],
-            SubscriptionsPage => _pages[1],
-            SettingsPage => _pages[2],
-
-            _ => throw new Exception()
-        };
-    }
-}

KeyVaultExplorer/ViewModels/NavigationFactory.cs

@@ -0,0 +1,61 @@
+using Avalonia.Controls;
+using FluentAvalonia.UI.Controls;
+using KeyVaultExplorer.Views.Pages;
+using System;
+using System.Collections.Generic;
+
+namespace KeyVaultExplorer.ViewModels;
+
+public class NavigationFactory : INavigationPageFactory
+{
+    // Do this to avoid needing Activator.CreateInstance to create from type info
+    // and to avoid a ridiculous amount of 'ifs'
+    private readonly Control[] _pages =
+    {
+        new MainPage(),
+        new SubscriptionsPage(),
+        new SettingsPage(),
+    };
+
+    private readonly Dictionary<string, Func<Control>> CorePages = new Dictionary<string, Func<Control>>
+    {
+        { "MainPage", () => new MainPage() },
+        { "SubscriptionsPage", () => new SubscriptionsPage() },
+        { "SettingsPage", () => new SettingsPage() },
+    };
+
+    public NavigationFactory()
+    {
+        Instance = this;
+    }
+
+    private static NavigationFactory? Instance { get; set; }
+
+    public static Control[] GetPages()
+    {
+        return Instance!._pages;
+    }
+
+    // Create a page based on a Type, but you can create it however you want
+    public Control? GetPage(Type srcType)
+    {
+        // Return null here because we won't use this method at all
+        CorePages.TryGetValue(srcType.FullName, out var func);
+        Control page = null;
+        page = func();
+        return page;
+    }
+
+    // Create a page based on an object, such as a view model
+    public Control? GetPageFromObject(object target)
+    {
+        return target switch
+        {
+            MainPage => _pages[0],
+            SubscriptionsPage => _pages[1],
+            SettingsPage => _pages[2],
+
+            _ => throw new Exception()
+        };
+    }
+}

KeyVaultExplorer/ViewModels/VaultPageViewModel.cs

@@ -39,6 +39,7 @@ public partial class VaultPageViewModel : ViewModelBase
     private NotificationViewModel _notificationViewModel;
 
     private SettingsPageViewModel _settingsPageViewModel;
+    public string VaultTotalString => VaultContents.Count == 0 || VaultContents.Count > 1 ? $"{VaultContents.Count} items" : "1 item";
 
     [ObservableProperty]
     private string authorizationMessage;
@@ -47,6 +48,7 @@ public partial class VaultPageViewModel : ViewModelBase
     private bool hasAuthorizationError = false;
 
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(VaultTotalString))]
     private bool isBusy = false;
 
     [ObservableProperty]
@@ -59,6 +61,7 @@ public partial class VaultPageViewModel : ViewModelBase
     private TabStripItem selectedTab;
 
     [ObservableProperty]
+    [NotifyPropertyChangedFor(nameof(VaultTotalString))]
     private ObservableCollection<KeyVaultContentsAmalgamation> vaultContents;
 
     [ObservableProperty]

KeyVaultExplorer/Views/CustomControls/KeyVaultTreeList.axaml

@@ -135,6 +135,7 @@
                 HorizontalAlignment="Stretch"
                 VerticalContentAlignment="Center"
                 AcceptsReturn="False"
+                Background="{DynamicResource LayerFillColorAltBrush}"
                 Classes.IsSmall="True"
                 Classes.clearButton="True"
                 FontSize="{StaticResource FontSizeSmall}"
@@ -274,6 +275,7 @@
                             <ui:BitmapIcon
                                 Width="16"
                                 Height="16"
+                                Foreground="{DynamicResource IconForegroundColor}"
                                 RenderOptions.BitmapInterpolationMode="HighQuality"
                                 ShowAsMonochrome="True"
                                 UriSource="avares://KeyVaultExplorer/Assets/KeyVault.png" />

KeyVaultExplorer/Views/CustomControls/ToolBar.axaml.cs

@@ -10,7 +10,7 @@ public partial class ToolBar : UserControl
     public ToolBar()
     {
         InitializeComponent();
-        DataContext = Defaults.Locator.GetRequiredService<ToolBarViewModel>();
+        //DataContext = Defaults.Locator.GetRequiredService<ToolBarViewModel>();
     }
 
     private void SettingsButton_Click(object? sender, Avalonia.Interactivity.RoutedEventArgs e)

KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml

@@ -0,0 +1,67 @@
+<UserControl
+    x:Class="KeyVaultExplorer.Views.CustomControls.UserStatusTag"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:KeyVaultExplorer.Models;assembly=KeyVaultExplorer"
+    xmlns:ui="using:FluentAvalonia.UI.Controls"
+    xmlns:vm="using:KeyVaultExplorer.ViewModels"
+    d:DesignHeight="150"
+    d:DesignWidth="925"
+    x:DataType="vm:MainViewModel"
+    mc:Ignorable="d">
+
+    <Design.DataContext>
+        <vm:MainViewModel />
+    </Design.DataContext>
+
+
+    <StackPanel
+        Grid.Row="1"
+        HorizontalAlignment="Stretch"
+        Background="{DynamicResource SolidBackgroundFillColorTertiaryBrush}"
+        IsHitTestVisible="False">
+
+        <StackPanel
+            HorizontalAlignment="Right"
+            IsVisible="{Binding !IsAuthenticated}"
+            Orientation="Horizontal">
+            <ui:BitmapIcon
+                Width="16"
+                Height="16"
+                VerticalAlignment="Bottom"
+                RenderOptions.BitmapInterpolationMode="HighQuality"
+                UriSource="avares://KeyVaultExplorer/Assets/StatusErrorOutline.png" />
+            <TextBlock
+                Margin="4,0"
+                Background="{x:Null}"
+                FontSize="{StaticResource FontSizeSmall}"
+                Text="You are currently signed out"
+                Theme="{StaticResource CaptionTextBlockStyle}" />
+        </StackPanel>
+
+
+        <StackPanel
+            HorizontalAlignment="Right"
+            IsVisible="{Binding IsAuthenticated}"
+            Orientation="Horizontal">
+            <ui:BitmapIcon
+                Width="16"
+                Height="16"
+                Margin="0,2,0,0"
+                VerticalAlignment="Bottom"
+                IsVisible="{Binding AuthenticatedUserClaims.TenantId}"
+                RenderOptions.BitmapInterpolationMode="HighQuality"
+                ShowAsMonochrome="True"
+                UriSource="avares://KeyVaultExplorer/Assets/Cloud.png" />
+            <TextBlock
+                Margin="5,0"
+                Background="{x:Null}"
+                FontSize="{StaticResource FontSizeSmall}"
+                Text="{Binding AuthenticatedUserClaims.Email}"
+                Theme="{StaticResource CaptionTextBlockStyle}" />
+        </StackPanel>
+    </StackPanel>
+
+</UserControl>

KeyVaultExplorer/Views/CustomControls/UserStatusTag.axaml.cs

@@ -0,0 +1,19 @@
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Threading;
+using KeyVaultExplorer.ViewModels;
+using KeyVaultExplorer.Services;
+using System;
+using System.ComponentModel;
+using System.ComponentModel.Design.Serialization;
+
+namespace KeyVaultExplorer.Views.CustomControls;
+
+public partial class UserStatusTag : UserControl
+{
+    public UserStatusTag()
+    {
+        InitializeComponent();
+        DataContext = Defaults.Locator.GetRequiredService<MainViewModel>();
+    }
+}