This commit is contained in:
2022-03-17 13:19:45 +08:00
parent cac4735bc4
commit b46b150f6a
11 changed files with 40 additions and 59 deletions

View File

@ -230,7 +230,7 @@ namespace Billing.UI
{
public static readonly BindableProperty DateProperty = Helper.Create<DateTime, BillingDay>(nameof(Date), propertyChanged: OnDatePropertyChanged);
public static readonly BindableProperty TextProperty = Helper.Create<string, BillingDay>(nameof(Text));
public static readonly BindableProperty FontFamilyProperty = Helper.Create<string, BillingDay>(nameof(FontFamily), defaultValue: Definition.GetRegularFontFamily());
public static readonly BindableProperty FontFamilyProperty = Helper.Create<string, BillingDay>(nameof(FontFamily), defaultValue: Definition.RegularFontFamily);
public static readonly BindableProperty IsSelectedProperty = Helper.Create<bool, BillingDay>(nameof(IsSelected), defaultValue: false);
public static readonly BindableProperty OpacityProperty = Helper.Create<double, BillingDay>(nameof(Opacity), defaultValue: 1.0);
public static readonly BindableProperty TextOpacityProperty = Helper.Create<double, BillingDay>(nameof(TextOpacity), defaultValue: 1.0);
@ -273,11 +273,11 @@ namespace Billing.UI
if (Helper.IsSameDay(date, selected))
{
IsSelected = true;
SetValue(FontFamilyProperty, Definition.GetBoldFontFamily());
SetValue(FontFamilyProperty, Definition.BoldFontFamily);
}
else
{
SetValue(FontFamilyProperty, Definition.GetRegularFontFamily());
SetValue(FontFamilyProperty, Definition.RegularFontFamily);
}
if (date.Year == selected.Year && date.Month == selected.Month)
{

View File

@ -211,7 +211,7 @@ namespace Billing.UI
}
return new FontImageSource
{
FontFamily = Definition.GetBrandsFontFamily(),
FontFamily = Definition.BrandsFontFamily,
Size = 20,
Glyph = glyph,
Color = Color.Black

View File

@ -10,12 +10,6 @@ namespace Billing.UI
public const string PrimaryColorKey = "PrimaryColor";
public const string DefaultIcon = "ic_default";
public const long TransparentColor = 0x00ffffffL;
public static partial (string main, long build) GetVersion();
public static partial string GetRegularFontFamily();
public static partial string GetSemiBoldFontFamily();
public static partial string GetBoldFontFamily();
public static partial string GetBrandsFontFamily();
}
public static class ExtensionHelper