Added Dark theme

Leo-Corporation · Aug 14, 2022 · 8c879f6 · 8c879f6
1 parent d4b69c9
commit 8c879f6
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 21 deletions.
diff --git a/InternetTest/InternetTest/MainWindow.xaml b/InternetTest/InternetTest/MainWindow.xaml
@@ -5,7 +5,7 @@
 		xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 		xmlns:local="clr-namespace:InternetTest"
 		xmlns:lang="clr-namespace:InternetTest.Properties"
-		mc:Ignorable="d"
+		mc:Ignorable="d" Foreground="{Binding Source={StaticResource Foreground1}}"
 		FontFamily="/Fonts/#Hauora"
 		Title="{x:Static lang:Resources.InternetTestPro}" MinHeight="500" MinWidth="500" Height="Auto" Width="950" WindowStyle="None" AllowsTransparency="True" WindowStartupLocation="CenterScreen" Background="Transparent" ResizeMode="CanResize">
 	<WindowChrome.WindowChrome>
@@ -141,7 +141,7 @@
 									</Border.Background>
 									<TextBlock Text="&#xF488;" FontSize="18" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontFamily="/Fonts/#FluentSystemIcons-Filled"/>
 								</Border>
-								<TextBlock Text="{x:Static lang:Resources.Home}" FontSize="14" FontWeight="Bold" Grid.Column="1" VerticalAlignment="Center" Margin="10,0,0,0"/>
+								<TextBlock Text="{x:Static lang:Resources.Home}" FontSize="14" FontWeight="Bold" Grid.Column="1" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="{Binding Source={StaticResource Foreground1}}"/>
 							</Grid>
 						</Button>
 						<Button x:Name="HistoryPageBtn" Background="Transparent" BorderThickness="0" Style="{DynamicResource StandardButton}" Margin="0,5,0,0" HorizontalContentAlignment="Left" Click="HistoryPageBtn_Click">
@@ -159,7 +159,7 @@
 									</Border.Background>
 									<TextBlock Text="&#xF486;" FontSize="18" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontFamily="/Fonts/#FluentSystemIcons-Filled"/>
 								</Border>
-								<TextBlock Text="{x:Static lang:Resources.History}" FontSize="14" FontWeight="Bold" Grid.Column="1" VerticalAlignment="Center" Margin="10,0,0,0"/>
+								<TextBlock Text="{x:Static lang:Resources.History}" FontSize="14" FontWeight="Bold" Grid.Column="1" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="{Binding Source={StaticResource Foreground1}}"/>
 							</Grid>
 						</Button>
 						<Button x:Name="SettingsPageBtn" Background="Transparent" BorderThickness="0" Style="{DynamicResource StandardButton}" Margin="0,5,0,0" HorizontalContentAlignment="Left" Click="SettingsPageBtn_Click">
@@ -177,7 +177,7 @@
 									</Border.Background>
 									<TextBlock Text="&#xF6B3;" FontSize="18" Foreground="{Binding Source={StaticResource WindowButtonsHoverForeground1}}" FontFamily="/Fonts/#FluentSystemIcons-Filled"/>
 								</Border>
-								<TextBlock Text="{x:Static lang:Resources.Settings}" FontSize="14" FontWeight="Bold" Grid.Column="1" VerticalAlignment="Center" Margin="10,0,0,0"/>
+								<TextBlock Text="{x:Static lang:Resources.Settings}" FontSize="14" FontWeight="Bold" Grid.Column="1" VerticalAlignment="Center" Margin="10,0,0,0" Foreground="{Binding Source={StaticResource Foreground1}}"/>
 							</Grid>
 						</Button>
 

diff --git a/InternetTest/InternetTest/MainWindow.xaml.cs b/InternetTest/InternetTest/MainWindow.xaml.cs
@@ -43,6 +43,7 @@ public MainWindow()
 	{
 		InitializeComponent();
 		InitUI();
+		GC.Collect();
 	}
 
 	DoubleAnimation expandAnimation = new()

diff --git a/InternetTest/InternetTest/Pages/DownDetectorPage.xaml b/InternetTest/InternetTest/Pages/DownDetectorPage.xaml
@@ -40,11 +40,11 @@
 						<ColumnDefinition/>
 						<ColumnDefinition Width="Auto"/>
 					</Grid.ColumnDefinitions>
