dan/Walleby
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve theming against light theme

Browse Source
This commit is contained in:
TheXamlGuy
2024-07-13 11:04:03 +01:00
parent cc699f19e0
commit 3b4deea573
7 changed files with 84 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Wallet.Avalonia/DateEntryView.axaml
+12 -2
View File
@@ -7,11 +7,21 @@
Header="{Binding Key}"
IsExpanded="False">
<SettingsExpander.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="DatePickerButtonBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="DatePickerButtonBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
<SolidColorBrush x:Key="DatePickerButtonBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="DatePickerButtonBorderBrushPointerOver" Color="Transparent" />
<Thickness x:Key="DatePickerHostPadding">0,5,0,6</Thickness>
<Thickness x:Key="DatePickerHostMonthPadding">9,5,0,6</Thickness>
</SettingsExpander.Resources>
Wallet.Avalonia/DropdownEntryView.axaml
+12 -2
View File
@@ -7,12 +7,22 @@
Header="{Binding Key}"
IsExpanded="False">
<SettingsExpander.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
<SolidColorBrush x:Key="ComboBoxBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="ComboBoxBorderBrushPointerOver" Color="Transparent" />
</SettingsExpander.Resources>
<SettingsExpander.Action>
<ItemEntryActionView />
Wallet.Avalonia/HyperlinkEntryView.axaml
+12 -2
View File
@@ -7,12 +7,22 @@
Header="{Binding Key}"
IsExpanded="False">
<SettingsExpander.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
</SettingsExpander.Resources>
<SettingsExpander.Action>
<ItemEntryActionView />
Wallet.Avalonia/ItemHeaderView.axaml
+12 -2
View File
@@ -7,14 +7,24 @@
Margin="0,0,0,-18"
x:DataType="vm:ItemHeaderViewModel">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<x:Double x:Key="PersonPictureSize">144</x:Double>
<x:Double x:Key="ButtonSize">36</x:Double>
<x:Double x:Key="TextBoxMaxWidth">360</x:Double>
<x:Double x:Key="TextBoxMinWidth">264</x:Double>
<Thickness x:Key="ButtonMargin">0,0,6,6</Thickness>
<CornerRadius x:Key="ButtonCornerRadius">18</CornerRadius>
<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
</UserControl.Resources>
<StackPanel Grid.Column="1" Spacing="12">
<Grid HorizontalAlignment="Center">
Wallet.Avalonia/MaskedTextEntryView.axaml
+12 -2
View File
@@ -7,12 +7,22 @@
Header="{Binding Key}"
IsExpanded="False">
<SettingsExpander.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
</SettingsExpander.Resources>
<SettingsExpander.Action>
<ItemEntryActionView />
Wallet.Avalonia/PasswordEntryView.axaml
+12 -2
View File
@@ -8,13 +8,23 @@
Header="{Binding Key}"
IsExpanded="False">
<SettingsExpander.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
<BooleanToPasswordCharConverter x:Key="BooleanToPasswordCharConverter" PasswordChar="&#x25CF;" />
<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
</SettingsExpander.Resources>
<SettingsExpander.Action>
<ItemEntryActionView />
Wallet.Avalonia/TextEntryView.axaml
+12 -2
View File
@@ -7,12 +7,22 @@
Header="{Binding Key}"
IsExpanded="False">
<SettingsExpander.Resources>
<ResourceDictionary>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="ControlStrokeColorDefaultBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="ControlStrokeColorDefaultBrush" />
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
</ResourceDictionary>
</ResourceDictionary.ThemeDictionaries>
</ResourceDictionary>
<Thickness x:Key="TextControlMargin">0</Thickness>
<Thickness x:Key="TextControlPadding">10,5,6,6</Thickness>
<Thickness x:Key="TextControlCompactPadding">0</Thickness>
<Thickness x:Key="TextControlCompactMargin">0,-3,0,0</Thickness>
<SolidColorBrush x:Key="TextControlBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="Transparent" />
</SettingsExpander.Resources>
<SettingsExpander.Action>
<ItemEntryActionView />