handle conditions when no data

src/App/Pages/Vault/VaultListCiphersPage.cs

@@ -56,11 +56,12 @@ namespace Bit.App.Pages
             Init();
         }
 
-        public ExtendedObservableCollection<Section<Cipher>> PresentationLetters { get; private set; }
+        public ExtendedObservableCollection<Section<Cipher>> PresentationSections { get; private set; }
             = new ExtendedObservableCollection<Section<Cipher>>();
         public Cipher[] Ciphers { get; set; } = new Cipher[] { };
         public ListView ListView { get; set; }
         public SearchBar Search { get; set; }
+        public StackLayout NoDataStackLayout { get; set; }
         public StackLayout ResultsStackLayout { get; set; }
         private AddCipherToolBarItem AddCipherItem { get; set; }
 
@@ -75,7 +76,7 @@ namespace Bit.App.Pages
             ListView = new ListView(ListViewCachingStrategy.RecycleElement)
             {
                 IsGroupingEnabled = true,
-                ItemsSource = PresentationLetters,
+                ItemsSource = PresentationSections,
                 HasUnevenRows = true,
                 GroupHeaderTemplate = new DataTemplate(() => new SectionHeaderViewCell(nameof(Section<Cipher>.Name),
                     nameof(Section<Cipher>.Count))),
@@ -101,6 +102,41 @@ namespace Bit.App.Pages
                 Search.HeightRequest = 50;
             }
 
+            var noDataLabel = new Label
+            {
+                Text = _favorites ? AppResources.NoFavorites : AppResources.NoItems,
+                HorizontalTextAlignment = TextAlignment.Center,
+                FontSize = Device.GetNamedSize(NamedSize.Small, typeof(Label)),
+                Style = (Style)Application.Current.Resources["text-muted"]
+            };
+
+            if(_folder || !string.IsNullOrWhiteSpace(_folderId))
+            {
+                noDataLabel.Text = AppResources.NoItemsFolder;
+            }
+            else if(!string.IsNullOrWhiteSpace(_collectionId))
+            {
+                noDataLabel.Text = AppResources.NoItemsCollection;
+            }
+
+            NoDataStackLayout = new StackLayout
+            {
+                Children = { noDataLabel },
+                VerticalOptions = LayoutOptions.CenterAndExpand,
+                Padding = new Thickness(20, 0),
+                Spacing = 20
+            };
+
+            if(string.IsNullOrWhiteSpace(_collectionId) && !_favorites)
+            {
+                NoDataStackLayout.Children.Add(new ExtendedButton
+                {
+                    Text = AppResources.AddAnItem,
+                    Command = new Command(() => Helpers.AddCipher(this, _folderId)),
+                    Style = (Style)Application.Current.Resources["btn-primaryAccent"]
+                });
+            }
+
             ResultsStackLayout = new StackLayout
             {
                 Children = { Search, ListView },
@@ -182,7 +218,7 @@ namespace Bit.App.Pages
 
             if(string.IsNullOrWhiteSpace(searchFilter))
             {
-                LoadLetters(Ciphers, ct);
+                LoadSections(Ciphers, ct);
             }
             else
             {
@@ -194,7 +230,7 @@ namespace Bit.App.Pages
                     .ToArray();
 
                 ct.ThrowIfCancellationRequested();
-                LoadLetters(filteredCiphers, ct);
+                LoadSections(filteredCiphers, ct);
             }
         }
 
@@ -248,7 +284,7 @@ namespace Bit.App.Pages
         private CancellationTokenSource FetchAndLoadVault()
         {
             var cts = new CancellationTokenSource();
-            if(PresentationLetters.Count > 0 && _syncService.SyncInProgress)
+            if(PresentationSections.Count > 0 && _syncService.SyncInProgress)
             {
                 return cts;
             }
@@ -281,7 +317,7 @@ namespace Bit.App.Pages
                     {
                         // Sort numbers and letters before special characters
                         return !string.IsNullOrWhiteSpace(s.Name) && s.Name.Length > 0 &&
-                            Char.IsLetterOrDigit(s.Name[0]) ? 0 : 1;
+                           Char.IsDigit(s.Name[0]) ? 0 : Char.IsLetter(s.Name[0]) ? 1 : 2;
                     })
                     .ThenBy(s => s.Name)
                     .ThenBy(s => s.Subtitle)
