Merge branch 'develop-merge-resolve' into develop

Author: iknowcodesoup

.github/workflows/dotnet-desktop.yml

@@ -33,8 +33,8 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-nuget-
 
-      # - name: Remove Local Source for CI
-      #   run: dotnet nuget remove source LocalNuGetPackages --configfile nuget.config
+      - name: Remove Local Source for CI
+        run: dotnet nuget remove source LocalNuGetPackages --configfile nuget.config
 
       - name: Restore NuGet packages
         run: dotnet restore LunaDraw.csproj --configfile nuget.config

App.xaml

@@ -4,17 +4,18 @@
              xmlns:local="clr-namespace:LunaDraw"
              xmlns:converters="clr-namespace:LunaDraw.Converters"
              x:Class="LunaDraw.App">
-    <Application.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="Resources/Styles/Colors.xaml" />
-                <ResourceDictionary Source="Resources/Styles/Styles.xaml" />
-            </ResourceDictionary.MergedDictionaries>
+  <Application.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Resources/Styles/Colors.xaml"/>
+        <ResourceDictionary Source="Resources/Styles/Styles.xaml"/>
+      </ResourceDictionary.MergedDictionaries>
 
-            <converters:ColorToHexConverter x:Key="ColorToHexConverter"/>
-            <converters:IsNotNullConverter x:Key="IsNotNullConverter"/>
-            <converters:IsNullConverter x:Key="IsNullConverter"/>
-            <converters:InverseBoolConverter x:Key="InverseBoolConverter"/>
-        </ResourceDictionary>
-    </Application.Resources>
+      <converters:ColorToHexConverter x:Key="ColorToHexConverter"/>
+      <converters:IsNotNullConverter x:Key="IsNotNullConverter"/>
+      <converters:IsNullConverter x:Key="IsNullConverter"/>
+      <converters:InverseBoolConverter x:Key="InverseBoolConverter"/>
+      <converters:Base64ToImageConverter x:Key="Base64ToImageConverter"/>
+    </ResourceDictionary>
+  </Application.Resources>
 </Application>

ClearCache.bat

@@ -0,0 +1,3 @@
+dotnet nuget locals all --clear
+dotnet clean
+for /d /r . %%d in (bin,obj) do @if exist "%%d" rd /s/q "%%d"

Components/DrawingGalleryPopup.xaml

@@ -3,6 +3,7 @@
                xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
                xmlns:toolkit="http://schemas.microsoft.com/dotnet/2022/maui/toolkit"
                xmlns:controls="clr-namespace:CodeSoupCafe.Maui.Controls;assembly=CodeSoupCafe.Maui"
+               xmlns:behaviors="clr-namespace:CodeSoupCafe.Maui.Behaviors;assembly=CodeSoupCafe.Maui"
                xmlns:viewModels="clr-namespace:LunaDraw.Logic.ViewModels"
                x:Class="LunaDraw.Components.DrawingGalleryPopup"
                x:Name="Popup"
@@ -47,6 +48,9 @@
       <controls:ItemGalleryView Grid.Row="1"
                                 x:Name="GalleryView"
                                 ItemsSource="{Binding DrawingItems}"
+                                ItemAppearingAction="{Binding OnItemAppearing}"
+                                ItemDisappearingAction="{Binding OnItemDisappearing}"
+                                RemainingItemsThreshold="10"
                                 Title="Gallery"
                                 SearchPlaceholder="Search drawings..."
                                 EmptyMessage="No drawings yet. Start creating!"
@@ -85,24 +89,29 @@
                 <Grid>
                   <!-- Actual thumbnail -->
                   <Image x:Name="ThumbnailImage"
-                         Source="{Binding ThumbnailSource}"
+                         Source="{Binding ThumbnailBase64, Converter={StaticResource Base64ToImageConverter}}"
                          Aspect="AspectFit"
                          WidthRequest="170"
                          HeightRequest="170"
                          HorizontalOptions="FillAndExpand"
                          VerticalOptions="FillAndExpand"
                          BackgroundColor="Transparent"
-                         IsVisible="{Binding ThumbnailSource, Converter={StaticResource IsNotNullConverter}}"
-                         Loaded="OnThumbnailImageLoaded"
-                         PropertyChanged="OnThumbnailImagePropertyChanged"/>
+                         IsVisible="{Binding ThumbnailBase64, Converter={StaticResource IsNotNullConverter}}"/>
+
+                  <!-- Loading indicator -->
+                  <ActivityIndicator IsRunning="{Binding IsLoadingThumbnail}"
+                                     IsVisible="{Binding IsLoadingThumbnail}"
+                                     Color="{AppThemeBinding Light={StaticResource Primary}, Dark={StaticResource PrimaryDark}}"
+                                     HorizontalOptions="Center"
+                                     VerticalOptions="Center"/>
 
                   <!-- Placeholder when no thumbnail -->
                   <Label Text="🎨"
                          FontSize="48"
                          HorizontalOptions="Center"
                          VerticalOptions="Center"
                          TextColor="{AppThemeBinding Light={StaticResource PlaceholderTextLight}, Dark={StaticResource PlaceholderTextDark}}"
