mr.mohande3
/
Plix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Packages

master
Amir Hossein Khademi 2021-03-07 16:14:25 +03:30
parent c91bde761e
commit ee4cabb631
8 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PlixP/App.xaml
View File

@ -15,7 +15,9 @@
<ResourceDictionary> <ResourceDictionary>
<ResourceDictionary.MergedDictionaries> <ResourceDictionary.MergedDictionaries>
<hc:Theme Name="HandyTheme" Skin="Dark" />
<hc:ThemeResources />
<hc:Theme />
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<ResourceDictionary x:Key="DictionaryTest"> <ResourceDictionary x:Key="DictionaryTest">
<system:String x:Key="str1a">String 1A</system:String> <system:String x:Key="str1a">String 1A</system:String>

3
PlixP/App.xaml.cs
View File

@ -6,6 +6,7 @@ using Prism.Ioc;
using PlixP.Views; using PlixP.Views;
using System.Windows; using System.Windows;
using AutoMapper; using AutoMapper;
using HandyControl.Themes;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using PlixP.Extentions; using PlixP.Extentions;
using PlixP.Models; using PlixP.Models;
@ -38,6 +39,8 @@ namespace PlixP
} }
} }
ThemeManager.Current.ApplicationTheme = ApplicationTheme.Dark;
AutoMapperConfig.ConfigurationMapper(); AutoMapperConfig.ConfigurationMapper();
App.Current.ConfigureExceptionHandling(AppDomain.CurrentDomain); App.Current.ConfigureExceptionHandling(AppDomain.CurrentDomain);
MovieServiceRealTime.Instance.StartReal(); MovieServiceRealTime.Instance.StartReal();

12
PlixP/PlixP.csproj
View File

@ -16,16 +16,16 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="HandyControls" Version="3.0.0-rc.1" /> <PackageReference Include="HandyControls" Version="3.2.0" />
<PackageReference Include="MaterialDesignColors" Version="2.0.0-ci2312" /> <PackageReference Include="MaterialDesignColors" Version="2.0.0" />
<PackageReference Include="MaterialDesignThemes" Version="4.0.0-ci2312" /> <PackageReference Include="MaterialDesignThemes" Version="4.0.0-ci2312" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.1"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.3">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.3" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.1"> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.3">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>

2
PlixP/Services/MovieServices.cs
View File

@ -354,7 +354,7 @@ namespace PlixP.Services
MovieCount = 1, MovieCount = 1,
Name = trim Name = trim
}; };
foreach (var movie in Movies.Where(m=>m.Genre.Contains(trim))) foreach (var movie in Movies.Where(m=>m.Genre!=null && m.Genre.Contains(trim)))
{ {
var poster = movie.Poster; var poster = movie.Poster;
if (!genres.Any(g => g.Image == poster)) if (!genres.Any(g => g.Image == poster))

2
PlixP/Views/Dialogs/GenresDialog.xaml
View File

@ -31,7 +31,7 @@
<Button <Button
Grid.Column="1" Grid.Column="1"
Margin="0,0,0,0" Margin="0,0,0,0"
Padding="9,8,0,0" Padding="0,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Background="#FF5252" Background="#FF5252"
BorderThickness="0" BorderThickness="0"

8
PlixP/Views/Dialogs/MovieDialog.xaml
View File

@ -243,7 +243,7 @@
Width="40" Width="40"
Height="40" Height="40"
Margin="0,0,10,0" Margin="0,0,10,0"
Padding="5,7,0,0" Padding="0,0,0,0"
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Click="Edit_OnClick" Click="Edit_OnClick"
Resources="{StaticResource Material}" Resources="{StaticResource Material}"
@ -252,7 +252,7 @@
</Button> </Button>
<Button <Button
Margin="0,5,0,0" Margin="0,5,0,0"
Padding="9,8,0,0" Padding="0,0,0,0"
Background="#FF5252" Background="#FF5252"
BorderThickness="0" BorderThickness="0"
Command="hc:ControlCommands.Close" Command="hc:ControlCommands.Close"
@ -271,7 +271,7 @@
HorizontalAlignment="Right" HorizontalAlignment="Right"
VerticalAlignment="Center"> VerticalAlignment="Center">
<Button <Button
Padding="12,5,0,0" Padding="0,0,0,0"
Command="{Binding OpenFolderCommand}" Command="{Binding OpenFolderCommand}"
Resources="{StaticResource Material}" Resources="{StaticResource Material}"
Style="{StaticResource MaterialDesignIconButton}"> Style="{StaticResource MaterialDesignIconButton}">
@ -280,7 +280,7 @@
<Button <Button
Width="60" Width="60"
Height="60" Height="60"
Padding="22,15,0,0" Padding="0,0,0,0"
Background="#40eeeeee" Background="#40eeeeee"
Command="{Binding PlayFileCommand}" Command="{Binding PlayFileCommand}"
Resources="{StaticResource Material}" Resources="{StaticResource Material}"

2
PlixP/Views/MainWindow.xaml
View File

@ -23,7 +23,7 @@
Width="50" Width="50"
Height="50" Height="50"
Margin="50,22,15,0" Margin="50,22,15,0"
Padding="8,15,0,0" Padding="0,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
VerticalAlignment="Top" VerticalAlignment="Top"
Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}" Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}"

6
PlixP/Views/MovieList.xaml
View File

@ -128,7 +128,7 @@
Margin="10,0,30,4" Margin="10,0,30,4"
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
Padding="6,7,0,0" Padding="0,0,0,0"
Command="{Binding RefreshCommand}" Command="{Binding RefreshCommand}"
Resources="{StaticResource Material}" Resources="{StaticResource Material}"
Style="{StaticResource MaterialDesignFloatingActionMiniButton}" Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
@ -137,7 +137,7 @@
</Button> </Button>
<Button <Button
Margin="10,0,0,0" Margin="10,0,0,0"
Padding="8,3,0,0" Padding="0,0,0,0"
Command="{Binding RefreshFilesCommand}" Command="{Binding RefreshFilesCommand}"
Resources="{StaticResource Material}" Resources="{StaticResource Material}"
Style="{StaticResource MaterialDesignFloatingActionMiniButton}" Style="{StaticResource MaterialDesignFloatingActionMiniButton}"
@ -165,7 +165,7 @@
<Button <Button
Grid.Column="5" Grid.Column="5"
Margin="15,0,50,0" Margin="15,0,50,0"
Padding="5,3,0,0" Padding="0,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
Click="SearchButtonBase_OnClick" Click="SearchButtonBase_OnClick"
Content="{materialDesign:PackIcon Search}" Content="{materialDesign:PackIcon Search}"