spt/launcher
spt/launcher
0
0
Fork 0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-13 03:30:43 -05:00
Code

update all styles

Browse Source 
using dynamic resource dictionary for theme variants
This commit is contained in:
IsWaffle 2024-07-06 20:06:43 -04:00
parent 587b152c36
commit 63f9b02fc4
14 changed files with 232 additions and 203 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
project/SPT.Launcher/App.axaml
View File

@ -14,20 +14,34 @@
</Application.Styles> </Application.Styles>
<Application.Resources> <Application.Resources>
<!-- Colors --> <ResourceDictionary>
<Color x:Key="SPT_DarkGray">#121212</Color> <ResourceDictionary.ThemeDictionaries>
<Color x:Key="SPT_Yellow">#FFC107</Color> <ResourceDictionary x:Key="Light">
<Color x:Key="SPT_White">#FFFFFF</Color> <SolidColorBrush x:Key="AccentBrush">#54a4ff</SolidColorBrush>
<Color x:Key="SPT_Gray">#282828</Color> <SolidColorBrush x:Key="AccentBrush2">#4383cc</SolidColorBrush>
<Color x:Key="SPT_DarkGrayBlue">#323947</Color> <SolidColorBrush x:Key="AccentBrush3">#326299</SolidColorBrush>
<SolidColorBrush x:Key="AltAccentBrush">#b2a58d</SolidColorBrush>
<!-- Brushes --> <SolidColorBrush x:Key="AltAccentBrush2">#7f7564</SolidColorBrush>
<SolidColorBrush x:Key="SPT_Foreground_Light" Color="{StaticResource SPT_White}"/> <SolidColorBrush x:Key="AltAccentBrush3">#4c463b</SolidColorBrush>
<SolidColorBrush x:Key="SPT_Background_Light" Color="{StaticResource SPT_Gray}"/> <SolidColorBrush x:Key="BackgroundBrush">White</SolidColorBrush>
<SolidColorBrush x:Key="SPT_Background_Dark" Color="{StaticResource SPT_DarkGray}"/> <SolidColorBrush x:Key="BackgroundBrush2">#cccccc</SolidColorBrush>
<SolidColorBrush x:Key="SPT_Brush_Yellow" Color="{StaticResource SPT_Yellow}"/> <SolidColorBrush x:Key="AltBackgroundBrush">#cca480</SolidColorBrush>
<SolidColorBrush x:Key="SPT_Brush_DarkGrayBlue" Color="{StaticResource SPT_DarkGrayBlue}"/> <SolidColorBrush x:Key="ForegroundBrush">Black</SolidColorBrush>
<SolidColorBrush x:Key="SPT_Brush_Lighter" Color="Gainsboro"/> </ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<SolidColorBrush x:Key="AccentBrush">#436082</SolidColorBrush>
<SolidColorBrush x:Key="AccentBrush2">#567ca8</SolidColorBrush>
<SolidColorBrush x:Key="AccentBrush3">#6998ce</SolidColorBrush>
<SolidColorBrush x:Key="AltAccentBrush">#6a6357</SolidColorBrush>
<SolidColorBrush x:Key="AltAccentBrush2">#908676</SolidColorBrush>
<SolidColorBrush x:Key="AltAccentBrush3">#b6a995</SolidColorBrush>
<SolidColorBrush x:Key="BackgroundBrush">#181a1b</SolidColorBrush>
<SolidColorBrush x:Key="BackgroundBrush2">#393e41</SolidColorBrush>
<SolidColorBrush x:Key="AltBackgroundBrush">#37332d</SolidColorBrush>
<SolidColorBrush x:Key="ForegroundBrush">White</SolidColorBrush>
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<!-- Path Geometry for re-usable icons --> <!-- Path Geometry for re-usable icons -->
<PathGeometry x:Key="FolderWithPlus" Figures="M20 6h-8l-2-2H4c-1.11 0-1.99.89-1.99 2L2 18c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V8c0-1.11-.89-2-2-2zm-1 8h-3v3h-2v-3h-3v-2h3V9h2v3h3v2z" FillRule="NonZero" <PathGeometry x:Key="FolderWithPlus" Figures="M20 6h-8l-2-2H4c-1.11 0-1.99.89-1.99 2L2 18c0 1.11.89 2 2 2h16c1.11 0 2-.89 2-2V8c0-1.11-.89-2-2-2zm-1 8h-3v3h-2v-3h-3v-2h3V9h2v3h3v2z" FillRule="NonZero"

260
project/SPT.Launcher/Assets/Styles.axaml
View File

