Skip to content

Commit 3a81742

Browse files
Guerra24Guerra24
committed
Mobile fully working, removed duplicated NuGet packages.
1 parent 7415073 commit 3a81742

27 files changed

+94
-243
lines changed

‎MALClient.Desktop/MALClient.UWP.Desktop.csproj

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -571,15 +571,6 @@
571571
<WCFMetadata Include="Connected Services\" />
572572
</ItemGroup>
573573
<ItemGroup>
574-
<PackageReference Include="FontAwesome.UWP">
575-
<Version>4.7.0.9</Version>
576-
</PackageReference>
577-
<PackageReference Include="HockeySDK.UWP">
578-
<Version>4.1.6</Version>
579-
</PackageReference>
580-
<PackageReference Include="HtmlAgilityPack">
581-
<Version>1.7.1</Version>
582-
</PackageReference>
583574
<PackageReference Include="Microsoft.Advertising.XAML">
584575
<Version>10.1705.16001</Version>
585576
</PackageReference>
@@ -589,26 +580,8 @@
589580
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
590581
<Version>6.0.8</Version>
591582
</PackageReference>
592-
<PackageReference Include="Microsoft.Services.Store.SDK">
593-
<Version>10.1705.16001</Version>
594-
</PackageReference>
595-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
596-
<Version>2.2.0</Version>
597-
</PackageReference>
598-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
599-
<Version>2.2.0</Version>
600-
</PackageReference>
601-
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
602-
<Version>2.2.0</Version>
603-
</PackageReference>
604-
<PackageReference Include="MvvmLightLibs">
605-
<Version>5.4.1</Version>
606-
</PackageReference>
607-
<PackageReference Include="Newtonsoft.Json">
608-
<Version>11.0.1</Version>
609-
</PackageReference>
610-
<PackageReference Include="WinRTXamlToolkit">
611-
<Version>2.3.0</Version>
583+
<PackageReference Include="Microsoft.Services.Store.Engagement">
584+
<Version>10.1711.28001</Version>
612585
</PackageReference>
613586
</ItemGroup>
614587
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">

‎MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,17 +40,9 @@
4040
<xamlConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
4141
</Page.Resources>
4242

43-
<Grid>
44-
<Grid.Background>
45-
<AcrylicBrush
46-
BackgroundSource="HostBackdrop"
47-
TintColor="{StaticResource BrushDeepBackgroundColor}"
48-
TintOpacity="0.8"
49-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
50-
</Grid.Background>
51-
<ScrollViewer>
52-
53-
<Grid>
43+
<Grid Background="{StaticResource PageBackground}">
44+
<ScrollViewer>
45+
<Grid>
5446
<Grid.RowDefinitions>
5547
<RowDefinition Height="Auto" />
5648
<RowDefinition Height="Auto" />

‎MALClient.Desktop/Pages/Main/AnimeListPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,8 @@
2525
<x:String x:Key="WorkModeAnyOther">AnyWorkMode</x:String>
2626
</Page.Resources>
2727

28-
<Grid>
29-
<Grid.Background>
30-
<AcrylicBrush
31-
BackgroundSource="HostBackdrop"
32-
TintColor="{StaticResource BrushDeepBackgroundColor}"
33-
TintOpacity="0.90"
34-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
35-
</Grid.Background>
36-
<Grid.RowDefinitions>
28+
<Grid Background="{StaticResource PageBackground}">
29+
<Grid.RowDefinitions>
3730
<RowDefinition Height="*" />
3831
<RowDefinition Height="Auto" />
3932
</Grid.RowDefinitions>

‎MALClient.Desktop/Pages/Main/AnimeSearchPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,8 @@
2424

2525
</Page.Resources>
2626