-					<TextBox x:Name="WebsiteTxt" Padding="5" Margin="5" BorderThickness="0" FontWeight="Bold" Foreground="{Binding Source={StaticResource DarkGray}}" d:Text="https://bing.com"/>
+					<TextBox x:Name="WebsiteTxt" Padding="5" Margin="5" BorderThickness="0" FontWeight="Bold" Foreground="{Binding Source={StaticResource DarkGray}}" d:Text="https://bing.com" Background="Transparent"/>
 					<StackPanel Grid.Column="1" Orientation="Horizontal">
-						<Button x:Name="TestSiteBtn" Content="&#xF606;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="TestSiteBtn_Click"/>
-						<Button x:Name="InfoBtn" Content="&#xF4A4;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="InfoBtn_Click"/>
-						<Button x:Name="AddBtn" Content="&#xF10A;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="AddBtn_Click"/>
+						<Button Foreground="{Binding Source={StaticResource Foreground1}}" x:Name="TestSiteBtn" Content="&#xF606;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="TestSiteBtn_Click"/>
+						<Button Foreground="{Binding Source={StaticResource Foreground1}}" x:Name="InfoBtn" Content="&#xF4A4;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="InfoBtn_Click"/>
+						<Button Foreground="{Binding Source={StaticResource Foreground1}}" x:Name="AddBtn" Content="&#xF10A;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="AddBtn_Click"/>
 					</StackPanel>
 				</Grid>
 			</Border>

diff --git a/InternetTest/InternetTest/Pages/LocateIpPage.xaml b/InternetTest/InternetTest/Pages/LocateIpPage.xaml
@@ -33,7 +33,7 @@
 				<Border.Effect>
 					<DropShadowEffect Color="{Binding Source={StaticResource AccentColor}}" BlurRadius="15" Opacity="0.2" ShadowDepth="0"/>
 				</Border.Effect>
-				<TextBox x:Name="IpTxt" Padding="5" Margin="5" BorderThickness="0" FontWeight="Bold" Foreground="{Binding Source={StaticResource DarkGray}}" d:Text="123.54.132.56"/>
+				<TextBox x:Name="IpTxt" Padding="5" Margin="5" BorderThickness="0" FontWeight="Bold" Foreground="{Binding Source={StaticResource DarkGray}}" d:Text="123.54.132.56" Background="Transparent"/>
 			</Border>
 		</StackPanel>
 

diff --git a/InternetTest/InternetTest/Pages/StatusPage.xaml b/InternetTest/InternetTest/Pages/StatusPage.xaml
@@ -6,7 +6,7 @@
 	  xmlns:local="clr-namespace:InternetTest.Pages"
 	  xmlns:lang="clr-namespace:InternetTest.Properties"
 	  mc:Ignorable="d" FontFamily="../Fonts/#Hauora"
-	  d:DesignHeight="450" d:DesignWidth="800"
+	  d:DesignHeight="450" d:DesignWidth="800" Foreground="{Binding Source={StaticResource Foreground1}}"
 	  Title="StatusPage" Background="Transparent" d:Background="White">
 
 	<Grid>

diff --git a/InternetTest/InternetTest/Themes/Dark.xaml b/InternetTest/InternetTest/Themes/Dark.xaml
@@ -0,0 +1,22 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+					xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+					xmlns:local="clr-namespace:InternetTest.Themes"
+					xmlns:sys="clr-namespace:System;assembly=mscorlib">
+
+	<sys:String x:Key="Background1">#0A0A1E</sys:String>
+	<sys:String x:Key="Background2">#141428</sys:String>
+	<sys:String x:Key="CardBackground">#141446</sys:String>
+	<sys:String x:Key="Foreground1">#FFFFFF</sys:String>
+	<sys:String x:Key="BackgroundImg">/Images/DarkBackground.png</sys:String>
+	<sys:String x:Key="WindowButtonsHover1">#141428</sys:String>
+	<sys:String x:Key="WindowButtonsPressed1">#1E1E32</sys:String>
+	<sys:String x:Key="WindowButtonsHoverForeground1">#ffffff</sys:String>
+	<sys:String x:Key="AccentColor">#2153E0</sys:String>
+	<sys:String x:Key="DarkFAccentColor">#7998ec</sys:String>
+	<sys:String x:Key="LightAccentColor">#001A65</sys:String>
+	<sys:String x:Key="Gray">#5A5A6E</sys:String>
+	<sys:String x:Key="Green">#25DE0F</sys:String>
+	<sys:String x:Key="Red">#FF321E</sys:String>
+    <sys:String x:Key="DarkGray">#7474B1</sys:String>
+
+</ResourceDictionary>
diff --git a/InternetTest/InternetTest/UserControls/DownDetectorItem.xaml b/InternetTest/InternetTest/UserControls/DownDetectorItem.xaml
@@ -13,9 +13,9 @@
 		</Grid.ColumnDefinitions>
 		<TextBox Background="Transparent" x:Name="WebsiteTxt" Padding="2" Margin="5" BorderThickness="0" FontWeight="Bold" Foreground="{Binding Source={StaticResource DarkGray}}" d:Text="https://bing.com" VerticalAlignment="Center"/>
 		<StackPanel Grid.Column="1" Orientation="Horizontal">
