drop community toolkit

fuzzzerd · fuzzzerd · commit 9057a13ad3b3 · 2023-09-15T21:50:38.000-05:00
diff --git a/SharpFM.App/MainWindow.axaml b/SharpFM.App/MainWindow.axaml
@@ -18,16 +18,16 @@
     <DockPanel>
         <Menu DockPanel.Dock="Top">
             <MenuItem Header="_File">
-                <MenuItem Command="{Binding NewEmptyItemCommand}" Header="_New" />
+                <MenuItem Command="{Binding NewEmptyItem}" Header="_New" />
                 <Separator />
-                <MenuItem Command="{Binding ExitApplicationCommand}" Header="_Exit" />
+                <MenuItem Command="{Binding ExitApplication}" Header="_Exit" />
             </MenuItem>
             <MenuItem Header="_Edit">
-                <MenuItem Command="{Binding CopySelectedToClipCommand}" Header="Copy" />
-                <MenuItem Command="{Binding PasteTextCommand}" Header="Paste" />
+                <MenuItem Command="{Binding CopySelectedToClip}" Header="Copy" />
+                <MenuItem Command="{Binding PasteFileMakerClipData}" Header="Paste" />
             </MenuItem>
             <MenuItem Header="Transform">
-                <MenuItem Command="{Binding CopyAsClassCommand}" Header="Copy as C# Class" />
+                <MenuItem Command="{Binding CopyAsClass}" Header="Copy as C# Class" />
             </MenuItem>
         </Menu>
         <TextBlock />
diff --git a/SharpFM.App/SharpFM.App.csproj b/SharpFM.App/SharpFM.App.csproj
@@ -27,7 +27,6 @@
 
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
     <PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.4" />
-    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.0.4" />
 
     <ProjectReference Include="..\SharpFM.Core\SharpFM.Core.csproj" />
diff --git a/SharpFM.App/ViewModels/MainWindowViewModel.cs b/SharpFM.App/ViewModels/MainWindowViewModel.cs
@@ -1,53 +1,54 @@
 using System;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
+using System.Runtime.CompilerServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Avalonia;
 using Avalonia.Controls.ApplicationLifetimes;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Input;
 using FluentAvalonia.UI.Data;
 using SharpFM.Core;
 
 namespace SharpFM.App.ViewModels;
 
-public partial class MainWindowViewModel : ViewModelBase
+public partial class MainWindowViewModel : INotifyPropertyChanged
 {
+    public event PropertyChangedEventHandler? PropertyChanged;
+
+    private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
     public MainWindowViewModel()
     {
         Keys = new ObservableCollection<FileMakerClip>();
     }
 
-    [ObservableProperty] private string? _text;
-
-    [RelayCommand]
-    private void ExitApplication()
+    public void ExitApplication()
     {
         if (Application.Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktopApp)
         {
             desktopApp.Shutdown();
         }
     }
 
-    [RelayCommand]
-    private void NewEmptyItem()
+    public void NewEmptyItem()
     {
-        ErrorMessages?.Clear();
         try
         {
-            Keys.Add(new FileMakerClip("New", "", Array.Empty<byte>()));
+            Keys.Add(new FileMakerClip("New", FileMakerClip.ClipTypes.First()?.KeyId ?? "", Array.Empty<byte>()));
         }
         catch (Exception e)
         {
-            ErrorMessages?.Add(e.Message);
         }
     }
 
-    [RelayCommand]
-    private void CopyAsClass()
+    public void CopyAsClass()
     {
-        ErrorMessages?.Clear();
+        // TODO: improve the UX of this whole thing. This works as a hack 
+        // for proving the concept, but it could be so much better.
         try
         {
             if (SelectedClip == null)
@@ -56,7 +57,6 @@ private void CopyAsClass()
                 return;
             }
 
-            // TODO: improve the UX of this whole thing. This works as a hack for proving the concept, but it could be so much better.
             // See DepInject project for a sample of how to accomplish this.
             if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
                 desktop.MainWindow?.Clipboard is not { } provider)
@@ -67,28 +67,53 @@ private void CopyAsClass()
         }
         catch (Exception e)
         {
-            ErrorMessages?.Add(e.Message);
         }
     }
 
-    [RelayCommand]
-    private async Task PasteText(CancellationToken token)
+    public async Task PasteFileMakerClipData(CancellationToken token)
     {
-        ErrorMessages?.Clear();
         try
         {
-            await DoGetClipboardDataAsync();
+            // See DepInject project for a sample of how to accomplish this.
+            if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
+                desktop.MainWindow?.Clipboard is not { } provider)
+                throw new NullReferenceException("Missing Clipboard instance.");
+
+            var formats = await provider.GetFormatsAsync();
+
+            foreach (var format in formats.Where(f => f.StartsWith("Mac-", StringComparison.CurrentCultureIgnoreCase)).Distinct())
+            {
+                if (string.IsNullOrEmpty(format)) { continue; }
+
+                object? clipData = await provider.GetDataAsync(format);
+
+                if (clipData is not byte[] dataObj)
+                {
+                    // this is some type of clipboard data this program can't handle
+                    continue;
+                }
+
+                var clip = new FileMakerClip("new-clip", format, dataObj);
+
+                if (clip is null) { continue; }
+
+                // don't bother adding a duplicate. For some reason entries were getting entered twice per clip
+                // this is not the most efficient method to detect it, but it works well enough for now
+                if (Keys.Any(k => k.XmlData == clip.XmlData))
+                {
+                    continue;
+                }
+
+                Keys.Add(clip);
+            }
         }
         catch (Exception e)
         {
-            ErrorMessages?.Add(e.Message);
         }
     }
 
