From f037fcba9a5713e68cadbbf8a823913943ac2626 Mon Sep 17 00:00:00 2001
From: Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com>
Date: Sat, 13 Jan 2024 00:41:57 +0000
Subject: Ava UI: Better Controller Applet (#5756)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Start work on better Controller Applet

* Don’t require title

* UI improvements

* Border around TBD area

* Formatting

* Better SVGs

* Add missing margin

* Use Locale

* Rename function

* Make buttons ourselves

* Make the buttons do shit

* Formatting

* Adjust SVGs

* Fix Open Settings Window

* Make field readonly

* Final tweaks

* Update src/Ryujinx.Ava/UI/Applet/AvaHostUiHandler.cs

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Update src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml.cs

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Apply suggestions from code review

Co-authored-by: Ac_K <Acoustik666@gmail.com>

* Update src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml.cs

Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>

* Move icons to Ava project

* Reorder arguments

* Try to focus Settings Window

* Fix icons

Project shenangians

* Add ContentDialogHelper.ShowWindowAsync method

* Fix closed SettingsWindow reference in MainWindow

* Fix SettingsWindow dialog

* Suggestion

---------

Co-authored-by: Ac_K <Acoustik666@gmail.com>
Co-authored-by: TSRBerry <20988865+TSRBerry@users.noreply.github.com>
---
 .../UI/Applet/ControllerAppletDialog.axaml         | 145 +++++++++++++++++++++
 1 file changed, 145 insertions(+)
 create mode 100644 src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml

(limited to 'src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml')

diff --git a/src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml b/src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml
new file mode 100644
index 00000000..b2c22f6b
--- /dev/null
+++ b/src/Ryujinx.Ava/UI/Applet/ControllerAppletDialog.axaml
@@ -0,0 +1,145 @@
+<UserControl
+    x:Class="Ryujinx.Ava.UI.Applet.ControllerAppletDialog"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:applet="using:Ryujinx.Ava.UI.Applet"
+    mc:Ignorable="d"
+    Width="400"
+    Focusable="True"
+    x:DataType="applet:ControllerAppletDialog">
+    <Grid
+        HorizontalAlignment="Stretch"
+        VerticalAlignment="Stretch">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <Border
+            Grid.Column="0"
+            Grid.Row="0"
+            Grid.ColumnSpan="2"
+            Margin="0 0 0 10"
+            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+            BorderThickness="1"
+            CornerRadius="5">
+            <StackPanel
+                Spacing="10"
+                Margin="10">
+                <TextBlock
+                    Text="{locale:Locale ControllerAppletDescription}" />
+                <TextBlock
+                    IsVisible="{Binding IsDocked}"
+                    FontWeight="Bold"
+                    Text="{locale:Locale ControllerAppletDocked}" />
+            </StackPanel>
+        </Border>
+        <Border
+            Grid.Column="0"
+            Grid.Row="1"
+            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+            BorderThickness="1"
+            CornerRadius="5"
+            Margin="0 0 10 0">
+            <StackPanel
+                Margin="10"
+                Spacing="10"
+                Orientation="Vertical">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    TextAlignment="Center"
+                    FontWeight="Bold"
+                    Text="{locale:Locale ControllerAppletControllers}" />
+                <StackPanel
+                    Spacing="10"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    Orientation="Horizontal">
+                    <Image
+                        Height="50"
+                        Width="50"
+                        Stretch="Uniform"
+                        Source="{Binding ProControllerImage}"
+                        IsVisible="{Binding SupportsProController}" />
+                    <Image
+                        Height="50"
+                        Width="50"
+                        Stretch="Uniform"
+                        Source="{Binding JoyconPairImage}"
+                        IsVisible="{Binding SupportsJoyconPair}" />
+                    <Image
+                        Height="50"
+                        Width="50"
+                        Stretch="Uniform"
+                        Source="{Binding JoyconLeftImage}"
+                        IsVisible="{Binding SupportsLeftJoycon}" />
+                    <Image
+                        Height="50"
+                        Width="50"
+                        Stretch="Uniform"
+                        Source="{Binding JoyconRightImage}"
+                        IsVisible="{Binding SupportsRightJoycon}" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+        <Border
+            Grid.Column="1"
+            Grid.Row="1"
+            BorderBrush="{DynamicResource ThemeControlBorderColor}"
+            BorderThickness="1"
+            CornerRadius="5">
+            <StackPanel
+                Margin="10"
+                Spacing="10"
+                Orientation="Vertical">
+                <TextBlock
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    TextAlignment="Center"
+                    FontWeight="Bold"
+                    Text="{locale:Locale ControllerAppletPlayers}" />
+                <Border Height="50">
+                    <TextBlock
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center"
+                        TextAlignment="Center"
+                        FontSize="40"
+                        FontWeight="Thin"
+                        Text="{Binding PlayerCount}" />
+                </Border>
+            </StackPanel>
+        </Border>
+        <Panel
+            Margin="0 24 0 0"
+            Grid.Column="0"
+            Grid.Row="2"
+            Grid.ColumnSpan="2">
+            <StackPanel
+                Orientation="Horizontal"
+                Spacing="10"
+                HorizontalAlignment="Right">
+                <Button
+                    Name="SaveButton"
+                    MinWidth="90"
+                    Command="{Binding OpenSettingsWindow}">
+                    <TextBlock Text="{locale:Locale DialogOpenSettingsWindowLabel}" />
+                </Button>
+                <Button
+                    Name="CancelButton"
+                    MinWidth="90"
+                    Command="{Binding Close}">
+                    <TextBlock Text="{locale:Locale SettingsButtonClose}" />
+                </Button>
+            </StackPanel>
+        </Panel>
+    </Grid>
+</UserControl>
+
-- 
cgit v1.2.3