@ -3,12 +3,31 @@
xmlns:cc="using:SPT.Launcher.CustomControls" xmlns:cc="using:SPT.Launcher.CustomControls"
> >
<Design.PreviewWith> <Design.PreviewWith>
<StackPanel Spacing="5" Background="{StaticResource SPT_Background_Dark}" Margin="50"> <Grid Background="{DynamicResource BackgroundBrush}">
<Button Content="Blah"/> <StackPanel Spacing="5" Margin="50">
<Label Content="Some label here"/>
<Label Content="Some acc label here" Classes="acc"/>
<Label Content="Some alt label here" Classes="alt"/>
<Label Classes="versionMismatch" Content="invalid version tag" />
<Button Content="button" />
<Button Content="acc button" Classes="acc"/>
<Button Content="alt button" Classes="alt"/>
<Button Content="link button" Classes="link"/>
<Button Classes="profileinfo" Content="profile info button"/>
<ComboBox SelectedIndex="0">
<ComboBoxItem>Item 1</ComboBoxItem>
<ComboBoxItem>Item 2</ComboBoxItem>
<ComboBoxItem>Item 3</ComboBoxItem>
</ComboBox>
<TextBox Text="Some cool text here" Margin="5" /> <TextBox Text="Some cool text here" Margin="5" />
<TextBox Watermark="This is a watermark" Margin="5" /> <TextBox Watermark="This is a watermark" Margin="5" />
<CheckBox Content="This is a checkbox"/> <CheckBox Content="unchecked" />
<CheckBox Content="checked" IsChecked="True"/>
<ProgressBar Value="40" />
<ProgressBar IsIndeterminate="True" />
<ProgressBar Classes="error" />
</StackPanel> </StackPanel>
</Grid>
</Design.PreviewWith> </Design.PreviewWith>
<!-- Add Styles Here --> <!-- Add Styles Here -->
@ -85,43 +104,42 @@
<!-- TitleBar Styles --> <!-- TitleBar Styles -->
<Style Selector="cc|TitleBar"> <Style Selector="cc|TitleBar">
<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
<Setter Property="ButtonForeground" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="ButtonForeground" Value="{DynamicResource AltAccentBrush}"/>
</Style> </Style>
<Style Selector="cc|TitleBar.versiontag"> <Style Selector="cc|TitleBar.versiontag">
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
<Setter Property="BorderThickness" Value="0 0 0 2"/> <Setter Property="BorderThickness" Value="0 0 0 2"/>
</Style> </Style>
<!-- TextBox Styles --> <!-- TextBox Styles -->
<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/TextBox.xaml -->
<Style Selector="TextBox"> <Style Selector="TextBox">
<Setter Property="Background" Value="{StaticResource SPT_Background_Light}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
</Style> </Style>
<Style Selector="TextBox:focus"> <Style Selector="TextBox:focus">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
</Style> </Style>
<Style Selector="TextBox:pointerover"> <Style Selector="TextBox:pointerover">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
</Style> </Style>
<Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement"> <Style Selector="TextBox:pointerover /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="DimGray"/> <Setter Property="BorderBrush" Value="{DynamicResource AltAccentBrush}"/>
</Style> </Style>
<Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark"> <Style Selector="TextBox:pointerover /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
<Setter Property="Foreground" Value="DimGray"/> <Setter Property="Foreground" Value="{DynamicResource AltAccentBrush2}"/>
</Style> </Style>
<Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark"> <Style Selector="TextBox:focus /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
<Setter Property="Foreground" Value="DimGray"/> <Setter Property="Foreground" Value="{DynamicResource AltAccentBrush3}"/>
</Style> </Style>
<Style Selector="TextBox /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark"> <Style Selector="TextBox /template/ TextBlock#PART_Watermark, TextBox:focus /template/ TextBlock#PART_FloatingWatermark">
@ -130,22 +148,21 @@
<Style Selector="TextBox:focus /template/ Border#PART_BorderElement"> <Style Selector="TextBox:focus /template/ Border#PART_BorderElement">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
</Style> </Style>
<!-- Label Styles --> <!-- Label Styles -->
<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Label.xaml -->
<Style Selector="Label"> <Style Selector="Label">
<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
</Style> </Style>
<Style Selector="Label.yellow"> <Style Selector="Label.acc">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="Foreground" Value="{DynamicResource AccentBrush}"/>
</Style> </Style>
<Style Selector="Label.dark"> <Style Selector="Label.alt">
<Setter Property="Foreground" Value="DimGray"/> <Setter Property="Foreground" Value="{DynamicResource AltAccentBrush}"/>
</Style> </Style>
<Style Selector="Label.versionMismatch"> <Style Selector="Label.versionMismatch">
@ -153,10 +170,9 @@
</Style> </Style>
<!-- ProgressBar Styles --> <!-- ProgressBar Styles -->
<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/ProgressBar.xaml -->
<Style Selector="ProgressBar"> <Style Selector="ProgressBar">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="Foreground" Value="{DynamicResource AccentBrush3}"/>
<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
</Style> </Style>
<Style Selector="ProgressBar.error"> <Style Selector="ProgressBar.error">
@ -164,11 +180,9 @@
<Style.Animations> <Style.Animations>
<Animation Duration="0:0:0.5" FillMode="Forward"> <Animation Duration="0:0:0.5" FillMode="Forward">
<KeyFrame Cue="0%"> <KeyFrame Cue="0%">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/>
<Setter Property="Value" Value="0"/> <Setter Property="Value" Value="0"/>
</KeyFrame> </KeyFrame>
<KeyFrame Cue="100%"> <KeyFrame Cue="100%">
<Setter Property="Foreground" Value="Red"/>
<Setter Property="Value" Value="100"/> <Setter Property="Value" Value="100"/>
</KeyFrame> </KeyFrame>
</Animation> </Animation>
@ -176,16 +190,14 @@
</Style> </Style>
<!-- Seperator Styles --> <!-- Seperator Styles -->
<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Separator.xaml -->
<Style Selector="Separator"> <Style Selector="Separator">
<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
</Style> </Style>
<!-- Button Styles --> <!-- Button Styles -->
<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/Button.xaml -->
<Style Selector="Button"> <Style Selector="Button">
<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
<Setter Property="Foreground" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
</Style> </Style>
<Style Selector="Button:pointerover"> <Style Selector="Button:pointerover">
@ -193,93 +205,120 @@
</Style> </Style>
<Style Selector="Button:pointerover /template/ ContentPresenter"> <Style Selector="Button:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="{StaticResource SPT_Background_Light}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush2}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
</Style> </Style>
<Style Selector="Button:pressed /template/ ContentPresenter"> <Style Selector="Button:pressed /template/ ContentPresenter">
<Setter Property="Background" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
</Style> </Style>
<Style Selector="Button:disabled /template/ ContentPresenter"> <Style Selector="Button:disabled /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
</Style> </Style>
<!-- Button yellow --> <!-- Button acc -->
<Style Selector="Button.yellow"> <Style Selector="Button.acc">
<Setter Property="Background" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="Background" Value="{DynamicResource AccentBrush2}"/>
<Setter Property="Foreground" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
</Style> </Style>
<Style Selector="Button.yellow:pointerover"> <Style Selector="Button.acc:pointerover">
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
</Style> </Style>
<Style Selector="Button.yellow:pointerover /template/ ContentPresenter"> <Style Selector="Button.acc:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="Gold"/> <Setter Property="Background" Value="{DynamicResource AccentBrush3}"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
<Setter Property="BorderThickness" Value="1"/> <Setter Property="BorderThickness" Value="1"/>
</Style> </Style>
<Style Selector="Button.yellow:pressed /template/ ContentPresenter"> <Style Selector="Button.acc:pressed /template/ ContentPresenter">
<Setter Property="Background" Value="{StaticResource SPT_Brush_Lighter}"/> <Setter Property="Background" Value="{DynamicResource AccentBrush}"/>
</Style> </Style>
<Style Selector="Button.yellow:disabled /template/ ContentPresenter"> <Style Selector="Button.acc:disabled /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
</Style>
<!-- Button alt -->
<Style Selector="Button.alt">
<Setter Property="Background" Value="{DynamicResource AltAccentBrush2}"/>
<Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
<Setter Property="FontWeight" Value="SemiBold"/>
</Style>
<Style Selector="Button.alt:pointerover">
<Setter Property="FontWeight" Value="SemiBold"/>
</Style>
<Style Selector="Button.alt:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="{DynamicResource AltAccentBrush3}"/>
<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
<Setter Property="BorderThickness" Value="1"/>
</Style>
<Style Selector="Button.alt:pressed /template/ ContentPresenter">
<Setter Property="Background" Value="{DynamicResource AltAccentBrush}"/>
</Style>
<Style Selector="Button.alt:disabled /template/ ContentPresenter">
<Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
</Style> </Style>
<!-- Button Link Style --> <!-- Button Link Style -->
<Style Selector="Button.link"> <Style Selector="Button.link">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/> <Setter Property="TextBlock.TextDecorations" Value="Underline"/>
<Setter Property="Foreground" Value="{DynamicResource AltAccentBrush3}"/>
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/> <Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
</Style> </Style>
<Style Selector="Button.link:pointerover /template/ ContentPresenter"> <Style Selector="Button.link:pointerover /template/ ContentPresenter">
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentBrush3}"/>
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/> <Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
</Style> </Style>
<Style Selector="Button.link:pressed /template/ ContentPresenter"> <Style Selector="Button.link:pressed /template/ ContentPresenter">
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentBrush}"/>
<Setter Property="Background" Value="Transparent"/> <Setter Property="Background" Value="Transparent"/>
<Setter Property="BorderBrush" Value="Transparent"/> <Setter Property="BorderBrush" Value="Transparent"/>
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
</Style> </Style>
<!-- Button Bordered Link Style --> <!-- Button Bordered Link Style -->
<Style Selector="Button.borderedlink"> <!-- <Style Selector="Button.borderedlink"> -->
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Lighter}"/> <!-- <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/> -->
<Setter Property="Background" Value="Transparent"/> <!-- <Setter Property="Background" Value="Transparent"/> -->
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Lighter}"/> <!-- <Setter Property="BorderBrush" Value="{DynamicResource ForegroundBrush}"/> -->
<Setter Property="BorderThickness" Value="1"/> <!-- <Setter Property="BorderThickness" Value="1"/> -->
</Style> <!-- </Style> -->
<!-- -->
<Style Selector="Button.borderedlink:pointerover /template/ ContentPresenter"> <!-- <Style Selector="Button.borderedlink:pointerover /template/ ContentPresenter"> -->
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_Yellow}"/> <!-- <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentBrush}"/> -->
<Setter Property="Background" Value="Transparent"/> <!-- <Setter Property="Background" Value="Transparent"/> -->
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/> <!-- <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/> -->
</Style> <!-- </Style> -->
<!-- -->
<Style Selector="Button.borderedlink:pressed /template/ ContentPresenter"> <!-- <Style Selector="Button.borderedlink:pressed /template/ ContentPresenter"> -->
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <!-- <Setter Property="TextBlock.Foreground" Value="{DynamicResource BackgroundBrush2}"/> -->
<Setter Property="Background" Value="Transparent"/> <!-- <Setter Property="Background" Value="Transparent"/> -->
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <!-- <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/> -->
<Setter Property="BorderThickness" Value="0"/> <!-- <Setter Property="BorderThickness" Value="0"/> -->
</Style> <!-- </Style> -->
<!-- Button Profile Info Style --> <!-- Button Profile Info Style -->
<Style Selector="Button.profileinfo"> <Style Selector="Button.profileinfo">
<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush}"/>
</Style> </Style>
<Style Selector="Button.icon"> <Style Selector="Button.icon">
@ -288,47 +327,41 @@
</Style> </Style>
<Style Selector="Button.icon:pointerover"> <Style Selector="Button.icon:pointerover">
<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
</Style> </Style>
<!-- Checkbox styles --> <!-- Checkbox styles -->
<!-- SourceRef: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/CheckBox.xaml -->
<Style Selector="CheckBox"> <Style Selector="CheckBox">
<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
</Style> </Style>
<Style Selector="CheckBox /template/ Border#NormalRectangle"> <Style Selector="CheckBox /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}"/>
</Style> </Style>
<Style Selector="CheckBox:pointerover /template/ Border#NormalRectangle"> <Style Selector="CheckBox:pointerover /template/ Border#NormalRectangle">
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}"/>
</Style>
<Style Selector="CheckBox:pointerover /template/ ContentPresenter#ContentPresenter">
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Foreground_Light}" />
</Style> </Style>
<Style Selector="CheckBox:checked"> <Style Selector="CheckBox:checked">
<Setter Property="FontWeight" Value="SemiBold"/> <Setter Property="FontWeight" Value="SemiBold"/>
<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/> <Setter Property="Foreground" Value="{DynamicResource AccentBrush3}"/>
</Style> </Style>
<Style Selector="CheckBox:checked /template/ Border#NormalRectangle"> <Style Selector="CheckBox:checked /template/ Border#NormalRectangle">
<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush3}"/>
</Style> </Style>
<Style Selector="CheckBox:checked /template/ Path#CheckGlyph"> <Style Selector="CheckBox:checked /template/ Path#CheckGlyph">
<Setter Property="Fill" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="Fill" Value="{DynamicResource AccentBrush3}"/>
</Style> </Style>
<!-- ComboBox Styles --> <!-- ComboBox Styles -->
<!-- Source Ref: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/ComboBox.xaml -->
<Style Selector="ComboBox"> <Style Selector="ComboBox">
<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
<Setter Property="PlaceholderForeground" Value="{StaticResource SPT_Brush_Lighter}"/> <Setter Property="PlaceholderForeground" Value="{DynamicResource ForegroundBrush}"/>
<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/>
<Setter Property="Template"> <Setter Property="Template">
<ControlTemplate> <ControlTemplate>
<DataValidationErrors> <DataValidationErrors>
@ -356,8 +389,8 @@
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
Grid.ColumnSpan="2" Grid.ColumnSpan="2"
Background="{DynamicResource ComboBoxBackgroundUnfocused}" Background="{DynamicResource AltBackgroundBrush}"
BorderBrush="{DynamicResource ComboBoxBackgroundBorderBrushUnfocused}" BorderBrush="{DynamicResource AltAccentBrush2}"
BorderThickness="{TemplateBinding BorderThickness}" BorderThickness="{TemplateBinding BorderThickness}"
CornerRadius="{TemplateBinding CornerRadius}" /> CornerRadius="{TemplateBinding CornerRadius}" />
<TextBlock x:Name="PlaceholderTextBlock" <TextBlock x:Name="PlaceholderTextBlock"
@ -401,7 +434,9 @@
<Panel Height="12" <Panel Height="12"
Width="12" /> Width="12" />
<Path x:Name="DropDownGlyph" <Path x:Name="DropDownGlyph"
VerticalAlignment="Center" /> VerticalAlignment="Center"
Data="M1939 486L2029 576L1024 1581L19 576L109 486L1024 1401L1939 486Z"
/>
</Panel> </Panel>
</Viewbox> </Viewbox>
<Popup Name="PART_Popup" <Popup Name="PART_Popup"
@ -412,8 +447,8 @@
PlacementTarget="Background" PlacementTarget="Background"
IsLightDismissEnabled="True"> IsLightDismissEnabled="True">
<Border x:Name="PopupBorder" <Border x:Name="PopupBorder"
Background="{StaticResource SPT_Background_Dark}" Background="{DynamicResource BackgroundBrush2}"
BorderBrush="{StaticResource SPT_Background_Dark}" BorderBrush="{DynamicResource BackgroundBrush2}"
BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}" BorderThickness="{DynamicResource ComboBoxDropdownBorderThickness}"
Margin="0,-1,0,-1" Margin="0,-1,0,-1"
Padding="{DynamicResource ComboBoxDropdownBorderPadding}" Padding="{DynamicResource ComboBoxDropdownBorderPadding}"
@ -435,47 +470,32 @@
</Style> </Style>
<Style Selector="ComboBox /template/ Path#DropDownGlyph"> <Style Selector="ComboBox /template/ Path#DropDownGlyph">
<Setter Property="Fill" Value="{StaticResource SPT_Foreground_Light}" /> <Setter Property="Fill" Value="{DynamicResource ForegroundBrush}" />
</Style> </Style>
<Style Selector="ComboBox:pointerover /template/ Path#DropDownGlyph"> <Style Selector="ComboBox:pointerover /template/ Path#DropDownGlyph">
<Setter Property="Fill" Value="{StaticResource SPT_Brush_Yellow}" /> <Setter Property="Fill" Value="{DynamicResource AccentBrush3}" />
</Style> </Style>
<Style Selector="ComboBox:pointerover"> <Style Selector="ComboBox:pointerover">
<Setter Property="Foreground" Value="{StaticResource SPT_Brush_Yellow}"/> <Setter Property="Foreground" Value="{DynamicResource AccentBrush3}"/>
</Style>
<Style Selector="ComboBox:pointerover /template/ Border#Background">
<Setter Property="Background" Value="Black"/>
<Setter Property="BorderBrush" Value="Black" />
</Style>
<Style Selector="ComboBox /template/ Border#PopupBorder">
<Setter Property="Background" Value="Black"/>
<Setter Property="BorderBrush" Value="Black"/>
</Style> </Style>
<!-- ComboBoxItem Styles --> <!-- ComboBoxItem Styles -->
<!-- Source Ref: https://github.com/AvaloniaUI/Avalonia/blob/master/src/Avalonia.Themes.Fluent/Controls/ComboBoxItem.xaml-->
<Style Selector="ComboBoxItem /template/ ContentPresenter">
<Setter Property="Background" Value="Black"/>
</Style>
<Style Selector="ComboBoxItem"> <Style Selector="ComboBoxItem">
<Setter Property="Foreground" Value="{StaticResource SPT_Foreground_Light}"/> <Setter Property="Foreground" Value="{DynamicResource ForegroundBrush}"/>
<Setter Property="Background" Value="{StaticResource SPT_Background_Dark}"/> <Setter Property="Background" Value="{DynamicResource BackgroundBrush2}"/>
</Style> </Style>
<Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter"> <Style Selector="ComboBoxItem:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="{StaticResource SPT_Background_Light}" /> <Setter Property="Background" Value="{DynamicResource AltAccentBrush}" />
<Setter Property="BorderBrush" Value="{StaticResource SPT_Background_Light}" /> <Setter Property="BorderBrush" Value="{DynamicResource BackgroundBrush2}" />
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Foreground_Light}" /> <Setter Property="TextBlock.Foreground" Value="{DynamicResource ForegroundBrush}" />
</Style> </Style>
<Style Selector="ComboBoxItem:selected /template/ ContentPresenter"> <Style Selector="ComboBoxItem:selected /template/ ContentPresenter">
<Setter Property="Background" Value="{StaticResource SPT_Brush_Yellow}" /> <Setter Property="Background" Value="{DynamicResource AccentBrush}" />
<Setter Property="BorderBrush" Value="{StaticResource SPT_Brush_Yellow}" /> <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
<Setter Property="TextBlock.Foreground" Value="{StaticResource SPT_Background_Dark}" /> <Setter Property="TextBlock.Foreground" Value="{DynamicResource ForegroundBrush}" />
</Style> </Style>
</Styles> </Styles>

