From ec6cb0abb4b7669895b6e96fd7581c93b5abd691 Mon Sep 17 00:00:00 2001
From: Mary Guillemard <mary@mary.zone>
Date: Sat, 2 Mar 2024 12:51:05 +0100
Subject: infra: Make Avalonia the default UI  (#6375)

* misc: Move Ryujinx project to Ryujinx.Gtk3

This breaks release CI for now but that's fine.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* misc: Move Ryujinx.Ava project to Ryujinx

This breaks CI for now, but it's fine.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* infra: Make Avalonia the default UI

Should fix CI after the previous changes.

GTK3 isn't build by the release job anymore, only by PR CI.

This also ensure that the test-ava update package is still generated to
allow update from the old testing channel.

Signed-off-by: Mary Guillemard <mary@mary.zone>

* Fix missing copy in create_app_bundle.sh

Signed-off-by: Mary Guillemard <mary@mary.zone>

* Fix syntax error

Signed-off-by: Mary Guillemard <mary@mary.zone>

---------

Signed-off-by: Mary Guillemard <mary@mary.zone>
---
 src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs | 107 ------------------------
 1 file changed, 107 deletions(-)
 delete mode 100644 src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs

(limited to 'src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs')

diff --git a/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs b/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
deleted file mode 100644
index e9e71b99..00000000
--- a/src/Ryujinx.Ava/Input/AvaloniaKeyboardDriver.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using Avalonia.Controls;
-using Avalonia.Input;
-using Ryujinx.Ava.Common.Locale;
-using Ryujinx.Input;
-using System;
-using System.Collections.Generic;
-using AvaKey = Avalonia.Input.Key;
-using Key = Ryujinx.Input.Key;
-
-namespace Ryujinx.Ava.Input
-{
-    internal class AvaloniaKeyboardDriver : IGamepadDriver
-    {
-        private static readonly string[] _keyboardIdentifers = new string[1] { "0" };
-        private readonly Control _control;
-        private readonly HashSet<AvaKey> _pressedKeys;
-
-        public event EventHandler<KeyEventArgs> KeyPressed;
-        public event EventHandler<KeyEventArgs> KeyRelease;
-        public event EventHandler<string> TextInput;
-
-        public string DriverName => "AvaloniaKeyboardDriver";
-        public ReadOnlySpan<string> GamepadsIds => _keyboardIdentifers;
-
-        public AvaloniaKeyboardDriver(Control control)
-        {
-            _control = control;
-            _pressedKeys = new HashSet<AvaKey>();
-
-            _control.KeyDown += OnKeyPress;
-            _control.KeyUp += OnKeyRelease;
-            _control.TextInput += Control_TextInput;
-        }
-
-        private void Control_TextInput(object sender, TextInputEventArgs e)
-        {
-            TextInput?.Invoke(this, e.Text);
-        }
-
-        public event Action<string> OnGamepadConnected
-        {
-            add { }
-            remove { }
-        }
-
-        public event Action<string> OnGamepadDisconnected
-        {
-            add { }
-            remove { }
-        }
-
-        public IGamepad GetGamepad(string id)
-        {
-            if (!_keyboardIdentifers[0].Equals(id))
-            {
-                return null;
-            }
-
-            return new AvaloniaKeyboard(this, _keyboardIdentifers[0], LocaleManager.Instance[LocaleKeys.AllKeyboards]);
-        }
-
-        protected virtual void Dispose(bool disposing)
-        {
-            if (disposing)
-            {
-                _control.KeyUp -= OnKeyPress;
-                _control.KeyDown -= OnKeyRelease;
-            }
-        }
-
-        protected void OnKeyPress(object sender, KeyEventArgs args)
-        {
-            _pressedKeys.Add(args.Key);
-
-            KeyPressed?.Invoke(this, args);
-        }
-
-        protected void OnKeyRelease(object sender, KeyEventArgs args)
-        {
-            _pressedKeys.Remove(args.Key);
-
-            KeyRelease?.Invoke(this, args);
-        }
-
-        internal bool IsPressed(Key key)
-        {
-            if (key == Key.Unbound || key == Key.Unknown)
-            {
-                return false;
-            }
-
-            AvaloniaKeyboardMappingHelper.TryGetAvaKey(key, out var nativeKey);
-
-            return _pressedKeys.Contains(nativeKey);
-        }
-
-        public void ResetKeys()
-        {
-            _pressedKeys.Clear();
-        }
-
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-    }
-}
-- 
cgit v1.2.3