Navigate to Search Result

ghost1372 · ghost1372 · commit c784292b06b5 · 2023-10-14T19:39:14.000+03:30
diff --git a/dev/ViewModels/QuranViewModel/QuranViewModel.cs b/dev/ViewModels/QuranViewModel/QuranViewModel.cs
@@ -85,7 +85,7 @@ public void SearchSurah(AutoSuggestBox sender)
         }
     }
 
-    private void AddNewSurahTab(TabView tabView, ChapterProperty chapterProperty)
+    public void AddNewSurahTab(TabView tabView, ChapterProperty chapterProperty, QuranSearch2 quranSearch2 = null)
     {
         this.tabview = tabView;
         var currentTabViewItem = tabView.TabItems?.Where(tabViewItem => (tabViewItem as QuranTabViewItem)?.Chapter?.Id == chapterProperty.Id)?.FirstOrDefault();
@@ -98,6 +98,7 @@ private void AddNewSurahTab(TabView tabView, ChapterProperty chapterProperty)
         var item = new QuranTabViewItem();
         item.Header = $"{chapterProperty.Id} - {chapterProperty.Name} - {chapterProperty.Ayas} آیه - {chapterProperty.Type}";
         item.Chapter = chapterProperty;
+        item.QuranSearch2 = quranSearch2;
         tabView.TabItems.Add(item);
         item.CloseRequested += TabViewItem_CloseRequested;
         tabView.SelectedIndex = tabView.TabItems.Count - 1;
diff --git a/dev/Views/MainPage.xaml b/dev/Views/MainPage.xaml
@@ -36,6 +36,7 @@
                                     QuerySubmitted="AutoSuggestBox_QuerySubmitted"
                                     TextChanged="AutoSuggestBox_TextChanged" />
                     <CommandBar x:Name="cmbSearch"
+                                Background="Transparent"
                                 DefaultLabelPosition="Collapsed"
                                 Visibility="Collapsed">
                         <CommandBar.SecondaryCommands>
diff --git a/dev/Views/QuranSearchItem.xaml b/dev/Views/QuranSearchItem.xaml
@@ -9,6 +9,7 @@
              xmlns:local="using:AlAnvar.Common"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:tables="using:AlAnvar.Database.Tables"
+             xmlns:wuc="using:WinUICommunity"
              Loaded="TabViewItem_Loaded"
              mc:Ignorable="d">
     <TabViewItem.IconSource>
@@ -18,7 +19,10 @@
     <TabViewItem.Resources>
         <DataTemplate x:Key="QuranTemplate"
                       x:DataType="tables:QuranSearch2">
-            <community:DataRow HorizontalAlignment="Left">
+            <community:DataRow HorizontalAlignment="Left"
+                               DoubleTapped="DataRow_DoubleTapped"
+                               IsDoubleTapEnabled="True"
+                               Tag="{x:Bind}">
                 <TextBlock VerticalAlignment="Center"
                            Text="{x:Bind Id}" />
                 <TextBlock VerticalAlignment="Center"
@@ -27,12 +31,25 @@
                            Text="{x:Bind AyahNumber}" />
                 <TextBlock VerticalAlignment="Center"
                            Text="{x:Bind Text}" />
+                <community:DataRow.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Margin="5"
+                                        Click="MenuGoToSurah_Click"
+                                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                                        Icon="{wuc:BitmapIcon Source=Assets/Fluent/external.png}"
+                                        Tag="{x:Bind}"
+                                        Text="برو به سوره موردنظر" />
+                    </MenuFlyout>
+                </community:DataRow.ContextFlyout>
             </community:DataRow>
         </DataTemplate>
         <DataTemplate x:Key="TranslationTemplate"
                       x:DataType="tables:QuranSearch2">
             <community:DataRow HorizontalAlignment="Left"
-                               Background="{ThemeResource InfoBarWarningSeverityBackgroundBrush}">
+                               Background="{ThemeResource InfoBarWarningSeverityBackgroundBrush}"
+                               DoubleTapped="DataRow_DoubleTapped"
+                               IsDoubleTapEnabled="True"
+                               Tag="{x:Bind}">
                 <TextBlock VerticalAlignment="Center"
                            Text="{x:Bind Id}" />
                 <TextBlock VerticalAlignment="Center"
@@ -41,6 +58,16 @@
                            Text="{x:Bind AyahNumber}" />
                 <TextBlock VerticalAlignment="Center"
                            Text="{x:Bind Text}" />
+                <community:DataRow.ContextFlyout>
+                    <MenuFlyout>
+                        <MenuFlyoutItem Margin="5"
+                                        Click="MenuGoToSurah_Click"
+                                        CornerRadius="{ThemeResource ControlCornerRadius}"
+                                        Icon="{wuc:BitmapIcon Source=Assets/Fluent/external.png}"
+                                        Tag="{x:Bind}"
+                                        Text="برو به سوره موردنظر" />
+                    </MenuFlyout>
+                </community:DataRow.ContextFlyout>
             </community:DataRow>
         </DataTemplate>
 
diff --git a/dev/Views/QuranSearchItem.xaml.cs b/dev/Views/QuranSearchItem.xaml.cs
@@ -103,4 +103,38 @@ await Task.Run(() =>
             });
         });
     }
