Gestures rework

.github/workflows/plugin.yaml

@@ -32,6 +32,7 @@ jobs:
         dotnet-version: |
           5.0.x
           6.0.x
+          8.0.x
 
     - name: Build
       run: bash ./build-plugin.sh --no-zip

.github/workflows/release.yaml

@@ -38,6 +38,9 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       run: |
         declare -a files
+        # Add the Handlers
+        files+=("build/plugin/0.5.x/Touch-Gestures-0.5.x.zip")
+        files+=("build/plugin/0.6.x/Touch-Gestures-0.6.x.zip")
         # Add Installers
         files+=("build/installer/0.5.x/Touch-Gestures.Installer-0.5.x.zip")
         files+=("build/installer/0.6.x/Touch-Gestures.Installer-0.6.x.zip")

.vscode/launch.json

@@ -22,6 +22,7 @@
             "type": "coreclr",
             "request": "attach",
             "requireExactSource": false,
+            "enableStepFiltering": false,
             "processName": "OpenTabletDriver.Daemon.exe",
             "logging": {
                 "moduleLoad": false

Directory.Build.props

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <NoWarn>$(NoWarn); NETSDK1138</NoWarn>
     <NuGetAuditLevel>critical</NuGetAuditLevel>
-    <AvaloniaVersion>11.0.10</AvaloniaVersion>
+    <AvaloniaVersion>11.3.0</AvaloniaVersion>
   </PropertyGroup>
 
   <!-- Only Embed debug symbols for the Release configuration -->

TODO.md

@@ -4,16 +4,32 @@
 
 ~~Add a `OnExternalGestureCompleted` event to `IGestures` with as parameter an GestureCompletedEventArgs that contains the gesture type and the gesture data.~~
 
+## High Priority Tasks
+
+- Rewrite gestures to properly handle areas.
+    - Draw used areas in the Gesture Setup View
+    - Indicate when new gesture area overlap with an existing gesture area.
+    - A gesture is invalidated depending on gesture type or finger count.
+
 ## Medium Priority Tasks
 
 ### Bindings Rework
 
-- [ ] Wrap different versions of Binding under a single generic interface, with a `Press()` and `Release()` method.
+- [x] Wrap different versions of Binding under a single generic interface, with a `Press()` and `Release()` method.
 
 ### Debugger
 
 - [ ] Implement an In-app gesture debugger, draw the inputs as well as state changes when they happen. (Simillar to osu!lazer's replay analyzer or Rewind)
 
+### Support for multiple Plugin Properties
+
+- [x] Implement having multiple settings per binding as done in OpenTabletDriver 
+    (will make it easier to convert settings to serializable form, ~~because i won't have to check which property is the validated property~~ will still have to do so when serializing)
+    ~~(This will be harder to handle on the UX side as i now need to create a viewmodel & control for each setting, depending on the plugin)~~
+    Handled in OpenTabletDriver.External/property-serialization
+
+## Low Priority Tasks
+
 ## Documentation
 
 ### Dev Documentation (Github Wiki)

Touch-Gestures-0.6.x/Bindings/BulletproofBinding.cs

@@ -0,0 +1,58 @@
+using System.Reflection;
+using OpenTabletDriver.Desktop.Reflection;
+using OpenTabletDriver.Plugin;
+using OpenTabletDriver.Plugin.Tablet;
+using Newtonsoft.Json;
+using OpenTabletDriver.External.Common.Serializables;
+using TouchGestures.Lib.Bindings;
+using System.Collections.Generic;
+using TouchGestures.Lib.Extensions.Reflection;
+
+namespace TouchGestures.Bindings
+{
+    public class BulletproofBinding : Binding
+    {
+        public BulletproofBinding() { }
+
+        public BulletproofBinding(SerializablePluginSettingsStore? store, TabletReference? tablet = null, IServiceManager? provider = null)
+            : base(store, null!)
+        {
+            Tablet = tablet;
+            Provider = provider;
+        }
+
+        public IServiceManager? Provider { get; set; }
+        public TabletReference? Tablet { get; set; }
+
+        [JsonProperty]
+        public PluginSettingStore? Store { get; set; }
+
+        public IBinding? Binding { get; protected set; }
+
+        public override void Construct() => Binding = Store?.Construct<IBinding>(Provider, Tablet);
+
+        public override void Press(IDeviceReport report)
+        {
+            if (Binding is IStateBinding stateBinding)
+                stateBinding.Press(Tablet, report);
+        }
+
+        public override void Release(IDeviceReport report)
+        {
+            if (Binding is IStateBinding stateBinding)
+                stateBinding.Release(Tablet, report);
+        }
+
+        public override SerializablePluginSettingsStore? ToSerializable(Dictionary<int, TypeInfo> identifierToPlugin)
+        {
+            return Store?.ToSerializable();
+        }
+
+        public override void FromSerializable(SerializablePluginSettingsStore? store, Dictionary<int, TypeInfo> identifierToPlugin)
+        {
+            Store = store?.FromSerializable();
+        }
+
+        public override string ToString() => Binding?.ToString() ?? string.Empty;
+    }
+}

Touch-Gestures-0.6.x/Bindings/BulletproofThresholdBinding.cs

@@ -0,0 +1,58 @@
+using System.Reflection;
+using OpenTabletDriver.Desktop.Reflection;
+using OpenTabletDriver.Plugin;
+using OpenTabletDriver.Plugin.Tablet;
+using Newtonsoft.Json;
+using OpenTabletDriver.External.Common.Serializables;
+using TouchGestures.Lib.Bindings;
+using System.Collections.Generic;
+using TouchGestures.Extensions;
+using TouchGestures.Lib.Extensions.Reflection;
+
+namespace TouchGestures.Bindings
+{
+    public class BulletproofThresholdBinding : ThresholdBinding
+    {
+        public BulletproofThresholdBinding() { }
+
+        public BulletproofThresholdBinding(float activationThreshold, SerializablePluginSettingsStore store,
+                                           Dictionary<int, TypeInfo> identifierToPlugin, TabletReference? tablet = null, IServiceManager? provider = null)
+            : base(activationThreshold, store, identifierToPlugin)
+        {
+            Tablet = tablet;
+            Provider = provider;
+        }
+
+        public IServiceManager? Provider { get; set; }
+        public TabletReference? Tablet { get; set; }
+
+        [JsonProperty]
+        public PluginSettingStore? Store { get; set; }
+
+        public IBinding? Binding { get; protected set; }
+
+        public override void Construct() => Binding = Store?.Construct<IBinding>(Provider, Tablet);
+
+        public override void Press(IDeviceReport report)
+        {
+            if (Binding is IStateBinding stateBinding)
+                stateBinding.Press(Tablet, report);
+        }
+
+        public override void Release(IDeviceReport report)
+        {
+            if (Binding is IStateBinding stateBinding)
+                stateBinding.Release(Tablet, report);
+        }
+
+        public override SerializablePluginSettingsStore? ToSerializable(Dictionary<int, TypeInfo> identifierToPlugin)
+        {
+            return Store?.ToSerializable();
+        }
+
+        public override void FromSerializable(SerializablePluginSettingsStore? store, Dictionary<int, TypeInfo> identifierToPlugin)
+        {
+            Store = store?.FromSerializable();
+        }
+    }
+}

Touch-Gestures-0.6.x/Converters/Json/GestureProfileConverter.cs

@@ -0,0 +1,27 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using TouchGestures.Lib.Entities;
+
+namespace TouchGestures.Converters
+{
+    public class GestureProfileConverter : JsonConverter<GestureProfile>
+    {
+        public override bool CanWrite => false;
+
+        public override GestureProfile? ReadJson(JsonReader reader, Type objectType, GestureProfile? existingValue, bool hasExistingValue, JsonSerializer serializer)
+        {
+            var value = JObject.Load(reader);
+
+            if (value == null)
+                return null!;
+
+            BulletproofGestureProfile profile = new();
+            serializer.Populate(value.CreateReader(), profile);
+            return profile;
+        }
+
+        public override void WriteJson(JsonWriter writer, GestureProfile? value, JsonSerializer serializer)
+            => throw new NotImplementedException();
+    }
+}

Touch-Gestures-0.6.x/Entities/BulletproofBindableProfile.cs

@@ -1,33 +1,21 @@
-using OpenTabletDriver.Plugin;
+using TouchGestures.Bindings;
 using TouchGestures.Entities;
+using TouchGestures.Extensions;
 using TouchGestures.Lib.Entities.Tablet;
 
 namespace TouchGestures.Lib.Entities
 {
-    public class BulletproofBindableProfile : BindableProfile
+    public class BulletproofGestureProfile : GestureProfile
     {
-        public override void ConstructBindings(SharedTabletReference? tablet = null)
+        public override void ConstructBindings(SharedTabletReference tablet)
         {
-            if (tablet is not BulletproofSharedTabletReference bTablet)
-                return;
+            if (tablet is not BulletproofSharedTabletReference btablet) return;
 
-            foreach (var gesture in TapGestures)
-                gesture.Binding = gesture.Store?.Construct<IBinding>(bTablet?.ServiceProvider);
-
-            foreach (var gesture in SwipeGestures)
-                gesture.Binding = gesture.Store?.Construct<IBinding>(bTablet?.ServiceProvider);
-
-            foreach (var gesture in HoldGestures)
-                gesture.Binding = gesture.Store?.Construct<IBinding>(bTablet?.ServiceProvider);
-
-            foreach (var gesture in PanGestures)
-                gesture.Binding = gesture.Store?.Construct<IBinding>(bTablet?.ServiceProvider);
-
-            foreach (var gesture in PinchGestures)
-                gesture.Binding = gesture.Store?.Construct<IBinding>(bTablet?.ServiceProvider);
-
-            foreach (var gesture in RotateGestures)
-                gesture.Binding = gesture.Store?.Construct<IBinding>(bTablet?.ServiceProvider);
+            foreach (var gesture in this)
+            {
+                gesture.Binding = new BulletproofBinding(gesture.Store, btablet.ToState(), btablet.ServiceProvider);
+                gesture.Binding?.Construct();
+            }
         }
     }
 }

Touch-Gestures-0.6.x/Entities/BulletproofSharedTabletReference.cs

@@ -1,5 +1,3 @@
-using System.Numerics;
-using Newtonsoft.Json;
 using OpenTabletDriver.Desktop.Reflection;
 using TouchGestures.Lib.Entities.Tablet;
 
@@ -12,14 +10,14 @@ public BulletproofSharedTabletReference() : base()
             ServiceProvider = new ServiceManager();
         }
 
-        public BulletproofSharedTabletReference(string name, SharedTabletDigitizer digitizer, 
+        public BulletproofSharedTabletReference(string name, SharedTabletDigitizer digitizer,
                                                 SharedTabletDigitizer touchDigitizer, IServiceManager serviceProvider)
             : base(name, digitizer, touchDigitizer)
         {
             ServiceProvider = serviceProvider;
         }
 
-        public BulletproofSharedTabletReference(string name, SharedTabletDigitizer digitizer, 
+        public BulletproofSharedTabletReference(string name, SharedTabletDigitizer digitizer,
                                                 SharedTabletDigitizer touchDigitizer, SharedDeviceIdentifier deviceIdentifier,
                                                 IServiceManager serviceProvider)
             : base(name, digitizer, touchDigitizer, deviceIdentifier)

Touch-Gestures-0.6.x/Extensions/Reflection/PropertyInfoExtensions.cs

@@ -0,0 +1,10 @@
+using System.Reflection;
+using OpenTabletDriver.External.Common.Serializables.Properties;
+
+namespace TouchGestures.Extensions.Reflection
+{
+    public static class PropertyInfoExtensions
+    {
+        public static SerializableProperty ToSerializable(this PropertyInfo property) => SerializablePropertyExtension.SerializableFrom(property);
+    }
+}