10
project/SPT.Launcher/CustomControls/ModInfoCard.axaml
View File

@ -6,11 +6,11 @@
xmlns:helpers="using:SPT.Launcher.Helpers" xmlns:helpers="using:SPT.Launcher.Helpers"
x:Class="SPT.Launcher.CustomControls.ModInfoCard"> x:Class="SPT.Launcher.CustomControls.ModInfoCard">
<Border CornerRadius="5" HorizontalAlignment="Stretch" <Border CornerRadius="5" HorizontalAlignment="Stretch"
BorderBrush="{StaticResource SPT_Background_Dark}" BorderBrush="{DynamicResource BackgroundBrush}"
BorderThickness="5" BorderThickness="5"
> >
<Grid RowDefinitions="10,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,AUTO,10" <Grid RowDefinitions="10,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,AUTO,10"
Background="{StaticResource SPT_Background_Dark}" Background="{DynamicResource BackgroundBrush}"
> >
<!-- Icon stack --> <!-- Icon stack -->
@ -19,12 +19,12 @@
Orientation="Horizontal" Spacing="5" Orientation="Horizontal" Spacing="5"
> >
<!-- Server Icon --> <!-- Server Icon -->
<Path Data="{StaticResource Server}" Fill="{StaticResource SPT_Brush_DarkGrayBlue}" <Path Data="{StaticResource Server}" Fill="DarkSlateGray"
IsVisible="{Binding IsInServer, RelativeSource={RelativeSource AncestorType=UserControl}}" IsVisible="{Binding IsInServer, RelativeSource={RelativeSource AncestorType=UserControl}}"
/> />
<!-- Profile Icon --> <!-- Profile Icon -->
<Path Data="{StaticResource Profile}" Fill="{StaticResource SPT_Brush_DarkGrayBlue}" <Path Data="{StaticResource Profile}" Fill="DarkSlateGray"
IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}" IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}"
/> />
@ -54,7 +54,7 @@
> >
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=open_link}"/> <Label Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=open_link}"/>
<Path Data="{StaticResource Open}" Fill="{StaticResource SPT_Brush_Yellow}" <Path Data="{StaticResource Open}" Fill="{DynamicResource AccentBrush}"
IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}" IsVisible="{Binding IsInProfile, RelativeSource={RelativeSource AncestorType=UserControl}}"
/> />
</StackPanel> </StackPanel>

