From fe37fc3369385df610f250d68c8f93e176ad0039 Mon Sep 17 00:00:00 2001
From: Mateusz Skoczek <mateusz5432160@gmail.com>
Date: Fri, 8 Mar 2024 00:07:22 +0100
Subject: [PATCH 1/6] names changed, layer of abstraction added

---
 ...del.cs => HomeVideoCollectionViewModel.cs} | 18 ++++++++---------
 .../Home/HomeViewModel.cs                     |  6 +++---
 ...View.xaml => HomeVideoCollectionView.xaml} |  2 +-
 ...aml.cs => HomeVideoCollectionView.xaml.cs} |  4 ++--
 .../VDownload.Core.Views.csproj               |  4 ++--
 .../ViewModelToViewConverter.cs               |  2 +-
 VDownload.Models/Playlist.cs                  |  4 +---
 VDownload.Models/Source.cs                    |  3 ++-
 VDownload.Models/SubscriptionList.cs          | 20 +++++++++++++++++++
 VDownload.Models/VideoCollection.cs           | 18 +++++++++++++++++
 VDownload/App.xaml.cs                         |  4 ++--
 11 files changed, 61 insertions(+), 24 deletions(-)
 rename VDownload.Core/VDownload.Core.ViewModels/Home/{HomePlaylistViewModel.cs => HomeVideoCollectionViewModel.cs} (92%)
 rename VDownload.Core/VDownload.Core.Views/Home/{HomePlaylistView.xaml => HomeVideoCollectionView.xaml} (99%)
 rename VDownload.Core/VDownload.Core.Views/Home/{HomePlaylistView.xaml.cs => HomeVideoCollectionView.xaml.cs} (82%)
 create mode 100644 VDownload.Models/SubscriptionList.cs
 create mode 100644 VDownload.Models/VideoCollection.cs

diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomePlaylistViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs
similarity index 92%
rename from VDownload.Core/VDownload.Core.ViewModels/Home/HomePlaylistViewModel.cs
rename to VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs
index 073c560..ddba5b0 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomePlaylistViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs
@@ -24,7 +24,7 @@ using VDownload.Services.Data.Application;
 
 namespace VDownload.Core.ViewModels.Home
 {
-    public partial class HomePlaylistViewModel : ObservableObject
+    public partial class HomeVideoCollectionViewModel : ObservableObject
     {
         #region SERVICES
 
@@ -43,7 +43,7 @@ namespace VDownload.Core.ViewModels.Home
 
         #region FIELDS
 
-        protected Playlist _playlist;
+        protected VideoCollection _collection;
 
         protected List<VideoViewModel> _removedVideos;
 
@@ -181,7 +181,7 @@ namespace VDownload.Core.ViewModels.Home
 
         #region CONSTRUCTORS
 
-        public HomePlaylistViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService, IFilenameService filenameService, IDialogsService dialogsService, IStringResourcesService stringResourcesService, IApplicationDataService applicationDataService)
+        public HomeVideoCollectionViewModel(IDownloadTaskManager tasksManager, ISettingsService settingsService, IStoragePickerService storagePickerService, IFilenameService filenameService, IDialogsService dialogsService, IStringResourcesService stringResourcesService, IApplicationDataService applicationDataService)
         {
             _tasksManager = tasksManager;
             _settingsService = settingsService;
@@ -202,10 +202,10 @@ namespace VDownload.Core.ViewModels.Home
 
         #region PUBLIC METHODS
 
-        public void LoadPlaylist(Playlist playlist)
+        public void LoadPlaylist(VideoCollection collection)
         {
-            _playlist = playlist;
-            ParallelQuery<Video> playlistQuery = playlist.AsParallel();
+            _collection = collection;
+            ParallelQuery<Video> playlistQuery = _collection.AsParallel();
 
             _removedVideos.Clear();
 
@@ -218,7 +218,7 @@ namespace VDownload.Core.ViewModels.Home
             _minViewsFilter = MinViews;
             _maxViewsFilter = MaxViews;
 
-            IEnumerable<DateTimeOffset> date = playlist.Select(x => new DateTimeOffset(x.PublishDate));
+            IEnumerable<DateTimeOffset> date = _collection.Select(x => new DateTimeOffset(x.PublishDate));
             MinDate = date.Min();
             MaxDate = date.Max();
             _minDateFilter = MinDate;
@@ -230,9 +230,9 @@ namespace VDownload.Core.ViewModels.Home
             _minDurationFilter = MinDuration;
             _maxDurationFilter = MaxDuration;
 
-            Name = _playlist.Name;
+            Name = _collection.Name;
             Videos.Clear();
-            foreach (Video video in playlist)
+            foreach (Video video in _collection)
             {
                 Videos.Add(new VideoViewModel(video, _settingsService, _storagePickerService, _filenameService, _applicationDataService), true);
             }
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
index 9d17d50..e326294 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
@@ -57,7 +57,7 @@ namespace VDownload.Core.ViewModels.Home
         protected readonly IDownloadTaskManager _downloadTaskManager;
 
         protected readonly HomeVideoViewModel _videoViewModel;
-        protected readonly HomePlaylistViewModel _playlistViewModel;
+        protected readonly HomeVideoCollectionViewModel _playlistViewModel;
 
         #endregion
 
@@ -67,7 +67,7 @@ namespace VDownload.Core.ViewModels.Home
 
         protected readonly Type _downloadsView = typeof(HomeDownloadsViewModel);
         protected readonly Type _videoView = typeof(HomeVideoViewModel);
-        protected readonly Type _playlistView = typeof(HomePlaylistViewModel);
+        protected readonly Type _playlistView = typeof(HomeVideoCollectionViewModel);
 
         #endregion
 
@@ -112,7 +112,7 @@ namespace VDownload.Core.ViewModels.Home
 
         #region CONSTRUCTORS
 
-        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomePlaylistViewModel playlistViewModel)
+        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel playlistViewModel)
         {
             _configurationService = configurationService;
             _settingsService = settingsService;
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
similarity index 99%
rename from VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml
rename to VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
index 9b13f73..d322f56 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Page
-    x:Class="VDownload.Core.Views.Home.HomePlaylistView"
+    x:Class="VDownload.Core.Views.Home.HomeVideoCollectionView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="using:VDownload.Core.Views.Home"
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml.cs
similarity index 82%
rename from VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml.cs
rename to VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml.cs
index 541afe6..7238b2b 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomePlaylistView.xaml.cs
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml.cs
@@ -16,11 +16,11 @@ using Windows.Foundation.Collections;
 
 namespace VDownload.Core.Views.Home
 {
-    public sealed partial class HomePlaylistView : Page
+    public sealed partial class HomeVideoCollectionView : Page
     {
         #region CONSTRUCTORS
 
-        public HomePlaylistView(HomePlaylistViewModel viewModel)
+        public HomeVideoCollectionView(HomeVideoCollectionViewModel viewModel)
         {
             this.InitializeComponent();
             this.DataContext = viewModel;
diff --git a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
index 376e829..6928f72 100644
--- a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
+++ b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
@@ -10,7 +10,7 @@
   </PropertyGroup>
   <ItemGroup>
     <None Remove="About\AboutView.xaml" />
-    <None Remove="Home\HomePlaylistView.xaml" />
+    <None Remove="Home\HomeVideoCollectionView.xaml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,7 +44,7 @@
     <None Update="Home\HomeDownloadsView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </None>
-    <Page Update="Home\HomePlaylistView.xaml">
+    <Page Update="Home\HomeVideoCollectionView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <None Update="Home\HomeVideoView.xaml">
diff --git a/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
index c001505..33423b9 100644
--- a/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
+++ b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
@@ -22,7 +22,7 @@ namespace VDownload.Core.Views
             { typeof(HomeViewModel), typeof(HomeView) },
             { typeof(HomeDownloadsViewModel), typeof(HomeDownloadsView) },
             { typeof(HomeVideoViewModel), typeof(HomeVideoView) },
-            { typeof(HomePlaylistViewModel), typeof(HomePlaylistView) },
+            { typeof(HomeVideoCollectionViewModel), typeof(HomeVideoCollectionView) },
             { typeof(SettingsViewModel), typeof(SettingsView) },
             { typeof(AboutViewModel), typeof(AboutView) },
             { typeof(AuthenticationViewModel), typeof(AuthenticationView) }
diff --git a/VDownload.Models/Playlist.cs b/VDownload.Models/Playlist.cs
index 4dcb4fe..7e202d1 100644
--- a/VDownload.Models/Playlist.cs
+++ b/VDownload.Models/Playlist.cs
@@ -6,14 +6,12 @@ using System.Threading.Tasks;
 
 namespace VDownload.Models
 {
-    public abstract class Playlist : List<Video>
+    public abstract class Playlist : VideoCollection
     {
         #region PROPERTIES
 
-        public required string Name { get; set; }
         public required string Description { get; set; }
         public required Uri Url { get; set; }
-        public Source Source { get; protected set; }
 
         #endregion
     }
diff --git a/VDownload.Models/Source.cs b/VDownload.Models/Source.cs
index 4bc4528..8862d31 100644
--- a/VDownload.Models/Source.cs
+++ b/VDownload.Models/Source.cs
@@ -8,6 +8,7 @@ namespace VDownload.Models
 {
     public enum Source
     {
-        Twitch
+        Twitch,
+        Subscriptions
     }
 }
diff --git a/VDownload.Models/SubscriptionList.cs b/VDownload.Models/SubscriptionList.cs
new file mode 100644
index 0000000..3d406a5
--- /dev/null
+++ b/VDownload.Models/SubscriptionList.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public class SubscriptionList : VideoCollection
+    {
+        #region CONSTRUCTORS
+
+        public SubscriptionList()
+        {
+            Source = Source.Subscriptions;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Models/VideoCollection.cs b/VDownload.Models/VideoCollection.cs
new file mode 100644
index 0000000..ba95a92
--- /dev/null
+++ b/VDownload.Models/VideoCollection.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public abstract class VideoCollection : List<Video>
+    {
+        #region PROPERTIES
+
+        public required string Name { get; init; }
+        public Source Source { get; protected set; }
+
+        #endregion
+    }
+}
diff --git a/VDownload/App.xaml.cs b/VDownload/App.xaml.cs
index 73351e5..4127d09 100644
--- a/VDownload/App.xaml.cs
+++ b/VDownload/App.xaml.cs
@@ -154,7 +154,7 @@ namespace VDownload
             services.AddSingleton<SettingsViewModel>();
             services.AddSingleton<HomeDownloadsViewModel>();
             services.AddSingleton<HomeVideoViewModel>();
-            services.AddSingleton<HomePlaylistViewModel>();
+            services.AddSingleton<HomeVideoCollectionViewModel>();
             services.AddSingleton<HomeViewModel>();
             services.AddSingleton<BaseViewModel>();
 
@@ -164,7 +164,7 @@ namespace VDownload
             services.AddTransient<SettingsView>();
             services.AddTransient<HomeDownloadsView>();
             services.AddTransient<HomeVideoView>();
-            services.AddTransient<HomePlaylistView>();
+            services.AddTransient<HomeVideoCollectionView>();
             services.AddTransient<HomeView>();
             services.AddTransient<BaseWindow>();
         }

From aeff58b972bd5bb52116de1eb2f4fcb0530776cc Mon Sep 17 00:00:00 2001
From: Mateusz Skoczek <mateusz5432160@gmail.com>
Date: Fri, 8 Mar 2024 00:34:21 +0100
Subject: [PATCH 2/6] rename

---
 ... => HomeVideoCollectionViewResources.resw} |   0
 .../Home/HomeVideoCollectionViewModel.cs      |   2 +-
 .../Home/HomeViewModel.cs                     |  14 +--
 .../Home/HomeVideoCollectionView.xaml         |  70 +++++++--------
 .../StringResourcesService.cs                 |   6 +-
 VDownload/App.xaml                            |   2 +-
 .../AuthorDark.png                            | Bin
 .../AuthorLight.png                           | Bin
 .../DateDark.png                              | Bin
 .../DateLight.png                             | Bin
 .../DirectoryDark.png                         | Bin
 .../DirectoryLight.png                        | Bin
 .../ExtensionDark.png                         | Bin
 .../ExtensionLight.png                        | Bin
 .../FilenameDark.png                          | Bin
 .../FilenameLight.png                         | Bin
 .../MediaDark.png                             | Bin
 .../MediaLight.png                            | Bin
 .../QualityDark.png                           | Bin
 .../QualityLight.png                          | Bin
 .../TimeDark.png                              | Bin
 .../TimeLight.png                             | Bin
 .../TrimDark.png                              | Bin
 .../TrimLight.png                             | Bin
 .../ViewDark.png                              | Bin
 .../ViewLight.png                             | Bin
 .../Images/ImagesHomePlaylistView.xaml        |  36 --------
 .../Images/ImagesHomeVideoCollectionView.xaml |  35 ++++++++
 VDownload/VDownload.csproj                    |  84 +++++++++---------
 29 files changed, 124 insertions(+), 125 deletions(-)
 rename VDownload.Core/VDownload.Core.Strings/Strings/en-US/{HomePlaylistViewResources.resw => HomeVideoCollectionViewResources.resw} (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/AuthorDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/AuthorLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/DateDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/DateLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/DirectoryDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/DirectoryLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/ExtensionDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/ExtensionLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/FilenameDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/FilenameLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/MediaDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/MediaLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/QualityDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/QualityLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/TimeDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/TimeLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/TrimDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/TrimLight.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/ViewDark.png (100%)
 rename VDownload/Assets/{HomePlaylistView => HomeVideoCollectionView}/ViewLight.png (100%)
 delete mode 100644 VDownload/Dictionaries/Images/ImagesHomePlaylistView.xaml
 create mode 100644 VDownload/Dictionaries/Images/ImagesHomeVideoCollectionView.xaml

diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomePlaylistViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoCollectionViewResources.resw
similarity index 100%
rename from VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomePlaylistViewResources.resw
rename to VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeVideoCollectionViewResources.resw
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs
index ddba5b0..49ec442 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeVideoCollectionViewModel.cs
@@ -202,7 +202,7 @@ namespace VDownload.Core.ViewModels.Home
 
         #region PUBLIC METHODS
 
-        public void LoadPlaylist(VideoCollection collection)
+        public void LoadCollection(VideoCollection collection)
         {
             _collection = collection;
             ParallelQuery<Video> playlistQuery = _collection.AsParallel();
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
index e326294..d0f88c7 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
@@ -57,7 +57,7 @@ namespace VDownload.Core.ViewModels.Home
         protected readonly IDownloadTaskManager _downloadTaskManager;
 
         protected readonly HomeVideoViewModel _videoViewModel;
-        protected readonly HomeVideoCollectionViewModel _playlistViewModel;
+        protected readonly HomeVideoCollectionViewModel _videoCollectionViewModel;
 
         #endregion
 
@@ -67,7 +67,7 @@ namespace VDownload.Core.ViewModels.Home
 
         protected readonly Type _downloadsView = typeof(HomeDownloadsViewModel);
         protected readonly Type _videoView = typeof(HomeVideoViewModel);
-        protected readonly Type _playlistView = typeof(HomeVideoCollectionViewModel);
+        protected readonly Type _videoCollectionView = typeof(HomeVideoCollectionViewModel);
 
         #endregion
 
@@ -112,7 +112,7 @@ namespace VDownload.Core.ViewModels.Home
 
         #region CONSTRUCTORS
 
-        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel playlistViewModel)
+        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel videoCollectionViewModel)
         {
             _configurationService = configurationService;
             _settingsService = settingsService;
@@ -125,8 +125,8 @@ namespace VDownload.Core.ViewModels.Home
             _videoViewModel = videoViewModel;
             _videoViewModel.CloseRequested += BackToDownload_EventHandler;
 
-            _playlistViewModel = playlistViewModel;
-            _playlistViewModel.CloseRequested += BackToDownload_EventHandler;
+            _videoCollectionViewModel = videoCollectionViewModel;
+            _videoCollectionViewModel.CloseRequested += BackToDownload_EventHandler;
         }
 
         #endregion
@@ -253,9 +253,9 @@ namespace VDownload.Core.ViewModels.Home
                 return;
             }
 
-            _playlistViewModel.LoadPlaylist(playlist);
+            _videoCollectionViewModel.LoadCollection(playlist);
 
-            MainContent = _playlistView;
+            MainContent = _videoCollectionView;
 
             OptionBarSearchNotPending = true;
             OptionBarMessageIcon = OptionBarMessageIconType.None;
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
index d322f56..6c5d31f 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeVideoCollectionView.xaml
@@ -41,7 +41,7 @@
                         Spacing="10">
                 <TextBlock VerticalAlignment="Center"
                            Visibility="{Binding IsSomethingHidden, Converter={StaticResource BoolToVisibilityConverter}}">
-                    <Run x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/HiddenTextBlock"/><Run Text="{Binding HiddenCount}"/>
+                    <Run x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/HiddenTextBlock"/><Run Text="{Binding HiddenCount}"/>
                 </TextBlock>
                 <AppBarToggleButton x:Name="FilterButton"
                                     Icon="Filter" 
@@ -49,7 +49,7 @@
                                     Height="48">
                     <AppBarToggleButton.Resources>
                         <TeachingTip x:Name="FilterWindow"
-                                     x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterWindow"
+                                     x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterWindow"
                                      Target="{Binding ElementName=FilterButton}"
                                      PreferredPlacement="BottomLeft"
                                      IsOpen="{Binding ElementName=FilterButton, Path=IsChecked, Mode=TwoWay}">
@@ -69,23 +69,23 @@
                                     <RowDefinition Height="Auto"/>
                                     <RowDefinition Height="Auto"/>
                                 </Grid.RowDefinitions>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBlock"
+                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterTitleTextBlock"
                                            Grid.Row="0"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
-                                <TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBox"
+                                <TextBox x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterTitleTextBox"
                                          Grid.Row="0"
                                          Grid.Column="1"
                                          Text="{Binding TitleFilter, Mode=TwoWay}"/>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBlock"
+                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterAuthorTextBlock"
                                            Grid.Row="1"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
-                                <TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBox"
+                                <TextBox x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterAuthorTextBox"
                                          Grid.Row="1"
                                          Grid.Column="1"
                                          Text="{Binding AuthorFilter, Mode=TwoWay}"/>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterViewsTextBlock"
+                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterViewsTextBlock"
                                            Grid.Row="2"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -115,7 +115,7 @@
                                                SmallChange="1" 
                                                LargeChange="10"/>
                                 </Grid>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterDateTextBlock"
+                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterDateTextBlock"
                                            Grid.Row="3"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -139,7 +139,7 @@
                                                         Date="{Binding MaxDateFilter, Mode=TwoWay}"
                                                         MaxDate="{Binding MaxDate}"/>
                                 </Grid>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterDurationTextBlock"
+                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterDurationTextBlock"
                                            Grid.Row="4"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -159,7 +159,7 @@
                                                        Value="{Binding MaxDurationFilter, Mode=TwoWay}"
                                                        Maximum="{Binding MaxDuration}"/>
                                 </Grid>
-                                <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterRemovedTextBlock"
+                                <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterRemovedTextBlock"
                                            Grid.Row="5"
                                            Grid.Column="0"
                                            VerticalAlignment="Center"/>
@@ -172,7 +172,7 @@
                                     <TextBlock Grid.Column="0"
                                                VerticalAlignment="Center"
                                                Text="{Binding RemovedCount}"/>
-                                    <Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterRemovedButton"
+                                    <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterRemovedButton"
                                             Grid.Column="1"
                                             Command="{Binding RestoreRemovedVideosCommand}"/>
                                 </Grid>
@@ -180,7 +180,7 @@
                         </TeachingTip>
                     </AppBarToggleButton.Resources>
                 </AppBarToggleButton>
-                <AppBarButton x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/ApplyDirectoryButton"
+                <AppBarButton x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/ApplyDirectoryButton"
                               Icon="Folder"
                               Width="40"
                               Height="48"
@@ -238,7 +238,7 @@
                                             <Image Grid.Column="0"
                                                    Grid.Row="0"
                                                    VerticalAlignment="Center"
-                                                   Source="{ThemeResource ImageHomePlaylistViewAuthor}"
+                                                   Source="{ThemeResource ImageHomeVideoCollectionViewAuthor}"
                                                    Width="{StaticResource IconSize}"/>
                                             <TextBlock Grid.Column="1"
                                                        Grid.Row="0"
@@ -248,7 +248,7 @@
                                             <Image Grid.Column="0"
                                                    Grid.Row="1"
                                                    VerticalAlignment="Center"
-                                                   Source="{ThemeResource ImageHomePlaylistViewDate}"
+                                                   Source="{ThemeResource ImageHomeVideoCollectionViewDate}"
                                                    Width="{StaticResource IconSize}"/>
                                             <TextBlock Grid.Column="1"
                                                        Grid.Row="1"
@@ -258,7 +258,7 @@
                                             <Image Grid.Column="2"
                                                    Grid.Row="0"
                                                    VerticalAlignment="Center"
-                                                   Source="{ThemeResource ImageHomePlaylistViewTime}"
+                                                   Source="{ThemeResource ImageHomeVideoCollectionViewTime}"
                                                    Width="{StaticResource IconSize}"/>
                                             <TextBlock Grid.Column="3"
                                                        Grid.Row="0"
@@ -268,7 +268,7 @@
                                             <Image Grid.Column="2"
                                                    Grid.Row="1"
                                                    VerticalAlignment="Center"
-                                                   Source="{ThemeResource ImageHomePlaylistViewViews}"
+                                                   Source="{ThemeResource ImageHomeVideoCollectionViewViews}"
                                                    Width="{StaticResource IconSize}"/>
                                             <TextBlock Grid.Column="3"
                                                        Grid.Row="1"
@@ -289,21 +289,21 @@
                             <Expander.Content>
                                 <StackPanel Spacing="20">
                                     <StackPanel Spacing="5">
-                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaOptionsHeader"
+                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/MediaOptionsHeader"
                                                    FontWeight="Bold"
                                                    FontSize="15"/>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/QualitySettingsCard">
+                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/QualitySettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False"
-                                                            UriSource="{ThemeResource ImageHomePlaylistViewMedia}"/>
+                                                            UriSource="{ThemeResource ImageHomeVideoCollectionViewMedia}"/>
                                             </ctc:SettingsCard.HeaderIcon>
                                             <ComboBox ItemsSource="{Binding Key.Streams}"
                                                       SelectedItem="{Binding Key.SelectedStream, Mode=TwoWay}"/>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaTypeSettingsCard">
+                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/MediaTypeSettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
-                                                            UriSource="{ThemeResource ImageHomePlaylistViewMedia}"/>
+                                                            UriSource="{ThemeResource ImageHomeVideoCollectionViewMedia}"/>
                                             </ctc:SettingsCard.HeaderIcon>
                                             <ComboBox ItemsSource="{ct:EnumValues Type=m:MediaType}"
                                                       SelectedItem="{Binding Key.MediaType, Mode=TwoWay}">
@@ -324,17 +324,17 @@
                                                 </ComboBox.ItemTemplate>
                                             </ComboBox>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/TrimSettingsGroup">
+                                        <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimSettingsGroup">
                                             <ctc:SettingsExpander.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
-                                                            UriSource="{ThemeResource ImageHomePlaylistViewTrim}"/>
+                                                            UriSource="{ThemeResource ImageHomeVideoCollectionViewTrim}"/>
                                             </ctc:SettingsExpander.HeaderIcon>
                                             <ctc:SettingsExpander.Items>
-                                                <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/TrimStartSettingsCard">
+                                                <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimStartSettingsCard">
                                                     <c:TimeSpanControl Value="{Binding Key.TrimStart, Mode=TwoWay}" 
                                                                        Maximum="{Binding Key.TrimEnd, Mode=OneWay}"/>
                                                 </ctc:SettingsCard>
-                                                <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/TrimEndSettingsCard">
+                                                <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimEndSettingsCard">
                                                     <c:TimeSpanControl Minimum="{Binding Key.TrimStart, Mode=OneWay}" 
                                                                        Value="{Binding Key.TrimEnd, Mode=TwoWay}" 
                                                                        Maximum="{Binding Key.Duration, Mode=OneWay}"/>
@@ -343,29 +343,29 @@
                                         </ctc:SettingsExpander>
                                     </StackPanel>
                                     <StackPanel Spacing="5">
-                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FileOptionsHeader"
+                                        <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FileOptionsHeader"
                                                    FontWeight="Bold"
                                                    FontSize="15"/>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/DirectorySettingsCard"
+                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/DirectorySettingsCard"
                                                           Description="{Binding Key.DirectoryPath}">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
-                                                            UriSource="{ThemeResource ImageHomePlaylistViewDirectory}"/>
+                                                            UriSource="{ThemeResource ImageHomeVideoCollectionViewDirectory}"/>
                                             </ctc:SettingsCard.HeaderIcon>
-                                            <Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/DirectorySettingsCardButton"
+                                            <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/DirectorySettingsCardButton"
                                                     Command="{Binding Key.BrowseCommand}"/>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilenameSettingsCard">
+                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilenameSettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
-                                                            UriSource="{ThemeResource ImageHomePlaylistViewFilename}"/>
+                                                            UriSource="{ThemeResource ImageHomeVideoCollectionViewFilename}"/>
                                             </ctc:SettingsCard.HeaderIcon>
                                             <TextBox Text="{Binding Key.Filename, Mode=TwoWay}"/>
                                         </ctc:SettingsCard>
-                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FileTypeSettingsCard">
+                                        <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FileTypeSettingsCard">
                                             <ctc:SettingsCard.HeaderIcon>
                                                 <BitmapIcon ShowAsMonochrome="False" 
-                                                            UriSource="{ThemeResource ImageHomePlaylistViewExtension}"/>
+                                                            UriSource="{ThemeResource ImageHomeVideoCollectionViewExtension}"/>
                                             </ctc:SettingsCard.HeaderIcon>
                                             <i:Interaction.Behaviors>
                                                 <ic:DataTriggerBehavior Binding="{Binding Key.MediaType, Converter={StaticResource ObjectToStringConverter}}"
@@ -414,9 +414,9 @@
                     HorizontalAlignment="Right"
                     Orientation="Horizontal"
                     Spacing="10">
-            <Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/CreateAndStartButton"
+            <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/CreateAndStartButton"
                     Command="{Binding CreateTasksAndDownloadCommand}"/>
-            <Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/CreateButton"
+            <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/CreateButton"
                     Style="{StaticResource AccentButtonStyle}" 
                     Command="{Binding CreateTasksCommand}"/>
         </StackPanel>
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
index d131d62..62c38bd 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
@@ -8,7 +8,7 @@ namespace VDownload.Services.UI.StringResources
         StringResources BaseViewResources { get; }
         StringResources HomeViewResources { get; }
         StringResources HomeVideoViewResources { get; }
-        StringResources HomePlaylistViewResources { get; }
+        StringResources HomeVideoCollectionViewResources { get; }
         StringResources HomeDownloadsViewResources { get; }
         StringResources AuthenticationViewResources { get; }
         StringResources NotificationsResources { get; }
@@ -37,7 +37,7 @@ namespace VDownload.Services.UI.StringResources
         public StringResources BaseViewResources { get; protected set; }
         public StringResources HomeViewResources { get; protected set; }
         public StringResources HomeVideoViewResources { get; protected set; }
-        public StringResources HomePlaylistViewResources { get; protected set; }
+        public StringResources HomeVideoCollectionViewResources { get; protected set; }
         public StringResources HomeDownloadsViewResources { get; protected set; }
         public StringResources AuthenticationViewResources { get; protected set; }
         public StringResources NotificationsResources { get; protected set; }
@@ -61,7 +61,7 @@ namespace VDownload.Services.UI.StringResources
             BaseViewResources = BuildResource("BaseViewResources");
             HomeViewResources = BuildResource("HomeViewResources");
             HomeVideoViewResources = BuildResource("HomeVideoViewResources");
-            HomePlaylistViewResources = BuildResource("HomePlaylistViewResources");
+            HomeVideoCollectionViewResources = BuildResource("HomeVideoCollectionViewResources");
             HomeDownloadsViewResources = BuildResource("HomeDownloadsViewResources");
             AuthenticationViewResources = BuildResource("AuthenticationViewResources");
             NotificationsResources = BuildResource("NotificationsResources");
diff --git a/VDownload/App.xaml b/VDownload/App.xaml
index 4814124..24ae100 100644
--- a/VDownload/App.xaml
+++ b/VDownload/App.xaml
@@ -16,7 +16,7 @@
                 <ResourceDictionary Source="Dictionaries/Images/ImagesBaseView.xaml"/>
                 <ResourceDictionary Source="Dictionaries/Images/ImagesHomeView.xaml"/>
                 <ResourceDictionary Source="Dictionaries/Images/ImagesHomeDownloadsView.xaml"/>
-                <ResourceDictionary Source="Dictionaries/Images/ImagesHomePlaylistView.xaml"/>
+                <ResourceDictionary Source="Dictionaries/Images/ImagesHomeVideoCollectionView.xaml"/>
                 <ResourceDictionary Source="Dictionaries/Images/ImagesHomeVideoView.xaml"/>
                 <ResourceDictionary Source="Dictionaries/Images/ImagesSettingsView.xaml"/>
             </ResourceDictionary.MergedDictionaries>
diff --git a/VDownload/Assets/HomePlaylistView/AuthorDark.png b/VDownload/Assets/HomeVideoCollectionView/AuthorDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/AuthorDark.png
rename to VDownload/Assets/HomeVideoCollectionView/AuthorDark.png
diff --git a/VDownload/Assets/HomePlaylistView/AuthorLight.png b/VDownload/Assets/HomeVideoCollectionView/AuthorLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/AuthorLight.png
rename to VDownload/Assets/HomeVideoCollectionView/AuthorLight.png
diff --git a/VDownload/Assets/HomePlaylistView/DateDark.png b/VDownload/Assets/HomeVideoCollectionView/DateDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/DateDark.png
rename to VDownload/Assets/HomeVideoCollectionView/DateDark.png
diff --git a/VDownload/Assets/HomePlaylistView/DateLight.png b/VDownload/Assets/HomeVideoCollectionView/DateLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/DateLight.png
rename to VDownload/Assets/HomeVideoCollectionView/DateLight.png
diff --git a/VDownload/Assets/HomePlaylistView/DirectoryDark.png b/VDownload/Assets/HomeVideoCollectionView/DirectoryDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/DirectoryDark.png
rename to VDownload/Assets/HomeVideoCollectionView/DirectoryDark.png
diff --git a/VDownload/Assets/HomePlaylistView/DirectoryLight.png b/VDownload/Assets/HomeVideoCollectionView/DirectoryLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/DirectoryLight.png
rename to VDownload/Assets/HomeVideoCollectionView/DirectoryLight.png
diff --git a/VDownload/Assets/HomePlaylistView/ExtensionDark.png b/VDownload/Assets/HomeVideoCollectionView/ExtensionDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/ExtensionDark.png
rename to VDownload/Assets/HomeVideoCollectionView/ExtensionDark.png
diff --git a/VDownload/Assets/HomePlaylistView/ExtensionLight.png b/VDownload/Assets/HomeVideoCollectionView/ExtensionLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/ExtensionLight.png
rename to VDownload/Assets/HomeVideoCollectionView/ExtensionLight.png
diff --git a/VDownload/Assets/HomePlaylistView/FilenameDark.png b/VDownload/Assets/HomeVideoCollectionView/FilenameDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/FilenameDark.png
rename to VDownload/Assets/HomeVideoCollectionView/FilenameDark.png
diff --git a/VDownload/Assets/HomePlaylistView/FilenameLight.png b/VDownload/Assets/HomeVideoCollectionView/FilenameLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/FilenameLight.png
rename to VDownload/Assets/HomeVideoCollectionView/FilenameLight.png
diff --git a/VDownload/Assets/HomePlaylistView/MediaDark.png b/VDownload/Assets/HomeVideoCollectionView/MediaDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/MediaDark.png
rename to VDownload/Assets/HomeVideoCollectionView/MediaDark.png
diff --git a/VDownload/Assets/HomePlaylistView/MediaLight.png b/VDownload/Assets/HomeVideoCollectionView/MediaLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/MediaLight.png
rename to VDownload/Assets/HomeVideoCollectionView/MediaLight.png
diff --git a/VDownload/Assets/HomePlaylistView/QualityDark.png b/VDownload/Assets/HomeVideoCollectionView/QualityDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/QualityDark.png
rename to VDownload/Assets/HomeVideoCollectionView/QualityDark.png
diff --git a/VDownload/Assets/HomePlaylistView/QualityLight.png b/VDownload/Assets/HomeVideoCollectionView/QualityLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/QualityLight.png
rename to VDownload/Assets/HomeVideoCollectionView/QualityLight.png
diff --git a/VDownload/Assets/HomePlaylistView/TimeDark.png b/VDownload/Assets/HomeVideoCollectionView/TimeDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/TimeDark.png
rename to VDownload/Assets/HomeVideoCollectionView/TimeDark.png
diff --git a/VDownload/Assets/HomePlaylistView/TimeLight.png b/VDownload/Assets/HomeVideoCollectionView/TimeLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/TimeLight.png
rename to VDownload/Assets/HomeVideoCollectionView/TimeLight.png
diff --git a/VDownload/Assets/HomePlaylistView/TrimDark.png b/VDownload/Assets/HomeVideoCollectionView/TrimDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/TrimDark.png
rename to VDownload/Assets/HomeVideoCollectionView/TrimDark.png
diff --git a/VDownload/Assets/HomePlaylistView/TrimLight.png b/VDownload/Assets/HomeVideoCollectionView/TrimLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/TrimLight.png
rename to VDownload/Assets/HomeVideoCollectionView/TrimLight.png
diff --git a/VDownload/Assets/HomePlaylistView/ViewDark.png b/VDownload/Assets/HomeVideoCollectionView/ViewDark.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/ViewDark.png
rename to VDownload/Assets/HomeVideoCollectionView/ViewDark.png
diff --git a/VDownload/Assets/HomePlaylistView/ViewLight.png b/VDownload/Assets/HomeVideoCollectionView/ViewLight.png
similarity index 100%
rename from VDownload/Assets/HomePlaylistView/ViewLight.png
rename to VDownload/Assets/HomeVideoCollectionView/ViewLight.png
diff --git a/VDownload/Dictionaries/Images/ImagesHomePlaylistView.xaml b/VDownload/Dictionaries/Images/ImagesHomePlaylistView.xaml
deleted file mode 100644
index d31623e..0000000
--- a/VDownload/Dictionaries/Images/ImagesHomePlaylistView.xaml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:VDownload.Dictionaries.Images">
-    <ResourceDictionary.ThemeDictionaries>
-        <ResourceDictionary x:Key="Light">
-            <x:String x:Key="ImageHomePlaylistViewAuthor">/Assets/HomePlaylistView/AuthorLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewDate">/Assets/HomePlaylistView/DateLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTime">/Assets/HomePlaylistView/TimeLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewViews">/Assets/HomePlaylistView/ViewLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewQuality">/Assets/HomePlaylistView/QualityLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewMedia">/Assets/HomePlaylistView/MediaLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTrimLeft">/Assets/HomePlaylistView/TrimLeftLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTrim">/Assets/HomePlaylistView/TrimLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTrimRight">/Assets/HomePlaylistView/TrimRightLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewDirectory">/Assets/HomePlaylistView/DirectoryLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewFilename">/Assets/HomePlaylistView/FilenameLight.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewExtension">/Assets/HomePlaylistView/ExtensionLight.png</x:String>
-        </ResourceDictionary>
-        <ResourceDictionary x:Key="Dark">
-            <x:String x:Key="ImageHomePlaylistViewAuthor">/Assets/HomePlaylistView/AuthorDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewDate">/Assets/HomePlaylistView/DateDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTime">/Assets/HomePlaylistView/TimeDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewViews">/Assets/HomePlaylistView/ViewDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewQuality">/Assets/HomePlaylistView/QualityDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewMedia">/Assets/HomePlaylistView/MediaDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTrimLeft">/Assets/HomePlaylistView/TrimLeftDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTrim">/Assets/HomePlaylistView/TrimDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewTrimRight">/Assets/HomePlaylistView/TrimRightDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewDirectory">/Assets/HomePlaylistView/DirectoryDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewFilename">/Assets/HomePlaylistView/FilenameDark.png</x:String>
-            <x:String x:Key="ImageHomePlaylistViewExtension">/Assets/HomePlaylistView/ExtensionDark.png</x:String>
-        </ResourceDictionary>
-    </ResourceDictionary.ThemeDictionaries>
-</ResourceDictionary>
diff --git a/VDownload/Dictionaries/Images/ImagesHomeVideoCollectionView.xaml b/VDownload/Dictionaries/Images/ImagesHomeVideoCollectionView.xaml
new file mode 100644
index 0000000..a21a67d
--- /dev/null
+++ b/VDownload/Dictionaries/Images/ImagesHomeVideoCollectionView.xaml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Light">
+            <x:String x:Key="ImageHomeVideoCollectionViewAuthor">/Assets/HomeVideoCollectionView/AuthorLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewDate">/Assets/HomeVideoCollectionView/DateLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTime">/Assets/HomeVideoCollectionView/TimeLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewViews">/Assets/HomeVideoCollectionView/ViewLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewQuality">/Assets/HomeVideoCollectionView/QualityLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewMedia">/Assets/HomeVideoCollectionView/MediaLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTrimLeft">/Assets/HomeVideoCollectionView/TrimLeftLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTrim">/Assets/HomeVideoCollectionView/TrimLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTrimRight">/Assets/HomeVideoCollectionView/TrimRightLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewDirectory">/Assets/HomeVideoCollectionView/DirectoryLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewFilename">/Assets/HomeVideoCollectionView/FilenameLight.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewExtension">/Assets/HomeVideoCollectionView/ExtensionLight.png</x:String>
+        </ResourceDictionary>
+        <ResourceDictionary x:Key="Dark">
+            <x:String x:Key="ImageHomeVideoCollectionViewAuthor">/Assets/HomeVideoCollectionView/AuthorDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewDate">/Assets/HomeVideoCollectionView/DateDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTime">/Assets/HomeVideoCollectionView/TimeDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewViews">/Assets/HomeVideoCollectionView/ViewDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewQuality">/Assets/HomeVideoCollectionView/QualityDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewMedia">/Assets/HomeVideoCollectionView/MediaDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTrimLeft">/Assets/HomeVideoCollectionView/TrimLeftDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTrim">/Assets/HomeVideoCollectionView/TrimDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewTrimRight">/Assets/HomeVideoCollectionView/TrimRightDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewDirectory">/Assets/HomeVideoCollectionView/DirectoryDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewFilename">/Assets/HomeVideoCollectionView/FilenameDark.png</x:String>
+            <x:String x:Key="ImageHomeVideoCollectionViewExtension">/Assets/HomeVideoCollectionView/ExtensionDark.png</x:String>
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+</ResourceDictionary>
diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj
index 47f4796..5b1b6cb 100644
--- a/VDownload/VDownload.csproj
+++ b/VDownload/VDownload.csproj
@@ -49,26 +49,26 @@
         <Content Remove="Assets\HomeDownloadsView\QueuedLight.png" />
         <Content Remove="Assets\HomeDownloadsView\TimeDark.png" />
         <Content Remove="Assets\HomeDownloadsView\TimeLight.png" />
-        <Content Remove="Assets\HomePlaylistView\AuthorDark.png" />
-        <Content Remove="Assets\HomePlaylistView\AuthorLight.png" />
-        <Content Remove="Assets\HomePlaylistView\DateDark.png" />
-        <Content Remove="Assets\HomePlaylistView\DateLight.png" />
-        <Content Remove="Assets\HomePlaylistView\DirectoryDark.png" />
-        <Content Remove="Assets\HomePlaylistView\DirectoryLight.png" />
-        <Content Remove="Assets\HomePlaylistView\ExtensionDark.png" />
-        <Content Remove="Assets\HomePlaylistView\ExtensionLight.png" />
-        <Content Remove="Assets\HomePlaylistView\FilenameDark.png" />
-        <Content Remove="Assets\HomePlaylistView\FilenameLight.png" />
-        <Content Remove="Assets\HomePlaylistView\MediaDark.png" />
-        <Content Remove="Assets\HomePlaylistView\MediaLight.png" />
-        <Content Remove="Assets\HomePlaylistView\QualityDark.png" />
-        <Content Remove="Assets\HomePlaylistView\QualityLight.png" />
-        <Content Remove="Assets\HomePlaylistView\TimeDark.png" />
-        <Content Remove="Assets\HomePlaylistView\TimeLight.png" />
-        <Content Remove="Assets\HomePlaylistView\TrimDark.png" />
-        <Content Remove="Assets\HomePlaylistView\TrimLight.png" />
-        <Content Remove="Assets\HomePlaylistView\ViewDark.png" />
-        <Content Remove="Assets\HomePlaylistView\ViewLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\AuthorDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\AuthorLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\DateDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\DateLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\DirectoryDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\DirectoryLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\ExtensionDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\ExtensionLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\FilenameDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\FilenameLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\MediaDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\MediaLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\QualityDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\QualityLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\TimeDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\TimeLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\TrimDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\TrimLight.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\ViewDark.png" />
+        <Content Remove="Assets\HomeVideoCollectionView\ViewLight.png" />
         <Content Remove="Assets\HomeVideoView\AuthorDark.png" />
         <Content Remove="Assets\HomeVideoView\AuthorLight.png" />
         <Content Remove="Assets\HomeVideoView\DateDark.png" />
@@ -154,7 +154,7 @@
         <None Remove="Dictionaries\Converters.xaml" />
         <None Remove="Dictionaries\Images\ImagesBaseView.xaml" />
         <None Remove="Dictionaries\Images\ImagesHomeDownloadsView.xaml" />
-        <None Remove="Dictionaries\Images\ImagesHomePlaylistView.xaml" />
+        <None Remove="Dictionaries\Images\ImagesHomeVideoCollectionView.xaml" />
         <None Remove="Dictionaries\Images\ImagesHomeVideoView.xaml" />
         <None Remove="Dictionaries\Images\ImagesHomeView.xaml" />
         <None Remove="Dictionaries\Images\ImagesLogo.xaml" />
@@ -372,64 +372,64 @@
     <None Update="Assets\HomeDownloadsView\TimeLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\AuthorDark.png">
+    <None Update="Assets\HomeVideoCollectionView\AuthorDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\AuthorLight.png">
+    <None Update="Assets\HomeVideoCollectionView\AuthorLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\DateDark.png">
+    <None Update="Assets\HomeVideoCollectionView\DateDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\DateLight.png">
+    <None Update="Assets\HomeVideoCollectionView\DateLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\DirectoryDark.png">
+    <None Update="Assets\HomeVideoCollectionView\DirectoryDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\DirectoryLight.png">
+    <None Update="Assets\HomeVideoCollectionView\DirectoryLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\ExtensionDark.png">
+    <None Update="Assets\HomeVideoCollectionView\ExtensionDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\ExtensionLight.png">
+    <None Update="Assets\HomeVideoCollectionView\ExtensionLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\FilenameDark.png">
+    <None Update="Assets\HomeVideoCollectionView\FilenameDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\FilenameLight.png">
+    <None Update="Assets\HomeVideoCollectionView\FilenameLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\MediaDark.png">
+    <None Update="Assets\HomeVideoCollectionView\MediaDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\MediaLight.png">
+    <None Update="Assets\HomeVideoCollectionView\MediaLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\QualityDark.png">
+    <None Update="Assets\HomeVideoCollectionView\QualityDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\QualityLight.png">
+    <None Update="Assets\HomeVideoCollectionView\QualityLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\TimeDark.png">
+    <None Update="Assets\HomeVideoCollectionView\TimeDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\TimeLight.png">
+    <None Update="Assets\HomeVideoCollectionView\TimeLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\TrimDark.png">
+    <None Update="Assets\HomeVideoCollectionView\TrimDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\TrimLight.png">
+    <None Update="Assets\HomeVideoCollectionView\TrimLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\ViewDark.png">
+    <None Update="Assets\HomeVideoCollectionView\ViewDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="Assets\HomePlaylistView\ViewLight.png">
+    <None Update="Assets\HomeVideoCollectionView\ViewLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
     <None Update="Assets\HomeVideoView\AuthorDark.png">
@@ -534,7 +534,7 @@
     <Page Update="Dictionaries\Images\ImagesOther.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Update="Dictionaries\Images\ImagesHomePlaylistView.xaml">
+    <Page Update="Dictionaries\Images\ImagesHomeVideoCollectionView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
     <Page Update="Dictionaries\Images\ImagesHomeDownloadsView.xaml">

From 032c08a810f324d93719d1a199bc755db86b5919 Mon Sep 17 00:00:00 2001
From: Mateusz Skoczek <mateusz5432160@gmail.com>
Date: Fri, 8 Mar 2024 00:59:34 +0100
Subject: [PATCH 3/6] subscription data service added

---
 .../Models/Appdata.cs                         |  3 +++
 .../SubscriptionsDataService.cs               | 12 +++++++++++
 ...ownload.Services.Data.Subscriptions.csproj |  9 ++++++++
 VDownload.sln                                 | 21 ++++++++++++++++++-
 VDownload/configuration.json                  |  3 ++-
 5 files changed, 46 insertions(+), 2 deletions(-)
 create mode 100644 VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs
 create mode 100644 VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj

diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs
index f8dbfd4..5f815e6 100644
--- a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Configuration/Models/Appdata.cs
@@ -21,5 +21,8 @@ namespace VDownload.Services.Data.Configuration.Models
 
         [ConfigurationKeyName("data_file")]
         public string DataFile { get; set; }
+
+        [ConfigurationKeyName("subscriptions_file")]
+        public string SubscriptionsFile { get; set; }
     }
 }
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs
new file mode 100644
index 0000000..d689c21
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Services.Data.Subscriptions
+{
+    public class SubscriptionsDataService
+    {
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj
new file mode 100644
index 0000000..fa71b7a
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj
@@ -0,0 +1,9 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+
+</Project>
diff --git a/VDownload.sln b/VDownload.sln
index f7c7683..117e850 100644
--- a/VDownload.sln
+++ b/VDownload.sln
@@ -71,7 +71,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Utility.
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Utility.Filename", "VDownload.Services\VDownload.Services.Utility\VDownload.Services.Utility.Filename\VDownload.Services.Utility.Filename.csproj", "{4647EFB5-A206-4F47-976D-BAED11B52579}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VDownload.Services.Data.Application", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Application\VDownload.Services.Data.Application.csproj", "{4983E15B-3730-4646-A2BD-16B9ECC9E4FF}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VDownload.Services.Data.Application", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Application\VDownload.Services.Data.Application.csproj", "{4983E15B-3730-4646-A2BD-16B9ECC9E4FF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VDownload.Services.Data.Subscriptions", "VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Subscriptions\VDownload.Services.Data.Subscriptions.csproj", "{3193DABC-87F8-4256-9449-3CF42FEF7098}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -539,6 +541,22 @@ Global
 		{4983E15B-3730-4646-A2BD-16B9ECC9E4FF}.Release|x64.Build.0 = Release|Any CPU
 		{4983E15B-3730-4646-A2BD-16B9ECC9E4FF}.Release|x86.ActiveCfg = Release|Any CPU
 		{4983E15B-3730-4646-A2BD-16B9ECC9E4FF}.Release|x86.Build.0 = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|x64.Build.0 = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Debug|x86.Build.0 = Debug|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|ARM64.Build.0 = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|x64.ActiveCfg = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|x64.Build.0 = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|x86.ActiveCfg = Release|Any CPU
+		{3193DABC-87F8-4256-9449-3CF42FEF7098}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -574,6 +592,7 @@ Global
 		{A3166F8A-ECAD-4D4B-9BE3-96FEC799B27B} = {1020167A-4101-496E-82CF-41B65769DD28}
 		{4647EFB5-A206-4F47-976D-BAED11B52579} = {1020167A-4101-496E-82CF-41B65769DD28}
 		{4983E15B-3730-4646-A2BD-16B9ECC9E4FF} = {05A45688-7EEF-4656-818A-2477625C3707}
+		{3193DABC-87F8-4256-9449-3CF42FEF7098} = {05A45688-7EEF-4656-818A-2477625C3707}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {9FD7B842-C3E2-4FD0-AD8A-C8E619280AB7}
diff --git a/VDownload/configuration.json b/VDownload/configuration.json
index b412757..0a6738c 100644
--- a/VDownload/configuration.json
+++ b/VDownload/configuration.json
@@ -147,7 +147,8 @@
         "directory_name": "VDownload",
         "authentication_file": "authentication.json",
         "settings_file": "settings.json",
-        "data_file": "data.json"
+        "data_file": "data.json",
+        "subscriptions_file": "subscriptions.json"
       },
       "temp": {
         "tasks_directory": "tasks"

From 70fdc10f5021a0a744a48a2e007a0020bf1edb1c Mon Sep 17 00:00:00 2001
From: Mateusz Skoczek <mateusz5432160@gmail.com>
Date: Fri, 8 Mar 2024 20:48:31 +0100
Subject: [PATCH 4/6] subscriptions page added

---
 .../Strings/en-US/BaseViewResources.resw      |   3 +
 .../en-US/SubscriptionsViewResources.resw     | 123 ++++++++++++++++++
 .../BaseViewModel.cs                          |   9 +-
 .../Subscriptions/SubscriptionsViewModel.cs   |  13 ++
 .../Subscriptions/SubscriptionsView.xaml      |  15 +++
 .../Subscriptions/SubscriptionsView.xaml.cs   |  32 +++++
 .../VDownload.Core.Views.csproj               |   4 +
 .../ViewModelToViewConverter.cs               |   3 +
 .../StringResourcesService.cs                 |   3 +
 VDownload/App.xaml.cs                         |   4 +
 .../Assets/BaseView/SubscriptionsDark.png     | Bin 0 -> 5417 bytes
 .../Assets/BaseView/SubscriptionsLight.png    | Bin 0 -> 5340 bytes
 .../Dictionaries/Images/ImagesBaseView.xaml   |   2 +
 VDownload/VDownload.csproj                    |   6 +
 14 files changed, 216 insertions(+), 1 deletion(-)
 create mode 100644 VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
 create mode 100644 VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs
 create mode 100644 VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
 create mode 100644 VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml.cs
 create mode 100644 VDownload/Assets/BaseView/SubscriptionsDark.png
 create mode 100644 VDownload/Assets/BaseView/SubscriptionsLight.png

diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
index 3df704d..749a837 100644
--- a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw
@@ -126,4 +126,7 @@
   <data name="HomeNavigationViewItem" xml:space="preserve">
     <value>Home</value>
   </data>
+  <data name="SubscriptionsNavigationViewItem" xml:space="preserve">
+    <value>Subscriptions</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
new file mode 100644
index 0000000..8590552
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Header.Text" xml:space="preserve">
+    <value>Subscriptions</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs
index 8ec282b..cd7ff21 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs
@@ -13,6 +13,7 @@ using VDownload.Services.UI.DictionaryResources;
 using VDownload.Services.UI.StringResources;
 using SimpleToolkit.UI.Models;
 using VDownload.Core.ViewModels.About;
+using VDownload.Core.ViewModels.Subscriptions;
 
 namespace VDownload.Core.ViewModels
 {
@@ -66,7 +67,13 @@ namespace VDownload.Core.ViewModels
                         Name = _stringResourcesService.BaseViewResources.Get("HomeNavigationViewItem"),
                         IconSource = _dictionaryResourcesService.Get<string>("ImageBaseViewHome"),
                         ViewModel = typeof(HomeViewModel),
-                    }
+                    },
+                    new NavigationViewItem()
+                    {
+                        Name = _stringResourcesService.BaseViewResources.Get("SubscriptionsNavigationViewItem"),
+                        IconSource = _dictionaryResourcesService.Get<string>("ImageBaseViewSubscriptions"),
+                        ViewModel = typeof(SubscriptionsViewModel),
+                    },
                 }
             );
             FooterItems = new ReadOnlyObservableCollection<NavigationViewItem>
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs
new file mode 100644
index 0000000..663b143
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs
@@ -0,0 +1,13 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Core.ViewModels.Subscriptions
+{
+    public class SubscriptionsViewModel : ObservableObject
+    {
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
new file mode 100644
index 0000000..386316e
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Page
+    x:Class="VDownload.Core.Views.Subscriptions.SubscriptionsView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:VDownload.Core.Views.Subscriptions"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+        <TextBlock Text="AAAAAAAAAA"/>
+    </Grid>
+</Page>
diff --git a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml.cs b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml.cs
new file mode 100644
index 0000000..abf79c5
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml.cs
@@ -0,0 +1,32 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Navigation;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using VDownload.Core.ViewModels.About;
+using VDownload.Core.ViewModels.Subscriptions;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+
+namespace VDownload.Core.Views.Subscriptions
+{
+    public sealed partial class SubscriptionsView : Page
+    {
+        #region CONSTRUCTORS
+
+        public SubscriptionsView(SubscriptionsViewModel viewModel)
+        {
+            this.InitializeComponent();
+            this.DataContext = viewModel;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
index 6928f72..cb2d07a 100644
--- a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
+++ b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <None Remove="About\AboutView.xaml" />
     <None Remove="Home\HomeVideoCollectionView.xaml" />
+    <None Remove="Subscriptions\SubscriptionsView.xaml" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,6 +45,9 @@
     <None Update="Home\HomeDownloadsView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </None>
+    <Page Update="Subscriptions\SubscriptionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Home\HomeVideoCollectionView.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
diff --git a/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
index 33423b9..bcf00dd 100644
--- a/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
+++ b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs
@@ -6,10 +6,12 @@ using VDownload.Core.ViewModels.About;
 using VDownload.Core.ViewModels.Authentication;
 using VDownload.Core.ViewModels.Home;
 using VDownload.Core.ViewModels.Settings;
+using VDownload.Core.ViewModels.Subscriptions;
 using VDownload.Core.Views.About;
 using VDownload.Core.Views.Authentication;
 using VDownload.Core.Views.Home;
 using VDownload.Core.Views.Settings;
+using VDownload.Core.Views.Subscriptions;
 
 namespace VDownload.Core.Views
 {
@@ -23,6 +25,7 @@ namespace VDownload.Core.Views
             { typeof(HomeDownloadsViewModel), typeof(HomeDownloadsView) },
             { typeof(HomeVideoViewModel), typeof(HomeVideoView) },
             { typeof(HomeVideoCollectionViewModel), typeof(HomeVideoCollectionView) },
+            { typeof(SubscriptionsViewModel), typeof(SubscriptionsView) },
             { typeof(SettingsViewModel), typeof(SettingsView) },
             { typeof(AboutViewModel), typeof(AboutView) },
             { typeof(AuthenticationViewModel), typeof(AuthenticationView) }
diff --git a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
index 62c38bd..e7bf3e0 100644
--- a/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
+++ b/VDownload.Services/VDownload.Services.UI/VDownload.Services.UI.StringResources/StringResourcesService.cs
@@ -18,6 +18,7 @@ namespace VDownload.Services.UI.StringResources
         StringResources SettingsViewResources { get; }
         StringResources FilenameTemplateResources { get; }
         StringResources AboutViewResources { get; }
+        StringResources SubscriptionsViewResources { get; }
     }
 
 
@@ -47,6 +48,7 @@ namespace VDownload.Services.UI.StringResources
         public StringResources SettingsViewResources { get; protected set; }
         public StringResources FilenameTemplateResources { get; protected set; }
         public StringResources AboutViewResources { get; protected set; }
+        public StringResources SubscriptionsViewResources { get; protected set; }
 
         #endregion
 
@@ -71,6 +73,7 @@ namespace VDownload.Services.UI.StringResources
             SettingsViewResources = BuildResource("SettingsViewResources");
             FilenameTemplateResources = BuildResource("FilenameTemplateResources");
             AboutViewResources = BuildResource("AboutViewResources");
+            SubscriptionsViewResources = BuildResource("SubscriptionsViewResources");
         }
 
         #endregion
diff --git a/VDownload/App.xaml.cs b/VDownload/App.xaml.cs
index 4127d09..a91d01c 100644
--- a/VDownload/App.xaml.cs
+++ b/VDownload/App.xaml.cs
@@ -11,11 +11,13 @@ using VDownload.Core.ViewModels.About;
 using VDownload.Core.ViewModels.Authentication;
 using VDownload.Core.ViewModels.Home;
 using VDownload.Core.ViewModels.Settings;
+using VDownload.Core.ViewModels.Subscriptions;
 using VDownload.Core.Views;
 using VDownload.Core.Views.About;
 using VDownload.Core.Views.Authentication;
 using VDownload.Core.Views.Home;
 using VDownload.Core.Views.Settings;
+using VDownload.Core.Views.Subscriptions;
 using VDownload.Services.Data.Application;
 using VDownload.Services.Data.Authentication;
 using VDownload.Services.Data.Configuration;
@@ -156,6 +158,7 @@ namespace VDownload
             services.AddSingleton<HomeVideoViewModel>();
             services.AddSingleton<HomeVideoCollectionViewModel>();
             services.AddSingleton<HomeViewModel>();
+            services.AddSingleton<SubscriptionsViewModel>();
             services.AddSingleton<BaseViewModel>();
 
             // Views
@@ -166,6 +169,7 @@ namespace VDownload
             services.AddTransient<HomeVideoView>();
             services.AddTransient<HomeVideoCollectionView>();
             services.AddTransient<HomeView>();
+            services.AddTransient<SubscriptionsView>();
             services.AddTransient<BaseWindow>();
         }
 
diff --git a/VDownload/Assets/BaseView/SubscriptionsDark.png b/VDownload/Assets/BaseView/SubscriptionsDark.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c34f4ff18b790c2ae04655db4b6b91952608730
GIT binary patch
literal 5417
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
LUf^5q6Or~G;3+ja

literal 0
HcmV?d00001

diff --git a/VDownload/Assets/BaseView/SubscriptionsLight.png b/VDownload/Assets/BaseView/SubscriptionsLight.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f1e77d0532a6362e5667266e01911b9fe41acd8
GIT binary patch
literal 5340
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

literal 0
HcmV?d00001

diff --git a/VDownload/Dictionaries/Images/ImagesBaseView.xaml b/VDownload/Dictionaries/Images/ImagesBaseView.xaml
index 1509708..e533eb6 100644
--- a/VDownload/Dictionaries/Images/ImagesBaseView.xaml
+++ b/VDownload/Dictionaries/Images/ImagesBaseView.xaml
@@ -7,11 +7,13 @@
             <x:String x:Key="ImageBaseViewAuthentication">/Assets/BaseView/AuthenticationDark.png</x:String>
             <x:String x:Key="ImageBaseViewHome">/Assets/BaseView/HomeDark.png</x:String>
             <x:String x:Key="ImageBaseViewAbout">/Assets/BaseView/AboutDark.png</x:String>
+            <x:String x:Key="ImageBaseViewSubscriptions">/Assets/BaseView/SubscriptionsDark.png</x:String>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
             <x:String x:Key="ImageBaseViewAuthentication">/Assets/BaseView/AuthenticationLight.png</x:String>
             <x:String x:Key="ImageBaseViewHome">/Assets/BaseView/HomeLight.png</x:String>
             <x:String x:Key="ImageBaseViewAbout">/Assets/BaseView/AboutLight.png</x:String>
+            <x:String x:Key="ImageBaseViewSubscriptions">/Assets/BaseView/SubscriptionsLight.png</x:String>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>
diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj
index 5b1b6cb..d6cbda5 100644
--- a/VDownload/VDownload.csproj
+++ b/VDownload/VDownload.csproj
@@ -214,6 +214,12 @@
     <Content Update="Assets\BaseView\AboutLight.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Update="Assets\BaseView\SubscriptionsDark.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Update="Assets\BaseView\SubscriptionsLight.png">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
     <Content Update="Assets\HomeVideoView\QualityDark.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>

From 38475a96adb4b1382d80fe2f2cc5ec98dd6f59f1 Mon Sep 17 00:00:00 2001
From: Mateusz Skoczek <mateusz5432160@gmail.com>
Date: Sat, 9 Mar 2024 02:56:56 +0100
Subject: [PATCH 5/6] subscription view finished

---
 .../en-US/SubscriptionsViewResources.resw     |  15 ++
 .../Helpers/PlaylistViewModel.cs              |  39 ++++++
 .../Subscriptions/SubscriptionsViewModel.cs   | 132 +++++++++++++++++-
 .../Subscriptions/SubscriptionsView.xaml      | 105 +++++++++++++-
 VDownload.Models/Playlist.cs                  |   1 +
 VDownload.Models/Source.cs                    |   3 +-
 VDownload.Models/SubscriptionList.cs          |  20 ---
 VDownload.Models/SubscriptionsVideoList.cs    |  12 ++
 VDownload.Models/VideoCollection.cs           |   1 -
 .../Subscription.cs                           |  32 +++++
 .../SubscriptionsDataService.cs               |  89 +++++++++++-
 ...ownload.Services.Data.Subscriptions.csproj |   9 ++
 .../VDownload.Sources.csproj                  |   1 +
 VDownload/App.xaml.cs                         |   5 +-
 VDownload/Dictionaries/Colors.xaml            |   2 +
 VDownload/Dictionaries/Converters.xaml        |   3 +
 VDownload/VDownload.csproj                    |   1 +
 17 files changed, 439 insertions(+), 31 deletions(-)
 create mode 100644 VDownload.Core/VDownload.Core.ViewModels/Subscriptions/Helpers/PlaylistViewModel.cs
 delete mode 100644 VDownload.Models/SubscriptionList.cs
 create mode 100644 VDownload.Models/SubscriptionsVideoList.cs
 create mode 100644 VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/Subscription.cs

diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
index 8590552..1e97e5b 100644
--- a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw
@@ -117,7 +117,22 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="DuplicateError" xml:space="preserve">
+    <value>Playlist has been already added</value>
+  </data>
+  <data name="ErrorInfoBar.Title" xml:space="preserve">
+    <value>Error</value>
+  </data>
   <data name="Header.Text" xml:space="preserve">
     <value>Subscriptions</value>
   </data>
+  <data name="PlaylistSearchButton.Content" xml:space="preserve">
+    <value>Add</value>
+  </data>
+  <data name="PlaylistUrlTextBox.PlaceholderText" xml:space="preserve">
+    <value>Playlist URL</value>
+  </data>
+  <data name="RemovePlaylistButton.Content" xml:space="preserve">
+    <value>Remove</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/Helpers/PlaylistViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/Helpers/PlaylistViewModel.cs
new file mode 100644
index 0000000..8f77732
--- /dev/null
+++ b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/Helpers/PlaylistViewModel.cs
@@ -0,0 +1,39 @@
+using CommunityToolkit.Mvvm.ComponentModel;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+
+namespace VDownload.Core.ViewModels.Subscriptions.Helpers
+{
+    public partial class PlaylistViewModel : ObservableObject
+    {
+        #region PROPERTIES
+
+        [ObservableProperty]
+        protected Guid _guid;
+
+        [ObservableProperty]
+        protected string _name;
+
+        [ObservableProperty]
+        protected Source _source;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public PlaylistViewModel(string name, Source source, Guid guid)
+        {
+            _name = name;
+            _source = source;
+            _guid = guid;
+        }
+
+        #endregion
+    }
+}
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs
index 663b143..921b770 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Subscriptions/SubscriptionsViewModel.cs
@@ -1,13 +1,141 @@
-using CommunityToolkit.Mvvm.ComponentModel;
+using ABI.System;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using VDownload.Core.ViewModels.Subscriptions.Helpers;
+using VDownload.Models;
+using VDownload.Services.Data.Subscriptions;
+using VDownload.Services.UI.StringResources;
+using VDownload.Sources;
+using VDownload.Sources.Common;
 
 namespace VDownload.Core.ViewModels.Subscriptions
 {
-    public class SubscriptionsViewModel : ObservableObject
+    public partial class SubscriptionsViewModel : ObservableObject
     {
+        #region SERVICES
+
+        protected readonly ISearchService _searchService;
+        protected readonly IStringResourcesService _stringResourcesService;
+        protected readonly ISubscriptionsDataService _subscriptionsDataService;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        [ObservableProperty]
+        protected ObservableCollection<PlaylistViewModel> _playlists;
+
+        [ObservableProperty]
+        protected string _url;
+
+        [ObservableProperty]
+        protected bool _loading;
+
+        [ObservableProperty]
+        protected string _error;
+
+        [ObservableProperty]
+        protected bool _isErrorOpened;
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public SubscriptionsViewModel(ISearchService searchService, IStringResourcesService stringResourcesService, ISubscriptionsDataService subscriptionsDataService)
+        {
+            _searchService = searchService;
+            _stringResourcesService = stringResourcesService;
+            _subscriptionsDataService = subscriptionsDataService;
+
+            _playlists = new ObservableCollection<PlaylistViewModel>();
+            _loading = false;
+            _isErrorOpened = true;
+            _error = null;
+        }
+
+        #endregion
+
+
+
+        #region COMMANDS
+
+        [RelayCommand]
+        public void Navigation()
+        {
+            Playlists.Clear();
+            foreach (Subscription sub in _subscriptionsDataService.Data)
+            {
+                Playlists.Add(new PlaylistViewModel(sub.Name, sub.Source, sub.Guid));
+            }
+        }
+
+        [RelayCommand]
+        public async Task RemovePlaylist(PlaylistViewModel playlist)
+        {
+            Playlists.Remove(playlist);
+
+            Subscription sub = _subscriptionsDataService.Data.FirstOrDefault(x => x.Guid == playlist.Guid);
+            _subscriptionsDataService.Data.Remove(sub);
+            await _subscriptionsDataService.Save();
+        }
+
+        [RelayCommand]
+        public async Task Add()
+        {
+            Loading = true;
+
+            Playlist playlist;
+            try
+            {
+                playlist = await _searchService.SearchPlaylist(Url, 0);
+            }
+            catch (MediaSearchException ex)
+            {
+                Error = _stringResourcesService.SearchResources.Get(ex.StringCode);
+                Loading = false;
+                return;
+            }
+
+
+            if (_subscriptionsDataService.Data.Any(x => x.Source == playlist.Source && x.Name == playlist.Name))
+            {
+                Error = _stringResourcesService.SubscriptionsViewResources.Get("DuplicateError");
+                Loading = false;
+                return;
+            }
+
+            Subscription subscription = new Subscription
+            {
+                Name = playlist.Name,
+                Source = playlist.Source,
+                Url = playlist.Url,
+            };
+            playlist.ForEach(x => subscription.VideoIds.Add(x.Id));
+
+            _subscriptionsDataService.Data.Add(subscription);
+            await _subscriptionsDataService.Save();
+            Playlists.Add(new PlaylistViewModel(subscription.Name, subscription.Source, subscription.Guid));
+
+            Loading = false;
+        }
+
+        [RelayCommand]
+        public void CloseError()
+        {
+            Error = null;
+            IsErrorOpened = true;
+        }
+
+        #endregion 
     }
 }
diff --git a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
index 386316e..2827059 100644
--- a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
@@ -6,10 +6,109 @@
     xmlns:local="using:VDownload.Core.Views.Subscriptions"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
+    xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
+    xmlns:ct="using:CommunityToolkit.WinUI"
+    xmlns:i="using:Microsoft.Xaml.Interactivity" 
+    xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
     mc:Ignorable="d"
-    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    Background="{ThemeResource ViewBackgroundColor}"
+    x:Name="Root">
+    <i:Interaction.Behaviors>
+        <ic:EventTriggerBehavior EventName="Loaded">
+            <ic:InvokeCommandAction Command="{Binding NavigationCommand}"/>
+        </ic:EventTriggerBehavior>
+    </i:Interaction.Behaviors>
 
-    <Grid>
-        <TextBlock Text="AAAAAAAAAA"/>
+    <Grid Padding="20"
+          RowSpacing="20">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/Header"
+                   Grid.Row="0"
+                   FontSize="28"
+                   FontWeight="SemiBold"/>
+        <ScrollViewer Grid.Row="1">
+            <ItemsControl ItemsSource="{Binding Playlists}">
+                <ItemsControl.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <ctuc:StaggeredPanel ColumnSpacing="10"
+                                             DesiredColumnWidth="120"
+                                             RowSpacing="10"/>
+                    </ItemsPanelTemplate>
+                </ItemsControl.ItemsPanel>
+                <ItemsControl.ItemTemplate>
+                    <DataTemplate>
+                        <Grid RowSpacing="10"
+                              Padding="10"
+                              Background="{ThemeResource PanelBackgroundColor}"
+                              CornerRadius="10">
+                            <Grid.RowDefinitions>
+                                <RowDefinition/>
+                                <RowDefinition Height="Auto"/>
+                                <RowDefinition Height="Auto"/>
+                            </Grid.RowDefinitions>
+                            <Image Grid.Row="0">
+                                <i:Interaction.Behaviors>
+                                    <ic:DataTriggerBehavior Binding="{Binding Source, Converter={StaticResource ObjectToStringConverter}}"
+                                                            Value="Twitch">
+                                        <ic:ChangePropertyAction PropertyName="Source"
+                                                                 Value="{StaticResource ImageSourcesTwitch}"/>
+                                    </ic:DataTriggerBehavior>
+                                </i:Interaction.Behaviors>
+                            </Image>
+                            <TextBlock Grid.Row="1" 
+                                       Text="{Binding Name}"
+                                       HorizontalAlignment="Center"/>
+                            <HyperlinkButton x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/RemovePlaylistButton"
+                                             Grid.Row="2"
+                                             Content="Remove"
+                                             HorizontalAlignment="Center"
+                                             Command="{Binding DataContext.RemovePlaylistCommand, ElementName=Root}"
+                                             CommandParameter="{Binding}"/>
+                        </Grid>
+                    </DataTemplate>
+                </ItemsControl.ItemTemplate>
+            </ItemsControl>
+        </ScrollViewer>
+        <ctuc:SwitchPresenter Grid.Row="2"
+                              Value="{Binding Error, Converter={StaticResource IsNotNullConverter}}">
+            <ctuc:Case Value="False">
+                <Grid Background="{ThemeResource PanelBackgroundColor}"
+                      Padding="10"
+                      ColumnSpacing="10"
+                      CornerRadius="10">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                    </Grid.ColumnDefinitions>
+                    <TextBox x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/PlaylistUrlTextBox"
+                             Grid.Column="0"
+                             Text="{Binding Url, Mode=TwoWay}"/>
+                    <ctuc:SwitchPresenter Grid.Column="1"
+                                          Value="{Binding Loading, Converter={StaticResource ObjectToStringConverter}}">
+                        <ctuc:Case Value="True">
+                            <ProgressRing IsIndeterminate="True"
+                                          Width="20"
+                                          Height="20"/>
+                        </ctuc:Case>
+                        <ctuc:Case Value="False">
+                            <Button x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/PlaylistSearchButton"
+                                    Command="{Binding AddCommand}"/>
+                        </ctuc:Case>
+                    </ctuc:SwitchPresenter>
+                </Grid>
+            </ctuc:Case>
+            <ctuc:Case Value="True">
+                <InfoBar x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/ErrorInfoBar"
+                         Severity="Error"
+                         IsOpen="{Binding IsErrorOpened, Mode=TwoWay}"
+                         Message="{Binding Error}"
+                         CloseButtonCommand="{Binding CloseErrorCommand}"/>
+            </ctuc:Case>
+        </ctuc:SwitchPresenter>
     </Grid>
 </Page>
diff --git a/VDownload.Models/Playlist.cs b/VDownload.Models/Playlist.cs
index 7e202d1..d176dd0 100644
--- a/VDownload.Models/Playlist.cs
+++ b/VDownload.Models/Playlist.cs
@@ -12,6 +12,7 @@ namespace VDownload.Models
 
         public required string Description { get; set; }
         public required Uri Url { get; set; }
+        public Source Source { get; protected set; }
 
         #endregion
     }
diff --git a/VDownload.Models/Source.cs b/VDownload.Models/Source.cs
index 8862d31..4bc4528 100644
--- a/VDownload.Models/Source.cs
+++ b/VDownload.Models/Source.cs
@@ -8,7 +8,6 @@ namespace VDownload.Models
 {
     public enum Source
     {
-        Twitch,
-        Subscriptions
+        Twitch
     }
 }
diff --git a/VDownload.Models/SubscriptionList.cs b/VDownload.Models/SubscriptionList.cs
deleted file mode 100644
index 3d406a5..0000000
--- a/VDownload.Models/SubscriptionList.cs
+++ /dev/null
@@ -1,20 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace VDownload.Models
-{
-    public class SubscriptionList : VideoCollection
-    {
-        #region CONSTRUCTORS
-
-        public SubscriptionList()
-        {
-            Source = Source.Subscriptions;
-        }
-
-        #endregion
-    }
-}
diff --git a/VDownload.Models/SubscriptionsVideoList.cs b/VDownload.Models/SubscriptionsVideoList.cs
new file mode 100644
index 0000000..4030f75
--- /dev/null
+++ b/VDownload.Models/SubscriptionsVideoList.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace VDownload.Models
+{
+    public class SubscriptionsVideoList : VideoCollection
+    {
+    }
+}
diff --git a/VDownload.Models/VideoCollection.cs b/VDownload.Models/VideoCollection.cs
index ba95a92..221314f 100644
--- a/VDownload.Models/VideoCollection.cs
+++ b/VDownload.Models/VideoCollection.cs
@@ -11,7 +11,6 @@ namespace VDownload.Models
         #region PROPERTIES
 
         public required string Name { get; init; }
-        public Source Source { get; protected set; }
 
         #endregion
     }
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/Subscription.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/Subscription.cs
new file mode 100644
index 0000000..b4516a9
--- /dev/null
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/Subscription.cs
@@ -0,0 +1,32 @@
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using VDownload.Models;
+
+namespace VDownload.Services.Data.Subscriptions
+{
+    public class Subscription
+    {
+        #region PROPERTIES
+
+        [JsonProperty("guid")]
+        public Guid Guid { get; private set; } = Guid.NewGuid();
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("source")]
+        public Source Source { get; set; }
+
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("video_ids")]
+        public ICollection<string> VideoIds { get; private set; } = new List<string>();
+
+        #endregion
+    }
+}
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs
index d689c21..4caee21 100644
--- a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/SubscriptionsDataService.cs
@@ -1,12 +1,97 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using VDownload.Services.Data.Configuration;
 
 namespace VDownload.Services.Data.Subscriptions
 {
-    public class SubscriptionsDataService
+    public interface ISubscriptionsDataService
     {
+        #region PROPERTIES
+
+        ICollection<Subscription> Data { get; }
+
+        #endregion
+
+
+
+        #region METHODS
+
+        Task Load();
+        Task Save();
+
+        #endregion
+    }
+
+
+
+    public class SubscriptionsDataService : ISubscriptionsDataService
+    {
+        #region SERVICES
+
+        protected readonly IConfigurationService _configurationService;
+
+        #endregion
+
+
+
+        #region FIELDS
+
+        protected readonly string _filePath;
+
+        #endregion
+
+
+
+        #region PROPERTIES
+
+        public ICollection<Subscription> Data { get; private set; }
+
+        #endregion
+
+
+
+        #region CONSTRUCTORS
+
+        public SubscriptionsDataService(IConfigurationService configurationService)
+        {
+            _configurationService = configurationService;
+
+            string appdataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
+            string appdataDirectoryName = _configurationService.Common.Path.Appdata.DirectoryName;
+            string appdataAuthenticationFilename = _configurationService.Common.Path.Appdata.SubscriptionsFile;
+            _filePath = Path.Combine(appdataPath, appdataDirectoryName, appdataAuthenticationFilename);
+        }
+
+        #endregion
+
+
+
+        #region PUBLIC METHODS
+
+        public async Task Load()
+        {
+            if (File.Exists(_filePath))
+            {
+                string content = await File.ReadAllTextAsync(_filePath);
+                Data = JsonConvert.DeserializeObject<ICollection<Subscription>>(content);
+            }
+            else
+            {
+                Data = new List<Subscription>();
+            }
+        }
+
+        public async Task Save()
+        {
+            Directory.CreateDirectory(Path.GetDirectoryName(_filePath));
+            string content = JsonConvert.SerializeObject(Data);
+            await File.WriteAllTextAsync(_filePath, content);
+        }
+
+        #endregion
     }
 }
diff --git a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj
index fa71b7a..d81009e 100644
--- a/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj
+++ b/VDownload.Services/VDownload.Services.Data/VDownload.Services.Data.Subscriptions/VDownload.Services.Data.Subscriptions.csproj
@@ -6,4 +6,13 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\VDownload.Models\VDownload.Models.csproj" />
+    <ProjectReference Include="..\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+  </ItemGroup>
+
 </Project>
diff --git a/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj b/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj
index fdec61e..c27e6e9 100644
--- a/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj
+++ b/VDownload.Sources/VDownload.Sources/VDownload.Sources.csproj
@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
+    <ProjectReference Include="..\..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Subscriptions\VDownload.Services.Data.Subscriptions.csproj" />
     <ProjectReference Include="..\VDownload.Sources.Common\VDownload.Sources.Common.csproj" />
     <ProjectReference Include="..\VDownload.Sources.Twitch\VDownload.Sources.Twitch\VDownload.Sources.Twitch.csproj" />
   </ItemGroup>
diff --git a/VDownload/App.xaml.cs b/VDownload/App.xaml.cs
index a91d01c..af9ab08 100644
--- a/VDownload/App.xaml.cs
+++ b/VDownload/App.xaml.cs
@@ -23,6 +23,7 @@ using VDownload.Services.Data.Authentication;
 using VDownload.Services.Data.Configuration;
 using VDownload.Services.Data.Configuration.Models;
 using VDownload.Services.Data.Settings;
+using VDownload.Services.Data.Subscriptions;
 using VDownload.Services.UI.Dialogs;
 using VDownload.Services.UI.DictionaryResources;
 using VDownload.Services.UI.Notifications;
@@ -110,6 +111,7 @@ namespace VDownload
             services.AddSingleton<IAuthenticationDataService, AuthenticationDataService>();
             services.AddSingleton<ISettingsService, SettingsService>();
             services.AddSingleton<IApplicationDataService, ApplicationDataService>();
+            services.AddSingleton<ISubscriptionsDataService, SubscriptionsDataService>();
         }
 
         protected void BuildUIServices(IServiceCollection services)
