From a51c2efdae02cfaaf6812565186bc97f90d25783 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Bispo?= <abispo@bitwarden.com>
Date: Wed, 29 Jun 2022 11:29:29 +0100
Subject: [PATCH] PS-70 changed premium required label. fixed bug when to show
 premium required label.

---
 .../AuthenticatorViewCell.xaml                |  4 --
 src/App/Pages/Vault/ViewPage.xaml             | 71 ++++++++++---------
 src/App/Pages/Vault/ViewPageViewModel.cs      | 20 +-----
 src/App/Resources/AppResources.Designer.cs    | 10 +--
 src/App/Resources/AppResources.resx           |  7 +-
 5 files changed, 44 insertions(+), 68 deletions(-)

diff --git a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
index cd2a6f061..a6e9ac662 100644
--- a/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
+++ b/src/App/Controls/AuthenticatorViewCell/AuthenticatorViewCell.xaml
@@ -8,16 +8,12 @@
                        xmlns:ff="clr-namespace:FFImageLoading.Forms;assembly=FFImageLoading.Forms"
                        xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
                        StyleClass="list-row, list-row-platform"
-                       RowSpacing="0"
-                       ColumnSpacing="0"
                        HorizontalOptions="FillAndExpand"
                        x:DataType="pages:GroupingsPageTOTPListItem">
 
     <Grid.Resources>
         <u:IconGlyphConverter x:Key="iconGlyphConverter" />
-        <u:IconImageConverter x:Key="iconImageConverter" />
         <u:InverseBoolConverter x:Key="inverseBool" />
-        <u:StringHasValueConverter x:Key="stringHasValueConverter" />
     </Grid.Resources>
 
     <Grid.RowDefinitions>
diff --git a/src/App/Pages/Vault/ViewPage.xaml b/src/App/Pages/Vault/ViewPage.xaml
index 2aeca48fa..bc733996e 100644
--- a/src/App/Pages/Vault/ViewPage.xaml
+++ b/src/App/Pages/Vault/ViewPage.xaml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<pages:BaseContentPage 
+<?xml version="1.0" encoding="utf-8"?>
+<pages:BaseContentPage
     xmlns="http://xamarin.com/schemas/2014/forms"
     xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
     x:Class="Bit.App.Pages.ViewPage"
@@ -22,15 +22,15 @@
             <u:StringHasValueConverter x:Key="stringHasValue" />
             <u:IsNotNullConverter x:Key="notNull" />
             <ToolbarItem Text="{u:I18n Collections}"
-                     x:Key="collectionsItem"
-                     x:Name="_collectionsItem"
-                     Clicked="Collections_Clicked"
-                     Order="Secondary" />
+                         x:Key="collectionsItem"
+                         x:Name="_collectionsItem"
+                         Clicked="Collections_Clicked"
+                         Order="Secondary" />
             <ToolbarItem Text="{u:I18n MoveToOrganization}"
-                     x:Key="shareItem"
-                     x:Name="_shareItem"
-                     Clicked="Share_Clicked"
-                     Order="Secondary" />
+                         x:Key="shareItem"
+                         x:Name="_shareItem"
+                         Clicked="Share_Clicked"
+                         Order="Secondary" />
             <ToolbarItem Text="{u:I18n Close}" Clicked="Close_Clicked" Order="Primary" Priority="-1"
                          x:Name="_closeItem" x:Key="closeItem" />
             <ToolbarItem Clicked="EditToolbarItem_Clicked" Order="Primary"
@@ -83,7 +83,7 @@
                                     StyleClass="box-value"
                                     Grid.Row="1"
                                     Grid.Column="0" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -96,7 +96,7 @@
                             </Grid>
                             <BoxView StyleClass="box-row-separator"
                                      IsVisible="{Binding Cipher.Login.Username, Converter={StaticResource stringHasValue}}" />
-                            <Grid StyleClass="box-row" 
+                            <Grid StyleClass="box-row"
                                   IsVisible="{Binding Cipher.Login.Password, Converter={StaticResource stringHasValue}}">
                                 <Grid.RowDefinitions>
                                     <RowDefinition Height="Auto" />
