From a07ef1a1d6a7af040c3570d86ee9690b8c1c8d0d Mon Sep 17 00:00:00 2001
From: Federico Maccaroni
 <92699249+Federico-Maccaroni@users.noreply.github.com>
Date: Mon, 25 Oct 2021 16:28:14 -0300
Subject: [PATCH] Fix html labels colors issue (#1516) (#1603)

---
 src/App/Pages/Generator/GeneratorHistoryPage.xaml | 3 +--
 src/App/Pages/Generator/GeneratorPage.xaml        | 3 +--
 src/App/Pages/Vault/PasswordHistoryPage.xaml      | 3 +--
 src/App/Pages/Vault/ViewPage.xaml                 | 3 +--
 src/App/Styles/Base.xaml                          | 8 ++++++++
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/App/Pages/Generator/GeneratorHistoryPage.xaml b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
index 0bf1af963..74edf0f7d 100644
--- a/src/App/Pages/Generator/GeneratorHistoryPage.xaml
+++ b/src/App/Pages/Generator/GeneratorHistoryPage.xaml
@@ -68,8 +68,7 @@
                         <controls:MonoLabel LineBreakMode="CharacterWrap"
                             Grid.Column="0"
                             Grid.Row="0"
-                            StyleClass="list-title, list-title-platform"
-                            TextType="Html"
+                            StyleClass="list-title, list-title-platform, text-html"
                             Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
                         <Label LineBreakMode="TailTruncation"
                             Grid.Column="0"
diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index cdc241044..51f8b99c8 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -63,10 +63,9 @@
                     </Frame>
                 </Grid>
                 <controls:MonoLabel
+                    StyleClass="text-lg, text-html"
                     Text="{Binding ColoredPassword, Mode=OneWay}"
-                    TextType="Html"
                     Margin="0, 20"
-                    StyleClass="text-lg"
                     HorizontalTextAlignment="Center"
                     HorizontalOptions="CenterAndExpand"
                     LineBreakMode="CharacterWrap" />
diff --git a/src/App/Pages/Vault/PasswordHistoryPage.xaml b/src/App/Pages/Vault/PasswordHistoryPage.xaml
index 680261a12..1f77e9c6f 100644
--- a/src/App/Pages/Vault/PasswordHistoryPage.xaml
+++ b/src/App/Pages/Vault/PasswordHistoryPage.xaml
@@ -59,8 +59,7 @@
                         <controls:MonoLabel LineBreakMode="CharacterWrap"
                             Grid.Column="0"
                             Grid.Row="0"
-                            StyleClass="list-title, list-title-platform"
-                            TextType="Html"
+                            StyleClass="list-title, list-title-platform, text-html"
                             Text="{Binding Password, Mode=OneWay, Converter={StaticResource coloredPassword}}" />
                         <Label LineBreakMode="TailTruncation"
                             Grid.Column="0"
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index 54f58ff02..d9607ba19 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -120,8 +120,7 @@
                                     IsVisible="{Binding ShowPassword, Converter={StaticResource inverseBool}}" />
                                 <controls:MonoLabel
                                     Text="{Binding ColoredPassword, Mode=OneWay}"
-                                    TextType="Html"
-                                    StyleClass="box-value"
+                                    StyleClass="box-value, text-html"
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     LineBreakMode="CharacterWrap"
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 6f509ed8a..e6788b016 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -59,6 +59,14 @@
         <Setter Property="FontAttributes"
                 Value="Bold" />
     </Style>
+    <Style TargetType="Label"
+           Class="text-html"
+           ApplyToDerivedTypes="True">
+        <Setter Property="TextColor"
+                Value="Default" />
+        <Setter Property="TextType"
+                Value="Html" />
+    </Style>
 
     <!-- Pages -->
     <Style TargetType="TabbedPage"