From 9ddbe400f83d528ab0251c7c88064d313b8afcd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Bispo?= <abispo@bitwarden.com>
Date: Wed, 22 Jun 2022 19:02:16 +0100
Subject: [PATCH] PS-70 changed labels on manual scanner screen

---
 src/App/Pages/Vault/ScanPage.xaml        | 105 ++++++++++++-----------
 src/App/Pages/Vault/ScanPageViewModel.cs |   9 +-
 2 files changed, 61 insertions(+), 53 deletions(-)

diff --git a/src/App/Pages/Vault/ScanPage.xaml b/src/App/Pages/Vault/ScanPage.xaml
index 55933d36e..4901e21f6 100644
--- a/src/App/Pages/Vault/ScanPage.xaml
+++ b/src/App/Pages/Vault/ScanPage.xaml
@@ -10,18 +10,18 @@
     xmlns:core="clr-namespace:Bit.Core;assembly=BitwardenCore"
     xmlns:zxing="clr-namespace:ZXing.Net.Mobile.Forms;assembly=ZXing.Net.Mobile.Forms"
     x:Name="_page"
-    Title="{u:I18n ScanQrTitle}">
-    
+    Title="{Binding ScanQrPageTitle}">
+
     <ContentPage.BindingContext>
         <pages:ScanPageViewModel />
     </ContentPage.BindingContext>
-    
+
     <ContentPage.Resources>
         <ResourceDictionary>
             <u:InverseBoolConverter x:Key="inverseBool" />
         </ResourceDictionary>
     </ContentPage.Resources>
-    
+
     <ContentPage.ToolbarItems>
         <ToolbarItem Text="{u:I18n Cancel}" Clicked="Close_Clicked" Order="Primary" Priority="-1" />
     </ContentPage.ToolbarItems>
@@ -44,13 +44,42 @@
             Grid.Row="0"
             Grid.RowSpan="3"
             OnScanResult="OnScanResult"/>
+        <StackLayout
+            VerticalOptions="Center"
+            HorizontalOptions="FillAndExpand"
+            IsVisible="{Binding ShowScanner}"
+            Grid.Column="0"
+            Grid.Row="0"
+            Grid.RowSpan="2"
+            Margin="30,0">
+
+            <forms:SKCanvasView
+                x:Name="SkCanvasView" 
+                Margin="0,50,0,0"
+                WidthRequest="250"
+                HeightRequest="250"
+                IsVisible="{Binding ShowScanner}"
+                VerticalOptions="Center" 
+                HorizontalOptions="Center"
+                PaintSurface="OnCanvasViewPaintSurface"/>
+
+            <controls:IconButton 
+                x:Name="_checkIcon"
+                IsVisible="{Binding ShowScanner}"
+                StyleClass="box-row-button, box-row-button-platform"
+                Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
+                HorizontalOptions="Center"
+                VerticalOptions="Start"
+                FontSize="30"
+                TextColor="Transparent"/>
+        </StackLayout>
         <BoxView
             Grid.Column="0"
             Grid.Row="0"
             Grid.RowSpan="2"
             IsVisible="{Binding ShowScanner, Converter={StaticResource inverseBool}}"
             BackgroundColor="{DynamicResource BackgroundColor}"/>
-            <StackLayout
+        <StackLayout
                 VerticalOptions="Center"
                 HorizontalOptions="FillAndExpand"
                 IsVisible="{Binding ShowScanner, Converter={StaticResource inverseBool}}"
@@ -58,76 +87,50 @@
                 Grid.Row="0"
                 Grid.RowSpan="2"
                 Margin="30,0">
-                <Label
+            <Label
                     Text="{u:I18n EnterCodeManually}"
                     FontSize="30" />
-                <Label
-                    Text="{u:I18n AuthenticatorKey}"
+            <Label
+                    Text="{u:I18n AuthenticatorKeyScanner}"
                     StyleClass="box-label" />
-                <controls:MonoEntry
+            <controls:MonoEntry
                     x:Name="_authenticationKeyEntry"
                     Text="{Binding TotpAuthenticationKey}"
                     IsSpellCheckEnabled="False"
                     IsTextPredictionEnabled="False"
                     StyleClass="box-value" />
-                <Button 
+            <Button 
                     Text="{u:I18n AddTotp}" 
                     StyleClass="box-button-row"
                     Clicked="AddAuthenticationKey_OnClicked"/>
