Skip to content

Commit ab1a59c

Browse files
RealMeddsamRealMeddsam
committed
IT FINALLY COMPILES, NO MORE ERRORS
1 parent 5168600 commit ab1a59c

31 files changed

Lines changed: 363 additions & 729 deletions

‎Froststrap.AvaloniaUI/App.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<!-- Fonts -->
2121
<FontFamily x:Key="Rubik">
22-
avares://Bloxstrap/Assets/Fonts/Rubik-Light.ttf#Rubik
22+
avares://Froststrap/Resources/Fonts/Rubik-VariableFont_wght.ttf#Rubik
2323
</FontFamily>
2424

2525
<!-- Accent brushes -->
@@ -41,4 +41,4 @@
4141
<converters:NumberAbbreviationConverter x:Key="NumberAbbreviationConverter" />
4242
</ResourceDictionary>
4343
</Application.Resources>
44-
</Application>
44+
</Application>

‎Froststrap.AvaloniaUI/Installer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.Windows;
33
using System.Xml.Linq;
44
using Froststrap.AppData;
5-
using Froststrap.AvaloniaUI;
5+
using Froststrap;
66
using Microsoft.Win32;
77

88
namespace Froststrap

‎Froststrap.AvaloniaUI/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Avalonia;
22

3-
namespace Froststrap.AvaloniaUI;
3+
namespace Froststrap;
44

