Better handler implementation

Demo/App.csproj

@@ -30,6 +30,11 @@
 	  <CodesignKey>iPhone Distribution: CARDIFF COUNTY COUNCIL (RHSME4M265)</CodesignKey>
 	</PropertyGroup>
 
+	<PropertyGroup Condition="'$(TargetFramework)'=='net7.0-ios'">
+	  <CodesignKey>Apple Development: Ieuan Walker (R4SVVV33HW)</CodesignKey>
+	  <CodesignProvision>VS: WildCard Development</CodesignProvision>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<!-- App Icon -->
 		<MauiIcon Include="Resources\AppIcon\appicon.svg" ForegroundFile="Resources\AppIcon\appiconfg.svg" Color="#512BD4" />

Scr/AppBuilderExtensions.cs

@@ -5,7 +5,7 @@ namespace StateButton;
 /// <summary>
 /// This class contains CustomSwitch <see cref="MauiAppBuilder"/> extensions.
 /// </summary>
-public static partial class AppBuilderExtensions
+public static class AppBuilderExtensions
 {
 	/// <summary>
 	/// Initializes the Switch control
@@ -16,32 +16,6 @@ public static MauiAppBuilder UseStateButton(this MauiAppBuilder builder)
 	{
 		builder.ConfigureMauiHandlers(h => h.AddHandler<StateButton, StateButtonHandler>());
 
-#if ANDROID
-		StateButtonHandler.Mapper.AppendToMapping("MyCustomization", (handler, view) =>
-		{
-			if (view is StateButton stateButton)
-			{
-				CustomContentViewGroup platformView = (CustomContentViewGroup)handler.PlatformView;
-
-				platformView.Pressed1 += (_, e) => stateButton.InternalPressed();
-				platformView.Released += (_, e) => stateButton.InternalReleased();
-				platformView.Clicked += (_, e) => stateButton.InternalClicked();
-			}
-		});
-#elif IOS
-		StateButtonHandler.Mapper.AppendToMapping("MyCustomization", (handler, view) =>
-		{
-			if (view is StateButton stateButton)
-			{
-				CustomContentView platformView = (CustomContentView)handler.PlatformView;
-
-				platformView.Pressed += (_, e) => stateButton.InternalPressed();
-				platformView.Released += (_, e) => stateButton.InternalReleased();
-				platformView.Clicked += (_, e) => stateButton.InternalClicked();
-			}
-		});
-#endif
-
 		return builder;
 	}
 }

Scr/Handler/IStateButtonHandler.cs

@@ -0,0 +1,6 @@
+using Microsoft.Maui.Handlers;
+
+namespace StateButton.Handler;
+public interface IStateButtonHandler : IBorderHandler
+{
+}

Scr/Handler/StateButtonHandler.Android.cs

@@ -7,6 +7,6 @@ protected override ContentViewGroup CreatePlatformView()
 	{
 		base.CreatePlatformView();
 
-		return new CustomContentViewGroup(Context);
+		return new CustomContentViewGroup(Context, VirtualView);
 	}
 }

Scr/Handler/StateButtonHandler.cs

@@ -2,6 +2,6 @@
 
 namespace StateButton.Handler;
 
-public partial class StateButtonHandler : BorderHandler
+public partial class StateButtonHandler : BorderHandler, IStateButtonHandler
 {
 }

Scr/Handler/StateButtonHandler.iOS.cs

@@ -5,6 +5,6 @@ protected override Microsoft.Maui.Platform.ContentView CreatePlatformView()
 	{
 		base.CreatePlatformView();
 
-		return new CustomContentView();
+		return new CustomContentView(VirtualView);
 	}
 }

Scr/Handler/CustomContentView.iOS.cs → Scr/Platform/CustomContentView.iOS.cs