8
project/SPT.Launcher/CustomControls/TitleBar.axaml
View File

@ -55,12 +55,12 @@
> >
<Button.Styles> <Button.Styles>
<Style Selector="Button:pointerover /template/ ContentPresenter"> <Style Selector="Button:pointerover /template/ ContentPresenter">
<Setter Property="Background" Value="{StaticResource SPT_Brush_DarkGrayBlue}"/> <Setter Property="Background" Value="DarkSlateGray"/>
<Setter Property="BorderThickness" Value="0"/> <Setter Property="BorderThickness" Value="0"/>
</Style> </Style>
<Style Selector="Button:pressed /template/ ContentPresenter"> <!-- <Style Selector="Button:pressed /template/ ContentPresenter"> -->
<Setter Property="Background" Value="{StaticResource SPT_Background_Light}"/> <!-- <Setter Property="Background" Value="{DynamicResource BackgroundBrush}"/> -->
</Style> <!-- </Style> -->
</Button.Styles> </Button.Styles>
</Button> </Button>

5
project/SPT.Launcher/Views/Dialogs/ChangeEditionDialogView.axaml
View File

@ -7,7 +7,8 @@
xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:s="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SPT.Launcher.Views.Dialogs.ChangeEditionDialogView" x:Class="SPT.Launcher.Views.Dialogs.ChangeEditionDialogView"
Background="{StaticResource SPT_Background_Dark}"> Background="{DynamicResource BackgroundBrush}"
>
<Grid RowDefinitions="10,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,*,AUTO,10"> <Grid RowDefinitions="10,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,*,AUTO,10">
@ -31,7 +32,7 @@
<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=update}" <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=update}"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
CommandParameter="{Binding editions.SelectedEdition}" CommandParameter="{Binding editions.SelectedEdition}"
Classes="yellow" Classes="alt"
/> />
<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=cancel}" <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=cancel}"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"

