Added MaterialDesignInXamlToolkit and set to Dark Mode

This commit is contained in:
Jack 2023-09-14 19:48:12 -04:00
parent c821c49ef9
commit c2cf342f39
5 changed files with 48 additions and 16 deletions

View File

@ -2,10 +2,17 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:converter="clr-namespace:AutoLikerCefSharpWpf.Converter"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
StartupUri="MainWindow.xaml">
<Application.Resources>
<converter:TitleConverter x:Key="TitleConverter"/>
<converter:EnvironmentConverter x:Key="EnvironmentConverter" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<ResourceDictionary>
<converter:TitleConverter x:Key="TitleConverter"/>
<converter:EnvironmentConverter x:Key="EnvironmentConverter" />
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
<ResourceDictionary.MergedDictionaries>
<materialDesign:BundledTheme BaseTheme="Inherit" PrimaryColor="Blue" SecondaryColor="LightBlue" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</Application>

View File

@ -92,6 +92,12 @@
<Reference Include="CefSharp.Wpf, Version=116.0.190.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=MSIL">
<HintPath>..\packages\CefSharp.Wpf.116.0.190\lib\net462\CefSharp.Wpf.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignColors, Version=2.1.4.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignColors.2.1.4\lib\net462\MaterialDesignColors.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf, Version=4.9.0.0, Culture=neutral, PublicKeyToken=df2a72020bd7962a, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.4.9.0\lib\net462\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Xaml.Behaviors, Version=1.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Xaml.Behaviors.Wpf.1.1.39\lib\net45\Microsoft.Xaml.Behaviors.dll</HintPath>
</Reference>
@ -194,6 +200,8 @@
<Error Condition="!Exists('..\packages\cef.redist.x86.116.0.19\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cef.redist.x86.116.0.19\build\cef.redist.x86.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.116.0.190\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.116.0.190\build\CefSharp.Common.props'))" />
<Error Condition="!Exists('..\packages\CefSharp.Common.116.0.190\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\CefSharp.Common.116.0.190\build\CefSharp.Common.targets'))" />
<Error Condition="!Exists('..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets'))" />
</Target>
<Import Project="..\packages\CefSharp.Common.116.0.190\build\CefSharp.Common.targets" Condition="Exists('..\packages\CefSharp.Common.116.0.190\build\CefSharp.Common.targets')" />
<Import Project="..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets" Condition="Exists('..\packages\MaterialDesignThemes.4.9.0\build\MaterialDesignThemes.targets')" />
</Project>

View File

