mirrors/DiscordChatExporter
1
0
Fork 0
mirror of https://github.com/Tyrrrz/DiscordChatExporter.git synced 2025-05-28 05:34:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[GUI] Clean up theme management

Browse source
This commit is contained in:
Alexey Golub 2020-10-05 17:10:00 +03:00
parent 19f678ca01
commit 239c47c06e
7 changed files with 62 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DiscordChatExporter.Gui/App.xaml
View file

@ -14,10 +14,12 @@
<!-- Merged dictionaries -->
<ResourceDictionary.MergedDictionaries>
<!-- Colors are irrelevant because they are overriden in runtime -->
<materialDesign:BundledTheme
BaseTheme="Light"
PrimaryColor="Blue"
SecondaryColor="Blue" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
</ResourceDictionary.MergedDictionaries>

29
DiscordChatExporter.Gui/App.xaml.cs
View file

@ -1,5 +1,7 @@
using System;
using System.Reflection;
using DiscordChatExporter.Gui.Internal;
using MaterialDesignThemes.Wpf;
namespace DiscordChatExporter.Gui
{
@ -13,4 +15,31 @@ namespace DiscordChatExporter.Gui
public static string VersionString => Version.ToString(3);
}
public partial class App
{
private static Theme LightTheme { get; } = Theme.Create(
new MaterialDesignLightTheme(),
MediaColor.FromHex("#343838"),
MediaColor.FromHex("#F9A825")
);
private static Theme DarkTheme { get; } = Theme.Create(
new MaterialDesignDarkTheme(),
MediaColor.FromHex("#E8E8E8"),
MediaColor.FromHex("#F9A825")
);
public static void SetLightTheme()
{
var paletteHelper = new PaletteHelper();
paletteHelper.SetTheme(LightTheme);
}
public static void SetDarkTheme()
{
var paletteHelper = new PaletteHelper();
paletteHelper.SetTheme(DarkTheme);
}
}
}

8
DiscordChatExporter.Gui/Bootstrapper.cs
View file

@ -13,6 +13,14 @@ namespace DiscordChatExporter.Gui
{
public class Bootstrapper : Bootstrapper<RootViewModel>
{
protected override void OnStart()
{
base.OnStart();
// Light theme is the default
App.SetLightTheme();
}
protected override void ConfigureIoC(IStyletIoCBuilder builder)
{
base.ConfigureIoC(builder);

9
DiscordChatExporter.Gui/Internal/MediaColor.cs Normal file
View file

@ -0,0 +1,9 @@
using System.Windows.Media;
namespace DiscordChatExporter.Gui.Internal
{
internal static class MediaColor
{
public static Color FromHex(string hex) => (Color) ColorConverter.ConvertFromString(hex);
}
}

42
DiscordChatExporter.Gui/Theme.cs
View file

@ -1,42 +0,0 @@
using MaterialDesignThemes.Wpf;
using System.Windows.Media;
namespace DiscordChatExporter.Gui
{
public sealed class Theme
{
public static Theme Light { get; } = new Theme(new MaterialDesignLightTheme(), HexToColor.Convert("#343838"), HexToColor.Convert("#F9A825"));
public static Theme Dark { get; } = new Theme(new MaterialDesignDarkTheme(), HexToColor.Convert("#E8E8E8"), HexToColor.Convert("#F9A825"));
public static void SetCurrent(Theme theme)
{
var paletteHelper = new PaletteHelper();
var materialTheme = paletteHelper.GetTheme();
materialTheme.SetBaseTheme(theme.BaseTheme);
materialTheme.SetPrimaryColor(theme.PrimaryColor);
materialTheme.SetSecondaryColor(theme.SecondaryColor);
paletteHelper.SetTheme(materialTheme);
}
public Theme(IBaseTheme baseTheme, Color primaryColor, Color secondaryColor)
{
BaseTheme = baseTheme;
PrimaryColor = primaryColor;
SecondaryColor = secondaryColor;
}
public IBaseTheme BaseTheme { get; }
public Color PrimaryColor { get; }
public Color SecondaryColor { get; }
class HexToColor
{
public static Color Convert(string hex)
{
return (Color)ColorConverter.ConvertFromString(hex);
}
}
}
}

11
DiscordChatExporter.Gui/ViewModels/RootViewModel.cs
View file

@ -107,8 +107,15 @@ namespace DiscordChatExporter.Gui.ViewModels
IsBotToken = _settingsService.LastToken.Type == AuthTokenType.Bot;
TokenValue = _settingsService.LastToken.Value;
}
Theme.SetCurrent(_settingsService.IsDarkThemeEnabled ? Theme.Dark : Theme.Light);
if (_settingsService.IsDarkThemeEnabled)
{
App.SetDarkTheme();
}
else
{
App.SetLightTheme();
}
await HandleAutoUpdateAsync();
}

17
DiscordChatExporter.Gui/Views/Dialogs/SettingsView.xaml.cs
View file

@ -1,6 +1,4 @@
using MaterialDesignThemes;
using MaterialDesignThemes.Wpf;
using System.Windows.Media.Media3D;
using System.Windows;
namespace DiscordChatExporter.Gui.Views.Dialogs
{
@ -11,19 +9,14 @@ namespace DiscordChatExporter.Gui.Views.Dialogs
InitializeComponent();
}
private void ToggleButton_Checked(object sender, System.Windows.RoutedEventArgs e)
private void ToggleButton_Checked(object sender, RoutedEventArgs e)
{
setBaseTheme(Theme.Dark);
App.SetDarkTheme();
}
private void ToggleButton_Unchecked(object sender, System.Windows.RoutedEventArgs e)
private void ToggleButton_Unchecked(object sender, RoutedEventArgs e)
{
setBaseTheme(Theme.Light);
}
private void setBaseTheme(Theme theme)
{
Theme.SetCurrent(theme);
App.SetLightTheme();
}
}
}