-                         IsVisible="{Binding ThumbnailSource, Converter={StaticResource IsNullConverter}}"/>
+                         IsVisible="{Binding ThumbnailBase64, Converter={StaticResource IsNullConverter}}"/>
                 </Grid>
               </Border>
 

Components/DrawingGalleryPopup.xaml.cs

@@ -36,12 +36,6 @@ public DrawingGalleryPopup(DrawingGalleryPopupViewModel viewModel)
     InitializeComponent();
     BindingContext = viewModel;
 
-    viewModel.DrawingItems.CollectionChanged += (s, e) =>
-    {
-      GalleryView.ItemsSource = null;
-      GalleryView.ItemsSource = viewModel.DrawingItems;
-    };
-
     viewModel.RequestClose += OnRequestClose;
   }
 
@@ -53,14 +47,6 @@ private void OnDrawingItemTapped(object? sender, EventArgs e)
     }
   }
 
-  private void OnThumbnailImageLoaded(object? sender, EventArgs e)
-  {
-  }
-
-  private void OnThumbnailImagePropertyChanged(object? sender, System.ComponentModel.PropertyChangedEventArgs e)
-  {
-  }
-
   private async void OnRequestClose(object? sender, EventArgs e)
   {
     await this.CloseAsync();
@@ -74,10 +60,10 @@ protected override void OnHandlerChanged()
     if (Handler == null && BindingContext is DrawingGalleryPopupViewModel vm)
     {
       vm.RequestClose -= OnRequestClose;
-      
+
       if (vm is IDisposable disposable)
       {
-          disposable.Dispose();
+        disposable.Dispose();
       }
     }
   }

Converters/Base64ToImageConverter.cs

@@ -0,0 +1,52 @@
+/*
+ *  Copyright (c) 2025 CodeSoupCafe LLC
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in all
+ *  copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ *
+ */
+
+using System.Globalization;
+
+namespace LunaDraw.Converters;
+
+public class Base64ToImageConverter : IValueConverter
+{
+    public object? Convert(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        if (value is not string base64String || string.IsNullOrEmpty(base64String))
+        {
+            return null;
+        }
+
+        try
+        {
+            var bytes = System.Convert.FromBase64String(base64String);
+            return ImageSource.FromStream(() => new MemoryStream(bytes));
+        }
+        catch
+        {
+            return null;
+        }
+    }
+
+    public object? ConvertBack(object? value, Type targetType, object? parameter, CultureInfo culture)
+    {
+        throw new NotImplementedException();
+    }
+}

Logic/Extensions/SkiaSharpExtensions.cs

@@ -263,39 +263,39 @@ public static SKMatrix MaxScaleCentered(this SKCanvas canvas,
 
   public static string ToHex(this SKColor color, bool includeAlpha = true)
   {
-      if (includeAlpha)
-      {
-          return $"#{color.Alpha:X2}{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
-      }
-      else
-      {
-          return $"#{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
-      }
+    if (includeAlpha)
+    {
+      return $"#{color.Alpha:X2}{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
+    }
+    else
+    {
+      return $"#{color.Red:X2}{color.Green:X2}{color.Blue:X2}";
+    }
   }
 
   public static SKColor ToSKColor(this string hex)
   {
-      if (string.IsNullOrEmpty(hex))
-      {
-          return SKColors.Transparent;
-      }
+    if (string.IsNullOrEmpty(hex))
+    {
+      return SKColors.Transparent;
+    }
 
-      // Remove # if present
-      if (hex.StartsWith("#"))
-      {
-          hex = hex.Substring(1);
-      }
+    // Remove # if present
+    if (hex.StartsWith("#"))
+    {
+      hex = hex.Substring(1);
+    }
 
-      if (hex.Length == 6) // RGB
-      {
-          return SKColor.Parse(hex);
-      }
-      else if (hex.Length == 8) // ARGB
-      {
-          return SKColor.Parse(hex);
-      }
-      
-      // Default to transparent if parsing fails
-      return SKColors.Transparent;
+    if (hex.Length == 6) // RGB
+    {
+      return SKColor.Parse(hex);
+    }
+    else if (hex.Length == 8) // ARGB
+    {
+      return SKColor.Parse(hex);
+    }
+
+    // Default to transparent if parsing fails
+    return SKColors.Transparent;
   }
 }

Logic/Models/NavigationModel.cs

@@ -55,4 +55,4 @@ public void Reset()
   {
     ViewMatrix = SKMatrix.CreateIdentity();
   }
-}
+}