5
project/SPT.Launcher/Views/Dialogs/ConfirmationDialogView.axaml
View File

@ -6,19 +6,18 @@
xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:s="clr-namespace:System;assembly=mscorlib"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SPT.Launcher.Views.Dialogs.ConfirmationDialogView" x:Class="SPT.Launcher.Views.Dialogs.ConfirmationDialogView"
Background="{StaticResource SPT_Background_Dark}"
MinWidth="300" MinWidth="300"
MinHeight="100" MinHeight="100"
Background="{DynamicResource BackgroundBrush}"
> >
<Grid RowDefinitions="*,AUTO" ColumnDefinitions="*,AUTO" Margin="10"> <Grid RowDefinitions="*,AUTO" ColumnDefinitions="*,AUTO" Margin="10">
<TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15" <TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15"
Foreground="{StaticResource SPT_Foreground_Light}"
/> />
<StackPanel Grid.Row="1" Grid.Column="1" <StackPanel Grid.Row="1" Grid.Column="1"
Orientation="Horizontal" Spacing="10"> Orientation="Horizontal" Spacing="10">
<Button Content="{Binding ConfirmButtonText}" <Button Content="{Binding ConfirmButtonText}"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
Classes="yellow" Classes="alt"
IsEnabled="{Binding AllowConfirm}" IsEnabled="{Binding AllowConfirm}"
> >
<Button.CommandParameter> <Button.CommandParameter>

