From 5e70d03dbe4caf6e2aa3b8d09b2b4ad481f75742 Mon Sep 17 00:00:00 2001
From: Matt Portune <59324545+mportune-bw@users.noreply.github.com>
Date: Thu, 11 Feb 2021 16:27:22 -0500
Subject: [PATCH] Added disabled icon and make File default type for new Sends
 if premium (#1261)

* Added disabled icon and make File default type for new Sends if premium

* forgot to expand colspan for extra icon
---
 .../Controls/SendViewCell/SendViewCell.xaml   | 20 +++++++++++++++----
 src/App/Pages/Send/SendAddEditPage.xaml       | 16 +++++++--------
 .../Pages/Send/SendAddEditPageViewModel.cs    |  3 ++-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/src/App/Controls/SendViewCell/SendViewCell.xaml b/src/App/Controls/SendViewCell/SendViewCell.xaml
index f740f87a6..135f2d729 100644
--- a/src/App/Controls/SendViewCell/SendViewCell.xaml
+++ b/src/App/Controls/SendViewCell/SendViewCell.xaml
@@ -46,6 +46,7 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="Auto" />
+                <ColumnDefinition Width="Auto" />
                 <ColumnDefinition Width="*" />
             </Grid.ColumnDefinitions>
 
@@ -59,7 +60,7 @@
                 LineBreakMode="TailTruncation"
                 Grid.Column="0"
                 Grid.Row="1"
-                Grid.ColumnSpan="5"
+                Grid.ColumnSpan="6"
                 StyleClass="list-subtitle, list-subtitle-platform"
                 Text="{Binding Send.DisplayDate, Mode=OneWay}" />
             <controls:FaLabel
@@ -69,12 +70,23 @@
                 VerticalOptions="Center"
                 StyleClass="list-title-icon"
                 Margin="5, 0, 0, 0"
+                Text="&#xf071;"
+                IsVisible="{Binding Send.Disabled, Mode=OneWay}"
+                AutomationProperties.IsInAccessibleTree="True"
+                AutomationProperties.Name="{u:I18n Disabled}" />
+            <controls:FaLabel
+                Grid.Column="2"
+                Grid.Row="0"
+                HorizontalOptions="Start"
+                VerticalOptions="Center"
+                StyleClass="list-title-icon"
+                Margin="5, 0, 0, 0"
                 Text="&#xf084;"
                 IsVisible="{Binding Send.HasPassword, Mode=OneWay}"
                 AutomationProperties.IsInAccessibleTree="True"
                 AutomationProperties.Name="{u:I18n Password}" />
             <controls:FaLabel
-                Grid.Column="2"
+                Grid.Column="3"
                 Grid.Row="0"
                 HorizontalOptions="Start"
                 VerticalOptions="Center"
@@ -85,7 +97,7 @@
                 AutomationProperties.IsInAccessibleTree="True"
                 AutomationProperties.Name="{u:I18n MaxAccessCountReached}" />
             <controls:FaLabel
-                Grid.Column="3"
+                Grid.Column="4"
                 Grid.Row="0"
                 HorizontalOptions="Start"
                 VerticalOptions="Center"
@@ -96,7 +108,7 @@
                 AutomationProperties.IsInAccessibleTree="True"
                 AutomationProperties.Name="{u:I18n Expired}" />
             <controls:FaLabel
-                Grid.Column="4"
+                Grid.Column="5"
                 Grid.Row="0"
                 HorizontalOptions="Start"
                 VerticalOptions="Center"
diff --git a/src/App/Pages/Send/SendAddEditPage.xaml b/src/App/Pages/Send/SendAddEditPage.xaml
index b303e222b..c86129203 100644
--- a/src/App/Pages/Send/SendAddEditPage.xaml
+++ b/src/App/Pages/Send/SendAddEditPage.xaml
@@ -86,11 +86,11 @@
                                     <ColumnDefinition Width="*" />
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
-                                <Button Text="{u:I18n TypeText}"
-                                        IsEnabled="{Binding IsFile}"
-                                        Clicked="TextType_Clicked"
+                                <Button Text="{u:I18n TypeFile}"
+                                        IsEnabled="{Binding IsText}"
+                                        Clicked="FileType_Clicked"
                                         AutomationProperties.IsInAccessibleTree="True"
-                                        AutomationProperties.Name="{u:I18n Text}"
+                                        AutomationProperties.Name="{u:I18n File}"
                                         Grid.Column="0">
                                     <VisualStateManager.VisualStateGroups>
                                         <!-- Rider users, if the x:Name values below are red, it's a known issue: -->
@@ -111,11 +111,11 @@
                                         </VisualStateGroup>
                                     </VisualStateManager.VisualStateGroups>
                                 </Button>
-                                <Button Text="{u:I18n TypeFile}"
-                                        IsEnabled="{Binding IsText}"
-                                        Clicked="FileType_Clicked"
+                                <Button Text="{u:I18n TypeText}"
+                                        IsEnabled="{Binding IsFile}"
+                                        Clicked="TextType_Clicked"
                                         AutomationProperties.IsInAccessibleTree="True"
-                                        AutomationProperties.Name="{u:I18n File}"
+                                        AutomationProperties.Name="{u:I18n Text}"
                                         Grid.Column="1">
                                     <VisualStateManager.VisualStateGroups>
                                         <!-- Rider users, if the x:Name values below are red, it's a known issue: -->
diff --git a/src/App/Pages/Send/SendAddEditPageViewModel.cs b/src/App/Pages/Send/SendAddEditPageViewModel.cs
index d8cb97446..1e3df352c 100644
--- a/src/App/Pages/Send/SendAddEditPageViewModel.cs
+++ b/src/App/Pages/Send/SendAddEditPageViewModel.cs
@@ -195,9 +195,10 @@ namespace Bit.App.Pages
                 }
                 else
                 {
+                    var defaultType = _canAccessPremium ? SendType.File : SendType.Text;
                     Send = new SendView
                     {
-                        Type = Type.GetValueOrDefault(SendType.Text),
+                        Type = Type.GetValueOrDefault(defaultType),
                         DeletionDate = DateTime.Now.AddDays(7),
                     };
                     DeletionDateTypeSelectedIndex = 4;