27-
<Grid>
28-
<Grid.Background>
29-
<AcrylicBrush
30-
BackgroundSource="HostBackdrop"
31-
TintColor="{StaticResource BrushDeepBackgroundColor}"
32-
TintOpacity="0.80"
33-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
34-
</Grid.Background>
35-
<Grid.RowDefinitions>
27+
<Grid Background="{StaticResource PageBackground}">
28+
<Grid.RowDefinitions>
3629
<RowDefinition Height="Auto"/>
3730
<RowDefinition Height="Auto"/>
3831
<RowDefinition Height="*"/>

‎MALClient.Desktop/Pages/Main/CalendarPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,8 @@
6868
<xamlConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
6969
</ResourceDictionary>
7070
</Page.Resources>
71-
<Grid>
72-
<Grid.Background>
73-
<AcrylicBrush
74-
BackgroundSource="HostBackdrop"
75-
TintColor="{StaticResource BrushDeepBackgroundColor}"
76-
TintOpacity="0.8"
77-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
78-
</Grid.Background>
79-
<Pivot x:Name="RootPivot" Margin="0,0,-12,0"
71+
<Grid Background="{StaticResource PageBackground}">
72+
<Pivot x:Name="RootPivot" Margin="0,0,-12,0"
8073
Style="{StaticResource PivotStyleOuterProfilePage}" Visibility="{Binding CalendarVisibility,Converter={StaticResource BoolToVisibilityConverter}}"
8174
ItemsSource="{Binding CalendarData}">
8275
<Pivot.Resources>

‎MALClient.Desktop/Pages/Main/MalArticlesPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,8 @@
1111
<Page.Resources>
1212
<xamlConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
1313
</Page.Resources>
14-
<Grid>
15-
<Grid.Background>
16-
<AcrylicBrush
17-
BackgroundSource="HostBackdrop"
18-
TintColor="{StaticResource BrushDeepBackgroundColor}"
19-
TintOpacity="0.8"
20-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
21-
</Grid.Background>
22-
<ProgressRing IsActive="True" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center"
14+
<Grid Background="{StaticResource PageBackground}">
15+
<ProgressRing IsActive="True" Width="75" Height="75" HorizontalAlignment="Center" VerticalAlignment="Center"
2316
Visibility="{Binding LoadingVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
2417
<WebView x:Name="ArticleWebView" DOMContentLoaded="ArticleWebView_OnDOMContentLoaded"
2518
NavigationStarting="ArticleWebView_OnNavigationStarting" RequestedTheme="Dark"

‎MALClient.Desktop/Pages/Main/PopularVideosPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,8 @@
1111
<Page.Resources>
1212
<xamlConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
1313
</Page.Resources>
14-
<Grid HorizontalAlignment="Stretch">
15-
<Grid.Background>
16-
<AcrylicBrush
17-
BackgroundSource="HostBackdrop"
18-
TintColor="{StaticResource BrushDeepBackgroundColor}"
19-
TintOpacity="0.8"
20-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
21-
</Grid.Background>
22-
<GridView ItemsSource="{Binding Videos}" ItemClick="ListViewBase_OnItemClick" HorizontalAlignment="Stretch" Background="Transparent" IsItemClickEnabled="True">
14+
<Grid HorizontalAlignment="Stretch" Background="{StaticResource PageBackground}">
15+
<GridView ItemsSource="{Binding Videos}" ItemClick="ListViewBase_OnItemClick" HorizontalAlignment="Stretch" Background="Transparent" IsItemClickEnabled="True">
2316
<GridView.ItemContainerStyle>
2417
<Style TargetType="GridViewItem">
2518
<Setter Property="Margin" Value="6,5" />

‎MALClient.Desktop/Pages/Main/ProfilePage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,8 @@
4646
</Page.Transitions>
4747

4848

49-
<Grid>
50-
<Grid.Background>
51-
<AcrylicBrush
52-
BackgroundSource="HostBackdrop"
53-
TintColor="{StaticResource BrushDeepBackgroundColor}"
54-
TintOpacity="0.8"
55-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
56-
</Grid.Background>
57-
<ScrollViewer>
49+
<Grid Background="{StaticResource PageBackground}">
50+
<ScrollViewer>
5851
<Grid>
5952
<Grid.ColumnDefinitions>
6053
<ColumnDefinition Width="58" />