@@ -189,7 +191,8 @@ namespace VDownload
             IApplicationDataService applicationDataService = _serviceProvider.GetService<IApplicationDataService>();
             ISettingsService settingsService = _serviceProvider.GetService<ISettingsService>();
             IAuthenticationDataService authenticationDataService = _serviceProvider.GetService<IAuthenticationDataService>();
-            await Task.WhenAll(applicationDataService.Load(), settingsService.Load(), authenticationDataService.Load());
+            ISubscriptionsDataService subscriptionsDataService = _serviceProvider.GetService<ISubscriptionsDataService>();
+            await Task.WhenAll(applicationDataService.Load(), settingsService.Load(), authenticationDataService.Load(), subscriptionsDataService.Load());
         }
 
         protected void AssignStaticProperties()
diff --git a/VDownload/Dictionaries/Colors.xaml b/VDownload/Dictionaries/Colors.xaml
index 077847a..65a6043 100644
--- a/VDownload/Dictionaries/Colors.xaml
+++ b/VDownload/Dictionaries/Colors.xaml
@@ -6,10 +6,12 @@
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="ViewBackgroundColor" Color="#F5F5F5"/>
+            <SolidColorBrush x:Key="PanelBackgroundColor" Color="#F5F5F5"/>
             <SolidColorBrush x:Key="OptionBarBackgroundColor" Color="#F5F5F5"/>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="ViewBackgroundColor" Color="#242424"/>
