This commit is contained in:
2024-03-08 00:34:21 +01:00
Unverified
parent fe37fc3369
commit aeff58b972
29 changed files with 124 additions and 125 deletions

View File

@@ -202,7 +202,7 @@ namespace VDownload.Core.ViewModels.Home
#region PUBLIC METHODS #region PUBLIC METHODS
public void LoadPlaylist(VideoCollection collection) public void LoadCollection(VideoCollection collection)
{ {
_collection = collection; _collection = collection;
ParallelQuery<Video> playlistQuery = _collection.AsParallel(); ParallelQuery<Video> playlistQuery = _collection.AsParallel();

View File

@@ -57,7 +57,7 @@ namespace VDownload.Core.ViewModels.Home
protected readonly IDownloadTaskManager _downloadTaskManager; protected readonly IDownloadTaskManager _downloadTaskManager;
protected readonly HomeVideoViewModel _videoViewModel; protected readonly HomeVideoViewModel _videoViewModel;
protected readonly HomeVideoCollectionViewModel _playlistViewModel; protected readonly HomeVideoCollectionViewModel _videoCollectionViewModel;
#endregion #endregion
@@ -67,7 +67,7 @@ namespace VDownload.Core.ViewModels.Home
protected readonly Type _downloadsView = typeof(HomeDownloadsViewModel); protected readonly Type _downloadsView = typeof(HomeDownloadsViewModel);
protected readonly Type _videoView = typeof(HomeVideoViewModel); protected readonly Type _videoView = typeof(HomeVideoViewModel);
protected readonly Type _playlistView = typeof(HomeVideoCollectionViewModel); protected readonly Type _videoCollectionView = typeof(HomeVideoCollectionViewModel);
#endregion #endregion
@@ -112,7 +112,7 @@ namespace VDownload.Core.ViewModels.Home
#region CONSTRUCTORS #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; _configurationService = configurationService;
_settingsService = settingsService; _settingsService = settingsService;
@@ -125,8 +125,8 @@ namespace VDownload.Core.ViewModels.Home
_videoViewModel = videoViewModel; _videoViewModel = videoViewModel;
_videoViewModel.CloseRequested += BackToDownload_EventHandler; _videoViewModel.CloseRequested += BackToDownload_EventHandler;
_playlistViewModel = playlistViewModel; _videoCollectionViewModel = videoCollectionViewModel;
_playlistViewModel.CloseRequested += BackToDownload_EventHandler; _videoCollectionViewModel.CloseRequested += BackToDownload_EventHandler;
} }
#endregion #endregion
@@ -253,9 +253,9 @@ namespace VDownload.Core.ViewModels.Home
return; return;
} }
_playlistViewModel.LoadPlaylist(playlist); _videoCollectionViewModel.LoadCollection(playlist);
MainContent = _playlistView; MainContent = _videoCollectionView;
OptionBarSearchNotPending = true; OptionBarSearchNotPending = true;
OptionBarMessageIcon = OptionBarMessageIconType.None; OptionBarMessageIcon = OptionBarMessageIconType.None;

View File

