Code tidy up

Author: bijington

engine/Orbit.Input/GameControllerManager.cs

@@ -2,11 +2,11 @@ namespace Orbit.Input;
 
 public partial class GameControllerManager
 {
-    private List<GameController> gameControllers = [];
+    private readonly List<GameController> gameControllers = [];
 
     private static GameControllerManager? current;
 
-    public static GameControllerManager Current => current ?? (current = new GameControllerManager());
+    public static GameControllerManager Current => current ??= new GameControllerManager();
 
     public partial Task StartDiscovery();
 
@@ -16,6 +16,7 @@ public partial class GameControllerManager
 
     private void OnGameControllerConnected(GameController controller)
     {
+        gameControllers.Add(controller);
         this.GameControllerConnected?.Invoke(this, new GameControllerConnectedEventArgs(controller));
     }
 }

engine/Orbit.Input/Platforms/Android/GameControllerManager.cs

@@ -51,7 +51,7 @@ public partial Task StartDiscovery()
 
             if (sources.HasFlag(InputSourceType.Gamepad) || sources.HasFlag(InputSourceType.Joystick))
             {
-                gameControllers.Add(new GameController(deviceId));
+                OnGameControllerConnected(new GameController(deviceId));
             }
         }
 

engine/Orbit.Input/Platforms/Android/GenericMotionListener.cs

@@ -7,14 +7,13 @@ namespace Orbit.Input;
 
 public class GenericMotionListener : Java.Lang.Object, ViewTreeObserver.IOnGlobalFocusChangeListener, View.IOnGenericMotionListener
 {
-    private readonly Activity activity;
     private readonly Func<MotionEvent, bool> callback;
 
     public GenericMotionListener(Activity activity, Func<MotionEvent, bool> callback)
     {
         this.callback = callback ?? throw new ArgumentNullException(nameof(callback));
-        this.activity = activity;
-        this.activity.Window?.DecorView.ViewTreeObserver?.AddOnGlobalFocusChangeListener(this);
+        
+        activity.Window?.DecorView.ViewTreeObserver?.AddOnGlobalFocusChangeListener(this);
     }
 
     public void OnGlobalFocusChanged(View? oldFocus, View? newFocus)

engine/Orbit.Input/Platforms/Android/KeyListener.cs

@@ -7,14 +7,13 @@ namespace Orbit.Input;
 
 public class KeyListener : Java.Lang.Object, ViewTreeObserver.IOnGlobalFocusChangeListener, View.IOnKeyListener
 {
-    private readonly Activity activity;
     private readonly Func<Keycode, KeyEvent, bool> callback;
 
     public KeyListener(Activity activity, Func<Keycode, KeyEvent, bool> callback)
     {
         this.callback = callback ?? throw new ArgumentNullException(nameof(callback));
-        this.activity = activity;
-        this.activity.Window?.DecorView.ViewTreeObserver?.AddOnGlobalFocusChangeListener(this);
+        
+        activity.Window?.DecorView.ViewTreeObserver?.AddOnGlobalFocusChangeListener(this);
     }
 
     public void OnGlobalFocusChanged(View? oldFocus, View? newFocus)

engine/Orbit.Input/Platforms/MacCatalyst/GameControllerManager.cs

@@ -21,7 +21,6 @@ private void ConnectToController(object? sender, NSNotificationEventArgs e)
         if (e.Notification.Object is GCController controller)
         {
             var gameController = new GameController(controller);
-            gameControllers.Add(gameController);
             OnGameControllerConnected(gameController);
         }
     }

engine/Orbit.Input/Platforms/Tizen/PlatformClass1.cs

@@ -35,8 +35,7 @@ private void OnRawGameControllerAdded(object? sender, RawGameController rawGameC
     private void OnGamepadAdded(object? sender, Gamepad gamepad)
     {
         var controller = new GameController(gamepad);
-        gameControllers.Add(controller);
-        GameControllerConnected?.Invoke(this, new GameControllerConnectedEventArgs(controller));
+        OnGameControllerConnected(controller);
 
         if (StartControllerMonitoringUponDetection)
         {

engine/Orbit.Input/Platforms/Windows/GameControllerManager.cs

@@ -21,7 +21,6 @@ private void ConnectToController(object? sender, NSNotificationEventArgs e)
         if (e.Notification.Object is GCController controller)
         {
             var gameController = new GameController(controller);
-            gameControllers.Add(gameController);
             OnGameControllerConnected(gameController);
         }
     }