Skip to content

Commit 9f5b621

Browse files
nukennuken
authored
v1.2.1
Movies search adjustments
1 parent 5dd412a commit 9f5b621

2 files changed

Lines changed: 36 additions & 32 deletions

File tree

‎MoviesPage.xaml‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -72,30 +72,17 @@
7272
<RowDefinition Height="*"/>
7373
</Grid.RowDefinitions>
7474

75-
<Border Grid.Row="0" Background="{DynamicResource PanelBackground}" CornerRadius="8" Padding="15" Margin="0,0,0,15">
75+
<Border Grid.Row="0" Background="{DynamicResource PanelBackground}" CornerRadius="8" Padding="15" Margin="0,0,0,15">
7676
<Grid>
7777
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
7878
<Button Content="🏠 Home" Margin="0,0,20,0" Click="HomeButton_Click" Style="{StaticResource ModernButton}"/>
7979
<TextBlock Text="🎬 MOVIES LIBRARY" FontSize="18" FontWeight="Bold" VerticalAlignment="Center" Foreground="{DynamicResource TextSecondary}"/>
8080
<TextBlock x:Name="StatusText" VerticalAlignment="Center" Margin="20,0,0,0" FontSize="14" FontWeight="SemiBold" Foreground="{DynamicResource StatusSuccess}"/>
8181
</StackPanel>
8282

83-
<Button x:Name="ToggleFiltersButton" Content="⚙️ Filters" HorizontalAlignment="Right" Click="ToggleFilters_Click"
84-
Background="{DynamicResource CardBackground}" Foreground="{DynamicResource TextPrimary}" FontSize="16" FontWeight="Bold" Padding="15,8" BorderThickness="0" Cursor="Hand"/>
85-
</Grid>
86-
</Border>
87-
88-
<Border x:Name="FilterBar" Grid.Row="1" Background="{DynamicResource PanelBackground}" CornerRadius="12" Padding="20" Margin="0,0,0,20" Visibility="Collapsed" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
89-
<StackPanel>
90-
<Grid>
91-
<Grid.ColumnDefinitions>
92-
<ColumnDefinition Width="*"/>
93-
<ColumnDefinition Width="Auto"/>
94-
<ColumnDefinition Width="Auto"/>
95-
<ColumnDefinition Width="Auto"/>
96-
</Grid.ColumnDefinitions>
97-
98-
<Grid Grid.Column="0" Margin="0,0,15,0">
83+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
84+
85+
<Grid Margin="0,0,15,0" Width="300">
9986
<TextBox x:Name="SearchBox" Padding="15,12" FontSize="18" Background="{DynamicResource CardBackground}" Foreground="{DynamicResource TextPrimary}"
10087
BorderThickness="2" BorderBrush="{DynamicResource BorderBrush}" VerticalContentAlignment="Center" TextChanged="Filter_Changed" />
10188
<TextBlock IsHitTestVisible="False" Text="🔍 Search Movies..." VerticalAlignment="Center" HorizontalAlignment="Left" Margin="15,0,0,0" Foreground="{DynamicResource TextSecondary}" FontSize="18">
@@ -112,23 +99,40 @@
11299
</TextBlock>
113100
</Grid>
114101

