From 5812dc7e7eda32918bc24cdf1ea55cc6ce2bcf7c Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Tue, 30 Apr 2019 11:27:53 -0400
Subject: [PATCH] more button on cipher listing

---
 .../Controls/CipherViewCell/CipherViewCell.xaml   | 15 ++++++++-------
 .../CipherViewCell/CipherViewCell.xaml.cs         | 14 ++++++++++++++
 .../Pages/Vault/GroupingsPage/GroupingsPage.xaml  |  7 +++++--
 .../Vault/GroupingsPage/GroupingsPageViewModel.cs | 12 ++++++++++++
 src/App/Styles/Android.xaml                       |  3 +++
 src/App/Styles/Base.xaml                          | 12 ++++++++++++
 6 files changed, 54 insertions(+), 9 deletions(-)

diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index 2cb827cd9..7edfa6836 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -74,13 +74,14 @@
                    Margin="5, 0, 0, 0"
                    Text="&#xf0c6;"
                    IsVisible="{Binding Cipher.HasAttachments, Mode=OneWay}" />
-
-            <Button WidthRequest="60"
-                    Grid.Column="4"
-                    Grid.Row="0"
-                    Grid.RowSpan="2"
-                    BackgroundColor="Transparent" />
-
+            <ImageButton
+                Source="more.png"
+                StyleClass="list-button, list-button-platform"
+                Clicked="ImageButton_Clicked"
+                Grid.Column="4"
+                Grid.Row="0"
+                Grid.RowSpan="2" />
         </Grid>
+
     </ViewCell.View>
 </ViewCell>
diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
index 420ce82a7..eb086b2b6 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml.cs
@@ -13,6 +13,9 @@ namespace Bit.App.Controls
         public static readonly BindableProperty CipherProperty = BindableProperty.Create(
             nameof(Cipher), typeof(CipherView), typeof(CipherViewCell), default(CipherView), BindingMode.OneWay);
 
+        public static readonly BindableProperty ButtonCommandProperty = BindableProperty.Create(
+            nameof(ButtonCommand), typeof(Command<CipherView>), typeof(CipherViewCell));
+
         private CipherViewCellViewModel _viewModel;
 
         public CipherViewCell()
@@ -27,6 +30,12 @@ namespace Bit.App.Controls
             set => SetValue(CipherProperty, value);
         }
 
+        public Command<CipherView> ButtonCommand
+        {
+            get => GetValue(ButtonCommandProperty) as Command<CipherView>;
+            set => SetValue(ButtonCommandProperty, value);
+        }
+
         protected override void OnPropertyChanged(string propertyName = null)
         {
             base.OnPropertyChanged(propertyName);
@@ -118,5 +127,10 @@ namespace Bit.App.Controls
             }
             return new Tuple<string, string>(icon, image);
         }
+
+        private void ImageButton_Clicked(object sender, EventArgs e)
+        {
+            ButtonCommand?.Execute(Cipher);
+        }
     }
 }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index 8ecc3b075..fb0ea25f3 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -6,7 +6,8 @@
              xmlns:u="clr-namespace:Bit.App.Utilities"
              xmlns:controls="clr-namespace:Bit.App.Controls"
              x:DataType="pages:GroupingsPageViewModel"
-             Title="{Binding PageTitle}">
+             Title="{Binding PageTitle}"
+             x:Name="_page">
 
     <ContentPage.BindingContext>
         <pages:GroupingsPageViewModel />
@@ -16,7 +17,9 @@
         <ResourceDictionary>
             <DataTemplate x:Key="cipherTemplate"
                           x:DataType="pages:GroupingsPageListItem">
-                <controls:CipherViewCell Cipher="{Binding Cipher}" />
+                <controls:CipherViewCell
+                    Cipher="{Binding Cipher}"
+                    ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}" />
             </DataTemplate>
 
             <DataTemplate x:Key="folderTemplate"
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
index 65ba9bfcb..82b60ffa8 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -43,6 +43,7 @@ namespace Bit.App.Pages
                 await LoadAsync();
             });
             AddCipherCommand = new Command(() => { /* TODO */ });
+            CipherOptionsCommand = new Command<CipherView>(CipherOptionsAsync);
         }
 
         public bool ShowFavorites { get; set; } = true;
@@ -99,6 +100,7 @@ namespace Bit.App.Pages
         public ExtendedObservableCollection<GroupingsPageListGroup> GroupedItems { get; set; }
         public Command RefreshCommand { get; set; }
         public Command AddCipherCommand { get; set; }
+        public Command<CipherView> CipherOptionsCommand { get; set; }
 
         public async Task LoadAsync()
         {
@@ -273,5 +275,15 @@ namespace Bit.App.Pages
                 }
             }
         }
+
+        private async void CipherOptionsAsync(CipherView cipher)
+        {
+            var option = await Page.DisplayActionSheet(cipher.Name, AppResources.Cancel, null, "1", "2");
+            if(option == AppResources.Cancel)
+            {
+                return;
+            }
+            // TODO: process options
+        }
     }
 }
diff --git a/src/App/Styles/Android.xaml b/src/App/Styles/Android.xaml
index ef55b6be4..8369be005 100644
--- a/src/App/Styles/Android.xaml
+++ b/src/App/Styles/Android.xaml
@@ -24,6 +24,9 @@
     <Style TargetType="Grid"
            Class="list-row-platform">
     </Style>
+    <Style TargetType="ImageButton"
+           Class="list-button-platform">
+    </Style>
     
     <!-- Box -->
 
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 4ef144a37..5b6b1f6ba 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -97,6 +97,18 @@
         <Setter Property="TextColor"
                 Value="{StaticResource MutedColor}" />
     </Style>
+    <Style TargetType="ImageButton"
+           ApplyToDerivedTypes="True"
+           Class="list-button">
+        <Setter Property="BackgroundColor"
+                Value="Transparent" />
+        <Setter Property="Padding"
+                Value="0" />
+        <Setter Property="HorizontalOptions"
+                Value="End" />
+        <Setter Property="VerticalOptions"
+                Value="CenterAndExpand" />
+    </Style>
     
     <!-- Box -->