‎MALClient.Desktop/Pages/Main/RecommendationsPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,8 @@
2626
</Page.Resources>
2727

2828

29-
<Grid>
30-
<Grid.Background>
31-
<AcrylicBrush
32-
BackgroundSource="HostBackdrop"
33-
TintColor="{StaticResource BrushDeepBackgroundColor}"
34-
TintOpacity="0.8"
35-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
36-
</Grid.Background>
37-
<VisualStateManager.VisualStateGroups>
29+
<Grid Background="{StaticResource PageBackground}">
30+
<VisualStateManager.VisualStateGroups>
3831
<VisualStateGroup x:Name="VisualStateGroup">
3932
<VisualState x:Name="Narrow">
4033
<VisualState.StateTriggers>

‎MALClient.Desktop/Pages/Main/WallpapersPage.xaml

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,8 @@
1717
<xamlConverters:BoolInverterConverter x:Key="BoolInverterConverter" />
1818
</Page.Resources>
1919

20-
<Grid>
21-
<Grid.Background>
22-
<AcrylicBrush
23-
BackgroundSource="HostBackdrop"
24-
TintColor="{StaticResource BrushDeepBackgroundColor}"
25-
TintOpacity="0.8"
26-
FallbackColor="{StaticResource ColorDetailsBackground}"/>
27-
</Grid.Background>
28-
<Grid.RowDefinitions>
20+
<Grid Background="{StaticResource PageBackground}">
21+
<Grid.RowDefinitions>
2922
<RowDefinition Height="*"/>
3023
<RowDefinition Height="Auto"/>
3124
</Grid.RowDefinitions>

‎MALClient.Desktop/Pages/Off/AnimeDetailsPage.xaml

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -781,15 +781,15 @@
781781
TextWrapping="WrapWholeWords" TextAlignment="Center" HorizontalAlignment="Center"
782782
VerticalAlignment="Center" Foreground="#FFB9B9B9" />
783783
<MenuFlyoutSeparator />
784-
<TextBlock Text="Characters &amp; Staff" FontWeight="Bold" HorizontalAlignment="Center"
785-
Visibility="{Binding LoadCharactersButtonVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
786-
<Button HorizontalAlignment="Center" Content="Load characters"
784+
<TextBlock Text="Characters &amp; Voice actors" FontWeight="Bold"
785+
HorizontalAlignment="Center" Margin="0,3" />
786+
<Button HorizontalAlignment="Center" Content="Load characters"
787787
Command="{Binding LoadCharactersCommand}"
788788
Visibility="{Binding LoadCharactersButtonVisibility,Converter={StaticResource BoolToVisibilityConverter}}"
789-
Margin="5,10"
789+
Margin="5,10,5,20"
790790
BorderThickness="1"
791791
Style="{StaticResource ButtonRevealStyle}"/>
792-
<ProgressRing IsActive="True" Width="40" Height="40" Margin="0,15"
792+
<ProgressRing IsActive="True" Width="40" Height="40" Margin="0,5,0,15"
793793
Visibility="{Binding LoadingCharactersVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
794794
<Grid HorizontalAlignment="Center"
795795
Visibility="{Binding CharactersGridVisibility,Converter={StaticResource BoolToVisibilityConverter}}">
@@ -799,10 +799,8 @@
799799
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
800800
</Style>
801801
</Grid.Resources>
802-
<StackPanel>
803-
<TextBlock Text="Characters &amp; Voice actors" FontWeight="Bold"
804-
HorizontalAlignment="Center" Margin="0,3" />
805-
<ItemsControl ItemsSource="{Binding AnimeStaffData.AnimeCharacterPairs}">
802+
<StackPanel>
803+
<ItemsControl ItemsSource="{Binding AnimeStaffData.AnimeCharacterPairs}">
806804
<ItemsControl.ItemsPanel>
807805
<ItemsPanelTemplate>
808806
<WrapGrid ItemHeight="300" ItemWidth="266"

