Revert "Merge pull request ppy#6105 from hwsmm/sdl-cs-android"

This reverts commit 508d7e0, reversing
changes made to 169bd07.

osu.Framework.Android/AndroidClipboard.cs

@@ -0,0 +1,31 @@
+// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// See the LICENCE file in the repository root for full licence text.
+
+using Android.Content;
+using osu.Framework.Platform;
+using SixLabors.ImageSharp;
+
+namespace osu.Framework.Android
+{
+    public class AndroidClipboard : Clipboard
+    {
+        private readonly ClipboardManager? clipboardManager;
+
+        public AndroidClipboard(AndroidGameView view)
+        {
+            clipboardManager = view.Activity.GetSystemService(Context.ClipboardService) as ClipboardManager;
+        }
+
+        public override string? GetText() => clipboardManager?.PrimaryClip?.GetItemAt(0)?.Text;
+
+        public override void SetText(string text)
+        {
+            if (clipboardManager != null)
+                clipboardManager.PrimaryClip = ClipData.NewPlainText(null, text);
+        }
+
+        public override Image<TPixel>? GetImage<TPixel>() => null;
+
+        public override bool SetImage(Image image) => false;
+    }
+}

osu.Framework.Android/AndroidGameActivity.cs

@@ -6,19 +6,18 @@
 using Android.Content;
 using Android.Content.PM;
 using Android.OS;
+using Android.Runtime;
 using Android.Views;
-using Java.Lang;
 using ManagedBass;
-using Org.Libsdl.App;
+using osu.Framework.Bindables;
 using osu.Framework.Extensions.ObjectExtensions;
-using osu.Framework.Platform;
 using Debug = System.Diagnostics.Debug;
 
 namespace osu.Framework.Android
 {
     // since `ActivityAttribute` can't be inherited, the below is only provided as an illustrative example of how to setup an activity for best compatibility.
     [Activity(ConfigurationChanges = DEFAULT_CONFIG_CHANGES, Exported = true, LaunchMode = DEFAULT_LAUNCH_MODE, MainLauncher = true)]
-    public abstract class AndroidGameActivity : SDLActivity
+    public abstract class AndroidGameActivity : Activity
     {
         protected const ConfigChanges DEFAULT_CONFIG_CHANGES = ConfigChanges.Keyboard
                                                                | ConfigChanges.KeyboardHidden
@@ -32,35 +31,37 @@ public abstract class AndroidGameActivity : SDLActivity
 
         protected const LaunchMode DEFAULT_LAUNCH_MODE = LaunchMode.SingleInstance;
 
-        internal static AndroidGameSurface Surface => (AndroidGameSurface)MSurface!;
-
-        private GameHost? host;
-
         protected abstract Game CreateGame();
 
-        protected override string[] GetLibraries() => new string[] { "SDL3" };
-
-        protected override SDLSurface CreateSDLSurface(Context? context) => new AndroidGameSurface(this, context);
+        /// <summary>
+        /// Whether this <see cref="AndroidGameActivity"/> is active (in the foreground).
+        /// </summary>
+        public BindableBool IsActive { get; } = new BindableBool();
 
-        protected override IRunnable CreateSDLMainRunnable() => new Runnable(() =>
+        /// <summary>
+        /// The visibility flags for the system UI (status and navigation bars)
+        /// </summary>
+        public SystemUiFlags UIVisibilityFlags
         {
-            host = new AndroidGameHost(this);
-            host.AllowScreenSuspension.Result.BindValueChanged(allow =>
+#pragma warning disable 618 // SystemUiVisibility is deprecated
+            get => (SystemUiFlags)Window.AsNonNull().DecorView.SystemUiVisibility;
+            set
             {
-                RunOnUiThread(() =>
-                {
-                    if (!allow.NewValue)
-                        Window?.AddFlags(WindowManagerFlags.KeepScreenOn);
-                    else
-                        Window?.ClearFlags(WindowManagerFlags.KeepScreenOn);
-                });
-            }, true);
+                systemUiFlags = value;
+                Window.AsNonNull().DecorView.SystemUiVisibility = (StatusBarVisibility)value;
+#pragma warning restore 618
+            }
+        }
+
+        private SystemUiFlags systemUiFlags;
 
-            host.Run(CreateGame());
+        private AndroidGameView gameView = null!;
 
-            if (!IsFinishing)
-                Finish();
-        });
+        public override void OnTrimMemory([GeneratedEnum] TrimMemory level)
+        {
+            base.OnTrimMemory(level);
+            gameView.Host?.Collect();
+        }
 
         protected override void OnCreate(Bundle? savedInstanceState)
         {
@@ -74,28 +75,82 @@ protected override void OnCreate(Bundle? savedInstanceState)
 
             base.OnCreate(savedInstanceState);
 
+            SetContentView(gameView = new AndroidGameView(this, CreateGame()));
+
+            UIVisibilityFlags = SystemUiFlags.LayoutFlags | SystemUiFlags.ImmersiveSticky | SystemUiFlags.HideNavigation | SystemUiFlags.Fullscreen;
+
+            // Firing up the on-screen keyboard (eg: interacting with textboxes) may cause the UI visibility flags to be altered thus showing the navigation bar and potentially the status bar
+            // This sets back the UI flags to hidden once the interaction with the on-screen keyboard has finished.
+            Window.AsNonNull().DecorView.SystemUiVisibilityChange += (_, e) =>
+            {
+                if ((SystemUiFlags)e.Visibility != systemUiFlags)
+                {
+                    UIVisibilityFlags = systemUiFlags;
+                }
+            };
+
             if (OperatingSystem.IsAndroidVersionAtLeast(28))
             {
                 Window.AsNonNull().Attributes.AsNonNull().LayoutInDisplayCutoutMode = LayoutInDisplayCutoutMode.ShortEdges;
             }
-        }
 