7
project/SPT.Launcher/Views/Dialogs/RegisterDialogView.axaml
View File

@ -6,7 +6,7 @@
xmlns:helpers="using:SPT.Launcher.Helpers" xmlns:helpers="using:SPT.Launcher.Helpers"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SPT.Launcher.Views.Dialogs.RegisterDialogView" x:Class="SPT.Launcher.Views.Dialogs.RegisterDialogView"
Background="{StaticResource SPT_Background_Dark}" Background="{DynamicResource BackgroundBrush}"
MinWidth="300" MinWidth="300"
MinHeight="100" MinHeight="100"
> >
@ -15,7 +15,6 @@
<!-- Question Text --> <!-- Question Text -->
<TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15" <TextBlock Text="{Binding Question}" Grid.ColumnSpan="2" FontSize="15"
Foreground="{StaticResource SPT_Foreground_Light}"
/> />
<!-- Editions Combo Selection --> <!-- Editions Combo Selection -->
@ -44,11 +43,9 @@
<StackPanel Spacing="10" Margin="10"> <StackPanel Spacing="10" Margin="10">
<TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=description}" <TextBlock Text="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=description}"
FontSize="12" FontSize="12"
Foreground="{StaticResource SPT_Foreground_Light}"
/> />
<TextBlock Text="{Binding Editions.SelectedEdition.Description}" <TextBlock Text="{Binding Editions.SelectedEdition.Description}"
TextWrapping="Wrap" TextWrapping="Wrap"
Foreground="{StaticResource SPT_Foreground_Light}"
/> />
</StackPanel> </StackPanel>
</Border> </Border>
@ -62,7 +59,7 @@
CommandParameter="{Binding Editions.SelectedEdition}" CommandParameter="{Binding Editions.SelectedEdition}"
IsEnabled="{Binding Editions.HasSelection}" IsEnabled="{Binding Editions.HasSelection}"
IsDefault="True" IsDefault="True"
Classes="yellow" Classes="alt"
/> />
<Button Content="{Binding CancelButtonText}" <Button Content="{Binding CancelButtonText}"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"

4
project/SPT.Launcher/Views/Dialogs/WarningDialogView.axaml
View File

@ -6,7 +6,7 @@
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia" xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450" mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SPT.Launcher.Views.Dialogs.WarningDialogView" x:Class="SPT.Launcher.Views.Dialogs.WarningDialogView"
Background="{StaticResource SPT_Background_Dark}" Background="{DynamicResource BackgroundBrush}"
BorderBrush="IndianRed" BorderBrush="IndianRed"
BorderThickness="1" BorderThickness="1"
> >
@ -20,7 +20,7 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}" Command="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType=dialogHost:DialogHost}, Path=CloseDialogCommand}"
Classes="yellow" Classes="alt"
/> />
</Grid> </Grid>
</UserControl> </UserControl>

