From 7ad95d975434d612831a8acd9e0eb6919c1c80e2 Mon Sep 17 00:00:00 2001
From: Vova <3emaster@gmail.com>
Date: Thu, 18 Jan 2024 19:06:51 +0200
Subject: [PATCH] Added BackCommand to video player window

---
 TV Player WPF/VideoPlayer.xaml                | 33 +++++++-------
 TV Player WPF/VideoPlayer.xaml.cs             |  8 +++-
 TV Player WPF/ViewModels/PlayerViewModel.cs   | 43 ++++++++-----------
 .../ViewModels/ProgramsGroupViewModel.cs      |  4 --
 .../ViewModels/ProgramsListViewModel.cs       | 12 ------
 5 files changed, 39 insertions(+), 61 deletions(-)

diff --git a/TV Player WPF/VideoPlayer.xaml b/TV Player WPF/VideoPlayer.xaml
index 1663b7e..fc1456b 100644
--- a/TV Player WPF/VideoPlayer.xaml	
+++ b/TV Player WPF/VideoPlayer.xaml	
@@ -6,26 +6,23 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
-            >
-
+             Unloaded="UserControl_Unloaded">
     <Grid>
-        <Grid x:Name="videoPlayer">
-            <vlc:VideoView x:Name="VideoView"  Panel.ZIndex="1">
-                <StackPanel  Panel.ZIndex="2" Opacity="0.9" 
-                             IsHitTestVisible="True"
+        <vlc:VideoView x:Name="VideoView" Panel.ZIndex="1">
+            <StackPanel  Panel.ZIndex="10" IsHitTestVisible="True" Background="#01FFFFFF"
                              HorizontalAlignment="Stretch" MouseLeftButtonDown="MyUserControl_MouseDown" 
                              TouchDown="MyUserControl_TouchDown" >
-                    <Grid x:Name="overlayPanel" Visibility="Collapsed" >
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                            <ColumnDefinition />
-                        </Grid.ColumnDefinitions>
-                        <Button Grid.Column="0" Content="Pause" HorizontalAlignment="Stretch" Click="PauseButton_Click" />
-                    </Grid>
-                </StackPanel>
-            </vlc:VideoView>
-        </Grid>
+                <Grid x:Name="overlayPanel" Visibility="Collapsed" >
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                        <ColumnDefinition />
+                    </Grid.ColumnDefinitions>
+                    <Button Grid.Column="0" Content="Back" HorizontalAlignment="Stretch" Command="{Binding BackCommand}" />
+                    <Button Grid.Column="1" Content="Pause" HorizontalAlignment="Stretch" Click="PauseButton_Click" />
+                </Grid>
+            </StackPanel>
+        </vlc:VideoView>
     </Grid>
 </UserControl>
diff --git a/TV Player WPF/VideoPlayer.xaml.cs b/TV Player WPF/VideoPlayer.xaml.cs
index dabd00d..9b0560b 100644
--- a/TV Player WPF/VideoPlayer.xaml.cs	
+++ b/TV Player WPF/VideoPlayer.xaml.cs	
@@ -3,6 +3,7 @@ using LibVLCSharp.WPF;
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Forms.Integration;
 using System.Windows.Input;
 
 namespace TV_Player
@@ -77,7 +78,7 @@ namespace TV_Player
                     VideoView.MediaPlayer.Play(media);
             }
         }
-
+         
 
         private void MyUserControl_MouseDown(object sender, MouseButtonEventArgs e)
         {
@@ -110,5 +111,10 @@ namespace TV_Player
         {
             overlayPanel.Visibility = Visibility.Collapsed;
         }
+
+        private void UserControl_Unloaded(object sender, RoutedEventArgs e)
+        {
+            VideoView.MediaPlayer.Dispose();
+        }
     }
 }
