The Statistics info card is now responsive (#84)

Leo-Corporation · May 9, 2021 · 43d1eb0 · 43d1eb0
1 parent bc789eb
commit 43d1eb0
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 15 deletions.
diff --git a/Gavilya/Pages/Statistics.xaml b/Gavilya/Pages/Statistics.xaml
@@ -5,6 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:Gavilya.Pages"
 	  xmlns:lang="clr-namespace:Gavilya.Properties"
+	  xmlns:uc="clr-namespace:Gavilya.UserControls"
       mc:Ignorable="d" 
 	  FontFamily="../Fonts/#Montserrat"
       d:DesignHeight="450" d:DesignWidth="800"
@@ -55,7 +56,11 @@
 						</ScrollViewer>
 					</Grid>
 
-					<Frame x:Name="GameInfoDisplayer" Grid.Column="1" Grid.RowSpan="2"/>
+
+
+					<Grid x:Name="GameInfoDisplayer" Grid.Column="1" Grid.RowSpan="2">
+						<uc:StatGameInfoControl Width="{Binding ActualWidth, ElementName=GameInfoDisplayer, Mode=OneWay}" Margin="10,0,0,0"></uc:StatGameInfoControl>
+					</Grid>
 
 				</Grid>
 			</Grid>

diff --git a/Gavilya/Pages/Statistics.xaml.cs b/Gavilya/Pages/Statistics.xaml.cs
@@ -56,6 +56,9 @@ public Statistics()
 
 		private void InitUI()
 		{
+			// Controls
+			Definitions.StatGameInfoControl = (StatGameInfoControl)GameInfoDisplayer.Children[0]; // Set content
+
 			// Values
 			Dictionary<GameInfo, int> gameTimes = new(); // Create dictionnary
 			List<GameInfo> mostPlayed = new(); // Create list
@@ -87,10 +90,7 @@ private void InitUI()
 			TotalTimePlayedTxt.Text = $"{Global.GetTotalTimePlayed() / 3600}{Properties.Resources.HourShort}"; // Set text
 
 			// Graph
-			GraphDisplayer.Content = new StatGraph(mostPlayed);
-
-			// Controls
-			GameInfoDisplayer.Content = Definitions.StatGameInfoControl; // Set content
+			GraphDisplayer.Content = new StatGraph(mostPlayed);			
 		}
 
 		internal void UnCheckAllStatItems()

diff --git a/Gavilya/UserControls/StatGameInfoControl.xaml b/Gavilya/UserControls/StatGameInfoControl.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="Gavilya.UserControls.StatGameInfoControl"
+<UserControl x:Name="userControl" x:Class="Gavilya.UserControls.StatGameInfoControl"
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
@@ -7,9 +7,9 @@
 			 xmlns:lang="clr-namespace:Gavilya.Properties"
 			 mc:Ignorable="d" Foreground="#fff"
 			 FontFamily="..\Fonts\#Montserrat"
-			 d:DesignHeight="500" >
+			 d:DesignHeight="500" d:DesignWidth="365">
 	<ScrollViewer Template="{DynamicResource ScrollViewerTemplate1}" HorizontalScrollBarVisibility="Hidden">
-		<Grid x:Name="ContentGrid" >
+		<Grid x:Name="ContentGrid" Width="{Binding ActualWidth, ElementName=userControl, Mode=OneWay}" >
 			<Grid.RowDefinitions>
 				<RowDefinition Height="Auto"/>
 				<RowDefinition/>
@@ -26,10 +26,10 @@
 						<ImageBrush x:Name="BackgroundImage" Stretch="UniformToFill" Opacity="0.9"></ImageBrush>
 					</Border.Background>
 
-					<Grid Height="100">
+					<Grid Height="150">
 						<Grid.Background>
 							<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-								<GradientStop Color="#FF0A0A1E" Offset="1"/>
+								<GradientStop Color="#E50A0A1E" Offset="0.95"/>
 								<GradientStop Color="#00000000" Offset="0"/>
 							</LinearGradientBrush>
 						</Grid.Background>
@@ -43,25 +43,25 @@
 							<ColumnDefinition/>
 							<ColumnDefinition/>
 						</Grid.ColumnDefinitions>
-						
+
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto"/>
 							<RowDefinition/>
 						</Grid.RowDefinitions>
 						<TextBlock Text="{x:Static lang:Resources.StatsTimePlayed}" FontSize="14" FontWeight="Bold" Foreground="#FF64648C"/>
 						<TextBlock Text="{x:Static lang:Resources.StatsLastTimePlayed}" FontSize="14" FontWeight="Bold" Foreground="#FF64648C" Grid.Column="1"/>
-						
+
 						<TextBlock x:Name="TotalTimePlayedTxt" d:Text="74,5h" Margin="0,10,10,10" FontSize="22" FontWeight="Bold" TextAlignment="Left" Grid.Column="0" Grid.Row="1"/>
 						<TextBlock x:Name="LastTimePlayedTxt" d:Text="10 December 2021" Margin="0,10,10,10" FontSize="22" FontWeight="Bold" TextAlignment="Left" Grid.Column="1" Grid.Row="1"/>
 					</Grid>
 				</Border>
 
-				<StackPanel Grid.Row="2" Orientation="Vertical">
+				<StackPanel Grid.Row="2" Orientation="Vertical" Margin="10">
 					<TextBlock Text="{x:Static lang:Resources.Description}" FontSize="18" FontWeight="Bold"/>
-					<TextBlock x:Name="DescriptionTxt" d:Text="{x:Static lang:Resources.Description}" FontSize="14" FontWeight="Normal" Margin="0,3,0,0" TextWrapping="Wrap"/>
+					<TextBlock x:Name="DescriptionTxt" d:Text="{x:Static lang:Resources.Description}" FontSize="14" FontWeight="Normal" TextWrapping="Wrap"/>
 				</StackPanel>
 			</Grid>
-			
+
 		</Grid>
 	</ScrollViewer>
 </UserControl>