Skip to content
This repository was archived by the owner on May 1, 2024. It is now read-only.

Revert "Replace Shell sans-serif-medium magic string on Android" #15705

Merged
merged 1 commit into from
Mar 6, 2023
Merged

Revert "Replace Shell sans-serif-medium magic string on Android" #15705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Xamarin.Forms.Core/Shell/BaseShellItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,7 @@ internal static DataTemplate CreateDefaultFlyoutItemCell(string textBinding, str
{
defaultLabelClass.Setters.Add(new Setter { Property = Label.FontSizeProperty, Value = 14 });
defaultLabelClass.Setters.Add(new Setter { Property = Label.TextColorProperty, Value = Color.Black.MultiplyAlpha(0.87) });
defaultLabelClass.Setters.Add(new Setter { Property = Label.FontFamilyProperty, Value = "sans-serif-medium" });
defaultLabelClass.Setters.Add(new Setter { Property = Label.MarginProperty, Value = new Thickness(20, 0, 0, 0) });
}
else if (Device.RuntimePlatform == Device.iOS)
Expand Down
2 changes: 1 addition & 1 deletion Xamarin.Forms.Platform.Android/Renderers/BottomNavigationViewUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ void clickCallback(object s, EventArgs e)

using (var text = new TextView(context))
{
text.SetTypeface(Typeface.SansSerif, TypefaceStyle.Normal);
text.SetTypeface(Typeface.Create("sans-serif-medium", TypefaceStyle.Normal), TypefaceStyle.Normal);
text.SetTextColor(AColor.Black);
text.Text = shellContent.title;
lp = new LinearLayout.LayoutParams(0, LP.WrapContent)
Expand Down
3 changes: 1 addition & 2 deletions Xamarin.Forms.Platform.Android/Renderers/ShellItemRenderer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
using System.Collections.Specialized;
using System.ComponentModel;
using Android.Content;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.OS;
using Android.Views;
Expand Down Expand Up @@ -217,7 +216,7 @@ void clickCallback(object s, EventArgs e)

using (var text = new TextView(Context))
{
text.Typeface = Typeface.SansSerif;
text.Typeface = "sans-serif-medium".ToTypeFace();
text.SetTextColor(AColor.Black);
text.Text = shellContent.Title;
lp = new LinearLayout.LayoutParams(0, LP.WrapContent)
Expand Down