+            <SolidColorBrush x:Key="PanelBackgroundColor" Color="#2F2F2F"/>
             <SolidColorBrush x:Key="OptionBarBackgroundColor" Color="#1B1B1B"/>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
diff --git a/VDownload/Dictionaries/Converters.xaml b/VDownload/Dictionaries/Converters.xaml
index f9324ce..350aef3 100644
--- a/VDownload/Dictionaries/Converters.xaml
+++ b/VDownload/Dictionaries/Converters.xaml
@@ -13,4 +13,7 @@
     <ct:StringFormatConverter x:Key="StringFormatConverter"/>
     <ct:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter"/>
     <ct:BoolNegationConverter x:Key="BoolNegationConverter"/>
+    <ct:EmptyObjectToObjectConverter x:Key="IsNotNullConverter"
+                                     EmptyValue="False"
+                                     NotEmptyValue="True"/>
 </ResourceDictionary>
diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj
index d6cbda5..31c3e2f 100644
--- a/VDownload/VDownload.csproj
+++ b/VDownload/VDownload.csproj
@@ -192,6 +192,7 @@
         <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Authentication\VDownload.Services.Data.Authentication.csproj" />
         <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Configuration\VDownload.Services.Data.Configuration.csproj" />
         <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Settings\VDownload.Services.Data.Settings.csproj" />