115-
<ComboBox x:Name="GenreBox" Grid.Column="1" Width="180" Height="50" Margin="0,0,15,0" FontSize="18" VerticalContentAlignment="Center" SelectionChanged="Filter_Changed"/>
116-
<ComboBox x:Name="WatchedBox" Grid.Column="2" Width="180" Height="50" Margin="0,0,15,0" FontSize="18" VerticalContentAlignment="Center" SelectionChanged="Filter_Changed">
102+
<Button x:Name="ToggleFiltersButton" Content="⚙️ Filters" Click="ToggleFilters_Click"
103+
Background="{DynamicResource CardBackground}" Foreground="{DynamicResource TextPrimary}" FontSize="16" FontWeight="Bold" Padding="15,8" BorderThickness="0" Cursor="Hand"/>
104+
</StackPanel>
105+
</Grid>
106+
</Border>
107+
108+
<Border x:Name="FilterBar" Grid.Row="1" Background="{DynamicResource PanelBackground}" CornerRadius="12" Padding="20" Margin="0,0,0,20" Visibility="Collapsed" BorderThickness="1" BorderBrush="{DynamicResource BorderBrush}">
109+
<StackPanel>
110+
<Grid HorizontalAlignment="Right">
111+
<Grid.ColumnDefinitions>
112+
<ColumnDefinition Width="Auto"/>
113+
<ColumnDefinition Width="Auto"/>
114+
<ColumnDefinition Width="Auto"/>
115+
</Grid.ColumnDefinitions>
116+
117+
<ComboBox x:Name="GenreBox" Grid.Column="0" Width="200" Height="50" Margin="0,0,15,0" FontSize="18" VerticalContentAlignment="Center" SelectionChanged="Filter_Changed"/>
118+
119+
<ComboBox x:Name="WatchedBox" Grid.Column="1" Width="180" Height="50" Margin="0,0,15,0" FontSize="18" VerticalContentAlignment="Center" SelectionChanged="Filter_Changed">
117120
<ComboBoxItem Content="All Statuses" IsSelected="True"/>
118121
<ComboBoxItem Content="Unwatched Only"/>
119122
<ComboBoxItem Content="Watched Only"/>
120123
</ComboBox>
121-
<ComboBox x:Name="SortBox" Grid.Column="3" Width="180" Height="50" FontSize="18" VerticalContentAlignment="Center" SelectionChanged="Filter_Changed">
124+
125+
<ComboBox x:Name="SortBox" Grid.Column="2" Width="180" Height="50" FontSize="18" VerticalContentAlignment="Center" SelectionChanged="Filter_Changed">
122126
<ComboBoxItem Content="A-Z (Alphabetical)" IsSelected="True"/>
123127
<ComboBoxItem Content="Newest Added"/>
124128
<ComboBoxItem Content="Release Year"/>
125129
</ComboBox>
126130
</Grid>
131+
127132
<Button Content="✅ Apply Filters" Click="ApplyAndClose_Click" HorizontalAlignment="Right" Margin="0,20,0,0"
128133
Background="{DynamicResource LiveBorder}" Foreground="White" FontSize="18" FontWeight="Bold" Padding="25,12" BorderThickness="0" Cursor="Hand"/>
129134
</StackPanel>
130135
</Border>
131-
132136
<ScrollViewer x:Name="MainScroller" Grid.Row="2" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" Focusable="False">
133137
<ItemsControl x:Name="MoviesItemsControl" Focusable="False">
134138
<ItemsControl.ItemsPanel>

‎MoviesPage.xaml.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -139,17 +139,17 @@ private async void Page_Loaded(object sender, RoutedEventArgs e)
139139
}
140140

141141
private void ToggleFilters_Click(object sender, RoutedEventArgs e)
142-
{
143-
if (FilterBar.Visibility == Visibility.Visible)
144-
{
145-
FilterBar.Visibility = Visibility.Collapsed;
146-
}
147-
else
148-
{
149-
FilterBar.Visibility = Visibility.Visible;
150-
SearchBox.Focus();
151-
}
152-
}
142+
{
143+
if (FilterBar.Visibility == Visibility.Visible)
144+
{
145+
FilterBar.Visibility = Visibility.Collapsed;
146+
}
147+
else
148+
{
149+
FilterBar.Visibility = Visibility.Visible;
150+
GenreBox.Focus(); // Shift focus to the first drop-down instead of Search
151+
}
152+
}
153153

154154
private void ApplyAndClose_Click(object sender, RoutedEventArgs e)
155155
{

0 commit comments

Comments
 (0)