Avalonia UI - Part 1 (#3270)

* avalonia part 1 * remove vulkan ui backend * move ui common files to ui common project * get name for oading screen from device * rebase. * review 1 * review 1.1 * review * cleanup * addressed review * use cancellation token * review * review * rebased * cancel library loading when closing window * remove star image, use fonticon instead * delete render control frame buffer when game ends. change position of fav star * addressed @Thog review * ensure the right ui is downloaded in updates * fix crash when showing not supported dialog during controller request * add prefix to artifact names * Auto-format Avalonia project * Fix input * Fix build, simplify app disposal * remove nv stutter thread * addressed review * add missing change * maintain window size if new size is zero length * add game, handheld, docked to local * reverse scale main window * Update de_DE.json * Update de_DE.json * Update de_DE.json * Update italian json * Update it_IT.json * let render timer poll with no wait * remove unused code * more unused code * enabled tiered compilation and trimming * check if window event is not closed before signaling * fix atmospher case * locale fix * locale fix * remove explicit tiered compilation declarations * Remove ) it_IT.json * Remove ) de_DE.json * Update it_IT.json * Update pt_BR locale with latest strings * Remove ')' * add more strings to locale * update locale * remove extra slash * remove extra slash * set firmware version to 0 if key's not found * fix * revert timer changes * lock on object instead * Update it_IT.json * remove unused method * add load screen text to locale * drop swap event * Update de_DE.json * Update de_DE.json * do null check when stopping emulator * Update de_DE.json * Create tr_TR.json * Add tr_TR * Add tr_TR + Turkish * Update it_IT.json * Update Ryujinx.Ava/Input/AvaloniaMappingHelper.cs Co-authored-by: Ac_K <[email protected]> * Apply suggestions from code review Co-authored-by: Ac_K <[email protected]> * Apply suggestions from code review Co-authored-by: Ac_K <[email protected]> * addressed review * Update Ryujinx.Ava/Ui/Backend/OpenGl/OpenGlRenderTarget.cs Co-authored-by: gdkchan <[email protected]> * use avalonia's inbuilt renderer on linux * removed whitespace * workaround for queue render crash with vsync off * drop custom backend * format files * fix not closing issue * remove warnings * rebase * update avalonia library * Reposition the Text and Button on About Page * Assign build version * Remove appveyor text Co-authored-by: gdk <[email protected]> Co-authored-by: Niwu34 <[email protected]> Co-authored-by: Antonio Brugnolo <[email protected]> Co-authored-by: aegiff <[email protected]> Co-authored-by: Ac_K <[email protected]> Co-authored-by: MostlyWhat <[email protected]>
TeaqariaWTF · May 15, 2022 · deb99d2 · deb99d2
1 parent 9ba73ff
commit deb99d2
Show file tree

Hide file tree

Showing 161 changed files with 17,178 additions and 854 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -69,6 +69,9 @@ jobs:
       - name: Publish Ryujinx.Headless.SDL2
         run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_sdl2_headless /p:Version="${{ env.RYUJINX_BASE_VERSION }}" /p:DebugType=embedded /p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" /p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx.Headless.SDL2 --self-contained
         if: github.event_name == 'pull_request'
+      - name: Publish Ryujinx.Ava
+        run: dotnet publish -c "${{ matrix.configuration }}" -r "${{ matrix.DOTNET_RUNTIME_IDENTIFIER }}" -o ./publish_ava /p:Version="1.0.0" /p:DebugType=embedded /p:SourceRevisionId="${{ steps.git_short_hash.outputs.result }}" /p:ExtraDefineConstants=DISABLE_UPDATER Ryujinx.Ava
+        if: github.event_name == 'pull_request'
       - name: Upload Ryujinx artifact
         uses: actions/upload-artifact@v2
         with:
@@ -78,6 +81,12 @@ jobs:
       - name: Upload Ryujinx.Headless.SDL2 artifact
         uses: actions/upload-artifact@v2
         with:
-          name: ryujinx-headless-sdl2-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}
+          name: sdl2-ryujinx-headless-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}
           path: publish_sdl2_headless
         if: github.event_name == 'pull_request'
+      - name: Upload Ryujinx.Ava artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: ava-ryujinx-${{ matrix.configuration }}-${{ env.RYUJINX_BASE_VERSION }}+${{ steps.git_short_hash.outputs.result }}-${{ matrix.RELEASE_ZIP_OS_NAME }}
+          path: publish_ava
+        if: github.event_name == 'pull_request'
diff --git a/README.md b/README.md
@@ -132,7 +132,7 @@ This software is licensed under the terms of the <a href="https://github.com/Ryu
 The Ryujinx.Audio project is licensed under the terms of the <a href="https://github.com/Ryujinx/Ryujinx/blob/master/Ryujinx.Audio/LICENSE.txt
 " target="_blank">LGPLv3 license.</a></i><br />
 This project makes use of code authored by the libvpx project, licensed under BSD and the ffmpeg project, licensed under LGPLv3.
