subscriptions page added

This commit is contained in:
2024-03-08 20:48:31 +01:00
Unverified
parent 032c08a810
commit 70fdc10f50
14 changed files with 216 additions and 1 deletions

View File

@@ -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>

View File

@@ -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>

View File

@@ -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>

View File

@@ -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
{
}
}

View File

@@ -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>

View File

@@ -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
}
}

View File

@@ -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>

View File

@@ -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) }

View File

@@ -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

View File

@@ -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>();
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

View File

@@ -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>

View File

@@ -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>