+        <ProjectReference Include="..\VDownload.Services\VDownload.Services.Data\VDownload.Services.Data.Subscriptions\VDownload.Services.Data.Subscriptions.csproj" />
         <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Dialogs\VDownload.Services.UI.Dialogs.csproj" />
         <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.DictionaryResources\VDownload.Services.UI.DictionaryResources.csproj" />
         <ProjectReference Include="..\VDownload.Services\VDownload.Services.UI\VDownload.Services.UI.Notifications\VDownload.Services.UI.Notifications.csproj" />

From 2d53f75be236046105ab323500f751c9f6796207 Mon Sep 17 00:00:00 2001
From: Mateusz Skoczek <mateusz5432160@gmail.com>
Date: Sat, 9 Mar 2024 20:15:19 +0100
Subject: [PATCH 6/6] subscriptions module finished

---
 .../Strings/en-US/CommonResources.resw        |  3 +
 .../Strings/en-US/HomeViewResources.resw      |  6 ++
 .../Home/HomeViewModel.cs                     | 71 +++++++++++++++++--
 .../VDownload.Core.Views/Home/HomeView.xaml   |  9 +--
 .../Subscriptions/SubscriptionsView.xaml      |  6 +-
 5 files changed, 82 insertions(+), 13 deletions(-)

diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/CommonResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/CommonResources.resw
index 9632010..6aa130d 100644
--- a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/CommonResources.resw
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/CommonResources.resw
@@ -159,4 +159,7 @@
   <data name="StartAtMeteredConnectionDialogTitle" xml:space="preserve">
     <value>Warning</value>
   </data>
+  <data name="SubscriptionVideoListName" xml:space="preserve">
+    <value>Subscriptions</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw
index 907f620..5601658 100644
--- a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw
+++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/HomeViewResources.resw
@@ -132,6 +132,12 @@
   <data name="OptionBarMessageLoading" xml:space="preserve">
     <value>Loading...</value>
   </data>
+  <data name="OptionBarMessageVideosFound" xml:space="preserve">
+    <value>New videos:</value>
+  </data>
+  <data name="OptionBarMessageVideosNotFound" xml:space="preserve">
+    <value>No new videos</value>
+  </data>
   <data name="OptionBarPlaylistSearch.Label" xml:space="preserve">
     <value>Playlist search</value>
   </data>
diff --git a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
index d0f88c7..8dd6d3f 100644
--- a/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
+++ b/VDownload.Core/VDownload.Core.ViewModels/Home/HomeViewModel.cs
@@ -10,6 +10,7 @@ using VDownload.Core.Tasks;
 using VDownload.Models;
 using VDownload.Services.Data.Configuration;
 using VDownload.Services.Data.Settings;
