From b530d6c412d9170ec6863e5f2776bb26116bb102 Mon Sep 17 00:00:00 2001
From: Romanus <trueromanus@gmail.com>
Date: Wed, 4 Mar 2020 19:50:58 +0300
Subject: [PATCH] > Fix filtering for And mode

---
 src/Anilibria/Pages/Releases/ReleasesView.xaml    | 5 +++--
 src/Anilibria/Pages/Releases/ReleasesView.xaml.cs | 2 ++
 src/Anilibria/Pages/Releases/ReleasesViewModel.cs | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Anilibria/Pages/Releases/ReleasesView.xaml b/src/Anilibria/Pages/Releases/ReleasesView.xaml
index acbc7a0..42a1bda 100644
--- a/src/Anilibria/Pages/Releases/ReleasesView.xaml
+++ b/src/Anilibria/Pages/Releases/ReleasesView.xaml
@@ -1716,7 +1716,8 @@
 					Grid.Column="1"
 					Margin="2 16 6 0">
 					<Grid
-						Tapped="ReleaseName_Tapped">
+						Tapped="ReleaseName_Tapped"
+						RightTapped="Grid_RightTapped">
 						<TextBlock
 							converters:BackgroundThemeConverter.TextMapper="TextBlockAccent"
 							Text="{Binding OpenedRelease.Title}"
@@ -1908,7 +1909,7 @@
 					/>
 					<Grid
 						Margin="0 2 0 0"
-						Tapped="ReleaseName_Tapped">
+						RightTapped="Grid_RightTapped">
 						<ScrollViewer
 							x:Name="CardDescription"
 							MaxHeight="190">
diff --git a/src/Anilibria/Pages/Releases/ReleasesView.xaml.cs b/src/Anilibria/Pages/Releases/ReleasesView.xaml.cs
index 06f703b..b121300 100644
--- a/src/Anilibria/Pages/Releases/ReleasesView.xaml.cs
+++ b/src/Anilibria/Pages/Releases/ReleasesView.xaml.cs
@@ -339,6 +339,8 @@ private void OpenInExternalPlayer_Tapped ( object sender , TappedRoutedEventArgs
 
 		private void ResetNewTorrentsNotification_Tapped ( object sender , TappedRoutedEventArgs e ) => m_ViewModel.ResetNewTorrentNotificationCommand.Execute ( null );
 
+		private void Grid_RightTapped ( object sender , RightTappedRoutedEventArgs e ) => FlyoutBase.ShowAttachedFlyout ( sender as FrameworkElement );
+
 	}
 
 }
diff --git a/src/Anilibria/Pages/Releases/ReleasesViewModel.cs b/src/Anilibria/Pages/Releases/ReleasesViewModel.cs
index 953e464..55524cb 100644
--- a/src/Anilibria/Pages/Releases/ReleasesViewModel.cs
+++ b/src/Anilibria/Pages/Releases/ReleasesViewModel.cs
@@ -1615,8 +1615,8 @@ private bool ContainsInArrayCaseSensitive ( string filter , IEnumerable<string>
 		}
 
 		private bool AllInArrayCaseSensitive ( IEnumerable<string> filterValues , IEnumerable<string> originalValues ) {
-			var processedFilterValues = filterValues.Select ( a => a.Replace ( "ё" , "е" ) ).ToList ();
-			var processedOriginalValues = originalValues.Where ( a => a != null ).Select ( a => a.Replace ( "ё" , "е" ) ).ToList ();
+			var processedFilterValues = filterValues.Select ( a => a.Replace ( "ё" , "е" ).ToLowerInvariant() ).ToList ();
+			var processedOriginalValues = originalValues.Where ( a => a != null ).Select ( a => a.Replace ( "ё" , "е" ).ToLowerInvariant () ).ToList ();
 
 			return processedFilterValues.All ( a => processedOriginalValues.Any ( b => b.Contains ( a ) ) );
 		}