Kekw

CosmicPredator · Nov 28, 2024 · 10cb4eb · 10cb4eb
1 parent f628269
commit 10cb4eb
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 12 deletions.
diff --git a/AniMoe.App/Controls/ListControls/AnimeListFilterDialog.xaml b/AniMoe.App/Controls/ListControls/AnimeListFilterDialog.xaml
@@ -204,7 +204,7 @@
                         VerticalAlignment="Center"
                         Text="{x:Bind EpisodeChapterMin}" />
                     <ctktCont:RangeSelector
-                        x:Name="EpChapterComboBox"
+                        x:Name="EpChapterSlider"
                         Grid.Column="1"
                         HorizontalAlignment="Stretch" />
                     <TextBlock
@@ -232,7 +232,7 @@
                         VerticalAlignment="Center"
                         Text="{x:Bind DurationVolumeMin}" />
                     <ctktCont:RangeSelector
-                        x:Name="DurationVolComboBox"
+                        x:Name="DurationVolumeSlider"
                         Grid.Column="1"
                         HorizontalAlignment="Stretch" />
                     <TextBlock

diff --git a/AniMoe.App/Controls/ListControls/AnimeListFilterDialog.xaml.cs b/AniMoe.App/Controls/ListControls/AnimeListFilterDialog.xaml.cs
@@ -50,8 +50,10 @@ public sealed partial class AnimeListFilterDialog : ContentDialog
     public List<string> SelectedNotInTags = new();
     public int? SelectedStartYear;
     public int? SelectedEndYear;
-    public int? SelectedChapterMin;
-    public int? SelectedChapterMax;
+    public int? SelectedEpChapterMin;
+    public int? SelectedEpChapterMax;
+    public int? SelectedDurationVolumeMin;
+    public int? SelectedDurationVolumeMax;
 
     private MainViewModel MainViewModel = Ioc.Default.GetRequiredService<MainViewModel>();
 
@@ -151,8 +153,10 @@ public void ClearFilters()
         SelectedStatus = null;
         SelectedMediaSource = null;
         SelectedSeason = null;
-        SelectedChapterMin = null;
-        SelectedChapterMax = null;
+        SelectedEpChapterMin = null;
+        SelectedEpChapterMax = null;
+        SelectedDurationVolumeMin = null;
+        SelectedDurationVolumeMax = null;
 
         SelectedGenres = new();
         SelectedTags = new();
@@ -177,8 +181,10 @@ private void ResetFilterControls()
         SeasonComboBox.SelectedIndex = -1;
         YearRangeComboBox.RangeStart = YearRangeStart;
         YearRangeComboBox.RangeEnd = YearRangeEnd;
-        EpChapterComboBox.RangeStart = EpisodeChapterMin;
-        EpChapterComboBox.RangeEnd = EpisodeChapterMax;
+        EpChapterSlider.RangeStart = EpisodeChapterMin;
+        EpChapterSlider.RangeEnd = EpisodeChapterMax;
+        DurationVolumeSlider.RangeStart = DurationVolumeMin;
+        DurationVolumeSlider.RangeEnd = DurationVolumeMax;
     }
 
     private void LoadDataFromControls()
@@ -189,12 +195,12 @@ private void LoadDataFromControls()
         SelectedStatus = StatusComboBox.SelectedValue as MediaStatus?;
         SelectedMediaSource = SourceMaterialComboBox.SelectedValue as MediaSource?;
         SelectedSeason = SeasonComboBox.SelectedValue as MediaSeason?;
-        //SelectedStartYear = 
-        //    (int)YearRangeComboBox.RangeStart == YearRangeStart ? null : (int)YearRangeComboBox.RangeStart;
-        //SelectedEndYear = 
-        //    (int)YearRangeComboBox.RangeEnd == YearRangeEnd ? null : (int)YearRangeComboBox.RangeEnd;
         SelectedStartYear = (int)YearRangeComboBox.RangeStart;
         SelectedEndYear = (int)YearRangeComboBox.RangeEnd;
+        SelectedEpChapterMin = (int)EpChapterSlider.RangeStart;
+        SelectedEpChapterMax = (int)EpChapterSlider.RangeEnd;
+        SelectedDurationVolumeMin = (int)DurationVolumeSlider.RangeStart;
+        SelectedDurationVolumeMax = (int)DurationVolumeSlider.RangeEnd;
 
         SelectedGenres = TagGenres
             .First(mediaTagsGenres => mediaTagsGenres.CategoryName is genreCategoryName)

diff --git a/AniMoe.App/Helpers/AnimeListFilterBuilder.cs b/AniMoe.App/Helpers/AnimeListFilterBuilder.cs
@@ -36,6 +36,12 @@ public class AnimeListFilterBuilder
     private int? rangeStartYear;
     private int? rangeEndYear; // 2025 as of 2024
 
+    private int? selectedEpChapterMin;
+    private int? selectedEpCahpterMax;
+
+    private int? selectedDurVolumeMin;
+    private int? selectedDurVolumeMax;
+
     private IEnumerable<Entry> animeList;
 
     public AnimeListFilterBuilder(IEnumerable<Entry> animeList)
@@ -73,6 +79,20 @@ public AnimeListFilterBuilder WithGenresInclude(List<string> genres)
         return this;
     }
 
+    public AnimeListFilterBuilder WithEpChapterRange(int? minValue, int? maxValue)
+    {
+        this.selectedEpChapterMin = minValue;
+        this.selectedEpCahpterMax = maxValue;
+        return this;
+    }
+
+    public AnimeListFilterBuilder WithDurationVolumeRange(int? minValue, int? maxValue)
+    {
+        this.selectedDurVolumeMin = minValue;
+        this.selectedDurVolumeMax = maxValue;
+        return this;
+    }
+
     public AnimeListFilterBuilder WithGenresExclude(List<string> genres)
     {
         this.selectedNotInGenres = genres;