diff --git a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AboutViewResources.resw b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AboutViewResources.resw new file mode 100644 index 0000000..76fc78a --- /dev/null +++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/AboutViewResources.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 + + + ss + + \ No newline at end of file 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 df0e3fa..3df704d 100644 --- a/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw +++ b/VDownload.Core/VDownload.Core.Strings/Strings/en-US/BaseViewResources.resw @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + About + Authentication diff --git a/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.cs new file mode 100644 index 0000000..bf3bcce --- /dev/null +++ b/VDownload.Core/VDownload.Core.ViewModels/About/AboutViewModel.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.About +{ + public class AboutViewModel : ObservableObject + { + } +} diff --git a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs index 0e1986b..8ec282b 100644 --- a/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs +++ b/VDownload.Core/VDownload.Core.ViewModels/BaseViewModel.cs @@ -12,6 +12,7 @@ using VDownload.Core.ViewModels.Settings; using VDownload.Services.UI.DictionaryResources; using VDownload.Services.UI.StringResources; using SimpleToolkit.UI.Models; +using VDownload.Core.ViewModels.About; namespace VDownload.Core.ViewModels { @@ -72,6 +73,12 @@ namespace VDownload.Core.ViewModels ( new ObservableCollection { + new NavigationViewItem() + { + Name = _stringResourcesService.BaseViewResources.Get("AboutNavigationViewItem"), + IconSource = _dictionaryResourcesService.Get("ImageBaseViewAbout"), + ViewModel = typeof(AboutViewModel), + }, new NavigationViewItem() { Name = _stringResourcesService.BaseViewResources.Get("AuthenticationNavigationViewItem"), diff --git a/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml b/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml new file mode 100644 index 0000000..5b1847d --- /dev/null +++ b/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml.cs b/VDownload.Core/VDownload.Core.Views/About/AboutView.xaml.cs new file mode 100644 index 0000000..1fbcd3e --- /dev/null +++ b/VDownload.Core/VDownload.Core.Views/About/AboutView.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.Home; +using Windows.Foundation; +using Windows.Foundation.Collections; + +namespace VDownload.Core.Views.About +{ + public sealed partial class AboutView : Page + { + #region CONSTRUCTORS + + public AboutView(AboutViewModel 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 c840d2b..376e829 100644 --- a/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj +++ b/VDownload.Core/VDownload.Core.Views/VDownload.Core.Views.csproj @@ -9,6 +9,7 @@ false + @@ -31,6 +32,9 @@ + + MSBuild:Compile + MSBuild:Compile diff --git a/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs index 7ce906b..c001505 100644 --- a/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs +++ b/VDownload.Core/VDownload.Core.Views/ViewModelToViewConverter.cs @@ -2,9 +2,11 @@ using System; using System.Collections.Generic; using System.Linq; +using VDownload.Core.ViewModels.About; using VDownload.Core.ViewModels.Authentication; using VDownload.Core.ViewModels.Home; using VDownload.Core.ViewModels.Settings; +using VDownload.Core.Views.About; using VDownload.Core.Views.Authentication; using VDownload.Core.Views.Home; using VDownload.Core.Views.Settings; @@ -22,6 +24,7 @@ namespace VDownload.Core.Views { typeof(HomeVideoViewModel), typeof(HomeVideoView) }, { typeof(HomePlaylistViewModel), typeof(HomePlaylistView) }, { 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 0748449..d131d62 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 @@ -17,6 +17,7 @@ namespace VDownload.Services.UI.StringResources StringResources DialogButtonsResources { get; } StringResources SettingsViewResources { get; } StringResources FilenameTemplateResources { get; } + StringResources AboutViewResources { get; } } @@ -45,6 +46,7 @@ namespace VDownload.Services.UI.StringResources public StringResources DialogButtonsResources { get; protected set; } public StringResources SettingsViewResources { get; protected set; } public StringResources FilenameTemplateResources { get; protected set; } + public StringResources AboutViewResources { get; protected set; } #endregion @@ -68,6 +70,7 @@ namespace VDownload.Services.UI.StringResources DialogButtonsResources = BuildResource("DialogButtonsResources"); SettingsViewResources = BuildResource("SettingsViewResources"); FilenameTemplateResources = BuildResource("FilenameTemplateResources"); + AboutViewResources = BuildResource("AboutViewResources"); } #endregion diff --git a/VDownload/Assets/BaseView/AboutDark.png b/VDownload/Assets/BaseView/AboutDark.png new file mode 100644 index 0000000..a3e8957 Binary files /dev/null and b/VDownload/Assets/BaseView/AboutDark.png differ diff --git a/VDownload/Assets/BaseView/AboutLight.png b/VDownload/Assets/BaseView/AboutLight.png new file mode 100644 index 0000000..5f5802e Binary files /dev/null and b/VDownload/Assets/BaseView/AboutLight.png differ diff --git a/VDownload/Dictionaries/Images/ImagesBaseView.xaml b/VDownload/Dictionaries/Images/ImagesBaseView.xaml index 1555d1c..1509708 100644 --- a/VDownload/Dictionaries/Images/ImagesBaseView.xaml +++ b/VDownload/Dictionaries/Images/ImagesBaseView.xaml @@ -6,10 +6,12 @@ /Assets/BaseView/AuthenticationDark.png /Assets/BaseView/HomeDark.png + /Assets/BaseView/AboutDark.png /Assets/BaseView/AuthenticationLight.png /Assets/BaseView/HomeLight.png + /Assets/BaseView/AboutLight.png diff --git a/VDownload/VDownload.csproj b/VDownload/VDownload.csproj index a171dc6..c24c481 100644 --- a/VDownload/VDownload.csproj +++ b/VDownload/VDownload.csproj @@ -197,6 +197,12 @@ + + Always + + + Always + Always