diff --git a/TV Player WPF/ViewModels/PlayerViewModel.cs b/TV Player WPF/ViewModels/PlayerViewModel.cs
index af40464..e9998af 100644
--- a/TV Player WPF/ViewModels/PlayerViewModel.cs	
+++ b/TV Player WPF/ViewModels/PlayerViewModel.cs	
@@ -1,4 +1,6 @@
-using System.Windows.Input;
+using CommunityToolkit.Mvvm.Input;
+using System.Windows.Input;
+using TV_Player.ViewModels;
 
 namespace TV_Player
 {
@@ -6,43 +8,32 @@ namespace TV_Player
     public class PlayerViewModel: ObservableViewModelBase
     {
 
-        private readonly M3UInfo _currentProgram;
 
-        private string _urlSource;
-        public string URLSource
+        private M3UInfo _currentProgram;
+        public M3UInfo SelectedProgram
         {
-            get => _urlSource;
-            set => SetProperty(ref _urlSource, value);
+            get => _currentProgram;
+            set => SetProperty(ref _currentProgram, value);
         }
 
-        public GroupInfo SelectedItem { get; set; }
-        public ICommand PlayCommand { get; }
+        public M3UInfo SelectedItem { get; set; }
+        public ICommand BackCommand { get; }
 
         public PlayerViewModel(M3UInfo selectedProgram)
         {
             _currentProgram = selectedProgram;
-            //PlayM3U8(_currentProgram.Url);
-            //_libVLC = new LibVLC();
-            //_mediaPlayer = new MediaPlayer(new Media(_libVLC, new Uri(_currentProgram.Url)));
-            //_mediaPlayer.Play();
-            //PlayCommand = new Command(OnPlayButtonClicked);
+            BackCommand = new RelayCommand(OnButtonBackClick);
+           
         }
 
-        private void OnPlayButtonClicked()
+        private void OnButtonBackClick()
         {
-            PlayM3U8(_currentProgram.Url);
+            var groupInfo = new GroupInfo() { Name = _currentProgram.GroupTitle, Count = 0 };
+
+            var programListViewModel = new ProgramsListViewModel(groupInfo);
+            var conrtrol = new ProgramsList();
+            TVPlayerViewModel.Instance.SetPageContext(conrtrol, programListViewModel);
         }
 
-        private void PlayM3U8(string url)
-        {
-            try
-            {
-                URLSource = _currentProgram.Url;
-            }
-            catch (Exception ex)
-            {
-                // Handle exceptions
-            }
-        }
     }
 }
diff --git a/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs b/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
index 45b2e37..2bb218a 100644
--- a/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs	
+++ b/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs	
@@ -24,13 +24,9 @@ namespace TV_Player
 
         private void OnItemSelected()
         {
-            //var navigation = (INavigation)Application.Current.MainPage.Navigation;
-
             var programListViewModel = new ProgramsListViewModel(SelectedItem);
             var conrtrol = new ProgramsList();
             TVPlayerViewModel.Instance.SetPageContext(conrtrol, programListViewModel);
-
-
         }
     }
 }
diff --git a/TV Player WPF/ViewModels/ProgramsListViewModel.cs b/TV Player WPF/ViewModels/ProgramsListViewModel.cs
index 91b7aae..a34b92e 100644
--- a/TV Player WPF/ViewModels/ProgramsListViewModel.cs	
+++ b/TV Player WPF/ViewModels/ProgramsListViewModel.cs	
@@ -24,22 +24,10 @@ namespace TV_Player
 
         private void OnItemSelected()
         {
-
             var playerViewModel = new PlayerViewModel(SelectedItem);
             var conrtrol = new VideoPlayer();
             conrtrol.SourceUrl = SelectedItem.Url;
             TVPlayerViewModel.Instance.SetPageContext(conrtrol, playerViewModel);
-            //var navigation = (INavigation)Application.Current.MainPage.Navigation;
-
-            //var playerViewModel = new PlayerViewModel(SelectedItem);
-
-            //// Create a new SecondPage and set its BindingContext to the ViewModel
-            //var playerPage = new PlayerPage
-            //{
-            //    BindingContext = playerViewModel
-            //};
-            //// Navigate to the OtherPage
-            //navigation.PushAsync(playerPage);
         }
     }
 }