-        public override void OnTrimMemory(TrimMemory level)
-        {
-            base.OnTrimMemory(level);
-            host?.Collect();
+            gameView.HostStarted += host =>
+            {
+                host.AllowScreenSuspension.Result.BindValueChanged(allow =>
+                {
+                    RunOnUiThread(() =>
+                    {
+                        if (!allow.NewValue)
+                            Window?.AddFlags(WindowManagerFlags.KeepScreenOn);
+                        else
+                            Window?.ClearFlags(WindowManagerFlags.KeepScreenOn);
+                    });
+                }, true);
+            };
         }
 
         protected override void OnStop()
         {
             base.OnStop();
+            gameView.Host?.Suspend();
             Bass.Pause();
         }
 
         protected override void OnRestart()
         {
             base.OnRestart();
+            gameView.Host?.Resume();
             Bass.Start();
         }
+
+        public override void OnWindowFocusChanged(bool hasFocus)
+        {
+            base.OnWindowFocusChanged(hasFocus);
+            IsActive.Value = hasFocus;
+        }
+
+        public override void OnBackPressed()
+        {
+            // Avoid the default implementation that does close the app.
+            // This only happens when the back button could not be captured from OnKeyDown.
+        }
+
+        // On some devices and keyboard combinations the OnKeyDown event does not propagate the key event to the view.
+        // Here it is done manually to ensure that the keys actually land in the view.
+
+        public override bool OnKeyDown([GeneratedEnum] Keycode keyCode, KeyEvent? e)
+        {
+            return gameView.OnKeyDown(keyCode, e);
+        }
+
+        public override bool OnKeyUp([GeneratedEnum] Keycode keyCode, KeyEvent? e)
+        {
+            return gameView.OnKeyUp(keyCode, e);
+        }
+
+        public override bool OnKeyLongPress([GeneratedEnum] Keycode keyCode, KeyEvent? e)
+        {
+            return gameView.OnKeyLongPress(keyCode, e);
+        }
     }
 }

osu.Framework.Android/AndroidGameHost.cs

@@ -8,27 +8,30 @@
 using Android.Content;
 using osu.Framework.Android.Graphics.Textures;
 using osu.Framework.Android.Graphics.Video;
+using osu.Framework.Android.Input;
 using osu.Framework.Configuration;
 using osu.Framework.Extensions;
 using osu.Framework.Extensions.IEnumerableExtensions;
 using osu.Framework.Extensions.ObjectExtensions;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Graphics.Video;
+using osu.Framework.Input;
+using osu.Framework.Input.Handlers;
+using osu.Framework.Input.Handlers.Midi;
 using osu.Framework.IO.Stores;
 using osu.Framework.Logging;
 using osu.Framework.Platform;
 using Uri = Android.Net.Uri;
 
 namespace osu.Framework.Android
 {
-    public class AndroidGameHost : SDL3GameHost
+    public class AndroidGameHost : OsuTKGameHost
     {
-        private readonly AndroidGameActivity activity;
+        private readonly AndroidGameView gameView;
 
-        public AndroidGameHost(AndroidGameActivity activity)
-            : base(string.Empty)
+        public AndroidGameHost(AndroidGameView gameView)
         {
-            this.activity = activity;
+            this.gameView = gameView;
         }
 
         protected override void SetupConfig(IDictionary<FrameworkSetting, object> defaultOverrides)
@@ -39,20 +42,28 @@ protected override void SetupConfig(IDictionary<FrameworkSetting, object> defaul
             base.SetupConfig(defaultOverrides);
         }
 
-        protected override IWindow CreateWindow(GraphicsSurfaceType preferredSurface) => new AndroidGameWindow(preferredSurface, Options.FriendlyGameName);
+        protected override IWindow CreateWindow(GraphicsSurfaceType preferredSurface) => new AndroidGameWindow(gameView);
 
-        protected override void DrawFrame()
-        {
-            if (AndroidGameActivity.Surface.IsSurfaceReady)
-                base.DrawFrame();
-        }
+        protected override Clipboard CreateClipboard() => new AndroidClipboard(gameView);
 
         public override bool CanExit => false;
 
         public override bool CanSuspendToBackground => true;
 
         public override bool OnScreenKeyboardOverlapsGameWindow => true;
 
+        protected override TextInputSource CreateTextInput() => new AndroidTextInput(gameView);
+
+        protected override IEnumerable<InputHandler> CreateAvailableInputHandlers() =>
+            new InputHandler[]
+            {
+                new AndroidMouseHandler(gameView),
+                new AndroidKeyboardHandler(gameView),
+                new AndroidTouchHandler(gameView),
+                new AndroidJoystickHandler(gameView),
+                new MidiHandler()
+            };
+
         public override string InitialFileSelectorPath => @"/sdcard";
 
         public override Storage GetStorage(string path) => new AndroidStorage(path, this);
@@ -76,7 +87,7 @@ public override void OpenUrlExternally(string url)
                 {
                     // Recommended way to open URLs on Android 11+
                     // https://developer.android.com/training/package-visibility/use-cases#open-urls-browser-or-other-app
-                    activity.StartActivity(intent);
+                    gameView.Activity.StartActivity(intent);
                 }
             }
             catch (Exception ex)
@@ -93,7 +104,7 @@ public override VideoDecoder CreateVideoDecoder(Stream stream)
 
         public override bool SuspendToBackground()
         {
-            return activity.MoveTaskToBack(true);
+            return gameView.Activity.MoveTaskToBack(true);
         }
     }
 }