From e36554eeab01674e754ee1198a7ee0a565f396a8 Mon Sep 17 00:00:00 2001
From: Vova <3emaster@gmail.com>
Date: Sun, 21 Jan 2024 13:18:48 +0200
Subject: [PATCH] Design

---
 TV Player WPF/MainWindow.xaml                 | 12 +++++--
 TV Player WPF/ProgramsList.xaml               | 11 +++++--
 TV Player WPF/VideoPlayer.xaml                |  8 ++---
 TV Player WPF/ViewModels/MainViewModel.cs     | 15 +++++----
 TV Player WPF/ViewModels/PlayerViewModel.cs   | 10 +++++-
 .../ViewModels/ProgramsGroupViewModel.cs      |  2 +-
 .../ViewModels/ProgramsListViewModel.cs       |  2 +-
 TV Player WPF/ViewModels/TVPlayerViewModel.cs | 33 ++++++++++++-------
 8 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/TV Player WPF/MainWindow.xaml b/TV Player WPF/MainWindow.xaml
index a1028ce..270bdd6 100644
--- a/TV Player WPF/MainWindow.xaml	
+++ b/TV Player WPF/MainWindow.xaml	
@@ -21,10 +21,16 @@
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
-        <StackPanel Orientation="Horizontal" Visibility="{Binding IsTopPanelVisible,Converter={StaticResource BooleanToVisibilityConverterKey}}" >
+        <Grid Visibility="{Binding IsTopPanelVisible,Converter={StaticResource BooleanToVisibilityConverterKey}}"  Height="70">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="70"/>
+                <ColumnDefinition Width="70"/>
+                <ColumnDefinition />
+            </Grid.ColumnDefinitions>
             <Button Height="50" Width="50" Margin="10,0,0,0" Style="{DynamicResource ButtonGear}" />
-            <Button Height="50" Width="50" Margin="10,0,0,0" Style="{DynamicResource ButtonBack}" Command="{Binding BackCommand}" />
-        </StackPanel>
+            <Button Grid.Column="1" Height="50" Width="50" Margin="10,0,0,0" Style="{DynamicResource ButtonBack}" Command="{Binding BackCommand}" />
+            <TextBlock Grid.Column="2" FontSize="20" Foreground="White" Text="{Binding TopPanelTitle}" HorizontalAlignment="Center"/>
+        </Grid>
         <ContentControl Grid.Row="1" Name="ControlContainer" Content="{Binding Control}" />
     </Grid>
 </Window>
diff --git a/TV Player WPF/ProgramsList.xaml b/TV Player WPF/ProgramsList.xaml
index 47e87e3..ccadaaa 100644
--- a/TV Player WPF/ProgramsList.xaml	
+++ b/TV Player WPF/ProgramsList.xaml	
@@ -7,15 +7,20 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid x:Name="groupsGrid">
         <ScrollViewer>
-            <ListBox ItemsSource="{Binding Programs}"
+            <ListBox ItemsSource="{Binding Programs}" Background="Transparent"
                   SelectionMode="Single"
                   SelectedItem="{Binding SelectedItem}"
                   SelectionChanged="ListBox_SelectionChanged">
+                <ListBox.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <UniformGrid Rows="4" />
+                    </ItemsPanelTemplate>
+                </ListBox.ItemsPanel>
                 <ListBox.ItemTemplate>
                     <DataTemplate>
                     <StackPanel>
-                        <Image Source="{Binding Logo}" Width="50" Height="50"/>
-                        <TextBlock Text="{Binding Name}"/>
+                        <Image Source="{Binding Logo}" Width="50" Height="50" HorizontalAlignment="Center"/>
+                        <TextBlock Text="{Binding Name}" FontSize="15" Foreground="White" HorizontalAlignment="Center"/>
                     </StackPanel>
                     </DataTemplate>
                 </ListBox.ItemTemplate>
diff --git a/TV Player WPF/VideoPlayer.xaml b/TV Player WPF/VideoPlayer.xaml
index 38d5021..5b86216 100644
--- a/TV Player WPF/VideoPlayer.xaml	
+++ b/TV Player WPF/VideoPlayer.xaml	
@@ -12,15 +12,13 @@
             <StackPanel  Panel.ZIndex="10" IsHitTestVisible="True" Background="#01FFFFFF"
                              HorizontalAlignment="Stretch" MouseLeftButtonDown="MyUserControl_MouseDown" 
                              TouchDown="MyUserControl_TouchDown" >
-                <Grid x:Name="overlayPanel" Visibility="Collapsed" >
+                <Grid x:Name="overlayPanel" Visibility="Collapsed" Background="#70000000" Height="70" >
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition />
-                        <ColumnDefinition />
-                        <ColumnDefinition />
+                        <ColumnDefinition Width="70"/>
                         <ColumnDefinition />
                     </Grid.ColumnDefinitions>
                     <Button Height="50" Width="50" Margin="10,0,0,0" Style="{DynamicResource ButtonBack}" Command="{Binding BackCommand}" />
-                    <Button Grid.Column="1" Content="Pause" HorizontalAlignment="Stretch" Click="PauseButton_Click" />
+                    <TextBlock Grid.Column="1" FontSize="20" Foreground="White" Text="{Binding TopPanelTitle}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
                 </Grid>
             </StackPanel>
         </vlc:VideoView>
