From 477408fff697e917b82d018879de969a20f5d6fb Mon Sep 17 00:00:00 2001
From: NotNite <hi@notnite.com>
Date: Mon, 16 Jan 2023 18:50:21 -0500
Subject: [PATCH] 'yea i think thats what we want' - blems

---
 src/XIVLauncher2/Views/LauncherView.axaml    | 64 ++++++++++++++++++++
 src/XIVLauncher2/Views/LauncherView.axaml.cs | 18 ++++++
 src/XIVLauncher2/Views/MainWindow.axaml      | 59 +-----------------
 3 files changed, 85 insertions(+), 56 deletions(-)
 create mode 100644 src/XIVLauncher2/Views/LauncherView.axaml
 create mode 100644 src/XIVLauncher2/Views/LauncherView.axaml.cs

diff --git a/src/XIVLauncher2/Views/LauncherView.axaml b/src/XIVLauncher2/Views/LauncherView.axaml
new file mode 100644
index 0000000..38c2084
--- /dev/null
+++ b/src/XIVLauncher2/Views/LauncherView.axaml
@@ -0,0 +1,64 @@
+<UserControl 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:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="XIVLauncher2.Views.LauncherView">
+    <Grid VerticalAlignment="Center" HorizontalAlignment="Center" ColumnDefinitions="Auto, Auto">
+
+        <!--- News and Links -->
+        <StackPanel Grid.Column="0">
+            <!-- News Images -->
+            <Image Source="/Assets/placeholder-news.png" Stretch="UniformToFill" Width="640" Height="250" />
+
+            <!-- News Links -->
+            <Border Background="#282828" CornerRadius="5" Margin="0,20,0,0">
+                <ListBox MaxHeight="150" VirtualizationMode="None">
+                    <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
+                    <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
+                </ListBox>
+            </Border>
+        </StackPanel>
+
+        <!-- Login -->
+        <Border
+            Background="#282828"
+            CornerRadius="5"
+            Margin="20,0,0,0"
+            Padding="10"
+            Grid.Column="1">
+            <StackPanel Width="250" Spacing="10" VerticalAlignment="Center">
+                <!-- Placeholder logo text -->
+                <TextBlock Text="{Binding XIVLauncherText}" FontSize="24" FontWeight="Bold"
+                           HorizontalAlignment="Center" />
+
+                <!-- Text boxes -->
+                <TextBox Watermark="ID"></TextBox>
+                <TextBox Watermark="Password" PasswordChar="*"></TextBox>
+
+                <!-- Checkboxes -->
+                <StackPanel HorizontalAlignment="Center">
+                    <CheckBox>Log in automatically</CheckBox>
+                    <CheckBox>Use one time password</CheckBox>
+                    <CheckBox>Use Steam service account</CheckBox>
+                </StackPanel>
+
+                <!-- Buttons -->
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
+                            Spacing="5">
+                    <Button i:Attached.Icon="fa-play" ToolTip.Tip="Play" Height="40" Width="40" FontSize="20"
+                            Background="#1e88e5" Command="{Binding RunTheThingCommand}" />
+                    <Button i:Attached.Icon="fa-user-group" ToolTip.Tip="Accounts" Height="40" Width="40"
+                            FontSize="20" />
+                    <Button i:Attached.Icon="fa-cog" ToolTip.Tip="Settings" Height="40" Width="40"
+                            FontSize="20" />
+                </StackPanel>
+            </StackPanel>
+        </Border>
+    </Grid>
+</UserControl>
diff --git a/src/XIVLauncher2/Views/LauncherView.axaml.cs b/src/XIVLauncher2/Views/LauncherView.axaml.cs
new file mode 100644
index 0000000..eecef28
--- /dev/null
+++ b/src/XIVLauncher2/Views/LauncherView.axaml.cs
@@ -0,0 +1,18 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
+
+namespace XIVLauncher2.Views;
+
+public partial class LauncherView : UserControl
+{
+    public LauncherView()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
diff --git a/src/XIVLauncher2/Views/MainWindow.axaml b/src/XIVLauncher2/Views/MainWindow.axaml
index d276910..4e37219 100644
--- a/src/XIVLauncher2/Views/MainWindow.axaml
+++ b/src/XIVLauncher2/Views/MainWindow.axaml
@@ -2,8 +2,8 @@
         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:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
         xmlns:vm="using:XIVLauncher2.ViewModels"
+        xmlns:views="clr-namespace:XIVLauncher2.Views"
         mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="500"
         x:Class="XIVLauncher2.MainWindow"
         Title="XIVLauncher2"
@@ -22,62 +22,9 @@
             <ExperimentalAcrylicMaterial BackgroundSource="Digger" TintOpacity="1" TintColor="Black"
                                          MaterialOpacity="0.75" FallbackColor="DarkBlue" />
         </ExperimentalAcrylicBorder.Material>
+        
         <Viewbox>
-            <Grid VerticalAlignment="Center" HorizontalAlignment="Center" ColumnDefinitions="Auto, Auto">
-
-                <!--- News and Links -->
-                <StackPanel Grid.Column="0">
-                    <!-- News Images -->
-                    <Image Source="/Assets/placeholder-news.png" Stretch="UniformToFill" Width="640" Height="250" />
-
-                    <!-- News Links -->
-                    <Border Background="#282828" CornerRadius="5" Margin="0,20,0,0">
-                        <ListBox MaxHeight="150" VirtualizationMode="None">
-                            <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
-                            <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
-                            <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
-                            <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
-                            <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
-                            <TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
-                        </ListBox>
-                    </Border>
-                </StackPanel>
-
-                <!-- Login -->
-                <Border
-                    Background="#282828"
-                    CornerRadius="5"
-                    Margin="20,0,0,0"
-                    Padding="10"
-                    Grid.Column="1">
-                    <StackPanel Width="250" Spacing="10" VerticalAlignment="Center">
-                        <!-- Placeholder logo text -->
-                        <TextBlock Text="{Binding XIVLauncherText}" FontSize="24" FontWeight="Bold" HorizontalAlignment="Center" />
-                        
-                        <!-- Text boxes -->
-                        <TextBox Watermark="ID"></TextBox>
-                        <TextBox Watermark="Password" PasswordChar="*"></TextBox>
-
-                        <!-- Checkboxes -->
-                        <StackPanel HorizontalAlignment="Center">
-                            <CheckBox>Log in automatically</CheckBox>
-                            <CheckBox>Use one time password</CheckBox>
-                            <CheckBox>Use Steam service account</CheckBox>
-                        </StackPanel>
-
-                        <!-- Buttons -->
-                        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
-                                    Spacing="5">
-                            <Button i:Attached.Icon="fa-play" ToolTip.Tip="Play" Height="40" Width="40" FontSize="20"
-                                    Background="#1e88e5" Command="{Binding RunTheThingCommand}" />
-                            <Button i:Attached.Icon="fa-user-group" ToolTip.Tip="Accounts" Height="40" Width="40"
-                                    FontSize="20" />
-                            <Button i:Attached.Icon="fa-cog" ToolTip.Tip="Settings" Height="40" Width="40"
-                                    FontSize="20" />
-                        </StackPanel>
-                    </StackPanel>
-                </Border>
-            </Grid>
+            <views:LauncherView />
         </Viewbox>
     </ExperimentalAcrylicBorder>
 </Window>