chore: add null-safety to FlxTouchManager

Author: NotHyper-474

flixel/input/touch/FlxTouchManager.hx

@@ -1,6 +1,7 @@
 package flixel.input.touch;
 
 #if FLX_TOUCH
+import flixel.util.FlxDestroyUtil;
 import openfl.Lib;
 import openfl.events.TouchEvent;
 import openfl.ui.Multitouch;
@@ -9,6 +10,7 @@ import openfl.ui.MultitouchInputMode;
 /**
  * @author Zaphod
  */
+@:nullSafety(Strict)
 class FlxTouchManager implements IFlxInputManager
 {
 	/**
@@ -34,24 +36,17 @@ class FlxTouchManager implements IFlxInputManager
 	/**
 	 * WARNING: can be null if no active touch with the provided ID could be found
 	 */
-	public inline function getByID(TouchPointID:Int):FlxTouch
+	public inline function getByID(TouchPointID:Int):Null<FlxTouch>
 	{
 		return _touchesCache.get(TouchPointID);
 	}
 
 	/**
 	 * Return the first touch if there is one, beware of null
 	 */
-	public function getFirst():FlxTouch
+	public function getFirst():Null<FlxTouch>
 	{
-		if (list[0] != null)
-		{
-			return list[0];
-		}
-		else
-		{
-			return null;
-		}
+		return list[0];
 	}
 
 	/**
@@ -60,19 +55,8 @@ class FlxTouchManager implements IFlxInputManager
 	@:noCompletion
 	public function destroy():Void
 	{
-		for (touch in list)
-		{
-			touch.destroy();
-		}
-		list = null;
-
-		for (touch in _inactiveTouches)
-		{
-			touch.destroy();
-		}
-		_inactiveTouches = null;
-
-		_touchesCache = null;
+		FlxDestroyUtil.destroyArray(list);
+		FlxDestroyUtil.destroyArray(_inactiveTouches);
 	}
 
 	/**
@@ -88,7 +72,7 @@ class FlxTouchManager implements IFlxInputManager
 			TouchArray = new Array<FlxTouch>();
 		}
 
-		var touchLen:Int = TouchArray.length;
+		final touchLen:Int = TouchArray.length;
 
 		if (touchLen > 0)
 		{
@@ -119,7 +103,7 @@ class FlxTouchManager implements IFlxInputManager
 			TouchArray = new Array<FlxTouch>();
 		}
 
-		var touchLen:Int = TouchArray.length;
+		final touchLen:Int = TouchArray.length;
 		if (touchLen > 0)
 		{
 			TouchArray.splice(0, touchLen);
@@ -141,10 +125,7 @@ class FlxTouchManager implements IFlxInputManager
 	 */
 	public function reset():Void
 	{
-		for (key in _touchesCache.keys())
-		{
-			_touchesCache.remove(key);
-		}
+		_touchesCache.clear();
 
 		for (touch in list)
 		{
@@ -174,7 +155,7 @@ class FlxTouchManager implements IFlxInputManager
 	 */
 	function handleTouchBegin(FlashEvent:TouchEvent):Void
 	{
-		var touch:FlxTouch = _touchesCache.get(FlashEvent.touchPointID);
+		var touch:Null<FlxTouch> = _touchesCache.get(FlashEvent.touchPointID);
 		if (touch != null)
 		{
 			touch.setXY(Std.int(FlashEvent.stageX), Std.int(FlashEvent.stageY));
@@ -192,7 +173,7 @@ class FlxTouchManager implements IFlxInputManager
 	 */
 	function handleTouchEnd(FlashEvent:TouchEvent):Void
 	{
-		var touch:FlxTouch = _touchesCache.get(FlashEvent.touchPointID);
+		var touch:Null<FlxTouch> = _touchesCache.get(FlashEvent.touchPointID);
 
 		if (touch != null)
 		{
@@ -205,7 +186,7 @@ class FlxTouchManager implements IFlxInputManager
 	 */
 	function handleTouchMove(FlashEvent:TouchEvent):Void
 	{
-		var touch:FlxTouch = _touchesCache.get(FlashEvent.touchPointID);
+		var touch:Null<FlxTouch> = _touchesCache.get(FlashEvent.touchPointID);
 
 		if (touch != null)
 		{
@@ -239,6 +220,7 @@ class FlxTouchManager implements IFlxInputManager
 	{
 		if (_inactiveTouches.length > 0)
 		{
+			@:nullSafety(Off)
 			var touch:FlxTouch = _inactiveTouches.pop();
 			touch.recycle(X, Y, PointID, pressure);
 			return add(touch);