From ba9605383da797c590414f6fd93e2e9162b566a3 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Wed, 1 May 2019 11:31:00 -0400
Subject: [PATCH] grouping types filter

---
 .../CipherViewCell/CipherViewCell.xaml        |  4 +-
 .../Vault/GroupingsPage/GroupingsPage.xaml    | 29 ++------
 .../Vault/GroupingsPage/GroupingsPage.xaml.cs |  4 ++
 .../GroupingsPage/GroupingsPageListGroup.cs   |  4 ++
 .../GroupingsPage/GroupingsPageListItem.cs    | 68 ++++++++++++++++++-
 .../GroupingsPageListItemSelector.cs          | 13 +---
 .../GroupingsPage/GroupingsPageViewModel.cs   | 15 +++-
 src/App/Resources/AppResources.Designer.cs    |  9 +++
 src/App/Resources/AppResources.resx           |  3 +
 src/App/Styles/Base.xaml                      | 12 +++-
 10 files changed, 118 insertions(+), 43 deletions(-)

diff --git a/src/App/Controls/CipherViewCell/CipherViewCell.xaml b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
index 7edfa6836..638fc9545 100644
--- a/src/App/Controls/CipherViewCell/CipherViewCell.xaml
+++ b/src/App/Controls/CipherViewCell/CipherViewCell.xaml
@@ -43,8 +43,8 @@
                             ErrorPlaceholder="login.png"
                             HorizontalOptions="Center"
                             VerticalOptions="Center"
-                            WidthRequest="20"
-                            HeightRequest="20"
+                            WidthRequest="22"
+                            HeightRequest="22"
                             IsVisible="False"/>
             <Label LineBreakMode="TailTruncation"
                    Grid.Column="1"
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
index d52a90aef..f569ddd15 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml
@@ -22,34 +22,16 @@
                     ButtonCommand="{Binding BindingContext.CipherOptionsCommand, Source={x:Reference _page}}" />
             </DataTemplate>
 
-            <DataTemplate x:Key="folderTemplate"
+            <DataTemplate x:Key="groupTemplate"
                           x:DataType="pages:GroupingsPageListItem">
                 <ViewCell>
                     <StackLayout Orientation="Horizontal"
                                  StyleClass="list-row, list-row-platform">
                         <controls:FaLabel Text="{Binding Icon, Mode=OneWay}"
-                                          HorizontalOptions="Start"
-                                          VerticalOptions="CenterAndExpand"
+                                          HorizontalOptions="Center"
+                                          VerticalOptions="Center"
                                           StyleClass="list-icon" />
-                        <Label Text="{Binding Folder.Name, Mode=OneWay}"
-                               LineBreakMode="TailTruncation"
-                               HorizontalOptions="StartAndExpand"
-                               VerticalOptions="CenterAndExpand"
-                               StyleClass="list-title"/>
-                    </StackLayout>
-                </ViewCell>
-            </DataTemplate>
-
-            <DataTemplate x:Key="collectionTemplate"
-                          x:DataType="pages:GroupingsPageListItem">
-                <ViewCell>
-                    <StackLayout Orientation="Horizontal"
-                                 StyleClass="list-row, list-row-platform">
-                        <controls:FaLabel Text="{Binding Icon, Mode=OneWay}"
-                                          HorizontalOptions="Start"
-                                          VerticalOptions="CenterAndExpand"
-                                          StyleClass="list-icon" />
-                        <Label Text="{Binding Collection.Name, Mode=OneWay}"
+                        <Label Text="{Binding Name, Mode=OneWay}"
                                LineBreakMode="TailTruncation"
                                HorizontalOptions="StartAndExpand"
                                VerticalOptions="CenterAndExpand"
@@ -60,8 +42,7 @@
 
             <pages:GroupingsPageListItemSelector x:Key="listItemDataTemplateSelector"
                                                  CipherTemplate="{StaticResource cipherTemplate}"
