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 @@ Home + + Subscriptions + \ No newline at end of file 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 @@ Warning + + Subscriptions + \ No newline at end of file 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.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 @@ Loading... + + New videos: + + + No new videos + Playlist search 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..1e97e5b --- /dev/null +++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/SubscriptionsViewResources.resw @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Playlist has been already added + + + Error + + + Subscriptions + + + Add + + + Playlist URL + + + Remove + + \ 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("ImageBaseViewHome"), ViewModel = typeof(HomeViewModel), - } + }, + new NavigationViewItem() + { + Name = _stringResourcesService.BaseViewResources.Get("SubscriptionsNavigationViewItem"), + IconSource = _dictionaryResourcesService.Get("ImageBaseViewSubscriptions"), + ViewModel = typeof(SubscriptionsViewModel), + }, } ); FooterItems = new ReadOnlyObservableCollection 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..49ec442 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 _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 LoadCollection(VideoCollection collection) { - _playlist = playlist; - ParallelQuery