@@ -41,7 +41,7 @@
Spacing="10"> Spacing="10">
<TextBlock VerticalAlignment="Center" <TextBlock VerticalAlignment="Center"
Visibility="{Binding IsSomethingHidden, Converter={StaticResource BoolToVisibilityConverter}}"> 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> </TextBlock>
<AppBarToggleButton x:Name="FilterButton" <AppBarToggleButton x:Name="FilterButton"
Icon="Filter" Icon="Filter"
@@ -49,7 +49,7 @@
Height="48"> Height="48">
<AppBarToggleButton.Resources> <AppBarToggleButton.Resources>
<TeachingTip x:Name="FilterWindow" <TeachingTip x:Name="FilterWindow"
x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterWindow" x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterWindow"
Target="{Binding ElementName=FilterButton}" Target="{Binding ElementName=FilterButton}"
PreferredPlacement="BottomLeft" PreferredPlacement="BottomLeft"
IsOpen="{Binding ElementName=FilterButton, Path=IsChecked, Mode=TwoWay}"> IsOpen="{Binding ElementName=FilterButton, Path=IsChecked, Mode=TwoWay}">
@@ -69,23 +69,23 @@
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBlock" <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterTitleTextBlock"
Grid.Row="0" Grid.Row="0"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterTitleTextBox" <TextBox x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterTitleTextBox"
Grid.Row="0" Grid.Row="0"
Grid.Column="1" Grid.Column="1"
Text="{Binding TitleFilter, Mode=TwoWay}"/> 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.Row="1"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
<TextBox x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterAuthorTextBox" <TextBox x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterAuthorTextBox"
Grid.Row="1" Grid.Row="1"
Grid.Column="1" Grid.Column="1"
Text="{Binding AuthorFilter, Mode=TwoWay}"/> 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.Row="2"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
@@ -115,7 +115,7 @@
SmallChange="1" SmallChange="1"
LargeChange="10"/> LargeChange="10"/>
</Grid> </Grid>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterDateTextBlock" <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterDateTextBlock"
Grid.Row="3" Grid.Row="3"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
@@ -139,7 +139,7 @@
Date="{Binding MaxDateFilter, Mode=TwoWay}" Date="{Binding MaxDateFilter, Mode=TwoWay}"
MaxDate="{Binding MaxDate}"/> MaxDate="{Binding MaxDate}"/>
</Grid> </Grid>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterDurationTextBlock" <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterDurationTextBlock"
Grid.Row="4" Grid.Row="4"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
@@ -159,7 +159,7 @@
Value="{Binding MaxDurationFilter, Mode=TwoWay}" Value="{Binding MaxDurationFilter, Mode=TwoWay}"
Maximum="{Binding MaxDuration}"/> Maximum="{Binding MaxDuration}"/>
</Grid> </Grid>
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterRemovedTextBlock" <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterRemovedTextBlock"
Grid.Row="5" Grid.Row="5"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center"/> VerticalAlignment="Center"/>
@@ -172,7 +172,7 @@
<TextBlock Grid.Column="0" <TextBlock Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="{Binding RemovedCount}"/> Text="{Binding RemovedCount}"/>
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilterRemovedButton" <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilterRemovedButton"
Grid.Column="1" Grid.Column="1"
Command="{Binding RestoreRemovedVideosCommand}"/> Command="{Binding RestoreRemovedVideosCommand}"/>
</Grid> </Grid>
@@ -180,7 +180,7 @@
</TeachingTip> </TeachingTip>
</AppBarToggleButton.Resources> </AppBarToggleButton.Resources>
</AppBarToggleButton> </AppBarToggleButton>
<AppBarButton x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/ApplyDirectoryButton" <AppBarButton x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/ApplyDirectoryButton"
Icon="Folder" Icon="Folder"
Width="40" Width="40"
Height="48" Height="48"
@@ -238,7 +238,7 @@
<Image Grid.Column="0" <Image Grid.Column="0"
Grid.Row="0" Grid.Row="0"
VerticalAlignment="Center" VerticalAlignment="Center"
Source="{ThemeResource ImageHomePlaylistViewAuthor}" Source="{ThemeResource ImageHomeVideoCollectionViewAuthor}"
Width="{StaticResource IconSize}"/> Width="{StaticResource IconSize}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Grid.Row="0" Grid.Row="0"
@@ -248,7 +248,7 @@
<Image Grid.Column="0" <Image Grid.Column="0"
Grid.Row="1" Grid.Row="1"
VerticalAlignment="Center" VerticalAlignment="Center"
Source="{ThemeResource ImageHomePlaylistViewDate}" Source="{ThemeResource ImageHomeVideoCollectionViewDate}"
Width="{StaticResource IconSize}"/> Width="{StaticResource IconSize}"/>
<TextBlock Grid.Column="1" <TextBlock Grid.Column="1"
Grid.Row="1" Grid.Row="1"
@@ -258,7 +258,7 @@
<Image Grid.Column="2" <Image Grid.Column="2"
Grid.Row="0" Grid.Row="0"
VerticalAlignment="Center" VerticalAlignment="Center"
Source="{ThemeResource ImageHomePlaylistViewTime}" Source="{ThemeResource ImageHomeVideoCollectionViewTime}"
Width="{StaticResource IconSize}"/> Width="{StaticResource IconSize}"/>
<TextBlock Grid.Column="3" <TextBlock Grid.Column="3"
Grid.Row="0" Grid.Row="0"
@@ -268,7 +268,7 @@
<Image Grid.Column="2" <Image Grid.Column="2"
Grid.Row="1" Grid.Row="1"
VerticalAlignment="Center" VerticalAlignment="Center"
Source="{ThemeResource ImageHomePlaylistViewViews}" Source="{ThemeResource ImageHomeVideoCollectionViewViews}"
Width="{StaticResource IconSize}"/> Width="{StaticResource IconSize}"/>
<TextBlock Grid.Column="3" <TextBlock Grid.Column="3"
Grid.Row="1" Grid.Row="1"
@@ -289,21 +289,21 @@
<Expander.Content> <Expander.Content>
<StackPanel Spacing="20"> <StackPanel Spacing="20">
<StackPanel Spacing="5"> <StackPanel Spacing="5">
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaOptionsHeader" <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/MediaOptionsHeader"
FontWeight="Bold" FontWeight="Bold"
FontSize="15"/> FontSize="15"/>
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/QualitySettingsCard"> <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/QualitySettingsCard">
<ctc:SettingsCard.HeaderIcon> <ctc:SettingsCard.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="{ThemeResource ImageHomePlaylistViewMedia}"/> UriSource="{ThemeResource ImageHomeVideoCollectionViewMedia}"/>
</ctc:SettingsCard.HeaderIcon> </ctc:SettingsCard.HeaderIcon>
<ComboBox ItemsSource="{Binding Key.Streams}" <ComboBox ItemsSource="{Binding Key.Streams}"
SelectedItem="{Binding Key.SelectedStream, Mode=TwoWay}"/> SelectedItem="{Binding Key.SelectedStream, Mode=TwoWay}"/>
</ctc:SettingsCard> </ctc:SettingsCard>
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/MediaTypeSettingsCard"> <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/MediaTypeSettingsCard">
<ctc:SettingsCard.HeaderIcon> <ctc:SettingsCard.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="{ThemeResource ImageHomePlaylistViewMedia}"/> UriSource="{ThemeResource ImageHomeVideoCollectionViewMedia}"/>
</ctc:SettingsCard.HeaderIcon> </ctc:SettingsCard.HeaderIcon>
<ComboBox ItemsSource="{ct:EnumValues Type=m:MediaType}" <ComboBox ItemsSource="{ct:EnumValues Type=m:MediaType}"
SelectedItem="{Binding Key.MediaType, Mode=TwoWay}"> SelectedItem="{Binding Key.MediaType, Mode=TwoWay}">
@@ -324,17 +324,17 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</ctc:SettingsCard> </ctc:SettingsCard>
<ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/TrimSettingsGroup"> <ctc:SettingsExpander x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/TrimSettingsGroup">
<ctc:SettingsExpander.HeaderIcon> <ctc:SettingsExpander.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="{ThemeResource ImageHomePlaylistViewTrim}"/> UriSource="{ThemeResource ImageHomeVideoCollectionViewTrim}"/>
</ctc:SettingsExpander.HeaderIcon> </ctc:SettingsExpander.HeaderIcon>
<ctc:SettingsExpander.Items> <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}" <c:TimeSpanControl Value="{Binding Key.TrimStart, Mode=TwoWay}"
Maximum="{Binding Key.TrimEnd, Mode=OneWay}"/> Maximum="{Binding Key.TrimEnd, Mode=OneWay}"/>
</ctc:SettingsCard> </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}" <c:TimeSpanControl Minimum="{Binding Key.TrimStart, Mode=OneWay}"
Value="{Binding Key.TrimEnd, Mode=TwoWay}" Value="{Binding Key.TrimEnd, Mode=TwoWay}"
Maximum="{Binding Key.Duration, Mode=OneWay}"/> Maximum="{Binding Key.Duration, Mode=OneWay}"/>
@@ -343,29 +343,29 @@
</ctc:SettingsExpander> </ctc:SettingsExpander>
</StackPanel> </StackPanel>
<StackPanel Spacing="5"> <StackPanel Spacing="5">
<TextBlock x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FileOptionsHeader" <TextBlock x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FileOptionsHeader"
FontWeight="Bold" FontWeight="Bold"
FontSize="15"/> FontSize="15"/>
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/DirectorySettingsCard" <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/DirectorySettingsCard"
Description="{Binding Key.DirectoryPath}"> Description="{Binding Key.DirectoryPath}">
<ctc:SettingsCard.HeaderIcon> <ctc:SettingsCard.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="{ThemeResource ImageHomePlaylistViewDirectory}"/> UriSource="{ThemeResource ImageHomeVideoCollectionViewDirectory}"/>
</ctc:SettingsCard.HeaderIcon> </ctc:SettingsCard.HeaderIcon>
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/DirectorySettingsCardButton" <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/DirectorySettingsCardButton"
Command="{Binding Key.BrowseCommand}"/> Command="{Binding Key.BrowseCommand}"/>
</ctc:SettingsCard> </ctc:SettingsCard>
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FilenameSettingsCard"> <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FilenameSettingsCard">
<ctc:SettingsCard.HeaderIcon> <ctc:SettingsCard.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="{ThemeResource ImageHomePlaylistViewFilename}"/> UriSource="{ThemeResource ImageHomeVideoCollectionViewFilename}"/>
</ctc:SettingsCard.HeaderIcon> </ctc:SettingsCard.HeaderIcon>
<TextBox Text="{Binding Key.Filename, Mode=TwoWay}"/> <TextBox Text="{Binding Key.Filename, Mode=TwoWay}"/>
</ctc:SettingsCard> </ctc:SettingsCard>
<ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/FileTypeSettingsCard"> <ctc:SettingsCard x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/FileTypeSettingsCard">
<ctc:SettingsCard.HeaderIcon> <ctc:SettingsCard.HeaderIcon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="{ThemeResource ImageHomePlaylistViewExtension}"/> UriSource="{ThemeResource ImageHomeVideoCollectionViewExtension}"/>
</ctc:SettingsCard.HeaderIcon> </ctc:SettingsCard.HeaderIcon>
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<ic:DataTriggerBehavior Binding="{Binding Key.MediaType, Converter={StaticResource ObjectToStringConverter}}" <ic:DataTriggerBehavior Binding="{Binding Key.MediaType, Converter={StaticResource ObjectToStringConverter}}"
@@ -414,9 +414,9 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="10"> Spacing="10">
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/CreateAndStartButton" <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/CreateAndStartButton"
Command="{Binding CreateTasksAndDownloadCommand}"/> Command="{Binding CreateTasksAndDownloadCommand}"/>
<Button x:Uid="/VDownload.Core.Strings/HomePlaylistViewResources/CreateButton" <Button x:Uid="/VDownload.Core.Strings/HomeVideoCollectionViewResources/CreateButton"
Style="{StaticResource AccentButtonStyle}" Style="{StaticResource AccentButtonStyle}"
Command="{Binding CreateTasksCommand}"/> Command="{Binding CreateTasksCommand}"/>
</StackPanel> </StackPanel>