+
+    private void MenuGoToSurah_Click(object sender, RoutedEventArgs e)
+    {
+        var menu = sender as MenuFlyoutItem;
+        if (menu != null && menu.Tag != null)
+        {
+            GoToSurah(menu.Tag as QuranSearch2);
+        }
+    }
+
+    private void DataRow_DoubleTapped(object sender, Microsoft.UI.Xaml.Input.DoubleTappedRoutedEventArgs e)
+    {
+        var dataRow = sender as DataRow;
+        if (dataRow != null && dataRow.Tag != null)
+        {
+            GoToSurah(dataRow.Tag as QuranSearch2);
+        }
+    }
+
+    private async void GoToSurah(QuranSearch2 quranSearch2)
+    {
+        if (quranSearch2 != null)
+        {
+            if (QuranPage.Instance != null)
+            {
+                using var db = new AlAnvarDBContext();
+                var chapter = await db.Chapters.Where(x=> x.Name == quranSearch2.SurahName).FirstOrDefaultAsync();
+                if (chapter != null)
+                {
+                    QuranPage.Instance.ViewModel.AddNewSurahTab(QuranPage.Instance.GetTabView(), chapter, quranSearch2);
+                }
+            }
+        }
+    }
 }
diff --git a/dev/Views/QuranTabViewItem.xaml.cs b/dev/Views/QuranTabViewItem.xaml.cs
@@ -27,6 +27,16 @@ public ChapterProperty Chapter
         set => SetValue(ChapterProperty, value);
     }
 
+    public static readonly DependencyProperty QuranSearch2Property =
+        DependencyProperty.Register("QuranSearch2", typeof(QuranSearch2), typeof(QuranTabViewItem),
+        new PropertyMetadata(null));
+
+    public QuranSearch2 QuranSearch2
+    {
+        get => (QuranSearch2) GetValue(QuranSearch2Property);
+        set => SetValue(QuranSearch2Property, value);
+    }
+
     public ObservableCollection<QuranItem> QuranCollection { get; set; } = new ObservableCollection<QuranItem>();
     private List<TranslationItem> TranslationCollection { get; set; } = new List<TranslationItem>();
     private List<Quran> AyahCollection { get; set; } = new List<Quran>();
@@ -97,6 +107,11 @@ await Task.Run(() =>
         prgLoading.IsActive = false;
         nbxRange1.Maximum = Chapter.Ayas;
         nbxRange2.Maximum = Chapter.Ayas;
+
+        if (QuranSearch2 != null)
+        {
+            ScrollIntoView(QuranSearch2.AyahNumber - 1);
+        }
     }
 
     private void LoadQaris()

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public void SearchSurah(AutoSuggestBox sender)`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`
`88`		`- private void AddNewSurahTab(TabView tabView, ChapterProperty chapterProperty)`
	`88`	`+ public void AddNewSurahTab(TabView tabView, ChapterProperty chapterProperty, QuranSearch2 quranSearch2 = null)`
`89`	`89`	`{`
`90`	`90`	`this.tabview = tabView;`
`91`	`91`	`var currentTabViewItem = tabView.TabItems?.Where(tabViewItem => (tabViewItem as QuranTabViewItem)?.Chapter?.Id == chapterProperty.Id)?.FirstOrDefault();`
`@@ -98,6 +98,7 @@ private void AddNewSurahTab(TabView tabView, ChapterProperty chapterProperty)`
`98`	`98`	`var item = new QuranTabViewItem();`
`99`	`99`	`item.Header = $"{chapterProperty.Id} - {chapterProperty.Name} - {chapterProperty.Ayas} آیه - {chapterProperty.Type}";`
`100`	`100`	`item.Chapter = chapterProperty;`
	`101`	`+ item.QuranSearch2 = quranSearch2;`
`101`	`102`	`tabView.TabItems.Add(item);`
`102`	`103`	`item.CloseRequested += TabViewItem_CloseRequested;`
`103`	`104`	`tabView.SelectedIndex = tabView.TabItems.Count - 1;`