Skip to content
This repository was archived by the owner on Feb 16, 2024. It is now read-only.

Commit 477408f

Browse files
NotNiteNotNite
committed
'yea i think thats what we want' - blems
1 parent 18b838d commit 477408f

File tree

3 files changed

+85
-56
lines changed

3 files changed

+85
-56
lines changed

‎src/XIVLauncher2/Views/LauncherView.axaml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<UserControl xmlns="https://github.com/avaloniaui"
2+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
4+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5+
xmlns:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
6+
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
7+
x:Class="XIVLauncher2.Views.LauncherView">
8+
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" ColumnDefinitions="Auto, Auto">
9+
10+
<!--- News and Links -->
11+
<StackPanel Grid.Column="0">
12+
<!-- News Images -->
13+
<Image Source="/Assets/placeholder-news.png" Stretch="UniformToFill" Width="640" Height="250" />
14+
15+
<!-- News Links -->
16+
<Border Background="#282828" CornerRadius="5" Margin="0,20,0,0">
17+
<ListBox MaxHeight="150" VirtualizationMode="None">
18+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
19+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
20+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
21+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
22+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
23+
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
24+
</ListBox>
25+
</Border>
26+
</StackPanel>
27+
28+
<!-- Login -->
29+
<Border
30+
Background="#282828"
31+
CornerRadius="5"
32+
Margin="20,0,0,0"
33+
Padding="10"
34+
Grid.Column="1">
35+
<StackPanel Width="250" Spacing="10" VerticalAlignment="Center">
36+
<!-- Placeholder logo text -->
37+
<TextBlock Text="{Binding XIVLauncherText}" FontSize="24" FontWeight="Bold"
38+
HorizontalAlignment="Center" />
39+
40+
<!-- Text boxes -->
41+
<TextBox Watermark="ID"></TextBox>
42+
<TextBox Watermark="Password" PasswordChar="*"></TextBox>
43+
44+
<!-- Checkboxes -->
45+
<StackPanel HorizontalAlignment="Center">
46+
<CheckBox>Log in automatically</CheckBox>
47+
<CheckBox>Use one time password</CheckBox>
48+
<CheckBox>Use Steam service account</CheckBox>
49+
</StackPanel>
50+
51+
<!-- Buttons -->
52+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
53+
Spacing="5">
54+
<Button i:Attached.Icon="fa-play" ToolTip.Tip="Play" Height="40" Width="40" FontSize="20"
55+
Background="#1e88e5" Command="{Binding RunTheThingCommand}" />
56+
<Button i:Attached.Icon="fa-user-group" ToolTip.Tip="Accounts" Height="40" Width="40"
57+
FontSize="20" />
58+
<Button i:Attached.Icon="fa-cog" ToolTip.Tip="Settings" Height="40" Width="40"
59+
FontSize="20" />
60+
</StackPanel>
61+
</StackPanel>
62+
</Border>
63+
</Grid>
64+
</UserControl>

‎src/XIVLauncher2/Views/LauncherView.axaml.cs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using Avalonia;
2+
using Avalonia.Controls;
3+
using Avalonia.Markup.Xaml;
4+
5+
namespace XIVLauncher2.Views;
6+
7+
public partial class LauncherView : UserControl
8+
{
9+
public LauncherView()
10+
{
11+
InitializeComponent();
12+
}
13+
14+
private void InitializeComponent()
15+
{
16+
AvaloniaXamlLoader.Load(this);
17+
}
18+
}

‎src/XIVLauncher2/Views/MainWindow.axaml‎

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
5-
xmlns:i="clr-namespace:Projektanker.Icons.Avalonia;assembly=Projektanker.Icons.Avalonia"
65
xmlns:vm="using:XIVLauncher2.ViewModels"
6+
xmlns:views="clr-namespace:XIVLauncher2.Views"
77
mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="500"
88
x:Class="XIVLauncher2.MainWindow"
99
Title="XIVLauncher2"
@@ -22,62 +22,9 @@
2222
<ExperimentalAcrylicMaterial BackgroundSource="Digger" TintOpacity="1" TintColor="Black"
2323
MaterialOpacity="0.75" FallbackColor="DarkBlue" />
2424
</ExperimentalAcrylicBorder.Material>
25+
2526
<Viewbox>
26-
<Grid VerticalAlignment="Center" HorizontalAlignment="Center" ColumnDefinitions="Auto, Auto">
27-
28-
<!--- News and Links -->
29-
<StackPanel Grid.Column="0">
30-
<!-- News Images -->
31-
<Image Source="/Assets/placeholder-news.png" Stretch="UniformToFill" Width="640" Height="250" />
32-
33-
<!-- News Links -->
34-
<Border Background="#282828" CornerRadius="5" Margin="0,20,0,0">
35-
<ListBox MaxHeight="150" VirtualizationMode="None">
36-
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
37-
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
38-
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
39-
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
40-
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
41-
<TextBlock VerticalAlignment="Center" Margin="10,0,0,0">News</TextBlock>
42-
</ListBox>
43-
</Border>
44-
</StackPanel>
45-
46-
<!-- Login -->
47-
<Border
48-
Background="#282828"
49-
CornerRadius="5"
50-
Margin="20,0,0,0"
51-
Padding="10"
52-
Grid.Column="1">
53-
<StackPanel Width="250" Spacing="10" VerticalAlignment="Center">
54-
<!-- Placeholder logo text -->
55-
<TextBlock Text="{Binding XIVLauncherText}" FontSize="24" FontWeight="Bold" HorizontalAlignment="Center" />
56-
57-
<!-- Text boxes -->
58-
<TextBox Watermark="ID"></TextBox>
59-
<TextBox Watermark="Password" PasswordChar="*"></TextBox>
60-
61-
<!-- Checkboxes -->
62-
<StackPanel HorizontalAlignment="Center">
63-
<CheckBox>Log in automatically</CheckBox>
64-
<CheckBox>Use one time password</CheckBox>
65-
<CheckBox>Use Steam service account</CheckBox>
66-
</StackPanel>
67-
68-
<!-- Buttons -->
69-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center"
70-
Spacing="5">
71-
<Button i:Attached.Icon="fa-play" ToolTip.Tip="Play" Height="40" Width="40" FontSize="20"
72-
Background="#1e88e5" Command="{Binding RunTheThingCommand}" />
73-
<Button i:Attached.Icon="fa-user-group" ToolTip.Tip="Accounts" Height="40" Width="40"
74-
FontSize="20" />
75-
<Button i:Attached.Icon="fa-cog" ToolTip.Tip="Settings" Height="40" Width="40"
76-
FontSize="20" />
77-
</StackPanel>
78-
</StackPanel>
79-
</Border>
80-
</Grid>
27+
<views:LauncherView />
8128
</Viewbox>
8229
</ExperimentalAcrylicBorder>
8330
</Window>

0 commit comments

Comments
 (0)