Preserve thumbnail aspect ratio

Author: d2dyno1

src/Platforms/SecureFolderFS.Maui/Popups/PropertiesPopup.xaml

@@ -50,6 +50,7 @@
                     </Border.StrokeShape>
                     <Image
                         x:Name="ImageView"
+                        Aspect="{Binding Thumbnail, Converter={StaticResource ThumbnailToAspectConverter}}"
                         BindingContext="{Binding ViewModel, Mode=OneWay}"
                         HeightRequest="40"
                         HorizontalOptions="Center"

src/Platforms/SecureFolderFS.Maui/Resources/Styles/Converters.xaml

@@ -14,6 +14,7 @@
     <vc:NullToOpacityConverter x:Key="NullToOpacityConverter" />
     <vc:ImageToSourceConverter x:Key="ImageToSourceConverter" />
     <vc:DateTimeToStringConverter x:Key="DateTimeToStringConverter" />
+    <vc:ThumbnailToAspectConverter x:Key="ThumbnailToAspectConverter" />
     <vc:StringInterpolationConverter x:Key="StringInterpolationConverter" />
 
 </ResourceDictionary>

src/Platforms/SecureFolderFS.Maui/UserControls/Browser/BrowserControl.Rendering.xaml.cs

@@ -1,7 +1,6 @@
 using SecureFolderFS.Maui.ValueConverters;
 using SecureFolderFS.Sdk.Enums;
 using SecureFolderFS.Sdk.Services;
-using SecureFolderFS.Sdk.ViewModels.Controls.Storage.Browser;
 using SecureFolderFS.Shared.ComponentModel;
 
 namespace SecureFolderFS.Maui.UserControls.Browser
@@ -80,7 +79,7 @@ public async Task ReloadCollectionViewAsync()
 #else
             newCollectionView.SetBinding(SelectableItemsView.SelectionModeProperty,
                 new Binding(nameof(IsSelecting), mode: BindingMode.OneWay, source: this,
-                    converter: GetConverter("BoolSelectionModeConverter")));
+                    converter: GetConverter(nameof(BoolSelectionModeConverter))));
 #endif
 
             // Wire up the events
@@ -166,7 +165,7 @@ private void ItemsCollectionView_Loaded(object? sender, EventArgs e)
             // On other platforms, bind SelectionMode to IsSelecting
             _collectionView?.SetBinding(SelectableItemsView.SelectionModeProperty,
                 new Binding(nameof(IsSelecting), mode: BindingMode.OneWay, source: this,
-                    converter: GetConverter("BoolSelectionModeConverter")));
+                    converter: GetConverter(nameof(BoolSelectionModeConverter))));
 #endif
         }
 

src/Platforms/SecureFolderFS.Maui/UserControls/Browser/BrowserControl.xaml

@@ -62,6 +62,7 @@
                         <HorizontalStackLayout Grid.Column="0" Spacing="8">
                             <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" IsVisible="{Binding ParentFolder.BrowserViewModel.IsSelecting, Mode=OneWay}" />
                             <Image
+                                Aspect="{Binding Thumbnail, Converter={StaticResource ThumbnailToAspectConverter}}"
                                 HeightRequest="40"
                                 HorizontalOptions="Center"
                                 IsOpaque="True"
@@ -159,6 +160,7 @@
                             </Grid.RowDefinitions>
                             <Image
                                 Grid.Row="0"
+                                Aspect="{Binding Thumbnail, Converter={StaticResource ThumbnailToAspectConverter}}"
                                 IsOpaque="True"
                                 Source="{Binding Thumbnail, Converter={StaticResource FileIconConverter}, ConverterParameter={x:Reference SourceGrid}}" />
 
@@ -245,7 +247,7 @@
                         HeightRequest="{Binding Width, Source={x:Reference SourceGrid}}"
                         Style="{StaticResource SelectableItemGridStyle}">
                         <Image