-    [RelayCommand]
-    private async Task CopySelectedToClip(CancellationToken token)
+    public async Task CopySelectedToClip(CancellationToken token)
     {
-        ErrorMessages?.Clear();
         try
         {
             // See DepInject project for a sample of how to accomplish this.
@@ -98,77 +123,30 @@ private async Task CopySelectedToClip(CancellationToken token)
 
             var dp = new DataPackage();
 
-            if (!(SelectedClip is FileMakerClip data))
+            if (SelectedClip is not FileMakerClip data)
             {
                 return; // no data
             }
 
-            // recalculate the length of the original text and make sure that is the first four bytes in the stream
-            //var code = data.RawData;// XamlCodeRenderer.Text;
-            //byte[] byteList = Encoding.UTF8.GetBytes(code);
-            //int bl = byteList.Length;
-            //byte[] intBytes = BitConverter.GetBytes(bl);
-
-            //dp.SetData("Mac-XMSS", intBytes.Concat(byteList).ToArray().AsBuffer().AsStream().AsRandomAccessStream());
             dp.SetData(data.ClipboardFormat, data.RawData);
 
             await provider.SetDataObjectAsync(dp);
         }
         catch (Exception e)
         {
-            ErrorMessages?.Add(e.Message);
         }
     }
-    private async Task DoGetClipboardDataAsync()
-    {
-        // For learning purposes, we opted to directly get the reference
-        // for StorageProvider APIs here inside the ViewModel. 
-
-        // For your real-world apps, you should follow the MVVM principles
-        // by making service classes and locating them with DI/IoC.
-
-        // See DepInject project for a sample of how to accomplish this.
-        if (Application.Current?.ApplicationLifetime is not IClassicDesktopStyleApplicationLifetime desktop ||
-            desktop.MainWindow?.Clipboard is not { } provider)
-            throw new NullReferenceException("Missing Clipboard instance.");
 
-        var formats = await provider.GetFormatsAsync();
+    public ObservableCollection<FileMakerClip> Keys { get; set; }
 
-        foreach (var format in formats.Where(f => f.StartsWith("Mac-", StringComparison.CurrentCultureIgnoreCase)).Distinct())
+    private FileMakerClip? _selectedClip;
+    public FileMakerClip? SelectedClip
+    {
+        get => _selectedClip;
+        set
         {
-            if (string.IsNullOrEmpty(format)) { continue; }
-
-            object? clipData = await provider.GetDataAsync(format);
-
-            if (!(clipData is byte[] dataObj))
-            {
-                // this is some type of clipboard data this program can't handle
-                continue;
-            }
-
-            var clip = new FileMakerClip("new-clip", format, dataObj);
-
-            if (clip is null) { continue; }
-
-            // don't bother adding a duplicate. For some reason entries were getting entered twice per clip
-            // this is not the most efficient method to detect it, but it works well enough for now
-            if (Keys.Any(k => k.XmlData == clip.XmlData))
-            {
-                continue;
-            }
-
-            Keys.Add(clip);
+            _selectedClip = value;
+            NotifyPropertyChanged();
         }
     }
-
-    [ObservableProperty]
-    private ObservableCollection<FileMakerClip> _keys;
-
-    //public ObservableCollection<FileMakerClip> Layouts { get; }
-
-    [ObservableProperty]
-    private FileMakerClip? _selectedLayout;
-
-    [ObservableProperty]
-    private FileMakerClip? _selectedClip;
 }
diff --git a/SharpFM.App/ViewModels/ViewModelBase.cs b/SharpFM.App/ViewModels/ViewModelBase.cs
diff --git a/SharpFM.Core/FileMakerClip.cs b/SharpFM.Core/FileMakerClip.cs
@@ -35,6 +35,8 @@ public class ClipFormat
     /// <param name="data">Data containing the clip.</param>
     public FileMakerClip(string name, string format, byte[] data)
     {
+        // grab the input clip name
+        Name = name;
         // load the format
         ClipboardFormat = format;
         // skip the first four bytes, as this is a length check
@@ -45,10 +47,10 @@ public FileMakerClip(string name, string format, byte[] data)
 
         // try to show better "name" if possible
         var xdoc = XDocument.Load(new StringReader(XmlData));
-        var containerName = xdoc.Element("fmxmlsnippet")?.Descendants().First()?.Attribute("name")?.Value ?? "";
+        var containerName = xdoc.Element("fmxmlsnippet")?.Descendants().First()?.Attribute("name")?.Value ?? "new-clip";
 
         // set the name from the xml data if possible and fall back to constructor parameter
-        Name = containerName ?? name ?? "new-clip";
+        Name = containerName ?? name;
     }
 
     /// <summary>
