From 588703ecd62f671ec90290ff9c6d630a72edd2a7 Mon Sep 17 00:00:00 2001
From: BONNEVILLE Geoffroy <gbonneville@mega.com>
Date: Thu, 14 Dec 2017 17:54:14 +0100
Subject: [PATCH] Added a small text explaining how to reorder entries Code
 cleanup

---
 ModernKeePass/Strings/en-US/Resources.resw |  3 +++
 ModernKeePass/Strings/fr-FR/Resources.resw |  3 +++
 ModernKeePass/ViewModels/GroupVm.cs        | 15 +--------------
 ModernKeePass/Views/GroupDetailPage.xaml   |  3 ++-
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/ModernKeePass/Strings/en-US/Resources.resw b/ModernKeePass/Strings/en-US/Resources.resw
index e33d69a..56f38ec 100644
--- a/ModernKeePass/Strings/en-US/Resources.resw
+++ b/ModernKeePass/Strings/en-US/Resources.resw
@@ -270,6 +270,9 @@
   <data name="RecentClear.Text" xml:space="preserve">
     <value>Clear all</value>
   </data>
+  <data name="ReorderEntriesLabel.Text" xml:space="preserve">
+    <value>Drag and drop entries to reorder them</value>
+  </data>
   <data name="SaveAsButton.Content" xml:space="preserve">
     <value>Save as...</value>
   </data>
diff --git a/ModernKeePass/Strings/fr-FR/Resources.resw b/ModernKeePass/Strings/fr-FR/Resources.resw
index f7b9251..ce7650d 100644
--- a/ModernKeePass/Strings/fr-FR/Resources.resw
+++ b/ModernKeePass/Strings/fr-FR/Resources.resw
@@ -270,6 +270,9 @@
   <data name="RecentClear.Text" xml:space="preserve">
     <value>Supprimer tout</value>
   </data>
+  <data name="ReorderEntriesLabel.Text" xml:space="preserve">
+    <value>Glissez-déposez les entrées pour les réorganiser</value>
+  </data>
   <data name="SaveAsButton.Content" xml:space="preserve">
     <value>Sauvegarder sous...</value>
   </data>
diff --git a/ModernKeePass/ViewModels/GroupVm.cs b/ModernKeePass/ViewModels/GroupVm.cs
index 89183df..e41213e 100644
--- a/ModernKeePass/ViewModels/GroupVm.cs
+++ b/ModernKeePass/ViewModels/GroupVm.cs
@@ -79,20 +79,7 @@ namespace ModernKeePass.ViewModels
             get { return _isMenuClosed; }
             set { SetProperty(ref _isMenuClosed, value); }
         }
-
-        public string Filter
-        {
-            get { return _filter; }
-            set
-            {
-                SetProperty(ref _filter, value);
-                OnPropertyChanged("EntriesFiltered");
-            }
-        }
-
-        public ObservableCollection<EntryVm> EntriesFiltered =>
-            new ObservableCollection<EntryVm>(Entries.Where(e => e.Name.IndexOf(Filter, StringComparison.OrdinalIgnoreCase) >= 0));
-
+        
         public string Path
         {
             get
diff --git a/ModernKeePass/Views/GroupDetailPage.xaml b/ModernKeePass/Views/GroupDetailPage.xaml
index aafdd0e..90b93a7 100644
--- a/ModernKeePass/Views/GroupDetailPage.xaml
+++ b/ModernKeePass/Views/GroupDetailPage.xaml
@@ -179,7 +179,7 @@
                         OtherItem="{StaticResource GroupOtherItem}" />
                 </ListView.ItemTemplateSelector>
             </ListView>
-            <!-- Horizontal scrolling grid -->
+            <TextBlock Grid.Column="1" x:Uid="ReorderEntriesLabel" Margin="20,20,0,0" Visibility="{Binding IsEditMode, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource BodyTextBlockStyle}" />
             <HyperlinkButton Grid.Column="1" VerticalAlignment="Top" Margin="40,10,0,0" Click="CreateEntry_ButtonClick" Visibility="{Binding IsSelected, Converter={StaticResource InverseBooleanToVisibilityConverter}}" HorizontalAlignment="Right">
                 <StackPanel Orientation="Horizontal">
                     <SymbolIcon Symbol="Add"></SymbolIcon>
@@ -188,6 +188,7 @@
             </HyperlinkButton>
             <SemanticZoom Grid.Column="1" ViewChangeStarted="SemanticZoom_ViewChangeStarted" Margin="20,60,0,0">
                 <SemanticZoom.ZoomedInView>
+                    <!-- Horizontal scrolling grid -->
                     <GridView
                         x:Name="GridView"
                         AutomationProperties.AutomationId="ItemGridView"