diff --git a/Billing.Shared/Themes/BaseTheme.cs b/Billing.Shared/Themes/BaseTheme.cs
index b2d8dfe..4c4ad78 100644
--- a/Billing.Shared/Themes/BaseTheme.cs
+++ b/Billing.Shared/Themes/BaseTheme.cs
@@ -7,11 +7,7 @@ namespace Billing.Themes
{
public static Color CurrentPrimaryColor => (Color)Application.Current.Resources[PrimaryColor];
- public const string CascadiaFontRegular = nameof(CascadiaFontRegular);
- public const string CascadiaFontBold = nameof(CascadiaFontBold);
- public const string RobotoCondensedFontRegular = nameof(RobotoCondensedFontRegular);
- public const string RobotoCondensedFontBold = nameof(RobotoCondensedFontBold);
- public const string BrandsFontRegular = nameof(BrandsFontRegular);
+ public const string FontBold = nameof(FontBold);
public const string WindowBackgroundColor = nameof(WindowBackgroundColor);
public const string OptionTintColor = nameof(OptionTintColor);
@@ -32,12 +28,8 @@ namespace Billing.Themes
protected void InitResources()
{
- var robotoRegularFontFamily = Definition.GetRobotoCondensedRegularFontFamily();
- Add(CascadiaFontRegular, Definition.GetCascadiaRegularFontFamily());
- Add(CascadiaFontBold, Definition.GetCascadiaBoldFontFamily());
- Add(RobotoCondensedFontRegular, Definition.GetRobotoCondensedRegularFontFamily());
- Add(RobotoCondensedFontBold, Definition.GetRobotoCondensedBoldFontFamily());
- Add(BrandsFontRegular, Definition.GetBrandsFontFamily());
+ var regularFontFamily = Definition.GetRegularFontFamily();
+ Add(FontBold, Definition.GetBoldFontFamily());
Add(PrimaryColor, PrimaryMauiColor);
Add(SecondaryColor, SecondaryMauiColor);
@@ -49,7 +41,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 = robotoRegularFontFamily }
+ new Setter { Property = Label.FontFamilyProperty, Value = regularFontFamily }
}
});
Add(new Style(typeof(OptionEntry))
@@ -57,7 +49,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = Entry.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(Entry)) },
- new Setter { Property = Entry.FontFamilyProperty, Value = robotoRegularFontFamily }
+ new Setter { Property = Entry.FontFamilyProperty, Value = regularFontFamily }
}
});
Add(new Style(typeof(OptionEditor))
@@ -65,7 +57,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = Editor.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(Editor)) },
- new Setter { Property = Editor.FontFamilyProperty, Value = robotoRegularFontFamily }
+ new Setter { Property = Editor.FontFamilyProperty, Value = regularFontFamily }
}
});
Add(new Style(typeof(OptionDatePicker))
@@ -73,7 +65,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = DatePicker.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(DatePicker)) },
- new Setter { Property = DatePicker.FontFamilyProperty, Value = robotoRegularFontFamily }
+ new Setter { Property = DatePicker.FontFamilyProperty, Value = regularFontFamily }
}
});
Add(new Style(typeof(OptionTimePicker))
@@ -81,7 +73,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = TimePicker.FontSizeProperty, Value = Device.GetNamedSize(NamedSize.Small, typeof(TimePicker)) },
- new Setter { Property = TimePicker.FontFamilyProperty, Value = robotoRegularFontFamily }
+ new Setter { Property = TimePicker.FontFamilyProperty, Value = regularFontFamily }
}
});
Add(new Style(typeof(Button))
@@ -89,7 +81,7 @@ namespace Billing.Themes
Setters =
{
new Setter { Property = Button.TextColorProperty, Value = SecondaryMauiColor },
- new Setter { Property = Button.FontFamilyProperty, Value = robotoRegularFontFamily },
+ new Setter { Property = Button.FontFamilyProperty, Value = regularFontFamily },
new Setter { Property = VisualElement.BackgroundColorProperty, Value = PrimaryMauiColor },
new Setter { Property = Button.PaddingProperty, Value = new Thickness(14, 10) }
}
diff --git a/Billing.Shared/UI/BillingDate.xaml b/Billing.Shared/UI/BillingDate.xaml
index 9ab73a0..d0d6d18 100644
--- a/Billing.Shared/UI/BillingDate.xaml
+++ b/Billing.Shared/UI/BillingDate.xaml
@@ -17,7 +17,7 @@
-
+
@@ -32,7 +32,7 @@
-
+
diff --git a/Billing.Shared/UI/BillingDate.xaml.cs b/Billing.Shared/UI/BillingDate.xaml.cs
index a87ed25..ec547cc 100644
--- a/Billing.Shared/UI/BillingDate.xaml.cs
+++ b/Billing.Shared/UI/BillingDate.xaml.cs
@@ -221,7 +221,7 @@ namespace Billing.UI
{
public static readonly BindableProperty DateProperty = BindableProperty.Create(nameof(Date), typeof(DateTime), typeof(BillingDay), propertyChanged: OnDatePropertyChanged);
public static readonly BindableProperty TextProperty = BindableProperty.Create(nameof(Text), typeof(string), typeof(BillingDay));
- public static readonly BindableProperty FontFamilyProperty = BindableProperty.Create(nameof(FontFamily), typeof(string), typeof(BillingDay), defaultValue: Definition.GetCascadiaRegularFontFamily());
+ public static readonly BindableProperty FontFamilyProperty = BindableProperty.Create(nameof(FontFamily), typeof(string), typeof(BillingDay), defaultValue: Definition.GetRegularFontFamily());
public static readonly BindableProperty IsSelectedProperty = BindableProperty.Create(nameof(IsSelected), typeof(bool), typeof(BillingDay));
public static readonly BindableProperty OpacityProperty = BindableProperty.Create(nameof(Opacity), typeof(double), typeof(BillingDay), defaultValue: 1.0);
public static readonly BindableProperty TextOpacityProperty = BindableProperty.Create(nameof(TextOpacity), typeof(double), typeof(BillingDay), defaultValue: 1.0);
@@ -271,11 +271,11 @@ namespace Billing.UI
if (date.Year == selected.Year && date.DayOfYear == selected.DayOfYear)
{
SetValue(IsSelectedProperty, true);
- SetValue(FontFamilyProperty, Definition.GetCascadiaBoldFontFamily());
+ SetValue(FontFamilyProperty, Definition.GetBoldFontFamily());
}
else
{
- SetValue(FontFamilyProperty, Definition.GetCascadiaRegularFontFamily());
+ SetValue(FontFamilyProperty, Definition.GetRegularFontFamily());
}
if (date.Year == selected.Year && date.Month == selected.Month)
{
diff --git a/Billing.Shared/UI/Definition.cs b/Billing.Shared/UI/Definition.cs
index eecbcab..9e04726 100644
--- a/Billing.Shared/UI/Definition.cs
+++ b/Billing.Shared/UI/Definition.cs
@@ -13,10 +13,8 @@ namespace Billing.UI
{
public static string PrimaryColorKey = "PrimaryColor";
public static partial (string main, long build) GetVersion();
- public static partial string GetCascadiaRegularFontFamily();
- public static partial string GetCascadiaBoldFontFamily();
- public static partial string GetRobotoCondensedRegularFontFamily();
- public static partial string GetRobotoCondensedBoldFontFamily();
+ public static partial string GetRegularFontFamily();
+ public static partial string GetBoldFontFamily();
public static partial string GetBrandsFontFamily();
}
diff --git a/Billing.Shared/Views/AccountPage.xaml b/Billing.Shared/Views/AccountPage.xaml
index 2405801..041e140 100644
--- a/Billing.Shared/Views/AccountPage.xaml
+++ b/Billing.Shared/Views/AccountPage.xaml
@@ -30,7 +30,7 @@
-->
-
diff --git a/Billing/Billing.Android/Assets/CascadiaCode-Bold.ttf b/Billing/Billing.Android/Assets/CascadiaCode-Bold.ttf
deleted file mode 100644
index 72183ac..0000000
Binary files a/Billing/Billing.Android/Assets/CascadiaCode-Bold.ttf and /dev/null differ
diff --git a/Billing/Billing.Android/Assets/CascadiaCode-Regular.ttf b/Billing/Billing.Android/Assets/CascadiaCode-Regular.ttf
deleted file mode 100644
index 70a54fa..0000000
Binary files a/Billing/Billing.Android/Assets/CascadiaCode-Regular.ttf and /dev/null differ
diff --git a/Billing/Billing.Android/Assets/OpenSans-Bold.ttf b/Billing/Billing.Android/Assets/OpenSans-Bold.ttf
new file mode 100644
index 0000000..4d8f3e5
Binary files /dev/null and b/Billing/Billing.Android/Assets/OpenSans-Bold.ttf differ
diff --git a/Billing/Billing.Android/Assets/OpenSans-Regular.ttf b/Billing/Billing.Android/Assets/OpenSans-Regular.ttf
new file mode 100644
index 0000000..3a29f26
Binary files /dev/null and b/Billing/Billing.Android/Assets/OpenSans-Regular.ttf differ
diff --git a/Billing/Billing.Android/Assets/RobotoCondensed-Bold.ttf b/Billing/Billing.Android/Assets/RobotoCondensed-Bold.ttf
deleted file mode 100644
index c807004..0000000
Binary files a/Billing/Billing.Android/Assets/RobotoCondensed-Bold.ttf and /dev/null differ
diff --git a/Billing/Billing.Android/Assets/RobotoCondensed-Regular.ttf b/Billing/Billing.Android/Assets/RobotoCondensed-Regular.ttf
deleted file mode 100644
index 17e8ea5..0000000
Binary files a/Billing/Billing.Android/Assets/RobotoCondensed-Regular.ttf and /dev/null differ
diff --git a/Billing/Billing.Android/Billing.Android.csproj b/Billing/Billing.Android/Billing.Android.csproj
index ffa0663..7f179fb 100644
--- a/Billing/Billing.Android/Billing.Android.csproj
+++ b/Billing/Billing.Android/Billing.Android.csproj
@@ -86,11 +86,9 @@
-
-
-
-
+
+
diff --git a/Billing/Billing.Android/Definition.cs b/Billing/Billing.Android/Definition.cs
index 16ebce1..be88aa1 100644
--- a/Billing/Billing.Android/Definition.cs
+++ b/Billing/Billing.Android/Definition.cs
@@ -13,10 +13,8 @@
return (version, build);
}
- public static partial string GetCascadiaRegularFontFamily() => "CascadiaCode-Regular.ttf#CascadiaCode-Regular";
- public static partial string GetCascadiaBoldFontFamily() => "CascadiaCode-Bold.ttf#CascadiaCode-Bold";
- public static partial string GetRobotoCondensedRegularFontFamily() => "RobotoCondensed-Regular.ttf#RobotoCondensed-Regular";
- public static partial string GetRobotoCondensedBoldFontFamily() => "RobotoCondensed-Bold.ttf#RobotoCondensed-Bold";
+ public static partial string GetRegularFontFamily() => "OpenSans-Regular.ttf#OpenSans-Regular";
+ public static partial string GetBoldFontFamily() => "OpenSans-Bold.ttf#OpenSans-Bold";
public static partial string GetBrandsFontFamily() => "fa-brands-400.ttf#FontAwesome6Brands-Regular";
}
}
\ No newline at end of file
diff --git a/Billing/Billing.Android/Properties/AndroidManifest.xml b/Billing/Billing.Android/Properties/AndroidManifest.xml
index dd74d19..8c5af44 100644
--- a/Billing/Billing.Android/Properties/AndroidManifest.xml
+++ b/Billing/Billing.Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
-
+
diff --git a/Billing/Billing.iOS/Billing.iOS.csproj b/Billing/Billing.iOS/Billing.iOS.csproj
index 264e97e..967ac90 100644
--- a/Billing/Billing.iOS/Billing.iOS.csproj
+++ b/Billing/Billing.iOS/Billing.iOS.csproj
@@ -80,15 +80,13 @@
-
-
-
-
+
+
diff --git a/Billing/Billing.iOS/Definition.cs b/Billing/Billing.iOS/Definition.cs
index 9aeed0c..32cb352 100644
--- a/Billing/Billing.iOS/Definition.cs
+++ b/Billing/Billing.iOS/Definition.cs
@@ -6,10 +6,8 @@
Foundation.NSBundle.MainBundle.ObjectForInfoDictionary("CFBundleShortVersionString").ToString(),
int.Parse(Foundation.NSBundle.MainBundle.ObjectForInfoDictionary("CFBundleVersion").ToString())
);
- public static partial string GetCascadiaRegularFontFamily() => "CascadiaCode-Regular";
- public static partial string GetCascadiaBoldFontFamily() => "CascadiaCode-Bold";
- public static partial string GetRobotoCondensedRegularFontFamily() => "RobotoCondensed-Regular";
- public static partial string GetRobotoCondensedBoldFontFamily() => "RobotoCondensed-Bold";
+ public static partial string GetRegularFontFamily() => "OpenSans-Regular";
+ public static partial string GetBoldFontFamily() => "OpenSans-Bold";
public static partial string GetBrandsFontFamily() => "FontAwesome6Brands-Regular";
}
}
\ No newline at end of file
diff --git a/Billing/Billing.iOS/Info.plist b/Billing/Billing.iOS/Info.plist
index e75ea94..799ef0e 100644
--- a/Billing/Billing.iOS/Info.plist
+++ b/Billing/Billing.iOS/Info.plist
@@ -36,17 +36,15 @@
China
UIAppFonts
- RobotoCondensed-Regular.ttf
- RobotoCondensed-Bold.ttf
- CascadiaCode-Bold.ttf
- CascadiaCode-Regular.ttf
fa-brands-400.ttf
+ OpenSans-Bold.ttf
+ OpenSans-Regular.ttf
UIFileSharingEnabled
CFBundleVersion
- 6
+ 7
CFBundleShortVersionString
- 0.6.307
+ 0.7.308
diff --git a/Billing/Billing.iOS/Resources/CascadiaCode-Bold.ttf b/Billing/Billing.iOS/Resources/CascadiaCode-Bold.ttf
deleted file mode 100644
index 9218232..0000000
Binary files a/Billing/Billing.iOS/Resources/CascadiaCode-Bold.ttf and /dev/null differ
diff --git a/Billing/Billing.iOS/Resources/CascadiaCode-Regular.ttf b/Billing/Billing.iOS/Resources/CascadiaCode-Regular.ttf
deleted file mode 100644
index 685374a..0000000
Binary files a/Billing/Billing.iOS/Resources/CascadiaCode-Regular.ttf and /dev/null differ
diff --git a/Billing/Billing.iOS/Resources/OpenSans-Bold.ttf b/Billing/Billing.iOS/Resources/OpenSans-Bold.ttf
new file mode 100644
index 0000000..4d8f3e5
Binary files /dev/null and b/Billing/Billing.iOS/Resources/OpenSans-Bold.ttf differ
diff --git a/Billing/Billing.iOS/Resources/OpenSans-Regular.ttf b/Billing/Billing.iOS/Resources/OpenSans-Regular.ttf
new file mode 100644
index 0000000..3a29f26
Binary files /dev/null and b/Billing/Billing.iOS/Resources/OpenSans-Regular.ttf differ
diff --git a/Billing/Billing.iOS/Resources/RobotoCondensed-Bold.ttf b/Billing/Billing.iOS/Resources/RobotoCondensed-Bold.ttf
deleted file mode 100644
index c807004..0000000
Binary files a/Billing/Billing.iOS/Resources/RobotoCondensed-Bold.ttf and /dev/null differ
diff --git a/Billing/Billing.iOS/Resources/RobotoCondensed-Regular.ttf b/Billing/Billing.iOS/Resources/RobotoCondensed-Regular.ttf
deleted file mode 100644
index 17e8ea5..0000000
Binary files a/Billing/Billing.iOS/Resources/RobotoCondensed-Regular.ttf and /dev/null differ