10
project/SPT.Launcher/Views/LoginView.axaml
View File

@ -57,14 +57,14 @@
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="{StaticResource SPT_Brush_DarkGrayBlue}" Foreground="DarkSlateGray"
IsVisible="{Binding !HasData}" IsVisible="{Binding !HasData}"
/> />
<!-- nickname --> <!-- nickname -->
<Label Content="{Binding Nickname}" Grid.Row="1" Grid.Column="3" <Label Content="{Binding Nickname}" Grid.Row="1" Grid.Column="3"
IsVisible="{Binding HasData}" IsVisible="{Binding HasData}"
Foreground="{StaticResource SPT_Brush_DarkGrayBlue}" Foreground="DarkSlateGray"
/> />
<!-- remaining exp --> <!-- remaining exp -->
@ -107,11 +107,11 @@
<!-- Login Control backdrop --> <!-- Login Control backdrop -->
<Border CornerRadius="5" <Border CornerRadius="5"
Grid.Row="2" Grid.Column="2" Grid.Row="2" Grid.Column="2"
BorderBrush="{StaticResource SPT_Background_Dark}" BorderBrush="{DynamicResource BackgroundBrush}"
BorderThickness="2" BorderThickness="2"
Background="{StaticResource SPT_Background_Dark}" Background="{DynamicResource BackgroundBrush}"
> >
<Rectangle Fill="{StaticResource SPT_Background_Dark}" /> <Rectangle Fill="{DynamicResource BackgroundBrush}" />
</Border> </Border>
<StackPanel Spacing="10" Margin="10" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch"> <StackPanel Spacing="10" Margin="10" Grid.Row="2" Grid.Column="2" HorizontalAlignment="Stretch">

8
project/SPT.Launcher/Views/MainWindow.axaml
View File

@ -18,7 +18,7 @@
ExtendClientAreaToDecorationsHint="True" ExtendClientAreaToDecorationsHint="True"
ExtendClientAreaChromeHints="NoChrome" ExtendClientAreaChromeHints="NoChrome"
ExtendClientAreaTitleBarHeightHint="-1" ExtendClientAreaTitleBarHeightHint="-1"
Background="{StaticResource SPT_Background_Light}"> Background="Gray">
<Window.Resources> <Window.Resources>
<cvt:ImageSourceConverter x:Key="imageSourceCvt"/> <cvt:ImageSourceConverter x:Key="imageSourceCvt"/>
@ -50,7 +50,7 @@
<dialogHost:DialogHost Identifier="mainHost" Grid.Row="1" Grid.RowSpan="2" <dialogHost:DialogHost Identifier="mainHost" Grid.Row="1" Grid.RowSpan="2"
CornerRadius="5" CornerRadius="5"
DialogMargin="0" DialogMargin="0"
OverlayBackground="{StaticResource SPT_Background_Light}" OverlayBackground="Gray"
> >
<rxui:RoutedViewHost Router="{Binding Router}" <rxui:RoutedViewHost Router="{Binding Router}"
/> />
@ -59,8 +59,8 @@
<Label Content="{Binding VersionInfo.Tag}" Grid.Row="1" <Label Content="{Binding VersionInfo.Tag}" Grid.Row="1"
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Top" VerticalAlignment="Top"
Background="{StaticResource SPT_Brush_Yellow}" Background="{DynamicResource AccentBrush}"
Foreground="{StaticResource SPT_Brush_DarkGrayBlue}" Foreground="DarkSlateGray"
FontWeight="SemiBold" FontWeight="SemiBold"
CornerRadius="0 0 5 5" CornerRadius="0 0 5 5"
Margin="10 0" Margin="10 0"

6
project/SPT.Launcher/Views/ModInfoView.axaml
View File

@ -20,7 +20,7 @@
<!-- Active Mods List Header --> <!-- Active Mods List Header -->
<Border Grid.Row="3" Grid.Column="1" <Border Grid.Row="3" Grid.Column="1"
CornerRadius="5" CornerRadius="5"
Background="{StaticResource SPT_Background_Dark}"> Background="{DynamicResource BackgroundBrush}">
<StackPanel Spacing="2" Margin="10"> <StackPanel Spacing="2" Margin="10">
<!-- Active mods count and text --> <!-- Active mods count and text -->
<Label VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"> <Label VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16">
@ -37,7 +37,6 @@
VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="12" FontSize="12"
TextWrapping="Wrap" TextWrapping="Wrap"
Foreground="{StaticResource SPT_Foreground_Light}"
/> />
</StackPanel> </StackPanel>
</Border> </Border>
@ -63,7 +62,7 @@
<!-- Inactive Mods List Header --> <!-- Inactive Mods List Header -->
<Border Grid.Row="3" Grid.Column="3" <Border Grid.Row="3" Grid.Column="3"
CornerRadius="5" CornerRadius="5"
Background="{StaticResource SPT_Background_Dark}"> Background="{DynamicResource BackgroundBrush}">
<StackPanel Spacing="2" Margin="10"> <StackPanel Spacing="2" Margin="10">
<!-- Inactive mods count and text --> <!-- Inactive mods count and text -->
<Label VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16"> <Label VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16">
@ -80,7 +79,6 @@
VerticalAlignment="Center" HorizontalAlignment="Center" VerticalAlignment="Center" HorizontalAlignment="Center"
FontSize="12" FontSize="12"
TextWrapping="Wrap" TextWrapping="Wrap"
Foreground="{StaticResource SPT_Foreground_Light}"
/> />
</StackPanel> </StackPanel>
</Border> </Border>