-            </StackLayout>
-            <StackLayout
-                VerticalOptions="Center"
-                HorizontalOptions="FillAndExpand"
-                IsVisible="{Binding ShowScanner}"
-                Grid.Column="0"
-                Grid.Row="0"
-                Grid.RowSpan="2"
-                Margin="30,0">
-                
-                <forms:SKCanvasView x:Name="SkCanvasView" 
-                                    Margin="0,50,0,0"
-                                    WidthRequest="250"
-                                    HeightRequest="250"
-                                    VerticalOptions="Center" 
-                                    HorizontalOptions="Center"
-                                    PaintSurface="OnCanvasViewPaintSurface"/>
-                    
-                <controls:IconButton 
-                    x:Name="_checkIcon"
-                    StyleClass="box-row-button, box-row-button-platform"
-                    Text="{Binding Source={x:Static core:BitwardenIcons.CheckCircle}}"
-                    HorizontalOptions="Center"
-                    VerticalOptions="Start"
-                    FontSize="30"
-                    TextColor="Transparent"/>
-            </StackLayout>
-            <BoxView
+        </StackLayout>
+        <BoxView
                 Grid.Column="0"
                 Grid.Row="2"
                 VerticalOptions="Fill"
                 HorizontalOptions="FillAndExpand"
                 BackgroundColor="Black"
                 Opacity="0.7" />
-            <StackLayout
+        <StackLayout
                 VerticalOptions="Start"
                 HorizontalOptions="Center"
                 Grid.Column="0"
                 Grid.Row="2">
-                <Label
-                    Text="{u:I18n CameraInstructionTop}"
+            <Label
+                    Text="{Binding CameraInstructionTop}"
                     AutomationId="zxingDefaultOverlay_TopTextLabel"
-                    Margin="0,15,0,0"
+                    Margin="30,15,30,0"
                     HorizontalOptions="Center"
                     StyleClass="text-sm"
                     TextColor="White" />
-                <Label
-                    Text="{u:I18n CameraInstructionBottom}"
+            <Label
+                    Text="{Binding CameraInstructionBottom}"
                     AutomationId="zxingDefaultOverlay_BottomTextLabel"
                     HorizontalOptions="Center"
                     StyleClass="text-sm"
                     TextColor="White" />
-            </StackLayout>
-            <Label
+        </StackLayout>
+        <Label
                 FormattedText="{Binding ToggleScanModeLabel}"
                 Grid.Column="0"
                 Grid.Row="2"
@@ -135,9 +138,9 @@
                 StyleClass="text-sm"
                 VerticalOptions="End"
                 HorizontalOptions="Center" >
-                <Label.GestureRecognizers>
-                    <TapGestureRecognizer Tapped="ToggleScanMode_OnTapped" />
-                </Label.GestureRecognizers>
-            </Label>
-        </Grid>
+            <Label.GestureRecognizers>
+                <TapGestureRecognizer Tapped="ToggleScanMode_OnTapped" />
+            </Label.GestureRecognizers>
+        </Label>
+    </Grid>
 </pages:BaseContentPage>
\ No newline at end of file
diff --git a/src/App/Pages/Vault/ScanPageViewModel.cs b/src/App/Pages/Vault/ScanPageViewModel.cs
index d7b80067c..8e5536733 100644
--- a/src/App/Pages/Vault/ScanPageViewModel.cs
+++ b/src/App/Pages/Vault/ScanPageViewModel.cs
@@ -17,7 +17,9 @@ namespace Bit.App.Pages
         }
 
         public Command ToggleScanModeCommand { get; set; }
-
+        public string ScanQrPageTitle => ShowScanner ? AppResources.ScanQrTitle : AppResources.AuthenticatorKeyScanner;
+        public string CameraInstructionTop => ShowScanner ? AppResources.CameraInstructionTop : AppResources.OnceTheKeyIsSuccessfullyEntered;
+        public string CameraInstructionBottom => ShowScanner ? AppResources.CameraInstructionBottom : AppResources.SelectAddTotpToStoreTheKeySafely;
         public string TotpAuthenticationKey
         {
             get => _totpAuthenticationKey;
@@ -33,7 +35,10 @@ namespace Bit.App.Pages
             set => SetProperty(ref _showScanner, value,
                 additionalPropertyNames: new string[]
                 {
-                    nameof(ToggleScanModeLabel)
+                    nameof(ToggleScanModeLabel),
+                    nameof(ScanQrPageTitle),
+                    nameof(CameraInstructionTop),
+                    nameof(CameraInstructionBottom)
                 });
         }