mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-29 12:28:31 +03:00
Code Issues Projects Releases Packages Wiki Activity

PM-3350 Fix for colored html text on iOS

Browse source
This commit is contained in:
Dinis Vieira 2023-11-11 15:05:51 +00:00
parent 0e75f3f5c8
commit a31f15559f
No known key found for this signature in database
GPG key ID: 9389160FF6C295F3
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Core/Controls/MonoLabel.cs
View file

@ -7,10 +7,6 @@
if (DeviceInfo.Platform == DevicePlatform.iOS) if (DeviceInfo.Platform == DevicePlatform.iOS)
{ {
FontFamily = "Menlo-Regular"; FontFamily = "Menlo-Regular";
//[MAUI-Migration] Temporary Workaround for the Text to appear in iOS.
// A proper solution needs to be found to be able to have html text with different colors or alternatively use Label FormattedString Spans
TextColor = Colors.Black;
} }
else if (DeviceInfo.Platform == DevicePlatform.Android) else if (DeviceInfo.Platform == DevicePlatform.Android)
{ {

3
src/Core/Resources/Styles/Base.xaml
View file

@ -59,12 +59,11 @@
<Setter Property="FontAttributes" <Setter Property="FontAttributes"
Value="Bold" /> Value="Bold" />
</Style> </Style>
<!--[MAUI-Migration][Color-default]-->
<Style TargetType="Label" <Style TargetType="Label"
Class="text-html" Class="text-html"
ApplyToDerivedTypes="True"> ApplyToDerivedTypes="True">
<Setter Property="TextColor" <Setter Property="TextColor"
Value="#ffffff" /> Value="{x:Null}" />
<Setter Property="TextType" <Setter Property="TextType"
Value="Html" /> Value="Html" />
</Style> </Style>