2
project/SPT.Launcher/Views/Notifications/SPTNotificationView.axaml
View File

@ -6,7 +6,7 @@
x:Class="SPT.Launcher.Views.Notifications.SPTNotificationView" x:Class="SPT.Launcher.Views.Notifications.SPTNotificationView"
> >
<Border Padding="12" MinHeight="20" Background="{StaticResource SPT_Background_Dark}" <Border Padding="12" MinHeight="20" Background="{DynamicResource BackgroundBrush}"
BorderBrush="{Binding BarColor}" BorderBrush="{Binding BarColor}"
BorderThickness="3 0 0 0"> BorderThickness="3 0 0 0">
<Grid> <Grid>

16
project/SPT.Launcher/Views/ProfileView.axaml
View File

@ -15,10 +15,10 @@
<!-- profile info --> <!-- profile info -->
<Border Grid.Row="1" Grid.Column="1" CornerRadius="5" <Border Grid.Row="1" Grid.Column="1" CornerRadius="5"
BorderBrush="{StaticResource SPT_Background_Dark}" BorderBrush="{DynamicResource BackgroundBrush}"
BorderThickness="5"> BorderThickness="5">
<Grid RowDefinitions="10,AUTO,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,10" <Grid RowDefinitions="10,AUTO,AUTO,AUTO,AUTO,10" ColumnDefinitions="10,AUTO,*,10"
Background="{StaticResource SPT_Background_Dark}"> Background="{DynamicResource BackgroundBrush}">
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1"> <StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1">
<Label Content="{Binding CurrentUsername}" Margin="5 0" /> <Label Content="{Binding CurrentUsername}" Margin="5 0" />
@ -69,10 +69,10 @@
<!-- Total Mods Info --> <!-- Total Mods Info -->
<Border Grid.Row="3" Grid.Column="1" CornerRadius="5" <Border Grid.Row="3" Grid.Column="1" CornerRadius="5"
BorderBrush="{StaticResource SPT_Background_Dark}" BorderBrush="{DynamicResource BackgroundBrush}"
BorderThickness="5" IsVisible="{Binding ModInfoCollection.HasMods}"> BorderThickness="5" IsVisible="{Binding ModInfoCollection.HasMods}">
<Grid RowDefinitions="10,AUTO,10" ColumnDefinitions="10,Auto,*,AUTO,10" <Grid RowDefinitions="10,AUTO,10" ColumnDefinitions="10,Auto,*,AUTO,10"
Background="{StaticResource SPT_Background_Dark}"> Background="{DynamicResource BackgroundBrush}">
<!-- server mods count text --> <!-- server mods count text -->
<Label Grid.Row="1" Grid.Column="1"> <Label Grid.Row="1" Grid.Column="1">
@ -90,7 +90,7 @@
Command="{Binding OpenModsInfoCommand}" Command="{Binding OpenModsInfoCommand}"
Classes="icon"> Classes="icon">
<Button.Content> <Button.Content>
<Path Data="{StaticResource Open}" Fill="{StaticResource SPT_Foreground_Light}" <Path Data="{StaticResource Open}" Fill="{DynamicResource ForegroundBrush}"
VerticalAlignment="Center" VerticalAlignment="Center"
/> />
</Button.Content> </Button.Content>
@ -100,9 +100,9 @@
<!-- Bottom bar --> <!-- Bottom bar -->
<Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="5" <Border Grid.Row="7" Grid.Column="1" Grid.ColumnSpan="3" CornerRadius="5"
BorderBrush="{StaticResource SPT_Background_Dark}" BorderBrush="{DynamicResource BackgroundBrush}"
BorderThickness="5"> BorderThickness="5">
<DockPanel Background="{StaticResource SPT_Background_Dark}"> <DockPanel Background="{DynamicResource BackgroundBrush}">
<StackPanel Orientation="Horizontal" <StackPanel Orientation="Horizontal"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
@ -134,7 +134,7 @@
DockPanel.Dock="Right" DockPanel.Dock="Right"
Command="{Binding StartGameCommand}" Command="{Binding StartGameCommand}"
IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}" IsEnabled="{Binding Source={x:Static helpers:LauncherSettingsProvider.Instance}, Path=!GameRunning}"
Classes="yellow" /> Classes="alt" />
<Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=logout}" <Button Content="{Binding Source={x:Static helpers:LocalizationProvider.Instance}, Path=logout}"
Command="{Binding LogoutCommand}" Command="{Binding LogoutCommand}"

2
project/SPT.Launcher/Views/SettingsView.axaml
View File

@ -11,7 +11,7 @@
<Grid RowDefinitions="10,AUTO,AUTO,*, AUTO, AUTO, AUTO,10" ColumnDefinitions="10,2*,2*,AUTO,10"> <Grid RowDefinitions="10,AUTO,AUTO,*, AUTO, AUTO, AUTO,10" ColumnDefinitions="10,2*,2*,AUTO,10">
<!-- Backdrop --> <!-- Backdrop -->
<Rectangle Fill="{StaticResource SPT_Background_Dark}" <Rectangle Fill="{DynamicResource BackgroundBrush}"
Grid.RowSpan="7" Grid.ColumnSpan="5" Grid.RowSpan="7" Grid.ColumnSpan="5"
Opacity=".7" Opacity=".7"
/> />