Skip to content

Commit

Permalink
Empty sections in Recent are hidden (#349)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leo-Peyronnet
Leo-Peyronnet committed Mar 11, 2023
1 parent 8a9b0fe commit 34d6f65
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 16 deletions.
24 changes: 16 additions & 8 deletions Gavilya/Pages/RecentGamesPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,22 @@
</StackPanel>
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Disabled" VerticalScrollBarVisibility="Auto">
<StackPanel>
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.Today}"/>
<WrapPanel x:Name="TodayGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.Yesterday}"/>
<WrapPanel x:Name="YesterdayGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.ThisMonth}"/>
<WrapPanel x:Name="MonthGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.LongTimeAgo}"/>
<WrapPanel x:Name="OtherGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
<StackPanel x:Name="TodaySection">
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.Today}"/>
<WrapPanel x:Name="TodayGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
</StackPanel>
<StackPanel x:Name="YesterdaySection">
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.Yesterday}"/>
<WrapPanel x:Name="YesterdayGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
</StackPanel>
<StackPanel x:Name="MonthSection">
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.ThisMonth}"/>
<WrapPanel x:Name="MonthGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
</StackPanel>
<StackPanel x:Name="OtherSection">
<TextBlock Margin="10,10,10,0" FontSize="14" FontWeight="Bold" Text="{x:Static lang:Resources.LongTimeAgo}"/>
<WrapPanel x:Name="OtherGamePresenter" x:FieldModifier="public" FlowDirection="LeftToRight" Orientation="Horizontal" Grid.Row="1" AllowDrop="True"></WrapPanel>
</StackPanel>
</StackPanel>
</ScrollViewer>

Expand Down
22 changes: 14 additions & 8 deletions Gavilya/Pages/RecentGamesPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ MIT License
using System.Linq;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Forms.Design;

namespace Gavilya.Pages;

Expand Down Expand Up @@ -58,10 +59,10 @@ public void LoadGames()
if (Definitions.Games.Count > 0) // If there is games
{
TodayGamePresenter.Visibility = Visibility.Visible; // Visible
YesterdayGamePresenter.Visibility = Visibility.Visible; // Visible
MonthGamePresenter.Visibility = Visibility.Visible; // Visible
OtherGamePresenter.Visibility = Visibility.Visible; // Visible
TodaySection.Visibility = Visibility.Visible; // Visible
YesterdaySection.Visibility = Visibility.Visible; // Visible
MonthSection.Visibility = Visibility.Visible; // Visible
OtherSection.Visibility = Visibility.Visible; // Visible
WelcomeHost.Visibility = Visibility.Collapsed; // Hide
Dictionary<GameInfo, int> keyValuePairs = new(); // Create a dictionnary
Expand Down Expand Up @@ -99,6 +100,11 @@ public void LoadGames()
{
OtherGamePresenter.Children.Add(gameCard);
}
TodaySection.Visibility = TodayGamePresenter.Children.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
YesterdaySection.Visibility = YesterdayGamePresenter.Children.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
MonthSection.Visibility = MonthGamePresenter.Children.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
OtherSection.Visibility = OtherGamePresenter.Children.Count > 0 ? Visibility.Visible : Visibility.Collapsed;
}
if (c < Definitions.Settings.MaxNumberRecentGamesShown.Value)
{
Expand Down Expand Up @@ -131,10 +137,10 @@ public void LoadGames()
}
else
{
TodayGamePresenter.Visibility = Visibility.Collapsed; // Hide
YesterdayGamePresenter.Visibility = Visibility.Collapsed; // Hide
MonthGamePresenter.Visibility = Visibility.Collapsed; // Hide
OtherGamePresenter.Visibility = Visibility.Collapsed; // Hide
TodaySection.Visibility = Visibility.Collapsed; // Hide
YesterdaySection.Visibility = Visibility.Collapsed; // Hide
MonthSection.Visibility = Visibility.Collapsed; // Hide
OtherSection.Visibility = Visibility.Collapsed; // Hide
WelcomeHost.Visibility = Visibility.Visible; // Visible
WelcomeHost.Children.Add(new WelcomeRecentGames()); // Add "WelcomeRecentGames"
Expand Down

0 comments on commit 34d6f65

Please sign in to comment.