Merge pull request #5 from Matheos96/dev

Implement IConfiguration and use-cases

Author: Matheos96

MainWindow.axaml

@@ -9,7 +9,7 @@
         Icon="avares://SelectSight/Assets/icon.ico">
 
     <Grid RowDefinitions="*,Auto" Background="WhiteSmoke">
-        <Grid Grid.Row="0" ColumnDefinitions="8*,1*">
+        <Grid x:Name="FilesGrid" Grid.Row="0" ColumnDefinitions="8*,1*">
             <Border Grid.Column="0" BorderBrush="LightGray" BorderThickness="0,0,1,0" Background="Transparent">
                 <Grid RowDefinitions="Auto,*">
                     <ListBox Grid.Row="1" 
@@ -37,7 +37,8 @@
                                             VerticalAlignment="Stretch"
                                             Background="Transparent">
                                     <Image Source="{Binding Thumbnail}"
-                                           Width="300" Height="300"
+                                           Width="{Binding Source={x:Static selectSight:Program.AppSettings}, Path=ThumbnailSize}" 
+                                           Height="{Binding Source={x:Static selectSight:Program.AppSettings}, Path=ThumbnailSize}"
                                            Stretch="Uniform"
                                            ClipToBounds="True"
                                            VerticalAlignment="Center"
@@ -47,7 +48,7 @@
                                                TextAlignment="Center"
                                                TextWrapping="NoWrap"
                                                TextTrimming="CharacterEllipsis"
-                                               MaxWidth="300"
+                                               MaxWidth="{Binding Source={x:Static selectSight:Program.AppSettings}, Path=ThumbnailSize}"
                                                ToolTip.Tip="{Binding Name}"
                                                Margin="0,5,0,0"/>
                                 </StackPanel>
@@ -57,7 +58,7 @@
                 </Grid>
             </Border>
 
-            <Border Grid.Column="1" Background="Transparent">
+            <Border Grid.Column="1" Background="Transparent" x:Name="SelectedFilesBorder">
                 <ListBox x:Name="SelectedFilesListBox" Background="Transparent">
                     <ListBox.ItemTemplate>
                         <DataTemplate x:DataType="selectSight:FileItem">

MainWindow.axaml.cs

@@ -34,13 +34,23 @@ public partial class MainWindow : Window
     public MainWindow()
     {
         InitializeComponent();
+
+        InitConditionalUiElements();
 
         AllFilesListBox.ItemsSource = _allFiles;
         SelectedFilesListBox.ItemsSource = _selectedFiles;
         AllFilesListBox.SelectedItems = _selectedFiles;
 
         _ = Initialize(); // Start the initialization process asynchronously
     }
+    
+    private void InitConditionalUiElements()
+    {
+        // Show/hide the selected files list based on app settings
+        if (Program.AppSettings.ShowSelectedFilesList) return;
+        SelectedFilesBorder.IsVisible = false;
+        FilesGrid.ColumnDefinitions = new ColumnDefinitions("*, Auto");
+    }
 
     private async Task Initialize()
     {

Program.cs

@@ -2,20 +2,39 @@
 
 using System;
 using Avalonia;
+using Microsoft.Extensions.Configuration;
 
 class Program
 {
+    public static AppSettings AppSettings { get; private set; } = null!;
+    
     // Initialization code. Don't use any Avalonia, third-party APIs or any
     // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
     // yet and stuff might break.
     [STAThread]
-    public static void Main(string[] args) => BuildAvaloniaApp()
-        .StartWithClassicDesktopLifetime(args);
+    public static void Main(string[] args)
+    {
+        var configuration = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json", optional:true)
+            .Build();
+        
+        AppSettings = configuration.GetSection("AppSettings").Get<AppSettings>() ?? new AppSettings();
+        
+        BuildAvaloniaApp()
+            .StartWithClassicDesktopLifetime(args);
+    }
 
     // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp()
         => AppBuilder.Configure<App>()
             .UsePlatformDetect()
             .WithInterFont()
             .LogToTrace();
+}
+
+internal class AppSettings
+{
+    public bool ReadExif { get; init; } = true;
+    public bool ShowSelectedFilesList { get; init; } = true;
+    public int ThumbnailSize { get; init; } = 300; // Default thumbnail size is 300 pixels
 }

SelectSight.csproj

@@ -22,15 +22,20 @@
             <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
         </PackageReference>
 
+        <!-- Non-Avalonia (3rdparty) packages -->
         <PackageReference Include="MessageBox.Avalonia" Version="3.2.0" />
-        
         <PackageReference Include="MetadataExtractor" Version="2.8.1" />
+        <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7" />
     </ItemGroup>
 
     <ItemGroup>
       <None Remove="Assets\icon.ico" />
       <AvaloniaResource Include="Assets\icon.ico" />
       <None Remove="Assets\no-photo.png" />
       <AvaloniaResource Include="Assets\no-photo.png" />
+      <None Update="appsettings.json">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      </None>
     </ItemGroup>
 </Project>

ThumbnailUtils.cs

@@ -11,15 +11,17 @@ namespace SelectSight;
 
 public static class ThumbnailUtils
 {
-    private const int TargetThumbnailSize = 300; // Define target size once
-    
     public static async Task<Bitmap?> GenerateBitmap(Stream fileStream)
     {
+        var thumbnailSize = Program.AppSettings.ThumbnailSize;
+        // First check app settings to see if we should read EXIF data
+        if (!Program.AppSettings.ReadExif) return Bitmap.DecodeToWidth(fileStream, thumbnailSize);
+        
         var skEncodedOrigin = GetSkiaEncodedOrigin(fileStream);
         fileStream.Position = 0; // Reset stream position to the beginning for decoding
 
         // If no adjustment is needed, decode directly to the target size
-        if (skEncodedOrigin == SKEncodedOrigin.Default) return Bitmap.DecodeToWidth(fileStream, TargetThumbnailSize);
+        if (skEncodedOrigin == SKEncodedOrigin.Default) return Bitmap.DecodeToWidth(fileStream, thumbnailSize);
 
         // Needs adjustment for orientation
         using var originalDecodedBitmap = SKBitmap.Decode(fileStream);
@@ -47,7 +49,7 @@ public static class ThumbnailUtils
 
         // 3. Resize the finalSkBitmap (which is now correctly oriented)
         // Calculate target dimensions maintaining aspect ratio
-        var scale = Math.Min((float)TargetThumbnailSize / orientedBitmap.Width, (float)TargetThumbnailSize / orientedBitmap.Height);
+        var scale = Math.Min((float)thumbnailSize / orientedBitmap.Width, (float)thumbnailSize / orientedBitmap.Height);
         var finalScaledWidth = (int)(orientedBitmap.Width * scale);
         var finalScaledHeight = (int)(orientedBitmap.Height * scale);
 

appsettings.json

@@ -0,0 +1,7 @@
+{
+  "AppSettings": {
+    "ReadEXIF": "true",
+    "ShowSelectedFilesList": "false",
+    "ThumbnailSize": "300"
+  }
+}