From 65a2831a68a0a8d419c1f616e145d2ecfd6a4fd8 Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Sun, 10 Sep 2023 13:44:42 -0400
Subject: [PATCH 1/2] udpate gitignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 0f5eeee..fcddec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -355,3 +355,4 @@ MigrationBackup/
 # Jetbrains IDEs database
 .idea/
 
+project/user/launcher

From c66922e0af50174517b35a0bea42941aed4906d5 Mon Sep 17 00:00:00 2001
From: "waffle.lord" <waffle.lord@hotmail.com>
Date: Sun, 10 Sep 2023 13:45:42 -0400
Subject: [PATCH 2/2] better fit some data

---
 project/Aki.Launcher/Views/LoginView.axaml  | 39 +++++++++++++--------
 project/Aki.Launcher/Views/MainWindow.axaml |  3 +-
 2 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/project/Aki.Launcher/Views/LoginView.axaml b/project/Aki.Launcher/Views/LoginView.axaml
index 52a67da..d211e23 100644
--- a/project/Aki.Launcher/Views/LoginView.axaml
+++ b/project/Aki.Launcher/Views/LoginView.axaml
@@ -24,7 +24,8 @@
 								Command="{Binding $parent[ItemsControl].DataContext.LoginProfileCommand}"
 								CommandParameter="{Binding Username}"
 								>
-							<Grid RowDefinitions="5,AUTO,AUTO,5" ColumnDefinitions="5,AUTO,AUTO,AUTO,*,AUTO,5">
+							<!-- profile info item grid -->
+							<Grid RowDefinitions="5,AUTO,AUTO,12,5" ColumnDefinitions="5,AUTO,AUTO,AUTO,*,5">
 								<Image Source="{Binding SideImage, Converter={StaticResource imageSourceCvt}}" Height="35"
 									   Grid.Row="1" Grid.RowSpan="2" Grid.Column="1" Margin="0 0 5 0"
 								   />
@@ -66,17 +67,19 @@
 									   Foreground="{StaticResource AKI_Brush_DarkGrayBlue}"
 								   />
 
-								<!-- next leve in text -->
-								<Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=next_level_in}"
-									   Grid.Row="1" Grid.Column="4"
-									   HorizontalAlignment="Right"
-									   IsVisible="{Binding HasData}"
-								   />
-
 								<!-- remaining exp -->
-								<Label Content="{Binding RemainingExp, StringFormat={}{0} xp}" Grid.Row="1" Grid.Column="5"
+								<Label Grid.Row="2" Grid.RowSpan="2" Grid.Column="4"
+									   VerticalAlignment="Bottom" HorizontalAlignment="Center"
+									   FontSize="12"
 									   IsVisible="{Binding HasData}"
-								   />
+								   >
+									<Label.Content>
+										<MultiBinding StringFormat="{}{0} {1} xp">
+											<Binding Source="{x:Static helpers:LocalizationProvider.Instance}" Path="next_level_in"/>
+											<Binding Path="RemainingExp"/>
+										</MultiBinding>
+									</Label.Content>
+								</Label>
 
 								<!-- level text-->
 								<Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=level}"
@@ -119,14 +122,20 @@
                />
 
 			<!-- Login button -->
-			<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_or_register}"
-					HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
+			<Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center"
 					Command="{Binding LoginCommand}"
 					IsEnabled="{Binding !IsLoggingIn}"
 					IsDefault="True"
-                />
-			<CheckBox Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_automatically}"
-					  IsChecked="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=UseAutoLogin}"/>
+                >
+				<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_or_register}"
+						   TextWrapping="Wrap"
+						   />
+			</Button>
+			<CheckBox IsChecked="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=UseAutoLogin}">
+				<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=login_automatically}"
+						   TextWrapping="Wrap"
+						   />
+			</CheckBox>
 		</StackPanel>
 	</Grid>
 </UserControl>
diff --git a/project/Aki.Launcher/Views/MainWindow.axaml b/project/Aki.Launcher/Views/MainWindow.axaml
index b593bf3..27d282a 100644
--- a/project/Aki.Launcher/Views/MainWindow.axaml
+++ b/project/Aki.Launcher/Views/MainWindow.axaml
@@ -12,7 +12,8 @@
         x:Class="Aki.Launcher.Views.MainWindow"
         Icon="/Assets/icon.ico"
         Title="Aki.Launcher"
-        Height="450" Width="750"
+        MinHeight="450" MinWidth="800"
+        Height="450" Width="800"
         WindowStartupLocation="CenterScreen"
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaChromeHints="NoChrome"