@ -1,6 +1,12 @@
<Window x:Class="AutoLikerCefSharpWpf.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
TextElement.Foreground="{DynamicResource MaterialDesignBody}"
Background="{DynamicResource MaterialDesignPaper}"
TextElement.FontWeight="Medium"
TextElement.FontSize="14"
FontFamily="{materialDesign:MaterialDesignFont}"
xmlns:wpf="clr-namespace:CefSharp.Wpf;assembly=CefSharp.Wpf"
xmlns:cef="clr-namespace:CefSharp;assembly=CefSharp.Core"
xmlns:behaviours="clr-namespace:AutoLikerCefSharpWpf.Behaviours"
@ -10,7 +16,7 @@
WindowState="Maximized"
x:Name="AutoLikerWindow">
<DockPanel>
<DockPanel DockPanel.Dock="Left" Width="350px" Background="WhiteSmoke">
<DockPanel DockPanel.Dock="Left" Width="350px">
<Grid DockPanel.Dock="Top" Margin="5 5 5 5">
<Grid.RowDefinitions>
@ -18,37 +24,46 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Label Grid.Row="0" Grid.Column="0" Content="Hashtags&#10;- don't include #&#10;- comma-separated" x:Name="lblHashTag" />
<Label Grid.Row="1" Grid.Column="0" Content="Maximum likes per page load" x:Name="lblMaxLikes" />
<Label Grid.Row="2" Grid.Column="0" Content="Delay range between likes (sec)" x:Name="lblDelay" />
<Label Grid.Row="3" Grid.Column="0" Content="Delay before reloading (min)" x:Name="lblDelayRestart" />
<TextBox Grid.Column="1" Grid.Row="0" Margin="3" Height="50px" TextWrapping="Wrap" x:Name="txtHashTag"/>
<StackPanel Grid.Column="1" Grid.Row="1" Margin="3" HorizontalAlignment="Left" Orientation="Horizontal">
<Label Grid.Row="0" Grid.Column="0" Content="Choose Type:" x:Name="lblChooseType" />
<Label Grid.Row="1" Grid.Column="0" Content="Hashtags&#10;- don't include #&#10;- comma-separated" x:Name="lblHashTag" />
<Label Grid.Row="2" Grid.Column="0" Content="Locations&#10;- include full path&#10;- comma-separated" x:Name="lblLocationTag" />
<Label Grid.Row="3" Grid.Column="0" Content="Maximum likes per page load" x:Name="lblMaxLikes" />
<Label Grid.Row="4" Grid.Column="0" Content="Delay range between likes (sec)" x:Name="lblDelay" />
<Label Grid.Row="5" Grid.Column="0" Content="Delay before reloading (min)" x:Name="lblDelayRestart" />
<StackPanel Grid.Column="1" Grid.Row="0" Margin="3" HorizontalAlignment="Left" Orientation="Vertical">
<RadioButton x:Name="radTypeHashTag" GroupName="grpTypeButtons" IsChecked="True" Foreground="White">Hashtags</RadioButton>
<RadioButton x:Name="radTypeLocationTag" GroupName="grpTypeButtons" Foreground="White">Location</RadioButton>
</StackPanel>
<TextBox Grid.Column="1" Grid.Row="1" Margin="3" Height="50px" TextWrapping="Wrap" x:Name="txtHashTag"/>
<TextBox Grid.Column="1" Grid.Row="2" Margin="3" Height="50px" TextWrapping="Wrap" x:Name="txtLocationTag"/>
<StackPanel Grid.Column="1" Grid.Row="3" Margin="3" HorizontalAlignment="Left" Orientation="Horizontal">
<TextBox Width="40" x:Name="txtMaxLikesMin" />
<Label Content="-" />
<TextBox Width="40" x:Name="txtMaxLikesMax" />
</StackPanel>
<StackPanel Grid.Column="1" Grid.Row="2" Margin="3" HorizontalAlignment="Left" Orientation="Horizontal">
<StackPanel Grid.Column="1" Grid.Row="4" Margin="3" HorizontalAlignment="Left" Orientation="Horizontal">
<TextBox Width="40" x:Name="txtDelayMin" />
<Label Content="-" />
<TextBox Width="40" x:Name="txtDelayMax" />
</StackPanel>
<StackPanel Grid.Column="1" Grid.Row="3" Margin="3" HorizontalAlignment="Left" Orientation="Horizontal">
<StackPanel Grid.Column="1" Grid.Row="5" Margin="3" HorizontalAlignment="Left" Orientation="Horizontal">
<TextBox Width="40" x:Name="txtDelayRestartMin" />
<Label Content="-" />
<TextBox Width="40" x:Name="txtDelayRestartMax" />
</StackPanel>
<Button Grid.Column="1" Grid.Row="4" HorizontalAlignment="Left" MinWidth="80" Margin="3" Content="Save" x:Name="btnSaveSettings" Click="BtnSaveSettings_Click"/>
<Button Grid.Column="1" Grid.Row="6" HorizontalAlignment="Center" MinWidth="80" Margin="3" Content="Save" x:Name="btnSaveSettings" Click="BtnSaveSettings_Click"/>
</Grid>
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left" Orientation="Horizontal" Margin="0 5">
<Button x:Name="btnStart" Height="35" Width="40" Content="Start" Margin="5 0 0 0" Click="BtnStart_Click"/>
<Button x:Name="btnStop" Height="35" Width="40" Content="Stop" Margin="5 0 5 0" Click="BtnStop_Click"/>
<Button x:Name="btnStart" Height="35" Content="Start" Margin="5 0 0 0" Click="BtnStart_Click"/>
<Button x:Name="btnStop" Height="35" Content="Stop" Margin="5 0 5 0" Click="BtnStop_Click"/>
</StackPanel>
<StackPanel DockPanel.Dock="Top" HorizontalAlignment="Left" Orientation="Horizontal">
<Label Content="MouseX:" />

View File

@ -21,7 +21,7 @@ namespace AutoLikerCefSharpWpf
InitializeComponent();
// version
this.AutoLikerVersion = "v2.0.1-20230914";
this.AutoLikerVersion = "v2.0.2-20230914";
this.DataContext = this;
// manage settings in UI
this._alsm = new AutoLikerSettingsManager(this);

View File

@ -4,5 +4,7 @@
<package id="cef.redist.x86" version="116.0.19" targetFramework="net472" />
<package id="CefSharp.Common" version="116.0.190" targetFramework="net472" />
<package id="CefSharp.Wpf" version="116.0.190" targetFramework="net472" />
<package id="MaterialDesignColors" version="2.1.4" targetFramework="net472" />
<package id="MaterialDesignThemes" version="4.9.0" targetFramework="net472" />
<package id="Microsoft.Xaml.Behaviors.Wpf" version="1.1.39" targetFramework="net472" />
</packages>