feat: try to implement Aqua.
This commit is contained in:
@@ -3,7 +3,9 @@
|
|||||||
xmlns="https://github.com/avaloniaui"
|
xmlns="https://github.com/avaloniaui"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
|
xmlns:u-semi="https://irihi.tech/ursa/themes/semi"
|
||||||
xmlns:semi="https://irihi.tech/semi">
|
RequestedThemeVariant="{x:Static semi:SemiTheme.Aquatic}"
|
||||||
|
xmlns:semi="https://irihi.tech/semi"
|
||||||
|
xmlns:demo="clr-namespace:Ursa.Demo">
|
||||||
<Application.Styles>
|
<Application.Styles>
|
||||||
<semi:SemiTheme Locale="zh-CN" />
|
<semi:SemiTheme Locale="zh-CN" />
|
||||||
<u-semi:SemiTheme Locale="zh-CN" />
|
<u-semi:SemiTheme Locale="zh-CN" />
|
||||||
|
|||||||
@@ -19,7 +19,9 @@
|
|||||||
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
|
||||||
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
|
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.0" />
|
||||||
|
<!--
|
||||||
<PackageReference Include="Semi.Avalonia" Version="11.1.0.2" />
|
<PackageReference Include="Semi.Avalonia" Version="11.1.0.2" />
|
||||||
|
-->
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
@@ -30,4 +32,10 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Folder Include="Models\" />
|
<Folder Include="Models\" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="Semi.Avalonia">
|
||||||
|
<HintPath>Assets\Semi.Avalonia.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
<!-- Add Resources Here -->
|
<!-- Add Resources Here -->
|
||||||
<ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
|
<ControlTheme x:Key="{x:Type u:Banner}" TargetType="u:Banner">
|
||||||
<Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
|
<Setter Property="u:Banner.BorderThickness" Value="{DynamicResource BannerBorderThickness}" />
|
||||||
<Setter Property="u:Banner.BorderBrush" Value="Transparent" />
|
<Setter Property="u:Banner.BorderBrush" Value="{DynamicResource BannerBorderBrush}" />
|
||||||
<Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
|
<Setter Property="u:Banner.HorizontalContentAlignment" Value="Center" />
|
||||||
<Setter Property="u:Banner.Template">
|
<Setter Property="u:Banner.Template">
|
||||||
<ControlTemplate TargetType="u:Banner">
|
<ControlTemplate TargetType="u:Banner">
|
||||||
|
|||||||
@@ -1,9 +1,14 @@
|
|||||||
<Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
<Styles x:Class="Ursa.Themes.Semi.SemiTheme" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
|
xmlns:semi="https://irihi.tech/ursa/themes/semi">
|
||||||
<Styles.Resources>
|
<Styles.Resources>
|
||||||
<ResourceDictionary>
|
<ResourceDictionary>
|
||||||
<ResourceDictionary.ThemeDictionaries>
|
<ResourceDictionary.ThemeDictionaries>
|
||||||
<ResourceInclude x:Key="Dark" Source="./Themes/Dark/_index.axaml" />
|
<ResourceInclude x:Key="Dark" Source="./Themes/Dark/_index.axaml" />
|
||||||
<ResourceInclude x:Key="Light" Source="./Themes/Light/_index.axaml" />
|
<ResourceInclude x:Key="Light" Source="./Themes/Light/_index.axaml" />
|
||||||
|
<ResourceInclude x:Key="{x:Static semi:SemiTheme.Aquatic}" Source="./Themes/HighContrast/Aquatic.axaml" />
|
||||||
|
<ResourceInclude x:Key="{x:Static semi:SemiTheme.Desert}" Source="./Themes/HighContrast/Aquatic.axaml" />
|
||||||
|
<ResourceInclude x:Key="{x:Static semi:SemiTheme.Dust}" Source="./Themes/HighContrast/Aquatic.axaml" />
|
||||||
|
<ResourceInclude x:Key="{x:Static semi:SemiTheme.NightSky}" Source="./Themes/HighContrast/Aquatic.axaml" />
|
||||||
</ResourceDictionary.ThemeDictionaries>
|
</ResourceDictionary.ThemeDictionaries>
|
||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceInclude Source="../Controls/_index.axaml" />
|
<ResourceInclude Source="../Controls/_index.axaml" />
|
||||||
|
|||||||
@@ -11,6 +11,11 @@ namespace Ursa.Themes.Semi;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public class SemiTheme: Styles
|
public class SemiTheme: Styles
|
||||||
{
|
{
|
||||||
|
public static ThemeVariant Aquatic => new ThemeVariant(nameof(Aquatic), ThemeVariant.Dark);
|
||||||
|
public static ThemeVariant Desert => new ThemeVariant(nameof(Desert), ThemeVariant.Light);
|
||||||
|
public static ThemeVariant Dust => new ThemeVariant(nameof(Dust), ThemeVariant.Dark);
|
||||||
|
public static ThemeVariant NightSky => new ThemeVariant(nameof(NightSky), ThemeVariant.Dark);
|
||||||
|
|
||||||
private static readonly Lazy<Dictionary<CultureInfo, ResourceDictionary>> _localeToResource = new Lazy<Dictionary<CultureInfo, ResourceDictionary>>(
|
private static readonly Lazy<Dictionary<CultureInfo, ResourceDictionary>> _localeToResource = new Lazy<Dictionary<CultureInfo, ResourceDictionary>>(
|
||||||
() => new Dictionary<CultureInfo, ResourceDictionary>
|
() => new Dictionary<CultureInfo, ResourceDictionary>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -10,4 +10,5 @@
|
|||||||
<SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" />
|
<SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#FFFC725A" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" />
|
<SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.6" Color="#FFF9F9F9" />
|
||||||
|
<SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
15
src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
Normal file
15
src/Ursa.Themes.Semi/Themes/HighContrast/Aquatic.axaml
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
<!-- Add Resources Here -->
|
||||||
|
<Color x:Key="WindowColor">#202020</Color>
|
||||||
|
<Color x:Key="WindowTextColor">#FFFFFF</Color>
|
||||||
|
<Color x:Key="HotlightColor">#75E9FC</Color>
|
||||||
|
<Color x:Key="GrayTextColor">#A6A6A6</Color>
|
||||||
|
<Color x:Key="HighlightTextColor">#263B50</Color>
|
||||||
|
<Color x:Key="HighlightColor">#8EE3F0</Color>
|
||||||
|
<Color x:Key="ButtonTextColor">#FFFFFF</Color>
|
||||||
|
<Color x:Key="ButtonFaceColor">#202020</Color>
|
||||||
|
<ResourceDictionary.MergedDictionaries>
|
||||||
|
<ResourceInclude Source="Base.axaml" />
|
||||||
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
</ResourceDictionary>
|
||||||
102
src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
Normal file
102
src/Ursa.Themes.Semi/Themes/HighContrast/Base.axaml
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
<ResourceDictionary xmlns="https://github.com/avaloniaui"
|
||||||
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
|
||||||
|
<!--
|
||||||
|
<Color x:Key="WindowColor">#202020</Color>
|
||||||
|
<Color x:Key="WindowTextColor">#FFFFFF</Color>
|
||||||
|
<Color x:Key="HotlightColor">#75E9FC</Color>
|
||||||
|
<Color x:Key="GrayTextColor">#A6A6A6</Color>
|
||||||
|
<Color x:Key="HighlightTextColor">#263B50</Color>
|
||||||
|
<Color x:Key="HighlightColor">#8EE3F0</Color>
|
||||||
|
<Color x:Key="ButtonTextColor">#FFFFFF</Color>
|
||||||
|
<Color x:Key="ButtonFaceColor">#202020</Color>
|
||||||
|
-->
|
||||||
|
<!-- Badge -->
|
||||||
|
<SolidColorBrush x:Key="BadgeBorderBrush" Color="{StaticResource WindowTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="BadgeForeground" Color="{StaticResource WindowColor}" />
|
||||||
|
<SolidColorBrush x:Key="BadgeContentForeground" Color="{StaticResource WindowTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="BadgePrimaryBadgeBackground" Color="{StaticResource HotlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="BadgeLightPrimaryBadgeForeground" Color="{StaticResource HotlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="BadgeInvertedBadgeBackground" Color="{StaticResource WindowColor}" />
|
||||||
|
<SolidColorBrush x:Key="BadgeInvertedPrimaryBadgeForeground" Color="{StaticResource WindowTextColor}" />
|
||||||
|
|
||||||
|
<!-- Banner -->
|
||||||
|
<SolidColorBrush x:Key="BannerInformationBackground" Color="{StaticResource WindowColor}" />
|
||||||
|
<SolidColorBrush x:Key="BannerBorderBrush" Color="{StaticResource WindowTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="BannerInformationBorderBrush" Color="{StaticResource WindowTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="BannerCloseButtonForeground" Color="{StaticResource WindowTextColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSeparatorForeground" Color="{StaticResource ButtonTextColor}" />
|
||||||
|
<!-- Light -->
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultPrimaryForeground" Color="{StaticResource ButtonTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultDisabledForeground" Color="{StaticResource GrayTextColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultBackground" Color="{StaticResource ButtonFaceColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultPressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultBorderBrush" Color="{StaticResource ButtonTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultPointeroverBorderBrush" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultPressedBorderBrush" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupDefaultDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
|
||||||
|
|
||||||
|
<!-- end Light -->
|
||||||
|
|
||||||
|
<!-- Solid -->
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidForeground" Color="{StaticResource HighlightTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidDisabledForeground" Color="{StaticResource GrayTextColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBackground" Color="{StaticResource ButtonTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryBorderBrush" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPointeroverBorderBrush" Color="{StaticResource ButtonTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidPrimaryPressedBorderBrush" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="ButtonGroupSolidDisabledBorderBrush" Color="{StaticResource GrayTextColor}" />
|
||||||
|
<!-- end Solid -->
|
||||||
|
|
||||||
|
<!--CalenderDayButton-->
|
||||||
|
<SolidColorBrush x:Key="CalenderDayBackground" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayBorderBrush" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayInRangeBackground" Color="{StaticResource HotlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayTodayBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayTodayForeground" Color="{StaticResource ButtonTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayNotCurrentMonthForeground" Color="{StaticResource GrayTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayPointeroverBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayPressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="CalenderDaySelectedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDaySelectedForeground" Color="{StaticResource HighlightTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDaySelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDaySelectedPressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="CalenderDayStartEndDateBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayStartEndDateBorderBrush" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayStartEndDatePointeroverBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayStartEndDateInRangeBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="CalenderDayPreviewStartEndDateBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayPreviewStartEndDatePressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<SolidColorBrush x:Key="CalenderDayBlackoutForeground" Color="{StaticResource GrayTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayBlackoutBackground" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="CalenderDayBlackoutTodayBackground" Color="Transparent" />
|
||||||
|
|
||||||
|
<!--CalenderYearButton-->
|
||||||
|
<SolidColorBrush x:Key="CalenderYearBackground" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="CalenderYearBorderBrush" Color="Transparent" />
|
||||||
|
<SolidColorBrush x:Key="CalenderYearPointeroverBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderYearPressedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderYearSelectedBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderYearSelectedForeground" Color="{StaticResource HighlightTextColor}" />
|
||||||
|
<SolidColorBrush x:Key="CalenderYearSelectedPointeroverBackground" Color="{StaticResource HighlightColor}" />
|
||||||
|
|
||||||
|
<!--CalenderView-->
|
||||||
|
<SolidColorBrush x:Key="CalenderViewBackground" Color="Transparent" />
|
||||||
|
|
||||||
|
<!-- Divider -->
|
||||||
|
<SolidColorBrush x:Key="DividerBorderBrush" Color="{StaticResource WindowTextColor}" />
|
||||||
|
|
||||||
|
</ResourceDictionary>
|
||||||
@@ -10,4 +10,5 @@
|
|||||||
<SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" />
|
<SolidColorBrush x:Key="BannerErrorBorderBrush" Color="#F93920" />
|
||||||
|
|
||||||
<SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
|
<SolidColorBrush x:Key="BannerCloseButtonForeground" Opacity="0.62" Color="#1C1F23" />
|
||||||
|
<SolidColorBrush x:Key="BannerBorderBrush" Color="Transparent" />
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
|
|||||||
Reference in New Issue
Block a user