-See [LICENSE.txt](LICENSE.txt) and [THIRDPARTY.md](Ryujinx/THIRDPARTY.md) for more details.
+See [LICENSE.txt](LICENSE.txt) and [THIRDPARTY.md](distribution/legal/THIRDPARTY.md) for more details.
 ## Credits
 
 - [LibHac](https://github.com/Thealexbarney/LibHac) is used for our file-system. 

diff --git a/Ryujinx.Ava/App.axaml b/Ryujinx.Ava/App.axaml
@@ -0,0 +1,9 @@
+<Application
+    x:Class="Ryujinx.Ava.App"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:sty="using:FluentAvalonia.Styling"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <Application.Styles>
+        <sty:FluentAvaloniaTheme UseSystemThemeOnWindows="False"/>
+    </Application.Styles>
+</Application>
diff --git a/Ryujinx.Ava/App.axaml.cs b/Ryujinx.Ava/App.axaml.cs
@@ -0,0 +1,126 @@
+using Avalonia;
+using Avalonia.Controls.ApplicationLifetimes;
+using Avalonia.Markup.Xaml;
+using Avalonia.Styling;
+using Avalonia.Threading;
+using FluentAvalonia.Styling;
+using Ryujinx.Ava.Ui.Windows;
+using Ryujinx.Common;
+using Ryujinx.Common.Logging;
+using Ryujinx.Ui.Common.Configuration;
+using System;
+using System.IO;
+
+namespace Ryujinx.Ava
+{
+    public class App : Avalonia.Application
+    {
+        public override void Initialize()
+        {
+            AvaloniaXamlLoader.Load(this);
+        }
+
+        public override void OnFrameworkInitializationCompleted()
+        {
+            if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
+            {
+                desktop.MainWindow = new MainWindow();
+            }
+
+            base.OnFrameworkInitializationCompleted();
+
+            if (Program.PreviewerDetached)
+            {
+                ApplyConfiguredTheme();
+
+                ConfigurationState.Instance.Ui.BaseStyle.Event += ThemeChanged_Event;
+                ConfigurationState.Instance.Ui.CustomThemePath.Event += ThemeChanged_Event;
+                ConfigurationState.Instance.Ui.EnableCustomTheme.Event += CustomThemeChanged_Event;
+            }
+        }
+
+        private void CustomThemeChanged_Event(object sender, ReactiveEventArgs<bool> e)
+        {
+            ApplyConfiguredTheme();
+        }
+
+        private void ShowRestartDialog()
+        {
+            // TODO. Implement Restart Dialog when SettingsWindow is implemented.
+        }
+
+        private void ThemeChanged_Event(object sender, ReactiveEventArgs<string> e)
+        {
+            ApplyConfiguredTheme();
+        }
+
+        private void ApplyConfiguredTheme()
+        {
+            try
+            {
+                string baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
+                string themePath = ConfigurationState.Instance.Ui.CustomThemePath;
+                bool enableCustomTheme = ConfigurationState.Instance.Ui.EnableCustomTheme;
+
+                const string BaseStyleUrl = "avares://Ryujinx.Ava/Assets/Styles/Base{0}.xaml";
+
+                if (string.IsNullOrWhiteSpace(baseStyle))
+                {
+                    ConfigurationState.Instance.Ui.BaseStyle.Value = "Dark";
+
+                    baseStyle = ConfigurationState.Instance.Ui.BaseStyle;
+                }
+
+                var theme = AvaloniaLocator.Current.GetService<FluentAvaloniaTheme>();
+
+                theme.RequestedTheme = baseStyle;
+
+                var currentStyles = this.Styles;
+
+                // Remove all styles except the base style.
+                if (currentStyles.Count > 1)
+                {
+                    currentStyles.RemoveRange(1, currentStyles.Count - 1);
+                }
+
+                IStyle newStyles = null;
+
+                // Load requested style, and fallback to Dark theme if loading failed.
+                try
+                {
+                    newStyles = (Styles)AvaloniaXamlLoader.Load(new Uri(string.Format(BaseStyleUrl, baseStyle), UriKind.Absolute));
+                }
+                catch (XamlLoadException)
+                {
+                    newStyles = (Styles)AvaloniaXamlLoader.Load(new Uri(string.Format(BaseStyleUrl, "Dark"), UriKind.Absolute));
+                }
+
+                currentStyles.Add(newStyles);
+
+                if (enableCustomTheme)
+                {
+                    if (!string.IsNullOrWhiteSpace(themePath))
+                    {
+                        try
+                        {
+                            var themeContent = File.ReadAllText(themePath);
+                            var customStyle = AvaloniaRuntimeXamlLoader.Parse<IStyle>(themeContent);
+
+                            currentStyles.Add(customStyle);
+                        }
+                        catch (Exception ex)
+                        {
+                            Logger.Error?.Print(LogClass.Application, $"Failed to Apply Custom Theme. Error: {ex.Message}");
+                        }
+                    }
+                }
+            }
+            catch (Exception)
+            {
+                Logger.Warning?.Print(LogClass.Application, "Failed to Apply Theme. A restart is needed to apply the selected theme");
+
+                ShowRestartDialog();
+            }
+        }
+    }
+}