refactor: Cleanup

Author: furesoft

src/Moss.NET.Sdk/Core/Extensions.cs

@@ -30,6 +30,11 @@ public static ulong GetPointer(this string str)
 
     public static ulong GetPointer<T>(this T @this)
     {
-        return Utils.Serialize(@this, (JsonTypeInfo<T>)JsonContext.Default.GetTypeInfo(typeof(T)));
+        return GetPointer(@this, (JsonTypeInfo<T>)JsonContext.Default.GetTypeInfo(typeof(T)));
+    }
+
+    public static ulong GetPointer<T>(this T @this, JsonTypeInfo<T> typeInfo)
+    {
+        return Utils.Serialize(@this, typeInfo);
     }
 }

src/Moss.NET.Sdk/FFI/JsonContext.cs

@@ -12,6 +12,7 @@ namespace Moss.NET.Sdk.FFI;
 [JsonSerializable(typeof(Color))]
 [JsonSerializable(typeof(TextColor))]
 [JsonSerializable(typeof(ContextButton))]
+[JsonSerializable(typeof(ContextMenu))]
 [JsonSerializable(typeof(List<ContextButton>))]
 [JsonSerializable(typeof(List<string>))]
 [JsonSerializable(typeof(List<ConfigGetD>))]

src/Moss.NET.Sdk/UI/ContextMenu.cs

@@ -23,5 +23,5 @@ public class ContextMenu(string key, List<ContextButton> buttons)
 
     public static ContextMenu Get(string name) => Cache[name];
 
-    public void Open(ulong x, ulong y) => OpenContextMenu(this.GetPointer(), x, y);
+    public void Open(ulong x, ulong y) => OpenContextMenu(Key.GetPointer(), x, y);
 }

src/Moss.NET.Sdk/UI/ContextMenuBuilder.cs

@@ -24,7 +24,7 @@ public ContextMenu Build()
     {
         var cm = new ContextMenu(name, _buttons);
         RegisterContextMenu(cm.GetPointer());
-        ContextMenu.Cache.Add(name, cm);
+        ContextMenu.Cache[name] = cm;
 
         return cm;
     }

src/Moss.NET.Sdk/UI/GUI.cs

@@ -1,4 +1,5 @@
 using System.Runtime.InteropServices;
+using Moss.NET.Sdk.Core;
 using Moss.NET.Sdk.FFI;
 
 namespace Moss.NET.Sdk.UI;
@@ -8,4 +9,8 @@ public class GUI
     [DllImport(Functions.DLL, EntryPoint = "moss_gui_invert_icon")]
     private static extern void InvertIcon(ulong keyPtr, ulong resultKeyPtr);
 
+    public static void InvertIcon(string key, string resultKey)
+    {
+        InvertIcon(key.GetPointer(), resultKey.GetPointer());
+    }
 }

src/SamplePlugin/SampleExtension.cs

@@ -30,7 +30,7 @@ public override ExtensionInfo Register(MossState state)
         Defaults.SetDefaultValue("OUTLINE_COLOR", Color.Blue);
         Theme.Apply(new DarkTheme());
 
-        Assets.Add("swap.svg");
+        Assets.Add("Assets/swap.svg");
 
         var md = Storage.GetDocumentMetadata("0ba3df9c-8ca0-4347-8d7c-07471101baad");
         Pdk.Log(LogLevel.Info, $"Metadata: {md.VisibleName} with {md.Hash}");
@@ -48,6 +48,10 @@ public override ExtensionInfo Register(MossState state)
             new ContextButton("Sample Button", "notebook", "notebook", "no_action",
                 "no_contextmenu"));
 
+        ContextMenu.Create("test_cm")
+            .AddButton("test", "swap", "notebook", "no_action")
+            .Build();
+
         return new ExtensionInfo();
     }
 
@@ -64,6 +68,12 @@ public override void ExtensionLoop(MossState state)
         Config.Get<string>("theme");
         Moss.NET.Sdk.Moss.GetState();
 
+        var cm = ContextMenu.Get("test_cm");
+
+        cm.Open(10, 10);
+
+        GUI.InvertIcon("swap", "swap_inverted");
+
         InternalFunctions.ExportStatisticalData();
     }
 

src/SamplePlugin/SampleScreen.cs

@@ -24,12 +24,6 @@ public override void PreLoop()
         ScreenManager.SetValue("hello", true);
 
         ScreenManager.GetValue<bool>("hello");
-
-        var cm = ContextMenu.Create("test_cm")
-            .AddButton("test", "notebook", "notebook", "no_action")
-            .Build();
-
-        cm.Open(10, 10);
     }
 
     protected override void OnLoop()