diff --git a/TV Player WPF/ViewModels/MainViewModel.cs b/TV Player WPF/ViewModels/MainViewModel.cs
index a0b0b77..e364503 100644
--- a/TV Player WPF/ViewModels/MainViewModel.cs	
+++ b/TV Player WPF/ViewModels/MainViewModel.cs	
@@ -19,17 +19,18 @@ namespace TV_Player
             set => SetProperty(ref _isTopPanelVisible, value);
         }
 
+        private string _topPaneTitle;
+        public string TopPanelTitle
+        {
+            get => _topPaneTitle;
+            set => SetProperty(ref _topPaneTitle, value);
+        }
+
         public Action ButtonBackAction { get; set; }
         public ICommand BackCommand { get; }
 
         public MainViewModel()
-        {
-            var vm = new ProgramsGroupViewModel();
-
-            var control = new ProgramsGroupGrid();
-            control.DataContext = vm;
-            Control = control;
-
+        {          
             BackCommand = new RelayCommand(OnButtonBackClick);
         }
         private void OnButtonBackClick()
diff --git a/TV Player WPF/ViewModels/PlayerViewModel.cs b/TV Player WPF/ViewModels/PlayerViewModel.cs
index eae2a63..ecac1eb 100644
--- a/TV Player WPF/ViewModels/PlayerViewModel.cs	
+++ b/TV Player WPF/ViewModels/PlayerViewModel.cs	
@@ -16,6 +16,13 @@ namespace TV_Player
             set => SetProperty(ref _currentProgram, value);
         }
 
+        private string _topPaneTitle;
+        public string TopPanelTitle
+        {
+            get => _topPaneTitle;
+            set => SetProperty(ref _topPaneTitle, value);
+        }
+
         public M3UInfo SelectedItem { get; set; }
         public ICommand BackCommand { get; }
 
@@ -23,7 +30,8 @@ namespace TV_Player
         {
             _currentProgram = selectedProgram;
             BackCommand = new RelayCommand(OnButtonBackClick);
-            TVPlayerViewModel.Instance.TopPanelVisible(false);
+            TVPlayerViewModel.Instance.TopPanelVisible(false, selectedProgram.Name);
+            TopPanelTitle = selectedProgram.Name;
         }
 
         private void OnButtonBackClick()
diff --git a/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs b/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
index ea8dccf..30af10a 100644
--- a/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs	
+++ b/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs	
@@ -21,7 +21,7 @@ namespace TV_Player
             ItemSelectedCommand = new RelayCommand(OnItemSelected);
             ProgramsData.Instance.GroupsInformation.Subscribe(x=>Programs = x);
            
-            //TVPlayerViewModel.Instance.TopPanelVisible(true);
+            TVPlayerViewModel.Instance.TopPanelVisible(true, "Groups");
         }
 
         private void OnItemSelected()
diff --git a/TV Player WPF/ViewModels/ProgramsListViewModel.cs b/TV Player WPF/ViewModels/ProgramsListViewModel.cs
index d8c44f0..2ef7314 100644
--- a/TV Player WPF/ViewModels/ProgramsListViewModel.cs	
+++ b/TV Player WPF/ViewModels/ProgramsListViewModel.cs	
@@ -18,7 +18,7 @@ namespace TV_Player
 
         public ProgramsListViewModel(GroupInfo groupInfo)
         {
-            TVPlayerViewModel.Instance.TopPanelVisible(true);
+            TVPlayerViewModel.Instance.TopPanelVisible(true, groupInfo.Name);
             ItemSelectedCommand = new RelayCommand(OnItemSelected);
             ProgramsData.Instance.AllPrograms.Subscribe(x => Programs = x.Where(p => p.GroupTitle == groupInfo.Name).ToList());
 
diff --git a/TV Player WPF/ViewModels/TVPlayerViewModel.cs b/TV Player WPF/ViewModels/TVPlayerViewModel.cs
index 6c60158..26e2c05 100644
--- a/TV Player WPF/ViewModels/TVPlayerViewModel.cs	
+++ b/TV Player WPF/ViewModels/TVPlayerViewModel.cs	
@@ -1,21 +1,19 @@
-using CommunityToolkit.Mvvm.Input;
-using System.Windows.Controls;
-using System.Windows.Input;
+using System.Windows.Controls;
 
 namespace TV_Player.ViewModels
 {
     public class TVPlayerViewModel
     {
         private readonly MainViewModel _mainViewModel;
-        
-        public Action ButtonBackAction { get; set; }       
 
-        private static TVPlayerViewModel _instance;
+        public Action ButtonBackAction { get; set; }
+
+        private static TVPlayerViewModel? _instance;
         public static TVPlayerViewModel Instance
         {
             get
             {
-                if(_instance==null)
+                if (_instance == null)
                     _instance = new TVPlayerViewModel();
                 return _instance;
             }
@@ -24,16 +22,29 @@ namespace TV_Player.ViewModels
         public TVPlayerViewModel()
         {
             _mainViewModel = new MainViewModel();
-            var mainWindow=new MainWindow();
+            var mainWindow = new MainWindow();
             mainWindow.DataContext = _mainViewModel;
-            
+
             mainWindow.Show();
             _instance = this;
-           
+
+            ShowInitialScreen();
         }
-        public void TopPanelVisible(bool value)
+
+        private void ShowInitialScreen()
+        {
+            var vm = new ProgramsGroupViewModel();
+
+            var control = new ProgramsGroupGrid();
+            control.DataContext = vm;
+
+            SetPageContext(control, vm);
+        }
+
+        public void TopPanelVisible(bool value, string title)
         {
             _mainViewModel.IsTopPanelVisible = value;
+            _mainViewModel.TopPanelTitle = title;
         }
 
         public void SetBackButtonAction(Action action)