+using VDownload.Services.Data.Subscriptions;
 using VDownload.Services.UI.Dialogs;
 using VDownload.Services.UI.StringResources;
 using VDownload.Sources;
@@ -52,6 +53,7 @@ namespace VDownload.Core.ViewModels.Home
         protected readonly ISettingsService _settingsService;
         protected readonly IStringResourcesService _stringResourcesService;
         protected readonly ISearchService _searchService;
+        protected readonly ISubscriptionsDataService _subscriptionsDataService;
         protected readonly IDialogsService _dialogsService;
 
         protected readonly IDownloadTaskManager _downloadTaskManager;
@@ -88,6 +90,9 @@ namespace VDownload.Core.ViewModels.Home
         [ObservableProperty]
         private OptionBarMessageIconType _optionBarMessageIcon;
 
+        [ObservableProperty]
+        private bool _optionBarLoadSubscriptionButtonChecked;
+
         [ObservableProperty]
         private bool _optionBarVideoSearchButtonChecked;
 
@@ -112,12 +117,13 @@ namespace VDownload.Core.ViewModels.Home
 
         #region CONSTRUCTORS
 
-        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel videoCollectionViewModel)
+        public HomeViewModel(IConfigurationService configurationService, ISettingsService settingsService, IStringResourcesService stringResourcesService, ISearchService searchService, ISubscriptionsDataService subscriptionsDataService, IDialogsService dialogsService, IDownloadTaskManager downloadTaskManager, HomeVideoViewModel videoViewModel, HomeVideoCollectionViewModel videoCollectionViewModel)
         {
             _configurationService = configurationService;
             _settingsService = settingsService;
             _stringResourcesService = stringResourcesService;
             _searchService = searchService;
+            _subscriptionsDataService = subscriptionsDataService;
             _dialogsService = dialogsService;
 
             _downloadTaskManager = downloadTaskManager;
@@ -145,6 +151,7 @@ namespace VDownload.Core.ViewModels.Home
             OptionBarContent = OptionBarContentType.None;
             OptionBarMessageIcon = OptionBarMessageIconType.None;
             OptionBarMessage = null;
+            OptionBarLoadSubscriptionButtonChecked = false;
             OptionBarVideoSearchButtonChecked = false;
             OptionBarPlaylistSearchButtonChecked = false;
             OptionBarSearchNotPending = true;
@@ -154,16 +161,64 @@ namespace VDownload.Core.ViewModels.Home
         }
 
         [RelayCommand]