@@ -5,34 +5,33 @@ namespace StateButton.Handler;
 
 public class CustomContentView : Microsoft.Maui.Platform.ContentView
 {
-	public event EventHandler<EventArgs>? Released;
-	public event EventHandler<EventArgs>? Pressed;
-	public event EventHandler<EventArgs>? Clicked;
-
-	public CustomContentView()
+	readonly StateButton _stateButton;
+	public CustomContentView(IBorderView virtualView)
 	{
 		AccessibilityTraits = UIAccessibilityTrait.Button;
 
-		AddGestureRecognizer(new UITapGestureRecognizer(() => Clicked?.Invoke(this, EventArgs.Empty)));
+		_stateButton = (StateButton)virtualView;
+
+		AddGestureRecognizer(new UITapGestureRecognizer(_stateButton.InvokeClicked));
 	}
 
 	public override void TouchesMoved(NSSet touches, UIEvent? evt)
 	{
-		Released?.Invoke(this, EventArgs.Empty);
+		_stateButton.InvokeReleased();
 
 		base.TouchesMoved(touches, evt);
 	}
 
 	public override void TouchesBegan(NSSet touches, UIEvent? evt)
 	{
-		Pressed?.Invoke(this, EventArgs.Empty);
+		_stateButton.InvokePressed();
 
 		base.TouchesBegan(touches, evt);
 	}
 
 	public override void TouchesCancelled(NSSet touches, UIEvent? evt)
 	{
-		Released?.Invoke(this, EventArgs.Empty);
+		_stateButton.InvokeReleased();
 
 		base.TouchesCancelled(touches, evt);
 	}

Scr/Platform/CustomContentViewGroup.Android.cs

@@ -0,0 +1,85 @@
+using Android.Content;
+using Android.Runtime;
+using Android.Views;
+using Android.Views.Accessibility;
+using Microsoft.Maui.Platform;
+
+namespace StateButton.Handler;
+public class CustomContentViewGroup : ContentViewGroup
+{
+	Rect _rect;
+	readonly StateButton _stateButton;
+	public CustomContentViewGroup(Context context, IBorderView virtualView) : base(context)
+	{
+		_stateButton = (StateButton)virtualView;
+
+		Focusable = true;
+		Clickable = true;
+	}
+
+	public override bool OnTouchEvent(MotionEvent? e)
+	{
+		if(RootView is null)
+		{
+			return base.OnTouchEvent(e);
+		}
+
+		switch (e?.Action)
+		{
+			case MotionEventActions.Down:
+				_rect = new Rect(RootView.Left, RootView.Top, RootView.Right, RootView.Bottom);
+				_stateButton.InvokePressed();
+				break;
+
+			case MotionEventActions.Up:
+				if (_rect.Contains(RootView.Left + (int)e.GetX(), RootView.Top + (int)e.GetY()))
+				{
+					_stateButton.InvokeReleased();
+					_stateButton.InvokeClicked();
+				}
+				else
+				{
+					_stateButton.InvokeReleased();
+				}
+				break;
+
+			case MotionEventActions.Cancel:
+				_stateButton.InvokeReleased();
+
+				break;
+
+			case MotionEventActions.Move:
+				if (!_rect.Contains(RootView.Left + (int)e.GetX(), RootView.Top + (int)e.GetY()))
+				{
+					_stateButton.InvokeReleased();
+				}
+
+				break;
+		}
+
+		return base.OnTouchEvent(e);
+	}
+
+	public override bool OnKeyUp([GeneratedEnum] Keycode keyCode, KeyEvent? e)
+	{
+		if (keyCode == Keycode.Space || keyCode == Keycode.Enter)
+		{
+			_stateButton.InvokeClicked();
+			return true;
+		}
+
+		return base.OnKeyUp(keyCode, e);
+	}
+
+	public override void OnInitializeAccessibilityNodeInfo(AccessibilityNodeInfo? info)
+	{
+		if (info is not null)
+		{
+			info.Focusable = true;
+			info.Clickable = true;
+			info.ClassName = "android.widget.Button";
+		}
+
+		base.OnInitializeAccessibilityNodeInfo(info);
+	}
+}

Scr/StateButton.csproj

@@ -7,7 +7,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">11.0</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
 	</PropertyGroup>
 
@@ -60,5 +60,16 @@
 	  </MauiXaml>
 	</ItemGroup>
 
-  <Import Project="MultiTargeting.targets" />
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-ios')) != true">
+    <Compile Remove="**\**\*.ios.cs" />
+    <None Include="**\**\*.ios.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid')) != true AND $(TargetFramework.StartsWith('net7.0-android')) != true">
+    <Compile Remove="**\**\*.android.cs" />
+    <None Include="**\**\*.android.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
+  <ItemGroup Condition="!($(TargetFramework.StartsWith('net')) == true AND $(TargetFramework.EndsWith('.0')) == true AND $(TargetFramework.Contains('-')) != true)">
+    <Compile Remove="**\**\*.net.cs" />
+    <None Include="**\**\*.net.cs" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder)" />
+  </ItemGroup>
 </Project>