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/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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + Subscriptions + + \ 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/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 @@ + + + + + + + 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 @@ + @@ -44,6 +45,9 @@ MSBuild:Compile + + MSBuild:Compile + MSBuild:Compile 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(); services.AddSingleton(); services.AddSingleton(); + services.AddSingleton(); services.AddSingleton(); // Views @@ -166,6 +169,7 @@ namespace VDownload services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); } diff --git a/VDownload/Assets/BaseView/SubscriptionsDark.png b/VDownload/Assets/BaseView/SubscriptionsDark.png new file mode 100644 index 0000000..1c34f4f Binary files /dev/null and b/VDownload/Assets/BaseView/SubscriptionsDark.png differ diff --git a/VDownload/Assets/BaseView/SubscriptionsLight.png b/VDownload/Assets/BaseView/SubscriptionsLight.png new file mode 100644 index 0000000..9f1e77d Binary files /dev/null and b/VDownload/Assets/BaseView/SubscriptionsLight.png differ 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 @@ /Assets/BaseView/AuthenticationDark.png /Assets/BaseView/HomeDark.png /Assets/BaseView/AboutDark.png + /Assets/BaseView/SubscriptionsDark.png /Assets/BaseView/AuthenticationLight.png /Assets/BaseView/HomeLight.png /Assets/BaseView/AboutLight.png + /Assets/BaseView/SubscriptionsLight.png 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 @@ Always + + Always + + + Always + Always