Skip to content

Commit 1b49ab3

Browse files
committed
Fix: improve overall ui
1 parent b618c3b commit 1b49ab3

File tree

7 files changed

+31
-10
lines changed

7 files changed

+31
-10
lines changed

DebitExpress.VatRelief/App.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<ResourceDictionary>
88
<ResourceDictionary.MergedDictionaries>
99
<ResourceDictionary Source="pack://application:,,,/DebitExpress.Controls;component/Defaults.xaml" />
10-
<ResourceDictionary Source="pack://application:,,,/Themes/MaterialTheme.Dark.xaml" />
10+
<ResourceDictionary Source="pack://application:,,,/Themes/MaterialTheme.Light.xaml" />
1111
<ResourceDictionary Source="pack://application:,,,/Themes/MaterialTheme.xaml" />
1212
</ResourceDictionary.MergedDictionaries>
1313
</ResourceDictionary>

DebitExpress.VatRelief/DebitExpress.VatRelief.csproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Nullable>enable</Nullable>
77
<UseWPF>true</UseWPF>
88
<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
9+
<ApplicationIcon>favicon.ico</ApplicationIcon>
910
</PropertyGroup>
1011

1112
<ItemGroup>
@@ -15,4 +16,8 @@
1516
<PackageReference Include="DebitExpress.Extensions" Version="1.0.10" />
1617
</ItemGroup>
1718

19+
<ItemGroup>
20+
<Resource Include="favicon.png" />
21+
</ItemGroup>
22+
1823
</Project>

DebitExpress.VatRelief/MainWindow.xaml

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
1010
mc:Ignorable="d"
1111
ResizeMode="NoResize"
12-
Title="DebitExpress VAT Relief"
12+
Title="VAT Relief Generator"
1313
WindowStartupLocation="CenterScreen"
1414
ShowTitle="True"
1515
AllowDrop="True"
@@ -19,6 +19,20 @@
1919
attached:WindowElement.ExtendContentToNonClientArea="True"
2020
attached:WindowElement.SaveWindowPosition="True"
2121
Height="500" Width="350">
22+
<ctrl:Window.IconContent>
23+
<Image
24+
Margin="7,5,0,5"
25+
Width="20"
26+
Height="20"
27+
attached:WindowElement.ShowSystemMenuOnRightClick="True">
28+
<Image.Source>
29+
<BitmapImage
30+
DecodePixelHeight="50"
31+
DecodePixelWidth="50"
32+
UriSource="/favicon.png" />
33+
</Image.Source>
34+
</Image>
35+
</ctrl:Window.IconContent>
2236
<ctrl:Window.TopmostContent>
2337
<ctrl:SimplePanel>
2438
<materialDesign:Snackbar
@@ -48,6 +62,7 @@
4862
Width="100"
4963
Height="100"
5064
Kind="FileExcelOutline"
65+
Foreground="{DynamicResource PrimaryHueDarkBrush}"
5166
HorizontalAlignment="Center" />
5267
<TextBlock
5368
x:Name="FileName"
@@ -57,6 +72,7 @@
5772
MaxHeight="50"
5873
TextWrapping="Wrap"
5974
TextTrimming="CharacterEllipsis"
75+
Foreground="{DynamicResource PrimaryHueDarkBrush}"
6076
Text="Drag and drop excel file here" />
6177
</StackPanel>
6278
<StackPanel VerticalAlignment="Center" Margin="0,0,0,80">

DebitExpress.VatRelief/Themes/MaterialTheme.Light.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
44

5-
<Color x:Key="MaterialPaper">#BFF5EDED</Color>
5+
<Color x:Key="MaterialPaper">#F6F6F6</Color>
66
<Color x:Key="ValidationErrorColor">#f44336</Color>
77
<SolidColorBrush x:Key="ValidationErrorBrush" Color="{StaticResource ValidationErrorColor}" po:Freeze="True" />
88
<SolidColorBrush x:Key="MaterialDesignValidationErrorBrush" Color="{StaticResource ValidationErrorColor}"
99
po:Freeze="True" />
1010

1111
<SolidColorBrush x:Key="MaterialDesignBackground" Color="#FFFFFFFF" po:Freeze="True" />
12-
<SolidColorBrush x:Key="MaterialDesignPaper" Color="#FFF5EDED" po:Freeze="True" />
12+
<SolidColorBrush x:Key="MaterialDesignPaper" Color="#F6F6F6" po:Freeze="True" />
1313
<SolidColorBrush x:Key="MaterialDesignCardBackground" Color="#FFF7F2F2" po:Freeze="True" />
1414
<SolidColorBrush x:Key="MaterialDesignBody" Color="#DD000000" po:Freeze="True" />
1515
<SolidColorBrush x:Key="MaterialDesignBodyLight" Color="#89000000" po:Freeze="True" />

DebitExpress.VatRelief/Themes/Theme.Primary.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@
44
xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
55
<Color
66
x:Key="PrimaryHueLightColor">
7-
#FF6659
7+
#827276
88
</Color>
99
<Color
1010
x:Key="PrimaryHueMidColor">
11-
#D32F2F
11+
#634B51
1212
</Color>
1313
<Color
1414
x:Key="PrimaryHueDarkColor">
15-
#9A0007
15+
#433237
1616
</Color>
1717
<Color
1818
x:Key="PrimaryLightForegroundColor">
@@ -28,15 +28,15 @@
2828
po:Freeze="True" />
2929
<SolidColorBrush
3030
x:Key="PrimaryHueLightBrush"
31-
Color="#FF6659"
31+
Color="#827276"
3232
po:Freeze="True" />
3333
<SolidColorBrush
3434
x:Key="PrimaryHueMidBrush"
35-
Color="#D32F2F"
35+
Color="#634B51"
3636
po:Freeze="True" />
3737
<SolidColorBrush
3838
x:Key="PrimaryHueDarkBrush"
39-
Color="#9A0007"
39+
Color="#433237"
4040
po:Freeze="True" />
4141
<SolidColorBrush
4242
x:Key="PrimaryHueDarkForegroundBrush"

DebitExpress.VatRelief/favicon.ico

13.4 KB
Binary file not shown.

DebitExpress.VatRelief/favicon.png

12.5 KB
Loading

0 commit comments

Comments
 (0)