55
sealed class Program
66
{

‎Froststrap.AvaloniaUI/UI/Elements/ContextMenu/GameInformation.axaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<StackPanel Spacing="10">
3131

3232
<StackPanel IsVisible="{Binding HasError}" HorizontalAlignment="Center" Margin="0,20" Spacing="10">
33-
<ui:SymbolIcon Symbol="ErrorCircle24" FontSize="48" Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
33+
<ui:SymbolIcon Symbol="WifiWarning" FontSize="48" Foreground="{DynamicResource SystemFillColorCriticalBrush}" />
3434
<TextBlock Text="{Binding ErrorMessage}" TextWrapping="Wrap" TextAlignment="Center" Foreground="{DynamicResource TextFillColorSecondaryBrush}"/>
3535
<Button Content="Retry" Command="{Binding RefreshInformationCommand}" HorizontalAlignment="Center" />
3636
</StackPanel>
@@ -71,7 +71,7 @@
7171
</StackPanel>
7272

7373
<StackPanel HorizontalAlignment="Center" Spacing="2">
74-
<ui:SymbolIcon Symbol="Eye24" Foreground="{DynamicResource SystemFillColorAttentionBrush}" />
74+
<ui:SymbolIcon Symbol="WifiWarning" Foreground="{DynamicResource SystemFillColorAttentionBrush}" />
7575
<TextBlock Text="{Binding VisitsCount}" FontSize="16" FontWeight="SemiBold" HorizontalAlignment="Center"/>
7676
<TextBlock Text="Visits" FontSize="11" Foreground="{DynamicResource TextFillColorSecondaryBrush}" HorizontalAlignment="Center"/>
7777
</StackPanel>
@@ -115,7 +115,7 @@
115115
<Border Grid.Row="2" Background="{DynamicResource SolidBackgroundFillColorBaseBrush}" BorderThickness="0,1,0,0" BorderBrush="{DynamicResource ControlStrokeColorDefaultBrush}">
116116
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Margin="15" Spacing="12">
117117
<Button Content="Copy Game Link" Command="{Binding CopyGameLinkCommand}" MinWidth="80"/>
118-
<Button Content="Close" Click="CloseButton_Click" MinWidth="80"/>
118+
<Button Content="Close" IsCancel="True" MinWidth="80"/>
119119
</StackPanel>
120120
</Border>
121121
</Grid>

‎Froststrap.AvaloniaUI/UI/Elements/ContextMenu/ServerInformation.axaml.cs‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
using Avalonia;
2-
using Avalonia.Controls;
3-
using Avalonia.Markup.Xaml;
41
using Froststrap.UI.ViewModels.ContextMenu;
52

63
namespace Froststrap.UI.Elements.ContextMenu;

‎Froststrap.AvaloniaUI/UI/Elements/Controls/OptionControl.axaml‎

Lines changed: 37 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,55 @@
11
<UserControl x:Class="Froststrap.UI.Elements.Controls.OptionControl"
22
xmlns="https://github.com/avaloniaui"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:models="clr-namespace:Froststrap.UI.ViewModels"
4+
xmlns:models="clr-namespace:Froststrap.UI.ViewModels"
55
xmlns:ui="clr-namespace:Froststrap.UI.Elements.Controls"
6-
xmlns:icon="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
6+
xmlns:icon="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
77
x:Name="Control">
88

9-
<Border
9+
<Border
1010
Margin="0,8,0,0"
1111
Padding="14"
1212
Background="{DynamicResource CardBackgroundBrush}"
1313
BorderBrush="{DynamicResource CardBorderBrush}"
1414
BorderThickness="1"
1515
CornerRadius="4">
1616

17-
<Grid>
18-
<Grid.ColumnDefinitions>
19-
<ColumnDefinition Width="*" />
20-
<ColumnDefinition Width="Auto" />
21-
</Grid.ColumnDefinitions>
22-
23-
<StackPanel Grid.Column="0">
24-
<StackPanel Orientation="Horizontal">
25-
<TextBlock FontSize="14" Text="{Binding Header, ElementName=Control}" />
26-
27-
<!-- Help link will use emoji for now -->
28-
<TextBlock x:Name="HelpLinkText" Margin="4,0,0,0">
29-
<HyperlinkButton
30-
Command="{x:Static models:GlobalViewModel.OpenWebpageCommand}"
31-
CommandParameter="{Binding HelpLink, ElementName=Control}">
32-
<icon:SymbolIcon Symbol="Help"
33-
Foreground="{DynamicResource SystemAccentColorSecondary}">
34-
<TextBlock.Styles>
35-
<Style Selector="TextBlock:pointerover">
36-
<Setter Property="Foreground" Value="{DynamicResource SystemAccentColorTertiary}" />
37-
</Style>
38-
</TextBlock.Styles>
39-
</icon:SymbolIcon>
40-
</HyperlinkButton>
41-
42-
<TextBlock.Styles>
43-
<Style Selector="#HelpLinkText">
44-
<Style.Triggers>
45-
<DataTrigger Binding="{Binding HelpLink, ElementName=Control}" Value="{x:Null}">
46-
<Setter Property="IsVisible" Value="False" />
47-
</DataTrigger>
48-
</Style.Triggers>
49-
</Style>
50-
</TextBlock.Styles>
51-
</TextBlock>
52-
</StackPanel>
53-
54-
<ui:MarkdownTextBlock x:Name="MarkdownText"
55-
Margin="0,2,0,0"
56-
FontSize="12"
57-
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
58-
MarkdownText="{Binding Description, ElementName=Control}"
59-
TextWrapping="Wrap">
60-
61-
<ui:MarkdownTextBlock.Styles>
62-
<Style Selector="#MarkdownText">
63-
<Style.Triggers>
64-
<DataTrigger Binding="{Binding Description, ElementName=Control}" Value="{x:Null}">
65-
<Setter Property="IsVisible" Value="False" />
66-
</DataTrigger>
67-
</Style.Triggers>
68-
</Style>
69-
</ui:MarkdownTextBlock.Styles>
70-
</ui:MarkdownTextBlock>
71-
</StackPanel>
72-
73-
<ContentPresenter
17+
<Grid>
18+
<Grid.ColumnDefinitions>
19+
<ColumnDefinition Width="*" />
20+
<ColumnDefinition Width="Auto" />
21+
</Grid.ColumnDefinitions>
22+
23+
<StackPanel Grid.Column="0">
24+
<StackPanel Orientation="Horizontal">
25+
<TextBlock FontSize="14" Text="{Binding Header, ElementName=Control}" />
26+
27+
<TextBlock x:Name="HelpLinkText" Margin="4,0,0,0"
28+
IsVisible="{Binding HelpLink, ElementName=Control, Converter={x:Static ObjectConverters.IsNotNull}}">
29+
<HyperlinkButton
30+
Command="{x:Static models:GlobalViewModel.OpenWebpageCommand}"
31+
CommandParameter="{Binding HelpLink, ElementName=Control}">
32+
<icon:SymbolIcon Symbol="Help" Foreground="{DynamicResource SystemAccentColorSecondary}"/>
33+
</HyperlinkButton>
34+
</TextBlock>
35+
</StackPanel>
36+
37+
<ui:MarkdownTextBlock x:Name="MarkdownText"
38+
Margin="0,2,0,0"
39+
FontSize="12"
40+
Foreground="{DynamicResource TextFillColorTertiaryBrush}"
41+
MarkdownText="{Binding Description, ElementName=Control}"
42+
TextWrapping="Wrap"
43+
IsVisible="{Binding Description, ElementName=Control, Converter={x:Static ObjectConverters.IsNotNull}}"/>
44+
</StackPanel>
45+
46+
<ContentPresenter
7447
Grid.Column="1"
7548
Margin="1,0,0,0"
7649
HorizontalAlignment="Right"
7750
VerticalAlignment="Center"
78-
Content="{Binding InnerContent, ElementName=Control}" />
79-
</Grid>
80-
</Border>
51+
Content="{Binding InnerContent, ElementName=Control}"
52+
IsVisible="{Binding InnerContent, ElementName=Control, Converter={x:Static ObjectConverters.IsNotNull}}"/>
53+
</Grid>
54+
</Border>
8155
</UserControl>

‎Froststrap.AvaloniaUI/UI/Elements/Dialogs/AddCustomThemeDialog.axaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@
1212
x:DataType="vm:AddCustomThemeViewModel"
1313
Title="Add Custom Theme"
1414
Width="480"
15-
d:DataContext="{d:DesignInstance viewmodels:AddCustomThemeViewModel, IsDesignTimeCreatable=True}"
1615
Background="{DynamicResource ApplicationPageBackgroundThemeBrush}"
17-
ExtendsContentIntoTitleBar="True"
1816
CanResize="False"
1917
SizeToContent="Height"
2018
WindowStartupLocation="CenterScreen"
@@ -72,7 +70,7 @@
7270
<Button HorizontalAlignment="Stretch"
7371
Click="OnImportButtonClicked">
7472
<StackPanel Orientation="Horizontal" Spacing="8">
75-
<ui:SymbolIcon Symbol="DocumentArrowUp" /> <!-- piece of shit SymbolIcon has basically nothing -->
73+
<ui:SymbolIcon Symbol="Document" /> <!-- piece of shit SymbolIcon has basically nothing -->
7674
<TextBlock Text="{x:Static resources:Strings.Common_ImportFromFile}" />
7775
</StackPanel>
7876
</Button>

‎Froststrap.AvaloniaUI/UI/Elements/Dialogs/AddFastFlagDialog.axaml‎

Lines changed: 21 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -28,118 +28,40 @@
2828
<TabControl x:Name="Tabs" Grid.Row="1" Margin="16">
2929
<TabItem Header="{x:Static resources:Strings.Common_AddSingle}" >
3030
<Border Margin="16" Padding="16" Background="#0AFFFFFF" CornerRadius="12">
31-
<Grid>
32-
<Grid.RowDefinitions>
33-
<RowDefinition Height="Auto"/>
34-
<RowDefinition Height="Auto"/>
35-
</Grid.RowDefinitions>
31+
<Grid Grid.Row="1" Grid.RowDefinitions="Auto, Auto" Grid.ColumnDefinitions="Auto, *">
32+
<TextBlock Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" MinWidth="100" Text="{x:Static resources:Strings.Common_Name}" Margin="0,0,0,12" />
33+
<TextBox Grid.Row="0" Grid.Column="1" Name="FlagNameTextBox" Margin="0,0,0,12" />
3634

37-
<StackPanel Grid.Row="0" Orientation="Horizontal" Margin="0,0,0,12" VerticalAlignment="Center">
38-
<TextBlock Text="{x:Static resources:Strings.Common_Name}" FontWeight="SemiBold" Width="120" VerticalAlignment="Center"/>
39-
<TextBox x:Name="FlagNameTextBox" Width="220"/>
40-
</StackPanel>
41-
42-
<StackPanel Grid.Row="1" Orientation="Horizontal" Margin="0,0,0,12" VerticalAlignment="Center">
43-
<TextBlock Text="{x:Static resources:Strings.Common_Value}" FontWeight="SemiBold" Width="120" VerticalAlignment="Center"/>
44-
45-
<ComboBox x:Name="FlagValueComboBox" Width="220" IsEditable="True" IsTextSearchEnabled="False" StaysOpenOnEdit="True" ItemsSource="{Binding CommonValuesView.View}" SelectedValueBinding="{Binding Value}" Loaded="FlagValueComboBox_Loaded" >
46-
<ComboBox.ItemTemplate>
47-
<DataTemplate>
48-
<StackPanel Orientation="Horizontal" Margin="2">
49-
<TextBlock Text="{Binding Value}" Width="160"/>
50-
<TextBlock Text="{Binding Group}" Foreground="Gray" FontSize="10" VerticalAlignment="Center"/>
51-
</StackPanel>
52-
</DataTemplate>
53-
</ComboBox.ItemTemplate>
54-
55-
<ComboBox.Resources>
56-
<Style TargetType="{x:Type GroupItem}">
57-
<Setter Property="Template">
58-
<Setter.Value>
59-
<ControlTemplate TargetType="{x:Type GroupItem}">
60-
<StackPanel>
61-
<TextBlock Text="{Binding Name}" FontWeight="Bold" Margin="4,6,0,2" Foreground="SlateGray" FontSize="12" />
62-
<ItemsPresenter/>
63-
</StackPanel>
64-
</ControlTemplate>
65-
</Setter.Value>
66-
</Setter>
67-
</Style>
68-
</ComboBox.Resources>
69-
</ComboBox>
70-
</StackPanel>
71-
</Grid>
35+
<TextBlock Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" MinWidth="100" Text="{x:Static resources:Strings.Common_Value}" />
36+
<TextBox Grid.Row="1" Grid.Column="1" Name="FlagValueTextBox" />
37+
</Grid>
7238
</Border>
7339
</TabItem>
7440

7541
<TabItem Header="{x:Static resources:Strings.Common_ImportJson}" >
7642
<Border Margin="16" Padding="16" Background="#0AFFFFFF" CornerRadius="12">
77-
<Grid>
78-
<Grid.RowDefinitions>
79-
<RowDefinition Height="*" />
80-
<RowDefinition Height="Auto" />
81-
</Grid.RowDefinitions>
43+
<Grid Grid.RowDefinitions="*, *">
8244
<TextBox Grid.Row="0" x:Name="JsonTextBox" Margin="5" AcceptsTab="True" AcceptsReturn="True" MinHeight="80" MaxHeight="480" />
83-
<TextBlock Grid.Row="0" IsHitTestVisible="False" Margin="18,14,0,0" Foreground="DarkGray" Text="{}{&#10; &quot;FFlagDebugDisplayFPS&quot;: &quot;True&quot;&#10;}">
84-
<TextBlock.Style>
85-
<Style TargetType="{x:Type TextBlock}">
86-
<Setter Property="IsVisible" Value="False"/>
87-
<Style.Triggers>
88-
<DataTrigger Binding="{Binding Text, ElementName=JsonTextBox}" Value="">
89-
<Setter Property="IsVisible" Value="True"/>
90-
</DataTrigger>
91-
</Style.Triggers>
92-
</Style>
93-
</TextBlock.Style>
94-
</TextBlock>
95-
<ui:Button Grid.Row="1" Margin="4,12,4,0" Icon="DocumentArrowUp16" Content="{x:Static resources:Strings.Common_ImportFromFile}" HorizontalAlignment="Stretch" Click="ImportButton_Click" />
96-
</Grid>
45+
<TextBlock Grid.Row="0"
46+
IsHitTestVisible="False"
47+
Margin="18,14,0,0"
48+
Foreground="DarkGray"
49+
Text="{}{&#10; &quot;FFlagDebugDisplayFPS&quot;: &quot;True&quot;&#10;}"
50+
IsVisible="{Binding #JsonTextBox.Text, Converter={x:Static StringConverters.IsNullOrEmpty}}"/>
51+
<Button Grid.Row="1" Margin="4" HorizontalAlignment="Stretch" Click="ImportButton_Click">
52+
<StackPanel Orientation="Horizontal" Spacing="8">
53+
<ui:SymbolIcon Symbol="Document" />
54+
<TextBlock Text="{x:Static resources:Strings.Common_ImportFromFile}" />
55+
</StackPanel>
56+
</Button>
57+
</Grid>
9758
</Border>
9859
</TabItem>
9960
</TabControl>
10061

10162
<Border Grid.Row="2" Margin="0,10,0,0" Padding="15" Background="{DynamicResource PrimaryBackgroundColor}">
10263
<StackPanel Orientation="Horizontal" FlowDirection="LeftToRight" HorizontalAlignment="Right">
103-
<Button MinWidth="100" Content="{x:Static resources:Strings.Common_OK}" Click="OKButton_Click" >
104-
<Button.Style>
105-
<Style TargetType="Button" BasedOn="{StaticResource {x:Type Button}}">
106-
<Style.Triggers>
107-
<MultiDataTrigger>
108-
<MultiDataTrigger.Conditions>
109-
<Condition Binding="{Binding ElementName=Tabs, Path=SelectedIndex}" Value="0" />
110-
<Condition Binding="{Binding ElementName=FlagNameTextBox, Path=Text.Length, Converter={StaticResource ValidationConverter}}" Value="True" />
111-
</MultiDataTrigger.Conditions>
112-
<Setter Property="IsEnabled" Value="True" />
113-
</MultiDataTrigger>
114-
<MultiDataTrigger>
115-
<MultiDataTrigger.Conditions>
116-
<Condition Binding="{Binding ElementName=Tabs, Path=SelectedIndex}" Value="1" />
117-
<Condition Binding="{Binding ElementName=JsonTextBox, Path=Text.Length, Converter={StaticResource ValidationConverter}}" Value="True" />
118-
</MultiDataTrigger.Conditions>
119-
<Setter Property="IsEnabled" Value="True" />
120-
</MultiDataTrigger>
121-
<MultiDataTrigger>
122-
<MultiDataTrigger.Conditions>
123-
<Condition Binding="{Binding ElementName=Tabs, Path=SelectedIndex}" Value="2" />
124-
<Condition Binding="{Binding ElementName=GameFlagNameTextBox, Path=Text.Length, Converter={StaticResource ValidationConverter}}" Value="True" />
125-
<Condition Binding="{Binding ElementName=FlagNameTextBox, Path=Text, Converter={StaticResource ValidationConverter}}" Value="True" />
126-
<Condition Binding="{Binding ElementName=GameFlagIdTextBox, Path=Text.Length, Converter={StaticResource ValidationConverter}}" Value="True" />
127-
</MultiDataTrigger.Conditions>
128-
<Setter Property="IsEnabled" Value="True" />
129-
</MultiDataTrigger>
130-
<MultiDataTrigger>
131-
<MultiDataTrigger.Conditions>
132-
<Condition Binding="{Binding ElementName=Tabs, Path=SelectedIndex}" Value="3" />
133-
<Condition Binding="{Binding ElementName=GameIdJsonTextBox, Path=Text.Length, Converter={StaticResource ValidationConverter}}" Value="True" />
134-
<Condition Binding="{Binding ElementName=ImportGameIdTextBox, Path=Text.Length, Converter={StaticResource ValidationConverter}}" Value="True" />
135-
</MultiDataTrigger.Conditions>
136-
<Setter Property="IsEnabled" Value="True" />
137-
</MultiDataTrigger>
138-
</Style.Triggers>
139-
<Setter Property="IsEnabled" Value="False" />
140-
</Style>
141-
</Button.Style>
142-
</Button>
64+
<Button MinWidth="100" Content="{x:Static resources:Strings.Common_OK}" Click="OKButton_Click" IsEnabled="False"/>
14365
<Button MinWidth="100" Margin="12,0,0,0" Content="{x:Static resources:Strings.Common_Cancel}" IsCancel="True" />
14466
</StackPanel>
14567
</Border>

0 commit comments

Comments
 (0)