From cf3d52772d5e3b6fcbbebf097510fc97d6c8e788 Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:18:09 -0500
Subject: [PATCH] Fixed password color and alignment on iOS password generator
 (#743)

---
 src/App/Pages/Generator/GeneratorPage.xaml |  1 +
 src/App/Utilities/PasswordFormatter.cs     | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/App/Pages/Generator/GeneratorPage.xaml b/src/App/Pages/Generator/GeneratorPage.xaml
index efecf5b68..f51301e2c 100644
--- a/src/App/Pages/Generator/GeneratorPage.xaml
+++ b/src/App/Pages/Generator/GeneratorPage.xaml
@@ -68,6 +68,7 @@
                     Margin="0, 20"
                     StyleClass="text-lg"
                     HorizontalTextAlignment="Center"
+                    HorizontalOptions="CenterAndExpand"
                     LineBreakMode="CharacterWrap" />
                 <Button Text="{u:I18n RegeneratePassword}"
                         HorizontalOptions="FillAndExpand"
diff --git a/src/App/Utilities/PasswordFormatter.cs b/src/App/Utilities/PasswordFormatter.cs
index fbf868c34..79a6c6ee5 100644
--- a/src/App/Utilities/PasswordFormatter.cs
+++ b/src/App/Utilities/PasswordFormatter.cs
@@ -30,8 +30,9 @@ namespace Bit.App.Utilities
 
             // First two digits of returned hex code contains the alpha,
             // which is not supported in HTML color, so we need to cut those out.
-            var numberColor = $"<span style=\"color:#{((Color)Application.Current.Resources["PasswordNumberColor"]).ToHex().Substring(2)}\">";
-            var specialColor = $"<span style=\"color:#{((Color)Application.Current.Resources["PasswordSpecialColor"]).ToHex().Substring(2)}\">";
+            var normalColor = $"<span style=\"color:#{((Color)Application.Current.Resources["TextColor"]).ToHex().Substring(3)}\">";
+            var numberColor = $"<span style=\"color:#{((Color)Application.Current.Resources["PasswordNumberColor"]).ToHex().Substring(3)}\">";
+            var specialColor = $"<span style=\"color:#{((Color)Application.Current.Resources["PasswordSpecialColor"]).ToHex().Substring(3)}\">";
             var result = string.Empty;
 
             // Start with an otherwise uncovered case so we will definitely enter the "something changed"
@@ -59,7 +60,7 @@ namespace Bit.App.Utilities
                 if(charType != currentType)
                 {
                     // Close off previous span.
-                    if (currentType != CharType.None && currentType != CharType.Normal)
+                    if (currentType != CharType.None)
                     {
                         result += "</span>";
                     }
@@ -71,6 +72,9 @@ namespace Bit.App.Utilities
                     switch(currentType)
                     {
                         // Apply color style to span.
+                        case CharType.Normal:
+                            result += normalColor;
+                            break;
                         case CharType.Number:
                             result += numberColor;
                             break;
@@ -83,7 +87,7 @@ namespace Bit.App.Utilities
             }
 
             // Close off last span.
-            if (currentType != CharType.None && currentType != CharType.Normal)
+            if (currentType != CharType.None)
             {
                 result += "</span>";
             }