-			<Button x:Name="TestSiteBtn" Content="&#xF606;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="TestSiteBtn_Click"/>
-			<Button x:Name="InfoBtn" Content="&#xF4A4;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="InfoBtn_Click"/>
-			<Button x:Name="DeleteBtn" Content="&#xF34D;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="DeleteBtn_Click"/>
+            <Button Foreground="{Binding Source={StaticResource Foreground1}}" x:Name="TestSiteBtn" Content="&#xF606;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="TestSiteBtn_Click"/>
+			<Button Foreground="{Binding Source={StaticResource Foreground1}}" x:Name="InfoBtn" Content="&#xF4A4;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="InfoBtn_Click"/>
+			<Button Foreground="{Binding Source={StaticResource Foreground1}}" x:Name="DeleteBtn" Content="&#xF34D;" Background="Transparent" BorderThickness="0" Padding="4" Margin="2" FontFamily="../Fonts/#FluentSystemIcons-Regular" Style="{DynamicResource ToolButton}" VerticalAlignment="Center" Click="DeleteBtn_Click"/>
 		</StackPanel>
 	</Grid>
 </UserControl>
diff --git a/InternetTest/InternetTest/UserControls/PageCard.xaml b/InternetTest/InternetTest/UserControls/PageCard.xaml
@@ -7,12 +7,12 @@
 			 mc:Ignorable="d" Foreground="{Binding Source={StaticResource Foreground1}}" 
 			 Height="75" Margin="5" MinWidth="200" FontFamily="../Fonts/#Hauora">
 	<Border Cursor="Hand" MouseLeftButtonUp="Border_MouseLeftButtonUp" Padding="5" CornerRadius="5" Background="{Binding Source={StaticResource CardBackground}}">
-        <Border.Effect>
-            <DropShadowEffect BlurRadius="10" Color="#1F1F1F" Direction="270" Opacity="0.1" ShadowDepth="0"/>
-        </Border.Effect>
-        <StackPanel Margin="10" Orientation="Horizontal" VerticalAlignment="Center">
-            <TextBlock x:Name="IconTxt" d:Text="&#xF4DB;" FontSize="26" FontFamily="../Fonts/#FluentSystemIcons-Filled" Foreground="{Binding Source={StaticResource AccentColor}}" VerticalAlignment="Center"/>
-            <TextBlock x:Name="PageNameTxt" d:Text="Status" FontSize="18" VerticalAlignment="Center" FontWeight="ExtraBold" Margin="10,0,0,0"/>
-        </StackPanel>
-    </Border>
+		<Border.Effect>
+			<DropShadowEffect BlurRadius="10" Color="#1F1F1F" Direction="270" Opacity="0.1" ShadowDepth="0"/>
+		</Border.Effect>
+		<StackPanel Margin="10" Orientation="Horizontal" VerticalAlignment="Center">
+			<TextBlock x:Name="IconTxt" d:Text="&#xF4DB;" FontSize="26" FontFamily="../Fonts/#FluentSystemIcons-Filled" Foreground="{Binding Source={StaticResource AccentColor}}" VerticalAlignment="Center"/>
+			<TextBlock x:Name="PageNameTxt" d:Text="Status" FontSize="18" VerticalAlignment="Center" FontWeight="ExtraBold" Margin="10,0,0,0"/>
+		</StackPanel>
+	</Border>
 </UserControl>