@@ -126,7 +126,7 @@
                                     Grid.Column="0"
                                     LineBreakMode="CharacterWrap"
                                     IsVisible="{Binding ShowPassword}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
                                     Command="{Binding CheckPasswordCommand}"
@@ -136,7 +136,7 @@
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n CheckPassword}"
                                     IsVisible="{Binding Cipher.ViewPassword}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowPasswordIcon}"
                                     Command="{Binding TogglePasswordCommand}"
@@ -147,7 +147,7 @@
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}"
                                     AutomationProperties.HelpText="{Binding PasswordVisibilityAccessibilityText}"
                                     IsVisible="{Binding Cipher.ViewPassword}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -166,6 +166,7 @@
                                     <RowDefinition Height="Auto" />
                                     <RowDefinition Height="*" />
                                     <RowDefinition Height="Auto" />
+                                    <RowDefinition Height="Auto" />
                                 </Grid.RowDefinitions>
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
@@ -176,14 +177,14 @@
                                     Text="{u:I18n VerificationCodeTotp}"
                                     StyleClass="box-label"
                                     Grid.Row="0"
-                                    Grid.Column="0"/>
+                                    Grid.Column="0" />
                                 <controls:MonoLabel
                                     Text="{Binding TotpCodeFormatted, Mode=OneWay}"
                                     StyleClass="box-value"
                                     Grid.Row="1"
-                                    Grid.Column="0" 
+                                    Grid.Column="0"
                                     VerticalTextAlignment="Start"
-                                    VerticalOptions="Start"/>
+                                    VerticalOptions="Start" />
                                 <controls:CircularProgressbarView
                                     Progress="{Binding TotpProgress}"
                                     ProgressColor="{StaticResource PrimaryColor}"
@@ -205,8 +206,8 @@
                                     VerticalTextAlignment="Center"
                                     HorizontalTextAlignment="Center"
                                     HorizontalOptions="FillAndExpand"
-                                    VerticalOptions="FillAndExpand"  />
-                                <controls:IconButton 
+                                    VerticalOptions="FillAndExpand" />
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -217,12 +218,16 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n CopyTotp}" />
+                                <Label
+                                    Text="{Binding UpgradeToPremiumTotpText}"
+                                    StyleClass="box-footer-label"
+                                    IsVisible="{Binding ShowUpgradePremiumTotpText}"
+                                    Margin="0,2"
+                                    Grid.Column="0"
+                                    Grid.Row="3"
+                                    Grid.ColumnSpan="3"
+                                    HorizontalOptions="FillAndExpand" />
                             </Grid>
-                            <Label FormattedText="{Binding UpgradeToPremiumTotpText}"
-                                   StyleClass="box-footer-label"
-                                   IsVisible="{Binding CanAccessPremium , Converter={StaticResource inverseBool}}"
-                                   Margin="0,5"
-                                   HorizontalOptions="StartAndExpand"/>
                             <BoxView StyleClass="box-row-separator" IsVisible="{Binding ShowTotp}" />
                         </StackLayout>
                         <StackLayout IsVisible="{Binding IsCard}" Spacing="0" Padding="0">
@@ -265,7 +270,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     IsVisible="{Binding ShowCardNumber}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowCardNumberIcon}"
                                     Command="{Binding ToggleCardNumberCommand}"
@@ -274,7 +279,7 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -337,7 +342,7 @@
                                     Grid.Row="1"
                                     Grid.Column="0"
                                     IsVisible="{Binding ShowCardCode}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding ShowCardCodeIcon}"
                                     Command="{Binding ToggleCardCodeCommand}"
@@ -346,7 +351,7 @@
                                     Grid.RowSpan="2"
                                     AutomationProperties.IsInAccessibleTree="True"
                                     AutomationProperties.Name="{u:I18n ToggleVisibility}" />
-                                <controls:IconButton 
+                                <controls:IconButton
                                     StyleClass="box-row-button, box-row-button-platform"
                                     Text="{Binding Source={x:Static core:BitwardenIcons.Clone}}"
                                     Command="{Binding CopyCommand}"