‎MALClient.Desktop/XamlResources/ThemeDictionary.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
<SolidColorBrush x:Key="AnimeGridItemTextDays" Color="#383838"/>
5151
<AcrylicBrush x:Key="AnimeGridItemGridBackground" BackgroundSource="Backdrop" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.5" FallbackColor="{StaticResource BrushDeepBackgroundColor}"/>
5252
<AcrylicBrush x:Key="PopUpBackground" BackgroundSource="Backdrop" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.7" FallbackColor="{StaticResource BrushDeepBackgroundColor}"/>
53+
<AcrylicBrush x:Key="PageBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.8" FallbackColor="{StaticResource ColorDetailsBackground}"/>
5354
</ResourceDictionary>
5455
<ResourceDictionary x:Key="Dark">
5556
<SolidColorBrush x:Key="BrushText" Color="White" />
@@ -97,6 +98,7 @@
9798
<SolidColorBrush x:Key="AnimeGridItemTextDays" Color="LightGray"/>
9899
<AcrylicBrush x:Key="AnimeGridItemGridBackground" BackgroundSource="Backdrop" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.5" FallbackColor="{StaticResource BrushDeepBackgroundColor}"/>
99100
<AcrylicBrush x:Key="PopUpBackground" BackgroundSource="Backdrop" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.7" FallbackColor="{StaticResource BrushDeepBackgroundColor}"/>
101+
<AcrylicBrush x:Key="PageBackground" BackgroundSource="HostBackdrop" TintColor="{StaticResource BrushDeepBackgroundColor}" TintOpacity="0.8" FallbackColor="{StaticResource ColorDetailsBackground}"/>
100102
</ResourceDictionary>
101103
</ResourceDictionary.ThemeDictionaries>
102104
</ResourceDictionary>

‎MALClient.Mobile/MALClient.UWP.Mobile.csproj

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -523,36 +523,12 @@
523523
<WCFMetadata Include="Connected Services\" />
524524
</ItemGroup>
525525
<ItemGroup>
526-
<PackageReference Include="FontAwesome.UWP">
527-
<Version>4.7.0.9</Version>
528-
</PackageReference>
529-
<PackageReference Include="HockeySDK.UWP">
530-
<Version>4.1.6</Version>
531-
</PackageReference>
532-
<PackageReference Include="HtmlAgilityPack">
533-
<Version>1.7.1</Version>
534-
</PackageReference>
535-
<PackageReference Include="Microsoft.Net.Http">
536-
<Version>2.2.29</Version>
537-
</PackageReference>
538-
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
539-
<Version>6.0.8</Version>
540-
</PackageReference>
541-
<PackageReference Include="Microsoft.Services.Store.SDK">
542-
<Version>10.1705.16001</Version>
543-
</PackageReference>
544526
<PackageReference Include="MvvmLight">
545527
<Version>5.4.1</Version>
546528
</PackageReference>
547-
<PackageReference Include="Newtonsoft.Json">
548-
<Version>11.0.1</Version>
549-
</PackageReference>
550529
<PackageReference Include="System.Net.Http">
551530
<Version>4.3.3</Version>
552531
</PackageReference>
553-
<PackageReference Include="WinRTXamlToolkit">
554-
<Version>2.3.0</Version>
555-
</PackageReference>
556532
</ItemGroup>
557533
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
558534
<VisualStudioVersion>14.0</VisualStudioVersion>

‎MALClient.Mobile/Pages/Main/AnimeListPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@
287287
Visibility="{Binding DisplayMode,Converter={StaticResource DisplayModeToPresenterControlVisibility},ConverterParameter={StaticResource IndefiniteGridString}}">
288288
<GridView.ItemsPanel>
289289
<ItemsPanelTemplate>
290-
<ItemsWrapGrid x:Name="GridViewWrapPanel" CacheLength="10" Orientation="Horizontal" HorizontalAlignment="Center" ItemHeight="345" ItemWidth="{Binding MaxWidth}"/>
290+
<ItemsWrapGrid x:Name="GridViewWrapPanel" CacheLength="10" Orientation="Horizontal" HorizontalAlignment="Center" ItemWidth="{Binding MaxWidth}"/>
291291
</ItemsPanelTemplate>
292292
</GridView.ItemsPanel>
293293
<GridView.ItemTemplate>

