Redesigned Scan Apps popup (#443)

Leo-Corporation · Mar 2, 2024 · 95c18f7 · 95c18f7
1 parent 7f51fac
commit 95c18f7
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 23 deletions.
diff --git a/Gavilya/App.xaml b/Gavilya/App.xaml
@@ -633,12 +633,16 @@
                         Value="{TemplateBinding VerticalOffset}">
                         <ScrollBar.Template>
                             <ControlTemplate TargetType="{x:Type ScrollBar}">
-                                <Track x:Name="PART_Track" IsDirectionReversed="true">
+                                <Track
+                                    x:Name="PART_Track"
+                                    MinHeight="20"
+                                    IsDirectionReversed="true">
                                     <Track.Thumb>
                                         <Thumb Background="{DynamicResource SelectedBackground}">
                                             <Thumb.Template>
                                                 <ControlTemplate TargetType="{x:Type Thumb}">
                                                     <Border
+                                                        MinHeight="20"
                                                         Margin="5"
                                                         Background="{TemplateBinding Background}"
                                                         BorderBrush="{TemplateBinding BorderBrush}"

diff --git a/Gavilya/Components/UwpSelectorComponent.xaml b/Gavilya/Components/UwpSelectorComponent.xaml
@@ -3,30 +3,100 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:lang="clr-namespace:Gavilya.Properties"
     xmlns:local="clr-namespace:Gavilya.Components"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    MaxWidth="340"
     FontFamily="..\Fonts\#Hauora"
     Foreground="{DynamicResource Foreground}"
     mc:Ignorable="d">
-    <Button
-        Padding="5"
+    <Border
+        Margin="10 5"
+        Padding="10"
         Background="{DynamicResource Background2}"
-        Command="{Binding ClickCommand}"
-        Cursor="Hand"
-        Style="{DynamicResource RegularButton2}">
-        <StackPanel
-            Grid.Column="1"
-            Width="380"
-            VerticalAlignment="Center">
-            <TextBlock
-                x:Name="GameNameTxt"
-                FontSize="18"
-                FontWeight="ExtraBold"
-                Text="{Binding Name}" />
-            <TextBlock
-                x:Name="GamePackageInfoTxt"
-                FontSize="10"
-                Text="{Binding InfoText}" />
-        </StackPanel>
-    </Button>
+        BorderBrush="{DynamicResource SelectedBackground}"
+        BorderThickness="2"
+        CornerRadius="10">
+        <Grid>
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" />
+                <RowDefinition />
+            </Grid.RowDefinitions>
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <TextBlock
+                    x:Name="SsidTxt"
+                    Grid.Column="1"
+                    d:Text="Game Name"
+                    FontSize="16"
+                    FontWeight="ExtraBold"
+                    Text="{Binding Name}" />
+                <StackPanel Grid.Column="2" Orientation="Horizontal">
+                    <Button
+                        x:Name="SelectBtn"
+                        Grid.Row="1"
+                        Margin="0 0 5 0"
+                        Padding="5 2"
+                        HorizontalAlignment="Right"
+                        Background="{DynamicResource Accent}"
+                        Command="{Binding ClickCommand}"
+                        Content="{x:Static lang:Resources.Select}"
+                        Cursor="Hand"
+                        FontWeight="ExtraBold"
+                        Style="{DynamicResource AccentButton}" />
+                    <Button
+                        x:Name="ExpanderBtn"
+                        Grid.Column="1"
+                        Padding="5"
+                        Background="Transparent"
+                        Command="{Binding CollapseCommand}"
+                        Content="{Binding CollapseIcon}"
+                        FontFamily="../Fonts/#FluentSystemIcons-Regular"
+                        Foreground="{DynamicResource Foreground}"
+                        Style="{DynamicResource RegularButton}" />
+                </StackPanel>
+            </Grid>
+            <Grid
+                x:Name="CollapseGrid"
+                Grid.Row="1"
+                Margin="5"
+                d:Visibility="Visible"
+                Visibility="{Binding CollapseGridVid}">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <TextBlock FontSize="10" Text="{x:Static lang:Resources.Package}" />
+                <TextBlock
+                    Grid.Row="1"
+                    FontSize="10"
+                    Text="{x:Static lang:Resources.AppID}" />
+                <TextBlock
+                    x:Name="FilePathTxt"
+                    Grid.Column="1"
+                    Margin="5 0 0 0"
+                    d:Text="C:/File"
+                    FontSize="10"
+                    Text="{Binding PackageName}"
+                    TextWrapping="Wrap" />
+                <TextBlock
+                    x:Name="AppTxt"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Margin="5 0 0 0"
+                    d:Text="C:/File"
+                    FontSize="10"
+                    Text="{Binding AppId}"
+                    TextWrapping="Wrap" />
+            </Grid>
+        </Grid>
+    </Border>
 </UserControl>
diff --git a/Gavilya/ViewModels/UwpSelectorViewModel.cs b/Gavilya/ViewModels/UwpSelectorViewModel.cs
@@ -24,6 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 
 using Gavilya.Commands;
 using Gavilya.Models;
+using System.Windows;
 using System.Windows.Input;
 
 namespace Gavilya.ViewModels;
@@ -36,9 +37,15 @@ public class UwpSelectorViewModel : ViewModelBase
 	public string AppId { get; }
 	public string Name { get; }
 
-	public string InfoText => $"{PackageName} • {AppId}";
-
+	public ICommand CollapseCommand { get; }
 	public ICommand ClickCommand { get; }
+
+	private Visibility _collapseGridVis = Visibility.Collapsed;
+	public Visibility CollapseGridVid { get => _collapseGridVis; set { _collapseGridVis = value; OnPropertyChanged(nameof(CollapseGridVid)); } }
+
+	private string _collapseIcon = "\uF2A4";
+	public string CollapseIcon { get => _collapseIcon; set { _collapseIcon = value; OnPropertyChanged(nameof(CollapseIcon)); } }
+
 	public UwpSelectorViewModel(UwpApp uwpApp, GameEditionViewModel gameEditionViewModel)
 	{
 		_gameEditionViewModel = gameEditionViewModel;
@@ -48,6 +55,7 @@ public UwpSelectorViewModel(UwpApp uwpApp, GameEditionViewModel gameEditionViewM
 		Name = uwpApp.Name;
 
 		ClickCommand = new RelayCommand(Click);
+		CollapseCommand = new RelayCommand(Collapse);
 	}
 
 	private void Click(object? obj)
@@ -56,4 +64,10 @@ private void Click(object? obj)
 		_gameEditionViewModel.AppId = AppId;
 		_gameEditionViewModel.IsUwpOpen = false;
 	}
+
+	private void Collapse(object? obj)
+	{
+		CollapseGridVid = CollapseGridVid == Visibility.Visible ? Visibility.Collapsed : Visibility.Visible;
+		CollapseIcon = CollapseGridVid == Visibility.Visible ? "\uF2B7" : "\uF2A4";
+	}
 }