From 65f3a146fa90e2d4c60a358e2197e8257c200466 Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Fri, 17 May 2019 14:58:42 -0400
Subject: [PATCH] autofill page fixes

---
 src/App/Pages/Vault/AutofillCiphersPage.xaml  |  6 ++-
 .../Pages/Vault/AutofillCiphersPage.xaml.cs   |  1 +
 .../Vault/AutofillCiphersPageViewModel.cs     | 40 +++++++++++--------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/App/Pages/Vault/AutofillCiphersPage.xaml b/src/App/Pages/Vault/AutofillCiphersPage.xaml
index d195664da..55b32e28b 100644
--- a/src/App/Pages/Vault/AutofillCiphersPage.xaml
+++ b/src/App/Pages/Vault/AutofillCiphersPage.xaml
@@ -20,6 +20,8 @@
 
     <ContentPage.Resources>
         <ResourceDictionary>
+            <u:InverseBoolConverter x:Key="inverseBool" />
+            
             <DataTemplate x:Key="cipherTemplate"
                           x:DataType="pages:GroupingsPageListItem">
                 <controls:CipherViewCell
@@ -35,9 +37,9 @@
                     VerticalOptions="CenterAndExpand"
                     Padding="20, 0"
                     Spacing="20"
-                    IsVisible="{Binding ShowNoData}">
+                    IsVisible="{Binding ShowList, Converter={StaticResource inverseBool}}">
                     <Label
-                        Text="TODO: no data"
+                        Text="{Binding NoDataText}"
                         HorizontalTextAlignment="Center"></Label>
                     <Button
                         Text="{u:I18n AddAnItem}"
diff --git a/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs b/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs
index 8429b8dc2..5b331848f 100644
--- a/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs
+++ b/src/App/Pages/Vault/AutofillCiphersPage.xaml.cs
@@ -15,6 +15,7 @@ namespace Bit.App.Pages
             InitializeComponent();
             _vm = BindingContext as AutofillCiphersPageViewModel;
             _vm.Page = this;
+            _fab.Clicked = AddButton_Clicked;
             _vm.Init(appOptions);
         }
 
diff --git a/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs b/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
index 0941a0186..14fefee59 100644
--- a/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
+++ b/src/App/Pages/Vault/AutofillCiphersPageViewModel.cs
@@ -25,8 +25,8 @@ namespace Bit.App.Pages
         private AppOptions _appOptions;
         private string _name;
         private string _uri;
-        private bool _showNoData;
         private bool _showList;
+        private string _noDataText;
 
         public AutofillCiphersPageViewModel()
         {
@@ -41,18 +41,18 @@ namespace Bit.App.Pages
         public Command CipherOptionsCommand { get; set; }
         public ExtendedObservableCollection<GroupingsPageListGroup> GroupedItems { get; set; }
 
-        public bool ShowNoData
-        {
-            get => _showNoData;
-            set => SetProperty(ref _showNoData, value);
-        }
-
         public bool ShowList
         {
             get => _showList;
             set => SetProperty(ref _showList, value);
         }
 
+        public string NoDataText
+        {
+            get => _noDataText;
+            set => SetProperty(ref _noDataText, value);
+        }
+
         public void Init(AppOptions appOptions)
         {
             _appOptions = appOptions;
@@ -67,23 +67,29 @@ namespace Bit.App.Pages
                 _name = "--";
             }
             PageTitle = string.Format(AppResources.ItemsForUri, _name ?? "--");
+            NoDataText = string.Format(AppResources.NoItemsForUri, _name ?? "--");
         }
 
         public async Task LoadAsync()
         {
-            ShowNoData = false;
             ShowList = false;
-
+            var groupedItems = new List<GroupingsPageListGroup>();
             var ciphers = await _cipherService.GetAllDecryptedByUrlAsync(_uri, null);
             var matching = ciphers.Item1?.Select(c => new GroupingsPageListItem { Cipher = c }).ToList();
-            var matchingGroup = new GroupingsPageListGroup(matching, AppResources.MatchingItems, matching.Count, false);
-            var fuzzy = ciphers.Item2?.Select(c => new GroupingsPageListItem { Cipher = c, FuzzyAutofill = true })
-                .ToList();
-            var fuzzyGroup = new GroupingsPageListGroup(fuzzy, AppResources.PossibleMatchingItems, fuzzy.Count, false);
-            GroupedItems.ResetWithRange(new List<GroupingsPageListGroup> { matchingGroup, fuzzyGroup });
-
-            ShowNoData = !matching.Any() && !fuzzy.Any();
-            ShowList = !ShowNoData;
+            if(matching?.Any() ?? false)
+            {
+                groupedItems.Add(
+                    new GroupingsPageListGroup(matching, AppResources.MatchingItems, matching.Count, false));
+            }
+            var fuzzy = ciphers.Item2?.Select(c =>
+                new GroupingsPageListItem { Cipher = c, FuzzyAutofill = true }).ToList();
+            if(fuzzy?.Any() ?? false)
+            {
+                groupedItems.Add(
+                    new GroupingsPageListGroup(fuzzy, AppResources.PossibleMatchingItems, fuzzy.Count, false));
+            }
+            GroupedItems.ResetWithRange(groupedItems);
+            ShowList = groupedItems.Any();
         }
 
         public async Task SelectCipherAsync(CipherView cipher, bool fuzzy)