@@ -297,15 +333,22 @@ namespace Bit.App.Pages
             return cts;
         }
 
-        private void LoadLetters(Cipher[] ciphers, CancellationToken ct)
+        private void LoadSections(Cipher[] ciphers, CancellationToken ct)
         {
             ct.ThrowIfCancellationRequested();
-            var letterGroups = ciphers.GroupBy(c => c.NameGroup).Select(g => new Section<Cipher>(g.ToList(), g.Key));
+            var sections = ciphers.GroupBy(c => c.NameGroup).Select(g => new Section<Cipher>(g.ToList(), g.Key));
             ct.ThrowIfCancellationRequested();
             Device.BeginInvokeOnMainThread(() =>
             {
-                PresentationLetters.ResetWithRange(letterGroups);
-                Content = ResultsStackLayout;
+                PresentationSections.ResetWithRange(sections);
+                if(PresentationSections.Count > 0 || !string.IsNullOrWhiteSpace(Search.Text))
+                {
+                    Content = ResultsStackLayout;
+                }
+                else
+                {
+                    Content = NoDataStackLayout;
+                }
             });
         }
 

src/App/Pages/Vault/VaultListGroupingsPage.cs

@@ -90,14 +90,6 @@ namespace Bit.App.Pages
                 Style = (Style)Application.Current.Resources["text-muted"]
             };
 
-            NoDataStackLayout = new StackLayout
-            {
-                Children = { noDataLabel },
-                VerticalOptions = LayoutOptions.CenterAndExpand,
-                Padding = new Thickness(20, 0),
-                Spacing = 20
-            };
-
             var addCipherButton = new ExtendedButton
             {
                 Text = AppResources.AddAnItem,
@@ -105,7 +97,13 @@ namespace Bit.App.Pages
                 Style = (Style)Application.Current.Resources["btn-primaryAccent"]
             };
 
-            NoDataStackLayout.Children.Add(addCipherButton);
+            NoDataStackLayout = new StackLayout
+            {
+                Children = { noDataLabel, addCipherButton },
+                VerticalOptions = LayoutOptions.CenterAndExpand,
+                Padding = new Thickness(20, 0),
+                Spacing = 20
+            };
 
             LoadingIndicator = new ActivityIndicator
             {
@@ -225,12 +223,9 @@ namespace Bit.App.Pages
 
                 Device.BeginInvokeOnMainThread(() =>
                 {
-                    if(sections.Any())
-                    {
-                        PresentationSections.ResetWithRange(sections);
-                    }
+                    PresentationSections.ResetWithRange(sections);
 
-                    if(PresentationSections.Count > 0)
+                    if(ciphers.Any() || folders.Any())
                     {
                         Content = ListView;
                     }

src/App/Resources/AppResources.Designer.cs

@@ -2113,6 +2113,24 @@ namespace Bit.App.Resources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to There are no items in this collection..
+        /// </summary>
+        public static string NoItemsCollection {
+            get {
+                return ResourceManager.GetString("NoItemsCollection", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to There are no items in this folder..
+        /// </summary>
+        public static string NoItemsFolder {
+            get {
+                return ResourceManager.GetString("NoItemsFolder", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to There are no items in your vault for {0}..
         /// </summary>

src/App/Resources/AppResources.resx

@@ -1203,4 +1203,10 @@
   <data name="DefaultPageVaultDescription" xml:space="preserve">
     <value>Default to the "My Vault" page instead of "Favorites" whenever I open the app.</value>
   </data>
+  <data name="NoItemsCollection" xml:space="preserve">
+    <value>There are no items in this collection.</value>
+  </data>
+  <data name="NoItemsFolder" xml:space="preserve">
+    <value>There are no items in this folder.</value>
+  </data>
 </root>