-                                                 FolderTemplate="{StaticResource folderTemplate}"
-                                                 CollectionTemplate="{StaticResource collectionTemplate}" />
+                                                 GroupTemplate="{StaticResource groupTemplate}" />
         </ResourceDictionary>
     </ContentPage.Resources>
     <StackLayout x:Name="_mainLayout">
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
index f2c6379ea..027b9e487 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPage.xaml.cs
@@ -90,6 +90,10 @@ namespace Bit.App.Pages
             {
                 await _viewModel.SelectCollectionAsync(item.Collection);
             }
+            else if(item.Type != null)
+            {
+                await _viewModel.SelectTypeAsync(item.Type.Value);
+            }
         }
     }
 }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs
index 4963e1447..3a556349b 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListGroup.cs
@@ -4,6 +4,10 @@ namespace Bit.App.Pages
 {
     public class GroupingsPageListGroup : List<GroupingsPageListItem>
     {
+        public GroupingsPageListGroup(string name, bool doUpper = true)
+            : this(new List<GroupingsPageListItem>(), name, doUpper)
+        { }
+
         public GroupingsPageListGroup(List<GroupingsPageListItem> groupItems, string name, bool doUpper = true)
         {
             AddRange(groupItems);
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
index acdba5124..48f5a4053 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItem.cs
@@ -1,14 +1,59 @@
-using Bit.Core.Models.View;
+using Bit.App.Resources;
+using Bit.Core.Enums;
+using Bit.Core.Models.View;
 
 namespace Bit.App.Pages
 {
     public class GroupingsPageListItem
     {
         private string _icon;
+        private string _name;
 
         public FolderView Folder { get; set; }
         public CollectionView Collection { get; set; }
         public CipherView Cipher { get; set; }
+        public CipherType? Type { get; set; }
+
+        public string Name
+        {
+            get
+            {
+                if(_name != null)
+                {
+                    return _name;
+                }
+                if(Folder != null)
+                {
+                    _name = Folder.Name;
+                }
+                else if(Collection != null)
+                {
+                    _name = Collection.Name;
+                }
+                else if(Type != null)
+                {
+                    switch(Type.Value)
+                    {
+                        case CipherType.Login:
+                            _name = AppResources.TypeLogin;
+                            break;
+                        case CipherType.SecureNote:
+                            _name = AppResources.TypeSecureNote;
+                            break;
+                        case CipherType.Card:
+                            _name = AppResources.TypeCard;
+                            break;
+                        case CipherType.Identity:
+                            _name = AppResources.TypeIdentity;
+                            break;
+                        default:
+                            break;
+                    }
+                }
+                return _name;
+            }
+        }
+
         public string Icon
         {
             get
@@ -25,6 +70,27 @@ namespace Bit.App.Pages
                 {
                     _icon = "";
                 }
+                else if(Type != null)
+                {
+                    switch(Type.Value)
+                    {
+                        case CipherType.Login:
+                            _icon = "";
+                            break;
+                        case CipherType.SecureNote:
+                            _icon = "";
+                            break;
+                        case CipherType.Card:
+                            _icon = "";
+                            break;
+                        case CipherType.Identity:
+                            _icon = "";
+                            break;
+                        default:
+                            _icon = "";
+                            break;
+                    }
+                }
                 return _icon;
             }
         }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs
index 51bea988d..4fea472ba 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageListItemSelector.cs
@@ -5,22 +5,13 @@ namespace Bit.App.Pages
     public class GroupingsPageListItemSelector : DataTemplateSelector
     {
         public DataTemplate CipherTemplate { get; set; }
-        public DataTemplate FolderTemplate { get; set; }
-        public DataTemplate CollectionTemplate { get; set; }
+        public DataTemplate GroupTemplate { get; set; }
 
         protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
         {
             if(item is GroupingsPageListItem listItem)
             {
-                if(listItem.Collection != null)
-                {
-                    return CollectionTemplate;
-                }
-                else if(listItem.Folder != null)
-                {
-                    return FolderTemplate;
-                }
-                return CipherTemplate;
+                return listItem.Cipher != null ? CipherTemplate : GroupTemplate;
             }
             return null;
         }
diff --git a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
index 82b60ffa8..4cae844f5 100644
--- a/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
+++ b/src/App/Pages/Vault/GroupingsPage/GroupingsPageViewModel.cs
@@ -125,6 +125,17 @@ namespace Bit.App.Pages
                     groupedItems.Add(new GroupingsPageListGroup(favListItems, AppResources.Favorites,
                         Device.RuntimePlatform == Device.iOS));
                 }
+                if(MainPage)
+                {
+                    groupedItems.Add(new GroupingsPageListGroup(
+                        AppResources.Types, Device.RuntimePlatform == Device.iOS)
+                    {
+                        new GroupingsPageListItem { Type = CipherType.Login },
+                        new GroupingsPageListItem { Type = CipherType.Card },
+                        new GroupingsPageListItem { Type = CipherType.Identity },
+                        new GroupingsPageListItem { Type = CipherType.SecureNote }
+                    });
+                }
                 if(folderListItems?.Any() ?? false)
                 {
                     groupedItems.Add(new GroupingsPageListGroup(folderListItems, AppResources.Folders,
@@ -158,10 +169,10 @@ namespace Bit.App.Pages
             await Page.Navigation.PushModalAsync(new NavigationPage(page));
         }
 
-        public async Task SelectFolderAsync(CipherType type)
+        public async Task SelectTypeAsync(CipherType type)
         {
             string title = null;
-            switch(Type.Value)
+            switch(type)
             {
                 case CipherType.Login:
                     title = AppResources.Logins;
diff --git a/src/App/Resources/AppResources.Designer.cs b/src/App/Resources/AppResources.Designer.cs
index 5d2fbbb34..c5d60c0a0 100644
--- a/src/App/Resources/AppResources.Designer.cs
+++ b/src/App/Resources/AppResources.Designer.cs
@@ -3219,6 +3219,15 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Types.
+        /// </summary>
+        public static string Types {
+            get {
+                return ResourceManager.GetString("Types", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Secure Note.
         /// </summary>
diff --git a/src/App/Resources/AppResources.resx b/src/App/Resources/AppResources.resx
index 3767ff445..763df10c4 100644
--- a/src/App/Resources/AppResources.resx
+++ b/src/App/Resources/AppResources.resx
@@ -1390,4 +1390,7 @@
   <data name="PasswordHistory" xml:space="preserve">
     <value>Password History</value>
   </data>
+  <data name="Types" xml:space="preserve">
+    <value>Types</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/App/Styles/Base.xaml b/src/App/Styles/Base.xaml
index 5b6b1f6ba..d6296273f 100644
--- a/src/App/Styles/Base.xaml
+++ b/src/App/Styles/Base.xaml
@@ -62,7 +62,7 @@
     <Style TargetType="StackLayout"
            Class="list-row">
         <Setter Property="Padding"
-                Value="12" />
+                Value="10, 12" />
     </Style>
     <Style TargetType="Grid"
            Class="list-row">
@@ -90,8 +90,14 @@
     <Style TargetType="Label"
            Class="list-icon"
            ApplyToDerivedTypes="True">
-        <Setter Property="Margin"
-                Value="3, 3, 3, 0" />
+        <Setter Property="WidthRequest"
+                Value="26" />
+        <Setter Property="HeightRequest"
+                Value="26" />
+        <Setter Property="HorizontalTextAlignment"
+                Value="Center" />
+        <Setter Property="VerticalTextAlignment"
+                Value="Center" />
         <Setter Property="FontSize"
                 Value="Large" />
         <Setter Property="TextColor"