UI adjustment

This commit is contained in:
2020-05-09 08:38:31 +08:00
parent 33cac052f6
commit 8c9f79f06d
19 changed files with 492 additions and 314 deletions

View File

@@ -2,7 +2,7 @@
namespace Pixiview.UI.Theme
{
public class ThemeBase : ResourceDictionary
public abstract class ThemeBase : ResourceDictionary
{
public const string FontIconUser = nameof(FontIconUser);
public const string FontIconSparkles = nameof(FontIconSparkles);
@@ -55,22 +55,21 @@ namespace Pixiview.UI.Theme
}
}
var tintColor = (Color)this[TextColor];
var regularFontFamily = (string)this[IconRegularFontFamily];
var solidFontFamily = (string)this[IconSolidFontFamily];
Add(FontIconUser, GetSolidIcon(StyleDefinition.IconUser, solidFontFamily, tintColor));
Add(FontIconSparkles, GetSolidIcon(StyleDefinition.IconSparkles, solidFontFamily, tintColor));
Add(FontIconOrder, GetSolidIcon(StyleDefinition.IconOrder, solidFontFamily, tintColor));
Add(FontIconRefresh, GetSolidIcon(StyleDefinition.IconRefresh, solidFontFamily, tintColor));
Add(FontIconLove, GetSolidIcon(StyleDefinition.IconLove, solidFontFamily, StyleDefinition.ColorRedBackground));
Add(FontIconNotLove, GetSolidIcon(StyleDefinition.IconLove, regularFontFamily, tintColor));
Add(FontIconOption, GetSolidIcon(StyleDefinition.IconOption, solidFontFamily, tintColor));
Add(FontIconDownload, GetSolidIcon(StyleDefinition.IconDownload, solidFontFamily, tintColor));
Add(FontIconFavorite, GetSolidIcon(StyleDefinition.IconFavorite, solidFontFamily, tintColor));
Add(FontIconUser, GetSolidIcon(StyleDefinition.IconUser, solidFontFamily));
Add(FontIconSparkles, GetSolidIcon(StyleDefinition.IconSparkles, solidFontFamily));
Add(FontIconOrder, GetSolidIcon(StyleDefinition.IconOrder, solidFontFamily));
Add(FontIconRefresh, GetSolidIcon(StyleDefinition.IconRefresh, solidFontFamily));
Add(FontIconNotLove, GetSolidIcon(StyleDefinition.IconLove, regularFontFamily));
Add(FontIconOption, GetSolidIcon(StyleDefinition.IconOption, solidFontFamily));
Add(FontIconDownload, GetSolidIcon(StyleDefinition.IconDownload, solidFontFamily));
Add(FontIconFavorite, GetSolidIcon(StyleDefinition.IconFavorite, solidFontFamily));
}
private FontImageSource GetSolidIcon(string icon, string family, Color color)
private FontImageSource GetSolidIcon(string icon, string family, Color color = default)
{
return new FontImageSource
{