-        public void LoadFromSubscription()
+        public async Task LoadFromSubscription()
         {
             MainContent = _downloadsView;
+            OptionBarMessageIcon = OptionBarMessageIconType.None;
+            OptionBarMessage = null;
 
-            OptionBarContent = OptionBarContentType.None;
-            OptionBarVideoSearchButtonChecked = false;
-            OptionBarPlaylistSearchButtonChecked = false;
-            OptionBarSearchNotPending = false;
+            if (OptionBarLoadSubscriptionButtonChecked)
+            {
+                OptionBarContent = OptionBarContentType.None;
+                OptionBarVideoSearchButtonChecked = false;
+                OptionBarPlaylistSearchButtonChecked = false;
 
-            //TODO: Load videos
+                OptionBarSearchNotPending = false;
+                OptionBarMessageIcon = OptionBarMessageIconType.ProgressRing;
+                OptionBarMessage = _stringResourcesService.HomeViewResources.Get("OptionBarMessageLoading");
+
+                SubscriptionsVideoList subList = new SubscriptionsVideoList { Name = _stringResourcesService.CommonResources.Get("SubscriptionVideoListName") };
+                List<Task> tasks = new List<Task>();
+                foreach (Subscription sub in _subscriptionsDataService.Data.ToArray())
+                {
+                    tasks.Add(Task.Run(async () =>
+                    {
+                        Playlist playlist;
+                        try
+                        {
+                            playlist = await _searchService.SearchPlaylist(sub.Url.OriginalString, 0);
+                        }
+                        catch (MediaSearchException)
+                        {
+                            return;
+                        }
+
+                        IEnumerable<Video> newIds = playlist.Where(x => !sub.VideoIds.Contains(x.Id));
+                        subList.AddRange(newIds);
+                        foreach (Video video in newIds)
+                        {
+                            sub.VideoIds.Add(video.Id);
+                        }
+                    }));
+                }
+                await Task.WhenAll(tasks);
+                await _subscriptionsDataService.Save();
+
+                if (subList.Count > 0)
+                {
+                    OptionBarMessage = $"{_stringResourcesService.HomeViewResources.Get("OptionBarMessageVideosFound")} {subList.Count}";
+
+                    _videoCollectionViewModel.LoadCollection(subList);
+                    MainContent = _videoCollectionView;
+                }
+                else
+                {
+                    OptionBarMessage = _stringResourcesService.HomeViewResources.Get("OptionBarMessageVideosNotFound");
+                }
+
+                OptionBarSearchNotPending = true;
+                OptionBarMessageIcon = OptionBarMessageIconType.None;
+            }
         }
 
         [RelayCommand]
@@ -178,6 +233,7 @@ namespace VDownload.Core.ViewModels.Home
             {
                 OptionBarContent = OptionBarContentType.VideoSearch;
                 OptionBarPlaylistSearchButtonChecked = false;
+                OptionBarLoadSubscriptionButtonChecked = false;
             }
             else
             {
@@ -197,6 +253,7 @@ namespace VDownload.Core.ViewModels.Home
             {
                 OptionBarContent = OptionBarContentType.PlaylistSearch;
                 OptionBarVideoSearchButtonChecked = false;
+                OptionBarLoadSubscriptionButtonChecked = false;
             }
             else
             {
diff --git a/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
index 55aa37b..25a1322 100644
--- a/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Home/HomeView.xaml
@@ -129,10 +129,11 @@
             </ctuc:UniformGrid>
             <StackPanel Grid.Column="2" 
                         Orientation="Horizontal">
-                <AppBarButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarLoadSubscription"
-                              Icon="Favorite"
-                              IsEnabled="{Binding OptionBarSearchNotPending}"
-                              Command="{Binding LoadFromSubscriptionCommand}"/>
+                <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarLoadSubscription"
+                                    Icon="Favorite"
+                                    IsEnabled="{Binding OptionBarSearchNotPending}"
+                                    IsChecked="{Binding OptionBarLoadSubscriptionButtonChecked, Mode=TwoWay}"
+                                    Command="{Binding LoadFromSubscriptionCommand}"/>
                 <AppBarToggleButton x:Uid="/VDownload.Core.Strings/HomeViewResources/OptionBarVideoSearch"
                                     Icon="Video"
                                     IsEnabled="{Binding OptionBarSearchNotPending}"
diff --git a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
index 2827059..feb9aca 100644
--- a/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
+++ b/VDownload.Core/VDownload.Core.Views/Subscriptions/SubscriptionsView.xaml
@@ -62,7 +62,8 @@
                             </Image>
                             <TextBlock Grid.Row="1" 
                                        Text="{Binding Name}"
-                                       HorizontalAlignment="Center"/>
+                                       HorizontalAlignment="Center"
+                                       TextTrimming="CharacterEllipsis"/>
                             <HyperlinkButton x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/RemovePlaylistButton"
                                              Grid.Row="2"
                                              Content="Remove"
@@ -87,7 +88,8 @@
                     </Grid.ColumnDefinitions>
                     <TextBox x:Uid="/VDownload.Core.Strings/SubscriptionsViewResources/PlaylistUrlTextBox"
                              Grid.Column="0"
-                             Text="{Binding Url, Mode=TwoWay}"/>
+                             Text="{Binding Url, Mode=TwoWay}"
+                             IsEnabled="{Binding Loading, Converter={StaticResource BoolNegationConverter}}"/>
                     <ctuc:SwitchPresenter Grid.Column="1"
                                           Value="{Binding Loading, Converter={StaticResource ObjectToStringConverter}}">
                         <ctuc:Case Value="True">