‎MALClient.Mobile/Pages/Main/CalendarPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<DataTemplate>
9696
<Grid>
9797
<items:AnimeGridItem DataContext="{Binding}" DisplayAirTillTime="True" DisplayContext="AirDay" AllowSwipeInGivenContext="False"/>
98-
<Button HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,90" Padding="7"
98+
<Button HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,90" Padding="7.5"
9999
Command="{Binding Source={StaticResource Locator},Path=CalendarPage.ExportToCalendarCommand}"
100100
CommandParameter="{Binding}">
101101
<Button.Background>

‎MALClient.Mobile/Pages/Main/FriendsFeedsPage.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<GridView ItemsSource="{Binding Feeds}" HorizontalAlignment="Stretch" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="OnItemClick">
1919
<GridView.ItemsPanel>
2020
<ItemsPanelTemplate>
21-
<ItemsWrapGrid Margin="0,0,16,0" Orientation="Horizontal" HorizontalAlignment="Center"
21+
<ItemsWrapGrid Margin="0" Orientation="Horizontal" HorizontalAlignment="Center"
2222
ItemWidth="{Binding ItemWidth}" ItemHeight="325" />
2323
</ItemsPanelTemplate>
2424
</GridView.ItemsPanel>

‎MALClient.Mobile/Pages/Off/AnimeDetailsPage.xaml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -822,17 +822,16 @@
822822
TextWrapping="WrapWholeWords" TextAlignment="Center" HorizontalAlignment="Center"
823823
VerticalAlignment="Center" Foreground="#FFB9B9B9" />
824824
<MenuFlyoutSeparator />
825-
<TextBlock Text="Characters &amp; Staff" FontWeight="Bold"
826-
HorizontalAlignment="Center"
827-
Visibility="{Binding LoadCharactersButtonVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
828-
<Button HorizontalAlignment="Center" Content="Load characters"
825+
<TextBlock Text="Characters &amp; Voice actors" FontWeight="Bold"
826+
HorizontalAlignment="Center" Margin="0,3" />
827+
<Button HorizontalAlignment="Center" Content="Load characters"
829828
Command="{Binding LoadCharactersCommand}"
830829
Visibility="{Binding LoadCharactersButtonVisibility,Converter={StaticResource BoolToVisibilityConverter}}"
831830
Background="{ThemeResource AppBarBackgroundThemeBrush}"
832-
Margin="5"
831+
Margin="15"
833832
BorderThickness="2"
834833
BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}" />
835-
<ProgressRing IsActive="True"
834+
<ProgressRing IsActive="True" Width="40" Height="40" Margin="15"
836835
Visibility="{Binding LoadingCharactersVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
837836
</StackPanel>
838837
<Grid Grid.Row="2" HorizontalAlignment="Center"
@@ -843,10 +842,8 @@
843842
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
844843
</Style>
845844
</Grid.Resources>
846-
<StackPanel>
847-
<TextBlock Text="Characters &amp; Voice actors" FontWeight="Bold"
848-
HorizontalAlignment="Center" Margin="0,3" />
849-
<ItemsControl
845+
<StackPanel>
846+
<ItemsControl
850847
ItemsSource="{Binding AnimeStaffData.AnimeCharacterPairs}"
851848
HorizontalAlignment="Center">
852849
<ItemsControl.ItemsPanel>

‎MALClient.Mobile/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("MALClient")]
13-
[assembly: AssemblyCopyright("Copyright © Piotr Szymczak 2016")]
13+
[assembly: AssemblyCopyright("Copyright © Piotr Szymczak 2018")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

0 commit comments

Comments
 (0)