-                            Aspect="AspectFill"
+                            Aspect="{Binding Thumbnail, Converter={StaticResource ThumbnailToAspectConverter}}"
                             HorizontalOptions="Fill"
                             IsOpaque="True"
                             Source="{Binding Thumbnail, Converter={StaticResource FileIconConverter}, ConverterParameter={x:Reference SourceGrid}}"

src/Platforms/SecureFolderFS.Maui/ValueConverters/FileIconConverter.cs

@@ -10,6 +10,11 @@
 
 namespace SecureFolderFS.Maui.ValueConverters
 {
+    /// <summary>
+    /// Converts file-related image data into an appropriate <see cref="ImageSource"/>
+    /// representation for display purposes. This converter is designed to handle
+    /// file type determination and generate corresponding icons or thumbnails.
+    /// </summary>
     internal sealed class FileIconConverter : IValueConverter
     {
         /// <inheritdoc/>
@@ -18,17 +23,19 @@ internal sealed class FileIconConverter : IValueConverter
             if (parameter is not View { BindingContext: IWrapper<IStorable> storableWrapper })
                 return ImageSource.FromFile(GetDefaultFileIcon());
 
-            // Thumbnail loaded → return optimized ImageSource
+            // Thumbnail loaded - return optimized ImageSource
             if (value is IImage image)
                 return FromImage(image);
 
-            // Fallback icon (folder, file, PDF, archive…)
+            // Fallback icon (folder, file, PDF, archive, etc.)
             return GetFallbackImageSource(storableWrapper);
         }
 
         /// <inheritdoc/>
         public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
-            => throw new NotImplementedException();
+        {
+            throw new NotImplementedException();
+        }
 
         private static ImageSource FromImage(IImage image)
         {

src/Platforms/SecureFolderFS.Maui/ValueConverters/ThumbnailToAspectConverter.cs

@@ -0,0 +1,24 @@
+using System.Globalization;
+using IImage = SecureFolderFS.Shared.ComponentModel.IImage;
+
+namespace SecureFolderFS.Maui.ValueConverters
+{
+    /// <summary>
+    /// Returns AspectFill when a real thumbnail (IImage) is present,
+    /// otherwise AspectFit for static fallback icons (folder/file/PDF/etc.).
+    /// </summary>
+    internal sealed class ThumbnailToAspectConverter : IValueConverter
+    {
+        /// <inheritdoc/>
+        public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            return value is IImage ? Aspect.AspectFill : Aspect.AspectFit;
+        }
+
+        /// <inheritdoc/>
+        public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}

src/Platforms/SecureFolderFS.Maui/Views/Modals/Vault/BrowserSearchModalPage.xaml

@@ -68,6 +68,7 @@
                             ColumnSpacing="12">
                             <Image
                                 Grid.Column="0"
+                                Aspect="{Binding Thumbnail, Converter={StaticResource ThumbnailToAspectConverter}}"
                                 HeightRequest="32"
                                 HorizontalOptions="Center"
                                 Source="{Binding Thumbnail, Converter={StaticResource FileIconConverter}, ConverterParameter={x:Reference SourceGrid}}"

src/Platforms/SecureFolderFS.Maui/Views/Modals/Vault/RecycleBinModalPage.xaml

@@ -192,6 +192,7 @@
                                                 <HorizontalStackLayout Grid.Column="0" Spacing="8">
                                                     <CheckBox IsChecked="{Binding IsSelected, Mode=TwoWay}" IsVisible="{Binding OverlayViewModel.IsSelecting, Mode=OneWay}" />
                                                     <Image
+                                                        Aspect="{Binding Thumbnail, Converter={StaticResource ThumbnailToAspectConverter}}"
                                                         HeightRequest="32"
                                                         HorizontalOptions="Center"
                                                         Source="{Binding Thumbnail, Mode=OneWay, Converter={StaticResource FileIconConverter}, ConverterParameter={x:Reference SourceGrid}}"