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

@@ -31,9 +31,8 @@ namespace Billing.Themes
protected void InitResources()
{
var regularFontFamily = Definition.GetRegularFontFamily();
Add(FontSemiBold, Definition.GetSemiBoldFontFamily());
Add(FontBold, Definition.GetBoldFontFamily());
Add(FontSemiBold, Definition.SemiBoldFontFamily);
Add(FontBold, Definition.BoldFontFamily);
Add(PrimaryColor, PrimaryMauiColor);
Add(SecondaryColor, SecondaryMauiColor);
@@ -45,7 +44,7 @@ namespace Billing.Themes
{
new Setter { Property = Label.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(Label)) },
new Setter { Property = Label.TextColorProperty, Value = PrimaryMauiColor },
new Setter { Property = Label.FontFamilyProperty, Value = regularFontFamily }
new Setter { Property = Label.FontFamilyProperty, Value = Definition.RegularFontFamily }
}
});
Add(new Style(typeof(OptionEntry))
@@ -53,7 +52,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = Entry.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(Entry)) },
new Setter { Property = Entry.FontFamilyProperty, Value = regularFontFamily }
new Setter { Property = Entry.FontFamilyProperty, Value = Definition.RegularFontFamily }
}
});
Add(new Style(typeof(OptionEditor))
@@ -61,7 +60,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = Editor.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(Editor)) },
new Setter { Property = Editor.FontFamilyProperty, Value = regularFontFamily }
new Setter { Property = Editor.FontFamilyProperty, Value = Definition.RegularFontFamily }
}
});
Add(new Style(typeof(OptionDatePicker))
@@ -69,7 +68,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = DatePicker.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(DatePicker)) },
new Setter { Property = DatePicker.FontFamilyProperty, Value = regularFontFamily }
new Setter { Property = DatePicker.FontFamilyProperty, Value = Definition.RegularFontFamily }
}
});
Add(new Style(typeof(OptionTimePicker))
@@ -77,7 +76,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = TimePicker.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(TimePicker)) },
new Setter { Property = TimePicker.FontFamilyProperty, Value = regularFontFamily }
new Setter { Property = TimePicker.FontFamilyProperty, Value = Definition.RegularFontFamily }
}
});
Add(new Style(typeof(OptionPicker))
@@ -85,7 +84,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = Picker.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(TimePicker)) },
new Setter { Property = Picker.FontFamilyProperty, Value = regularFontFamily }
new Setter { Property = Picker.FontFamilyProperty, Value = Definition.RegularFontFamily }
}
});
Add(new Style(typeof(TintImage))