diff --git a/TV Player WPF/Assets/GroupButtonStyle.xaml b/TV Player WPF/Assets/GroupButtonStyle.xaml
index a891769..8ce8bfb 100644
--- a/TV Player WPF/Assets/GroupButtonStyle.xaml
+++ b/TV Player WPF/Assets/GroupButtonStyle.xaml
@@ -5,20 +5,20 @@
-
+
-
+
- Programs
+ программ
-
+
@@ -45,6 +45,54 @@ c-0.781-0.781-0.788-2.047-0.007-2.828L51.438,14.43c1.754-1.755,1.753-4.61-0.001-
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/TV Player WPF/MainWindow.xaml b/TV Player WPF/MainWindow.xaml
index 9ea2320..d24af21 100644
--- a/TV Player WPF/MainWindow.xaml
+++ b/TV Player WPF/MainWindow.xaml
@@ -20,7 +20,6 @@
-
@@ -30,7 +29,7 @@
-
+
diff --git a/TV Player WPF/ProgramsGroupGrid.xaml b/TV Player WPF/ProgramsGroupGrid.xaml
index b3aa5a4..236833a 100644
--- a/TV Player WPF/ProgramsGroupGrid.xaml
+++ b/TV Player WPF/ProgramsGroupGrid.xaml
@@ -5,23 +5,26 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:tv_player="clr-namespace:TV_Player"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TV Player WPF/ProgramsList.xaml b/TV Player WPF/ProgramsList.xaml
index ccadaaa..0dd2ef8 100644
--- a/TV Player WPF/ProgramsList.xaml
+++ b/TV Player WPF/ProgramsList.xaml
@@ -5,26 +5,35 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/TV Player WPF/VideoPlayer.xaml b/TV Player WPF/VideoPlayer.xaml
index a01ac92..1f8729b 100644
--- a/TV Player WPF/VideoPlayer.xaml
+++ b/TV Player WPF/VideoPlayer.xaml
@@ -22,20 +22,33 @@
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+
diff --git a/TV Player WPF/VideoPlayer.xaml.cs b/TV Player WPF/VideoPlayer.xaml.cs
index ad153f1..563a394 100644
--- a/TV Player WPF/VideoPlayer.xaml.cs
+++ b/TV Player WPF/VideoPlayer.xaml.cs
@@ -11,21 +11,11 @@ namespace TV_Player
///
public partial class VideoPlayer : UserControl
{
- public static readonly DependencyProperty SourceUrlProperty =
- DependencyProperty.Register(
- "SourceUrl", // Name of the property
- typeof(string), // Type of the property
- typeof(VideoPlayer), // Type of the owner class
- new PropertyMetadata(string.Empty) // Default value
- );
- public string SourceUrl
- {
- get { return (string)GetValue(SourceUrlProperty); }
- set { SetValue(SourceUrlProperty, value); }
- }
+ public string SourceUrl { get; set; }
private LibVLC _libVLC;
private MediaPlayer _mediaPlayer;
+ private PlayerViewModel _viewModel;
public VideoPlayer()
{
@@ -33,6 +23,12 @@ namespace TV_Player
_libVLC = new LibVLC(enableDebugLogs: true);
_mediaPlayer = new MediaPlayer(_libVLC);
+ this.DataContextChanged += (sender, e) =>
+ {
+ _viewModel = (PlayerViewModel)e.NewValue;
+ _viewModel.SourceUrlChangedEvent += _viewModel_SourceUrlChangedEvent;
+ };
+
VideoView.Loaded += (sender, e) =>
{
@@ -43,7 +39,15 @@ namespace TV_Player
AutoPlay();
};
Unloaded += VideoPlayer_Unloaded;
+ }
+ private void _viewModel_SourceUrlChangedEvent(string videoURL)
+ {
+ SourceUrl = videoURL;
+ VideoView.MediaPlayer.Stop();
+ VideoView.MediaPlayer.Media.Dispose();
+
+ AutoPlay();
}
private void VideoView_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
@@ -55,8 +59,6 @@ namespace TV_Player
{
VideoView.Dispose();
}
-
-
void PauseButton_Click(object sender, RoutedEventArgs e)
{
if (VideoView.MediaPlayer.IsPlaying)
@@ -64,28 +66,22 @@ namespace TV_Player
VideoView.MediaPlayer.Pause();
}
}
-
private void AutoPlay()
{
if (!VideoView.MediaPlayer.IsPlaying)
{
-
using (var media = new Media(_libVLC, new Uri(SourceUrl)))
VideoView.MediaPlayer.Play(media);
}
}
-
-
private void MyUserControl_MouseDown(object sender, MouseButtonEventArgs e)
{
ToggleOverlay();
}
-
private void MyUserControl_TouchDown(object sender, TouchEventArgs e)
{
ToggleOverlay();
}
-
private void ToggleOverlay()
{
if (overlayPanel.Visibility == Visibility.Visible)
@@ -97,19 +93,17 @@ namespace TV_Player
ShowOverlay();
}
}
-
public void ShowOverlay()
{
overlayPanel.Visibility = Visibility.Visible;
}
-
public void HideOverlay()
{
overlayPanel.Visibility = Visibility.Collapsed;
}
-
private void UserControl_Unloaded(object sender, RoutedEventArgs e)
{
+ _viewModel.SourceUrlChangedEvent -= _viewModel_SourceUrlChangedEvent;
VideoView.MediaPlayer?.Dispose();
}
}
diff --git a/TV Player WPF/ViewModels/M3UParser.cs b/TV Player WPF/ViewModels/M3UParser.cs
index ac3acea..b6613e6 100644
--- a/TV Player WPF/ViewModels/M3UParser.cs
+++ b/TV Player WPF/ViewModels/M3UParser.cs
@@ -1,6 +1,7 @@
using System.Net.Http;
using System.Net.Http.Headers;
using System.Text.RegularExpressions;
+using System.Threading.Channels;
using System.Xml;
namespace TV_Player
@@ -11,10 +12,10 @@ namespace TV_Player
private int _durationValue;
public string Title { get => _title; set => SetProperty(ref _title, value); }
-
+
public DateTime StartTime { get; set; }
public DateTime StopTime { get; set; }
- public int DurationValue { get => _durationValue; set => SetProperty(ref _durationValue , value); }
+ public int DurationValue { get => _durationValue; set => SetProperty(ref _durationValue, value); }
}
@@ -49,151 +50,174 @@ namespace TV_Player
private static List ParseEpg(string epgData)
{
List epgChannels = new List();
+ XmlReaderSettings settings = new XmlReaderSettings();
+ settings.IgnoreWhitespace = true;
+ settings.IgnoreComments = true;
- using (XmlReader reader = XmlReader.Create(new System.IO.StringReader(epgData)))
+ using (XmlReader reader = XmlReader.Create(new System.IO.StringReader(epgData), settings))
{
- ProgramGuide currentChannel = null;
- XmlDocument doc = new XmlDocument();
- doc.LoadXml(epgData);
-
- XmlNodeList channelNodes = doc.SelectNodes("//channel");
-
- foreach (XmlNode channelNode in channelNodes)
+ try
{
- ProgramGuide channel = new ProgramGuide();
- channel.Id = channelNode.Attributes["id"].Value;
- channel.DisplayName = channelNode.SelectSingleNode("display-name").InnerText;
-
- XmlNodeList programNodes = doc.SelectNodes($"//programme[@channel='{channel.Id}']");
- foreach (XmlNode programNode in programNodes)
+ while (reader.Read())
{
- ProgramInfo program = new ProgramInfo();
- program.Title = programNode.SelectSingleNode("title").InnerText;
- program.StartTime = DateTime.ParseExact(programNode.Attributes["start"].Value, "yyyyMMddHHmmss zzz", null);
- program.StopTime = DateTime.ParseExact(programNode.Attributes["stop"].Value, "yyyyMMddHHmmss zzz", null);
+ if (reader.NodeType == XmlNodeType.Element && reader.Name == "channel")
+ {
+ ProgramGuide channel = new ProgramGuide();
+ channel.Id = reader.GetAttribute("id");
+ reader.Read();
+ channel.DisplayName = reader.ReadElementContentAsString();
- channel.Programs.Add(program);
+ epgChannels.Add(channel);
+ continue;
+ }
+
+ if (reader.NodeType == XmlNodeType.Element && reader.Name == "programme")
+ {
+ ProgramInfo program = new ProgramInfo();
+
+ var id=reader.GetAttribute("channel");
+ var channel = epgChannels.FirstOrDefault(x => x.Id == id);
+ program.StartTime = DateTime.ParseExact(reader.GetAttribute("start"), "yyyyMMddHHmmss zzz", null);
+ program.StopTime = DateTime.ParseExact(reader.GetAttribute("stop"), "yyyyMMddHHmmss zzz", null);
+
+ reader.Read();
+ program.Title = reader.ReadElementContentAsString();
+
+
+ channel.Programs.Add(program);
+ }
+ else if (reader.NodeType == XmlNodeType.EndElement && reader.Name == "channel")
+ {
+ break;
+ }
}
-
- epgChannels.Add(channel);
}
- //while (reader.Read())
- //{
- // if (reader.NodeType == XmlNodeType.Element)
- // {
- // if (reader.Name == "channel")
- // {
- // currentChannel = new ProgramGuide();
- // currentChannel.Id = reader.GetAttribute("id");
- // currentChannel.DisplayName = reader.ReadElementContentAsString();
- // epgChannels.Add(currentChannel);
- // }
- // else if (reader.Name == "programme" && currentChannel != null)
- // {
- // ProgramInfo program = new ProgramInfo();
- // program.Title = reader.ReadElementContentAsString();
- // program.StartTime = DateTime.ParseExact(reader.GetAttribute("start"), "yyyyMMddHHmmss zzz", null);
- // program.StopTime = DateTime.ParseExact(reader.GetAttribute("stop"), "yyyyMMddHHmmss zzz", null);
- // currentChannel.Programs.Add(program);
- // }
- // }
- //}
+ catch (Exception ex) {
}
+ }
+ //using (XmlReader reader = XmlReader.Create(new System.IO.StringReader(epgData)))
+ //{
+ // ProgramGuide currentChannel = null;
+ // XmlDocument doc = new XmlDocument();
+ // doc.LoadXml(epgData);
+
+ // XmlNodeList channelNodes = doc.SelectNodes("//channel");
+
+ // foreach (XmlNode channelNode in channelNodes)
+ // {
+ // ProgramGuide channel = new ProgramGuide();
+ // channel.Id = channelNode.Attributes["id"].Value;
+ // channel.DisplayName = channelNode.SelectSingleNode("display-name").InnerText;
+
+ // XmlNodeList programNodes = doc.SelectNodes($"//programme[@channel='{channel.Id}']");
+ // foreach (XmlNode programNode in programNodes)
+ // {
+ // ProgramInfo program = new ProgramInfo();
+ // program.Title = programNode.SelectSingleNode("title").InnerText;
+ // program.StartTime = DateTime.ParseExact(programNode.Attributes["start"].Value, "yyyyMMddHHmmss zzz", null);
+ // program.StopTime = DateTime.ParseExact(programNode.Attributes["stop"].Value, "yyyyMMddHHmmss zzz", null);
+
+ // channel.Programs.Add(program);
+ // }
+
+ // epgChannels.Add(channel);
+ // }
+ //}
return epgChannels;
}
- public static async Task> DownloadM3UFromWebAsync(string url)
+ public static async Task> DownloadM3UFromWebAsync(string url)
+ {
+ List playlistItems = new List();
+
+ using (var client = new HttpClient())
+ using (var request = new HttpRequestMessage())
{
- List playlistItems = new List();
+ client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/text"));
+ request.Method = HttpMethod.Get;
+ request.RequestUri = new Uri(url);
+ var response = await client.GetAsync(url);
+ response.EnsureSuccessStatusCode();
+ string responseBody = await response.Content.ReadAsStringAsync();
- using (var client = new HttpClient())
- using (var request = new HttpRequestMessage())
+ // Parse M3U content
+ playlistItems = ParseM3UFromString(responseBody);
+ }
+ return playlistItems;
+ }
+
+ static string[] SplitStringBeforeSeparator(string input, string separator)
+ {
+ string[] parts = input.Split(separator);
+
+ // Reconstruct the string until the separator is reached
+ int separatorIndex = input.IndexOf(separator);
+ if (separatorIndex != -1)
+ {
+ parts[0] = input.Substring(0, separatorIndex + 1);
+ for (int i = 1; i < parts.Length; i++)
{
- client.DefaultRequestHeaders.Accept.Add(new MediaTypeWithQualityHeaderValue("application/text"));
- request.Method = HttpMethod.Get;
- request.RequestUri = new Uri(url);
- var response = await client.GetAsync(url);
- response.EnsureSuccessStatusCode();
- string responseBody = await response.Content.ReadAsStringAsync();
-
- // Parse M3U content
- playlistItems = ParseM3UFromString(responseBody);
+ parts[i] = separator + parts[i];
}
- return playlistItems;
}
- static string[] SplitStringBeforeSeparator(string input, string separator)
+ return parts;
+ }
+
+ static List ParseM3UFromString(string content)
+ {
+ List playlistItems = new List();
+
+ try
{
- string[] parts = input.Split(separator);
+ var m3u = SplitStringBeforeSeparator(content, "#EXT");
- // Reconstruct the string until the separator is reached
- int separatorIndex = input.IndexOf(separator);
- if (separatorIndex != -1)
+ foreach (var line in m3u)
{
- parts[0] = input.Substring(0, separatorIndex + 1);
- for (int i = 1; i < parts.Length; i++)
+ if (line.StartsWith("#EXTINF:"))
{
- parts[i] = separator + parts[i];
- }
- }
-
- return parts;
- }
-
- static List ParseM3UFromString(string content)
- {
- List playlistItems = new List();
-
- try
- {
- var m3u = SplitStringBeforeSeparator(content, "#EXT");
-
- foreach (var line in m3u)
- {
- if (line.StartsWith("#EXTINF:"))
+ if (TryParseM3ULine(line, out var m3uInfo))
{
- if (TryParseM3ULine(line, out var m3uInfo))
- {
- playlistItems.Add(m3uInfo);
- }
+ playlistItems.Add(m3uInfo);
}
}
}
- catch (Exception ex)
- {
- Console.WriteLine("Error reading M3U file: " + ex.Message);
- }
-
- return playlistItems;
}
-
-
- static bool TryParseM3ULine(string m3uLine, out M3UInfo? info)
+ catch (Exception ex)
{
- info = null;
- string pattern = @"#EXTINF:\d+ CUID=""(?.*?)"" number=""(?.*?)"" tvg-id=""(?.*?)"" tvg-name=""(?.*?)"".*?tvg-logo=""(?.*?)"" group-title=""(?.*?)""[^,]*,(?.*)[^\r](?.*)$";
- Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);
-
- Match match = regex.Match(m3uLine);
- if (match.Success)
- {
- info = new M3UInfo
- {
- CUID = match.Groups["CUID"].Value,
- Number = match.Groups["Number"].Value,
- TvgID = match.Groups["TvgID"].Value,
- TvgName = match.Groups["TvgName"].Value,
- GroupTitle = match.Groups["GroupTitle"].Value,
- Logo = match.Groups["Logo"].Value,
- Name = match.Groups["Name"].Value,
- Url = match.Groups["URL"].Value
- };
- return true;
- }
-
- return false;
+ Console.WriteLine("Error reading M3U file: " + ex.Message);
}
+
+ return playlistItems;
+ }
+
+
+ static bool TryParseM3ULine(string m3uLine, out M3UInfo? info)
+ {
+ info = null;
+ string pattern = @"#EXTINF:\d+ CUID=""(?.*?)"" number=""(?.*?)"" tvg-id=""(?.*?)"" tvg-name=""(?.*?)"".*?tvg-logo=""(?.*?)"" group-title=""(?.*?)""[^,]*,(?.*)[^\r](?.*)$";
+ Regex regex = new Regex(pattern, RegexOptions.IgnoreCase);
+
+ Match match = regex.Match(m3uLine);
+ if (match.Success)
+ {
+ info = new M3UInfo
+ {
+ CUID = match.Groups["CUID"].Value,
+ Number = match.Groups["Number"].Value,
+ TvgID = match.Groups["TvgID"].Value,
+ TvgName = match.Groups["TvgName"].Value,
+ GroupTitle = match.Groups["GroupTitle"].Value,
+ Logo = match.Groups["Logo"].Value,
+ Name = match.Groups["Name"].Value,
+ Url = match.Groups["URL"].Value
+ };
+ return true;
+ }
+
+ return false;
}
}
+}
diff --git a/TV Player WPF/ViewModels/MainViewModel.cs b/TV Player WPF/ViewModels/MainViewModel.cs
index ae70b41..b212bb9 100644
--- a/TV Player WPF/ViewModels/MainViewModel.cs
+++ b/TV Player WPF/ViewModels/MainViewModel.cs
@@ -7,12 +7,13 @@ namespace TV_Player
{
public class MainViewModel : ObservableViewModelBase
{
- private ContentControl _control;
- public ContentControl Control
+ private ContentControl? _control;
+ public ContentControl? Control
{
get => _control;
set => SetProperty(ref _control, value);
}
+
private bool _isTopPanelVisible;
public bool IsTopPanelVisible
@@ -56,7 +57,7 @@ namespace TV_Player
CurrentWindowStyle = WindowStyle.SingleBorderWindow;
}
- private void OnFullSctreenButtonClick()
+ public void OnFullSctreenButtonClick()
{
if (CurrentWindowStyle == WindowStyle.SingleBorderWindow)
{
diff --git a/TV Player WPF/ViewModels/PlayerViewModel.cs b/TV Player WPF/ViewModels/PlayerViewModel.cs
index 8930f2d..9f3897a 100644
--- a/TV Player WPF/ViewModels/PlayerViewModel.cs
+++ b/TV Player WPF/ViewModels/PlayerViewModel.cs
@@ -8,12 +8,10 @@ namespace TV_Player
public class PlayerViewModel : ObservableViewModelBase, IDisposable
{
- private M3UInfo _currentProgram;
- public M3UInfo SelectedProgram
- {
- get => _currentProgram;
- set => SetProperty(ref _currentProgram, value);
- }
+ public delegate void SourceUrlChanged(string videoURL);
+ public event SourceUrlChanged SourceUrlChangedEvent;
+
+ private M3UInfo _currentProgram;
private string _topPaneTitle;
public string TopPanelTitle
@@ -50,40 +48,81 @@ namespace TV_Player
set => SetProperty(ref _endProgram, value);
}
-
- public M3UInfo SelectedItem { get; set; }
+ private List _programs;
public ICommand BackCommand { get; }
+ public ICommand FullscreenCommand { get; }
+ public ICommand NextCommand { get; }
+ public ICommand PreviousCommand { get; }
private ProgramGuide _currentGuide;
private ProgramInfo _currentProgramInfo;
private IDisposable _programGuideDisposable;
private IDisposable _timer;
+ private IDisposable _programSubscriber;
+
+ private int _currentProgramIndex = 0;
public PlayerViewModel(M3UInfo selectedProgram)
{
_currentProgram = selectedProgram;
+
BackCommand = new RelayCommand(OnButtonBackClick);
- TVPlayerViewModel.Instance.TopPanelVisible(false, selectedProgram.Name);
-
- TopPanelTitle = selectedProgram.Name;
-
- _programGuideDisposable = ProgramsData.Instance.ProgramGuideInfo.Subscribe(x =>
- {
- try
- {
- _currentGuide = x.FirstOrDefault(p => p.Id == selectedProgram.TvgID);
- UpdateScreenInfo();
-
- _timer = Observable.Interval(TimeSpan.FromMinutes(1)).Subscribe(x =>
- {
- UpdateScreenInfo();
- });
- }
- catch { }
- });
+ NextCommand = new RelayCommand(NextProgram);
+ PreviousCommand = new RelayCommand(PreviousProgram);
+ FullscreenCommand = new RelayCommand(TVPlayerViewModel.Instance.FullScreenToggle);
+ _programSubscriber = ProgramsData.Instance.AllPrograms.Subscribe(x =>
+ {
+ _programs = x.Where(p => p.GroupTitle == _currentProgram.GroupTitle).ToList();
+ _currentProgramIndex = _programs.Select((program, index) => new { program, index })
+ .Where(x => x.program.Name == _currentProgram.Name)
+ .Select(x => x.index)
+ .FirstOrDefault();
+ });
+
+ UpdateUI();
}
+ private void UpdateUI()
+ {
+ TVPlayerViewModel.Instance.TopPanelVisible(false, _currentProgram.Name);
+ TopPanelTitle = _currentProgram.Name;
+ SourceUrlChangedEvent?.Invoke(_currentProgram.Url);
+
+ _programGuideDisposable = ProgramsData.Instance.ProgramGuideInfo.Subscribe(x =>
+ {
+ try
+ {
+ _currentGuide = x.FirstOrDefault(p => p.Id == _currentProgram.TvgID);
+ UpdateScreenInfo();
+
+ _timer = Observable.Interval(TimeSpan.FromMinutes(1)).Subscribe(x =>
+ {
+ UpdateScreenInfo();
+ });
+ }
+ catch { }
+ });
+ }
+
+ private void PreviousProgram()
+ {
+ _currentProgramIndex -= 1;
+ if (_currentProgramIndex < 0)
+ _currentProgramIndex = _programs.Count - 1;
+ _currentProgram = _programs[_currentProgramIndex];
+ _programGuideDisposable?.Dispose();
+ UpdateUI();
+ }
+ private void NextProgram()
+ {
+ _currentProgramIndex += 1;
+ if (_currentProgramIndex > _programs.Count - 1)
+ _currentProgramIndex = 0;
+ _currentProgram = _programs[_currentProgramIndex];
+ _programGuideDisposable?.Dispose();
+ UpdateUI();
+ }
private void UpdateScreenInfo()
{
_currentProgramInfo = _currentGuide.Programs.FirstOrDefault(d => d.StartTime <= DateTime.Now && d.StopTime >= DateTime.Now);
@@ -96,8 +135,6 @@ namespace TV_Player
var programMinutes = (_currentProgramInfo.StopTime - _currentProgramInfo.StartTime).TotalMinutes;
DurationValue = (int)((DateTime.Now - _currentProgramInfo.StartTime).TotalMinutes / programMinutes * 100);
}
-
-
private void OnButtonBackClick()
{
var groupInfo = new GroupInfo() { Name = _currentProgram.GroupTitle, Count = 0 };
@@ -106,9 +143,9 @@ namespace TV_Player
var conrtrol = new ProgramsList();
TVPlayerViewModel.Instance.SetPageContext(conrtrol, programListViewModel);
}
-
public void Dispose()
{
+ _programSubscriber.Dispose();
_programGuideDisposable.Dispose();
_timer.Dispose();
}
diff --git a/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs b/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
index d3222db..6643ccc 100644
--- a/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
+++ b/TV Player WPF/ViewModels/ProgramsGroupViewModel.cs
@@ -22,7 +22,7 @@ namespace TV_Player
ItemSelectedCommand = new RelayCommand(OnItemSelected);
_groupInformationSubscriber = ProgramsData.Instance.GroupsInformation.Subscribe(x=>Programs = x);
- TVPlayerViewModel.Instance.TopPanelVisible(true, "Groups");
+ TVPlayerViewModel.Instance.TopPanelVisible(true, "Группы");
}
private void OnItemSelected()
diff --git a/TV Player WPF/ViewModels/TVPlayerViewModel.cs b/TV Player WPF/ViewModels/TVPlayerViewModel.cs
index 40f92b9..db9cfbe 100644
--- a/TV Player WPF/ViewModels/TVPlayerViewModel.cs
+++ b/TV Player WPF/ViewModels/TVPlayerViewModel.cs
@@ -47,6 +47,11 @@ namespace TV_Player.ViewModels
_mainViewModel.TopPanelTitle = title;
}
+ public void FullScreenToggle()
+ {
+ _mainViewModel.OnFullSctreenButtonClick();
+ }
+
public void SetBackButtonAction(Action action)
{
_mainViewModel.ButtonBackAction = action;
@@ -57,7 +62,9 @@ namespace TV_Player.ViewModels
if (_mainViewModel.Control is IDisposable disposable)
disposable.Dispose();
control.DataContext = viewModel;
+
_mainViewModel.Control = control;
}
+
}
}