@@ -550,7 +555,7 @@
                         <StackLayout StyleClass="box-row">
                             <controls:SelectableLabel
                                 Text="{Binding Cipher.Notes, Mode=OneWay}"
-                                StyleClass="box-value"/>
+                                StyleClass="box-value" />
                         </StackLayout>
                         <BoxView StyleClass="box-row-separator" />
                     </StackLayout>
@@ -609,7 +614,7 @@
                                                     StyleClass="box-value"
                                                     IsVisible="{Binding ShowHiddenValue, Converter={StaticResource inverseBool}}" />
                                             </StackLayout>
-                                            <controls:IconButton 
+                                            <controls:IconButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding ShowHiddenValueIcon}"
                                                 Command="{Binding ToggleHiddenValueCommand}"
@@ -657,7 +662,7 @@
                                                 StyleClass="box-sub-label"
                                                 HorizontalTextAlignment="End"
                                                 VerticalTextAlignment="Center" />
-                                            <controls:IconButton 
+                                            <controls:IconButton
                                                 StyleClass="box-row-button, box-row-button-platform"
                                                 Text="{Binding Source={x:Static core:BitwardenIcons.Download}}"
                                                 Command="{Binding BindingContext.DownloadAttachmentCommand, Source={x:Reference _page}}"
@@ -721,4 +726,4 @@
         </Button>
     </AbsoluteLayout>
 
-</pages:BaseContentPage>
+</pages:BaseContentPage>
\ No newline at end of file
diff --git a/src/App/Pages/Vault/ViewPageViewModel.cs b/src/App/Pages/Vault/ViewPageViewModel.cs
index f3b80eb4c..4a443fc1b 100644
--- a/src/App/Pages/Vault/ViewPageViewModel.cs
+++ b/src/App/Pages/Vault/ViewPageViewModel.cs
@@ -204,24 +204,8 @@ namespace Bit.App.Pages
             }
         }
 
-        public FormattedString UpgradeToPremiumTotpText
-        {
-            get
-            {
-                var fs = new FormattedString();
-                fs.Spans.Add(new Span
-                {
-                    Text = AppResources.UpgradeToPremium,
-                    TextColor = ThemeManager.GetResourceColor("PrimaryColor")
-                });
-                fs.Spans.Add(new Span
-                {
-                    Text = AppResources.ToViewVerificationCodes,
-                    TextColor = ThemeManager.GetResourceColor("MutedColor")
-                });
-                return fs;
-            }
-        }
+        public string UpgradeToPremiumTotpText => AppResources.PremiumSubscriptionRequired;
+        public bool ShowUpgradePremiumTotpText => !CanAccessPremium && ShowTotp;
 
         public bool ShowUris => IsLogin && Cipher.Login.HasUris;
         public bool ShowIdentityAddress => IsIdentity && (
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index d94aeac06..55f17f42f 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -4047,15 +4047,9 @@ namespace Bit.App.Resources {
             }
         }
         
-        public static string UpgradeToPremium {
+        public static string PremiumSubscriptionRequired {
             get {
-                return ResourceManager.GetString("UpgradeToPremium", resourceCulture);
-            }
-        }
-        
-        public static string ToViewVerificationCodes {
-            get {
-                return ResourceManager.GetString("ToViewVerificationCodes", resourceCulture);
+                return ResourceManager.GetString("PremiumSubscriptionRequired", resourceCulture);
             }
         }
         
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 6cb64b15e..7083ac6d2 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -2261,11 +2261,8 @@
   <data name="DisplayItemsContainingTOTP" xml:space="preserve">
     <value>Display items containing TOTP</value>
   </data>
-  <data name="UpgradeToPremium" xml:space="preserve">
-    <value>Upgrade to  premium </value>
-  </data>
-  <data name="ToViewVerificationCodes" xml:space="preserve">
-    <value>to view verification codes</value>
+  <data name="PremiumSubscriptionRequired" xml:space="preserve">
+    <value>Premium subscription required</value>
   </data>
   <data name="CannotAddAuthenticatorKey" xml:space="preserve">
     <value>Cannot add authenticator key? </value>