View File

@@ -8,7 +8,7 @@ namespace VDownload.Services.UI.StringResources
StringResources BaseViewResources { get; } StringResources BaseViewResources { get; }
StringResources HomeViewResources { get; } StringResources HomeViewResources { get; }
StringResources HomeVideoViewResources { get; } StringResources HomeVideoViewResources { get; }
StringResources HomePlaylistViewResources { get; } StringResources HomeVideoCollectionViewResources { get; }
StringResources HomeDownloadsViewResources { get; } StringResources HomeDownloadsViewResources { get; }
StringResources AuthenticationViewResources { get; } StringResources AuthenticationViewResources { get; }
StringResources NotificationsResources { get; } StringResources NotificationsResources { get; }
@@ -37,7 +37,7 @@ namespace VDownload.Services.UI.StringResources
public StringResources BaseViewResources { get; protected set; } public StringResources BaseViewResources { get; protected set; }
public StringResources HomeViewResources { get; protected set; } public StringResources HomeViewResources { get; protected set; }
public StringResources HomeVideoViewResources { 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 HomeDownloadsViewResources { get; protected set; }
public StringResources AuthenticationViewResources { get; protected set; } public StringResources AuthenticationViewResources { get; protected set; }
public StringResources NotificationsResources { get; protected set; } public StringResources NotificationsResources { get; protected set; }
@@ -61,7 +61,7 @@ namespace VDownload.Services.UI.StringResources
BaseViewResources = BuildResource("BaseViewResources"); BaseViewResources = BuildResource("BaseViewResources");
HomeViewResources = BuildResource("HomeViewResources"); HomeViewResources = BuildResource("HomeViewResources");
HomeVideoViewResources = BuildResource("HomeVideoViewResources"); HomeVideoViewResources = BuildResource("HomeVideoViewResources");
HomePlaylistViewResources = BuildResource("HomePlaylistViewResources"); HomeVideoCollectionViewResources = BuildResource("HomeVideoCollectionViewResources");
HomeDownloadsViewResources = BuildResource("HomeDownloadsViewResources"); HomeDownloadsViewResources = BuildResource("HomeDownloadsViewResources");
AuthenticationViewResources = BuildResource("AuthenticationViewResources"); AuthenticationViewResources = BuildResource("AuthenticationViewResources");
NotificationsResources = BuildResource("NotificationsResources"); NotificationsResources = BuildResource("NotificationsResources");

View File

@@ -16,7 +16,7 @@
<ResourceDictionary Source="Dictionaries/Images/ImagesBaseView.xaml"/> <ResourceDictionary Source="Dictionaries/Images/ImagesBaseView.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesHomeView.xaml"/> <ResourceDictionary Source="Dictionaries/Images/ImagesHomeView.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesHomeDownloadsView.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/ImagesHomeVideoView.xaml"/>
<ResourceDictionary Source="Dictionaries/Images/ImagesSettingsView.xaml"/> <ResourceDictionary Source="Dictionaries/Images/ImagesSettingsView.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

Before

Width:  |  Height:  |  Size: 40 KiB

After

Width:  |  Height:  |  Size: 40 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

View File

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

View File

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

View File

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

View File

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

View File

@@ -49,26 +49,26 @@
<Content Remove="Assets\HomeDownloadsView\QueuedLight.png" /> <Content Remove="Assets\HomeDownloadsView\QueuedLight.png" />
<Content Remove="Assets\HomeDownloadsView\TimeDark.png" /> <Content Remove="Assets\HomeDownloadsView\TimeDark.png" />
<Content Remove="Assets\HomeDownloadsView\TimeLight.png" /> <Content Remove="Assets\HomeDownloadsView\TimeLight.png" />
<Content Remove="Assets\HomePlaylistView\AuthorDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\AuthorDark.png" />
<Content Remove="Assets\HomePlaylistView\AuthorLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\AuthorLight.png" />
<Content Remove="Assets\HomePlaylistView\DateDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\DateDark.png" />
<Content Remove="Assets\HomePlaylistView\DateLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\DateLight.png" />
<Content Remove="Assets\HomePlaylistView\DirectoryDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\DirectoryDark.png" />
<Content Remove="Assets\HomePlaylistView\DirectoryLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\DirectoryLight.png" />
<Content Remove="Assets\HomePlaylistView\ExtensionDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\ExtensionDark.png" />
<Content Remove="Assets\HomePlaylistView\ExtensionLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\ExtensionLight.png" />
<Content Remove="Assets\HomePlaylistView\FilenameDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\FilenameDark.png" />
<Content Remove="Assets\HomePlaylistView\FilenameLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\FilenameLight.png" />
<Content Remove="Assets\HomePlaylistView\MediaDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\MediaDark.png" />
<Content Remove="Assets\HomePlaylistView\MediaLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\MediaLight.png" />
<Content Remove="Assets\HomePlaylistView\QualityDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\QualityDark.png" />
<Content Remove="Assets\HomePlaylistView\QualityLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\QualityLight.png" />
<Content Remove="Assets\HomePlaylistView\TimeDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\TimeDark.png" />
<Content Remove="Assets\HomePlaylistView\TimeLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\TimeLight.png" />
<Content Remove="Assets\HomePlaylistView\TrimDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\TrimDark.png" />
<Content Remove="Assets\HomePlaylistView\TrimLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\TrimLight.png" />
<Content Remove="Assets\HomePlaylistView\ViewDark.png" /> <Content Remove="Assets\HomeVideoCollectionView\ViewDark.png" />
<Content Remove="Assets\HomePlaylistView\ViewLight.png" /> <Content Remove="Assets\HomeVideoCollectionView\ViewLight.png" />
<Content Remove="Assets\HomeVideoView\AuthorDark.png" /> <Content Remove="Assets\HomeVideoView\AuthorDark.png" />
<Content Remove="Assets\HomeVideoView\AuthorLight.png" /> <Content Remove="Assets\HomeVideoView\AuthorLight.png" />
<Content Remove="Assets\HomeVideoView\DateDark.png" /> <Content Remove="Assets\HomeVideoView\DateDark.png" />
@@ -154,7 +154,7 @@
<None Remove="Dictionaries\Converters.xaml" /> <None Remove="Dictionaries\Converters.xaml" />
<None Remove="Dictionaries\Images\ImagesBaseView.xaml" /> <None Remove="Dictionaries\Images\ImagesBaseView.xaml" />
<None Remove="Dictionaries\Images\ImagesHomeDownloadsView.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\ImagesHomeVideoView.xaml" />
<None Remove="Dictionaries\Images\ImagesHomeView.xaml" /> <None Remove="Dictionaries\Images\ImagesHomeView.xaml" />
<None Remove="Dictionaries\Images\ImagesLogo.xaml" /> <None Remove="Dictionaries\Images\ImagesLogo.xaml" />
@@ -372,64 +372,64 @@
<None Update="Assets\HomeDownloadsView\TimeLight.png"> <None Update="Assets\HomeDownloadsView\TimeLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\AuthorDark.png"> <None Update="Assets\HomeVideoCollectionView\AuthorDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\AuthorLight.png"> <None Update="Assets\HomeVideoCollectionView\AuthorLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\DateDark.png"> <None Update="Assets\HomeVideoCollectionView\DateDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\DateLight.png"> <None Update="Assets\HomeVideoCollectionView\DateLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\DirectoryDark.png"> <None Update="Assets\HomeVideoCollectionView\DirectoryDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\DirectoryLight.png"> <None Update="Assets\HomeVideoCollectionView\DirectoryLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\ExtensionDark.png"> <None Update="Assets\HomeVideoCollectionView\ExtensionDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\ExtensionLight.png"> <None Update="Assets\HomeVideoCollectionView\ExtensionLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\FilenameDark.png"> <None Update="Assets\HomeVideoCollectionView\FilenameDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\FilenameLight.png"> <None Update="Assets\HomeVideoCollectionView\FilenameLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\MediaDark.png"> <None Update="Assets\HomeVideoCollectionView\MediaDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\MediaLight.png"> <None Update="Assets\HomeVideoCollectionView\MediaLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\QualityDark.png"> <None Update="Assets\HomeVideoCollectionView\QualityDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\QualityLight.png"> <None Update="Assets\HomeVideoCollectionView\QualityLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\TimeDark.png"> <None Update="Assets\HomeVideoCollectionView\TimeDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\TimeLight.png"> <None Update="Assets\HomeVideoCollectionView\TimeLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\TrimDark.png"> <None Update="Assets\HomeVideoCollectionView\TrimDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\TrimLight.png"> <None Update="Assets\HomeVideoCollectionView\TrimLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\ViewDark.png"> <None Update="Assets\HomeVideoCollectionView\ViewDark.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomePlaylistView\ViewLight.png"> <None Update="Assets\HomeVideoCollectionView\ViewLight.png">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Update="Assets\HomeVideoView\AuthorDark.png"> <None Update="Assets\HomeVideoView\AuthorDark.png">
@@ -534,7 +534,7 @@
<Page Update="Dictionaries\Images\ImagesOther.xaml"> <Page Update="Dictionaries\Images\ImagesOther.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Update="Dictionaries\Images\ImagesHomePlaylistView.xaml"> <Page Update="Dictionaries\Images\ImagesHomeVideoCollectionView.xaml">
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
</Page> </Page>
<Page Update="Dictionaries\Images\ImagesHomeDownloadsView.xaml"> <Page Update="Dictionaries\Images\ImagesHomeDownloadsView.xaml">