Skip to content

Commit b38e209

Browse files
Guerra24Guerra24
committed
Updated all libs and mobile should work.
Added: Support for notification RemoteId (not tested). Modified: Mobile look to match desktop. Bug: Large tile doesn't display logo (News & Articles).
1 parent 099b39d commit b38e209

File tree

23 files changed

+204
-190
lines changed

23 files changed

+204
-190
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@
572572
<Version>4.1.6</Version>
573573
</PackageReference>
574574
<PackageReference Include="HtmlAgilityPack">
575-
<Version>1.5.5</Version>
575+
<Version>1.6.13</Version>
576576
</PackageReference>
577577
<PackageReference Include="Microsoft.Advertising.XAML">
578578
<Version>10.1705.16001</Version>
@@ -581,25 +581,25 @@
581581
<Version>2.2.29</Version>
582582
</PackageReference>
583583
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
584-
<Version>5.3.4</Version>
584+
<Version>6.0.6</Version>
585585
</PackageReference>
586586
<PackageReference Include="Microsoft.Services.Store.SDK">
587587
<Version>10.1705.16001</Version>
588588
</PackageReference>
589589
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
590-
<Version>2.0.0</Version>
590+
<Version>2.1.1</Version>
591591
</PackageReference>
592592
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
593-
<Version>2.0.0</Version>
593+
<Version>2.1.1</Version>
594594
</PackageReference>
595595
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
596-
<Version>2.0.0</Version>
596+
<Version>2.1.1</Version>
597597
</PackageReference>
598598
<PackageReference Include="MvvmLightLibs">
599599
<Version>5.3.0</Version>
600600
</PackageReference>
601601
<PackageReference Include="Newtonsoft.Json">
602-
<Version>9.0.1</Version>
602+
<Version>10.0.3</Version>
603603
</PackageReference>
604604
<PackageReference Include="WinRTXamlToolkit">
605605
<Version>2.3.0</Version>

‎MALClient.Desktop/MainPage.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private void VmOnPropertyChanged(object sender, PropertyChangedEventArgs args)
164164
{
165165
SplitterColumn.Width = new GridLength(ViewModelLocator.GeneralMain.OffContentVisibility ? 16 : 0);
166166

167-
var width = ViewModelLocator.GeneralMain.OffContentVisibility ? (DataContext as MainViewModel).OffContentStatusBarWidth : 0;
167+
var width = ViewModelLocator.GeneralMain.OffContentVisibility ? (DataContext as MainViewModel).OffContentStatusBarWidth + 16 : 0;
168168
TitleBarRight.Margin = new Thickness(0, 0, Math.Max(width, CoreApplication.GetCurrentView().TitleBar.SystemOverlayRightInset), 0);
169169
}
170170
else if (args.PropertyName == nameof(ViewModelLocator.GeneralMain.AdsContainerVisibility))
@@ -323,7 +323,7 @@ private void TitleBar_LayoutMetricsChanged(CoreApplicationViewTitleBar coreTitle
323323
OffContentTopGrid.Margin = new Thickness(0, -coreTitleBar.Height, 0, 0);
324324
OffContentTopGrid.Padding = new Thickness(0, coreTitleBar.Height, 0, 0);
325325
TitleBarLeft.Margin = new Thickness(Math.Max(_paneState ? 250 : 48, coreTitleBar.SystemOverlayLeftInset), 0, 0, 0);
326-
var width = ViewModelLocator.GeneralMain.OffContentVisibility ? (DataContext as MainViewModel).OffContentStatusBarWidth : 0;
326+
var width = ViewModelLocator.GeneralMain.OffContentVisibility ? (DataContext as MainViewModel).OffContentStatusBarWidth + 16 : 0;
327327
TitleBarRight.Margin = new Thickness(0, 0, Math.Max(width, coreTitleBar.SystemOverlayRightInset), 0);
328328
}
329329

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

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<AssemblyName>MALClient</AssemblyName>
1212
<DefaultLanguage>en-US</DefaultLanguage>
1313
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
14-
<TargetPlatformVersion>10.0.14393.0</TargetPlatformVersion>
14+
<TargetPlatformVersion>10.0.15063.0</TargetPlatformVersion>
1515
<TargetPlatformMinVersion>10.0.10586.0</TargetPlatformMinVersion>
1616
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
1717
<FileAlignment>512</FileAlignment>
@@ -24,6 +24,7 @@
2424
<AppxPackageDir>C:\Users\dogie\Documents\VsBuilds\</AppxPackageDir>
2525
<PackageCertificateThumbprint>AD5778F7B956D67FCD8A45D45DBA0A4B5C5A3174</PackageCertificateThumbprint>
2626
<HockeyAppResourceId>b79e78858bdf44c4bfc3a1f37c8fd90c</HockeyAppResourceId>
27+
<RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
2728
</PropertyGroup>
2829
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2930
<DebugSymbols>true</DebugSymbols>
@@ -100,7 +101,6 @@
100101
<ItemGroup>
101102
<!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
102103
<None Include="MALClient.Mobile_StoreKey.pfx" />
103-
<None Include="project.json" />
104104
</ItemGroup>
105105
<ItemGroup>
106106
<Compile Include="App.xaml.cs">
@@ -481,7 +481,7 @@
481481
<SDKReference Include="Microsoft.VCLibs, Version=14.0">
482482
<Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
483483
</SDKReference>
484-
<SDKReference Include="WindowsMobile, Version=10.0.14393.0">
484+
<SDKReference Include="WindowsMobile, Version=10.0.15063.0">
485485
<Name>Windows Mobile Extensions for the UWP</Name>
486486
</SDKReference>
487487
</ItemGroup>
@@ -522,6 +522,38 @@
522522
<ItemGroup>
523523
<WCFMetadata Include="Connected Services\" />
524524
</ItemGroup>
525+
<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.6.13</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.6</Version>
540+
</PackageReference>
541+
<PackageReference Include="Microsoft.Services.Store.SDK">
542+
<Version>10.1705.16001</Version>
543+
</PackageReference>
544+
<PackageReference Include="MvvmLight">
545+
<Version>5.3.0</Version>
546+
</PackageReference>
547+
<PackageReference Include="Newtonsoft.Json">
548+
<Version>10.0.3</Version>
549+
</PackageReference>
550+
<PackageReference Include="System.Net.Http">
551+
<Version>4.3.3</Version>
552+
</PackageReference>
553+
<PackageReference Include="WinRTXamlToolkit">
554+
<Version>2.3.0</Version>
555+
</PackageReference>
556+
</ItemGroup>
525557
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
526558
<VisualStudioVersion>14.0</VisualStudioVersion>
527559
</PropertyGroup>

‎MALClient.Mobile/MainPage.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -280,10 +280,10 @@
280280
<Grid x:Name="PinDialog" Opacity="0" DataContext="{Binding Source={StaticResource UwpLocator},Path=PinTileDialog}"
281281
Visibility="{Binding GeneralVisibility}"
282282
VerticalAlignment="Stretch" HorizontalAlignment="Stretch" Grid.Row="1"
283-
Background="{ThemeResource BrushPinTileDialogOverlay}" Tapped="PinDialog_OnTapped">
283+
Background="Transparent" Tapped="PinDialog_OnTapped">
284284
<Grid x:Name="PinDialogInner" Margin="15,15,15,55"
285-
Background="{ThemeResource BrushPinTileDialogBackground}" VerticalAlignment="Center"
286-
HorizontalAlignment="Stretch" MaxWidth="450" Padding="10">
285+
Background="{StaticResource PopUpBackground}" VerticalAlignment="Center"
286+
HorizontalAlignment="Stretch" MaxWidth="450" Padding="10" BorderThickness="1" BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}">
287287
<Grid.RowDefinitions>
288288
<RowDefinition Height="Auto" />
289289
<RowDefinition Height="Auto" />

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

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@
209209
Margin="3,1,-2,1" Padding="3,0,0,0"
210210
ItemsSource="{Binding AnimeCompactItems}" SelectionMode="Single"
211211
SelectionChanged="AnimesItemsIndefinite_OnSelectionChanged"
212-
ShowsScrollingPlaceholders="False"
213212
IsItemClickEnabled="True"
214213
Visibility="{Binding DisplayMode,Converter={StaticResource DisplayModeToPresenterControlVisibility},ConverterParameter={StaticResource IndefiniteCompactListString}}">
215214
<userControls:AlternatingListView.ItemContainerStyle>
@@ -250,7 +249,7 @@
250249
</ListView.Footer>
251250
</userControls:AlternatingListView>
252251
<ListView x:Name="AnimesItemsIndefinite" ItemsSource="{Binding AnimeListItems}"
253-
SelectionChanged="AnimesItemsIndefinite_OnSelectionChanged" ShowsScrollingPlaceholders="False"
252+
SelectionChanged="AnimesItemsIndefinite_OnSelectionChanged"
254253
Visibility="{Binding DisplayMode,Converter={StaticResource DisplayModeToPresenterControlVisibility},ConverterParameter={StaticResource IndefiniteListString}}">
255254
<ListView.ItemContainerStyle>
256255
<Style TargetType="ListViewItem">
@@ -284,12 +283,11 @@
284283
</ListView.Footer>
285284
</ListView>
286285
<GridView x:Name="AnimesGridIndefinite" ItemsSource="{Binding AnimeGridItems}"
287-
SelectionChanged="AnimesItemsIndefinite_OnSelectionChanged" HorizontalAlignment="Center"
288-
ShowsScrollingPlaceholders="False"
286+
SelectionChanged="AnimesItemsIndefinite_OnSelectionChanged" HorizontalAlignment="Stretch"
289287
Visibility="{Binding DisplayMode,Converter={StaticResource DisplayModeToPresenterControlVisibility},ConverterParameter={StaticResource IndefiniteGridString}}">
290288
<GridView.ItemsPanel>
291289
<ItemsPanelTemplate>
292-
<ItemsWrapGrid x:Name="GridViewWrapPanel" CacheLength="10" Orientation="Horizontal" ItemHeight="345" ItemWidth="{Binding MaxWidth}"/>
290+
<ItemsWrapGrid x:Name="GridViewWrapPanel" CacheLength="10" Orientation="Horizontal" HorizontalAlignment="Center" ItemHeight="345" ItemWidth="{Binding MaxWidth}"/>
293291
</ItemsPanelTemplate>
294292
</GridView.ItemsPanel>
295293
<GridView.ItemTemplate>
@@ -341,23 +339,23 @@
341339
</Grid>
342340
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
343341
Visibility="{Binding LoadingAllDetailsVisibility,Converter={StaticResource BoolToVisibilityConverter}}"
344-
Background="{ThemeResource BrushLoadingNonTransparent}">
345-
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" Margin="10,0" CornerRadius="10" Padding="10" Background="{ThemeResource BrushLoadingAllShadow}">
342+
Background="Transparent">
343+
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" MaxWidth="350" Padding="10" Background="{ThemeResource PopUpBackground}" BorderThickness="1" BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}">
346344
<StackPanel VerticalAlignment="Center">
347345
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Margin="10" >
348-
<TextBlock Text="Loading all items details... "/>
349-
<TextBlock Text="{Binding LoadingItemsStatus}"/>
350-
</StackPanel>
346+
<TextBlock>
347+
<Run Text="Loading all items details..."/>
348+
<Run Text="{Binding LoadingItemsStatus}"/>
349+
</TextBlock>
350+
</StackPanel>
351351
<Grid>
352-
<Grid.ColumnDefinitions>
353-
<ColumnDefinition Width="Auto"/>
354-
<ColumnDefinition Width="*"/>
355-
<ColumnDefinition Width="Auto"/>
356-
</Grid.ColumnDefinitions>
357-
<TextBlock Text="0"/>
358-
<ProgressBar Grid.Column="1" HorizontalAlignment="Stretch" Margin="10,0" Value="{Binding ItemsLoaded}" Minimum="0" Maximum="{Binding AllItemsToLoad}"/>
359-
<TextBlock Grid.Column="2" Text="{Binding AllItemsToLoad}"/>
360-
</Grid>
352+
<Grid.ColumnDefinitions>
353+
<ColumnDefinition Width="Auto"/>
354+
<ColumnDefinition Width="*"/>
355+
<ColumnDefinition Width="Auto"/>
356+
</Grid.ColumnDefinitions>
357+
<ProgressBar Grid.Column="1" HorizontalAlignment="Stretch" Margin="10,0" Value="{Binding ItemsLoaded}" Minimum="0" Maximum="{Binding AllItemsToLoad}"/>
358+
</Grid>
361359
<Button Style="{StaticResource TextBlockButtonStyle}" Content="Cancel" Margin="0,10" HorizontalAlignment="Center" Command="{Binding CancelLoadingAllItemsCommand}"/>
362360
</StackPanel>
363361
</Grid>

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

Lines changed: 10 additions & 9 deletions
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"
98+
<Button HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="0,0,0,90" Padding="7"
9999
Command="{Binding Source={StaticResource Locator},Path=CalendarPage.ExportToCalendarCommand}"
100100
CommandParameter="{Binding}">
101101
<Button.Background>
@@ -138,14 +138,15 @@
138138
</Pivot.HeaderTemplate>
139139
</Pivot>
140140
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center"
141-
Visibility="{Binding CalendarBuildingVisibility,Converter={StaticResource BoolToVisibilityConverter}}">
142-
<Grid.RowDefinitions>
143-
<RowDefinition Height="Auto" />
144-
<RowDefinition Height="Auto" />
145-
</Grid.RowDefinitions>
146-
<ProgressBar HorizontalAlignment="Stretch" Margin="40,0" VerticalAlignment="Center"
141+
Visibility="{Binding CalendarBuildingVisibility,Converter={StaticResource BoolToVisibilityConverter}}">
142+
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Center" MaxWidth="350" Padding="10,10" BorderThickness="1" BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}"
143+
Background="{StaticResource PopUpBackground}">
144+
<StackPanel HorizontalAlignment="Stretch" VerticalAlignment="Center">
145+
<TextBlock HorizontalAlignment="Center" Margin="5" Text="Building calendar, please wait..." />
146+
<ProgressBar HorizontalAlignment="Stretch" Margin="40,10" VerticalAlignment="Center"
147147
Value="{Binding ProgressValue}" Maximum="{Binding MaxProgressValue}" />
148-
<TextBlock Grid.Row="1" HorizontalAlignment="Center" Margin="5" Text="Building calendar, please wait..." />
149-
</Grid>
148+
</StackPanel>
149+
</Grid>
150+
</Grid>
150151
</Grid>
151152
</Page>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
</Page.Resources>
1616

1717
<Grid Background="{ThemeResource BrushDeepBackground}">
18-
<GridView ItemsSource="{Binding Feeds}" HorizontalAlignment="Center" SelectionMode="Single" IsItemClickEnabled="True" ItemClick="OnItemClick">
18+
<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="Stretch"
21+
<ItemsWrapGrid Margin="0,0,16,0" Orientation="Horizontal" HorizontalAlignment="Center"
2222
ItemWidth="{Binding ItemWidth}" ItemHeight="325" />
2323
</ItemsPanelTemplate>
2424
</GridView.ItemsPanel>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<xamlConverters:BoolToVisibilityConverter x:Key="BoolToVisibilityConverter" />
1313
</Page.Resources>
1414
<Grid Background="{ThemeResource BrushDeepBackground}" HorizontalAlignment="Stretch">
15-
<GridView ItemsSource="{Binding Videos}" ItemClick="ListViewBase_OnItemClick" HorizontalAlignment="Center" IsItemClickEnabled="True" Background="Transparent">
15+
<GridView ItemsSource="{Binding Videos}" ItemClick="ListViewBase_OnItemClick" HorizontalAlignment="Stretch" IsItemClickEnabled="True" Background="Transparent">
1616
<GridView.ItemContainerStyle>
1717
<Style TargetType="GridViewItem">
1818
<Setter Property="Margin" Value="2,4" />
@@ -23,7 +23,7 @@
2323
</GridView.ItemContainerStyle>
2424
<GridView.ItemsPanel>
2525
<ItemsPanelTemplate>
26-
<ItemsWrapGrid ItemWidth="{Binding ItemWidth}" ItemHeight="340" Orientation="Horizontal" Margin="0,0,10,0" />
26+
<ItemsWrapGrid ItemWidth="{Binding ItemWidth}" ItemHeight="340" Orientation="Horizontal" Margin="0,0,10,0" HorizontalAlignment="Center" />
2727
</ItemsPanelTemplate>
2828
</GridView.ItemsPanel>
2929
<GridView.ItemContainerTransitions>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
Grid.Column="0">
107107
<Image x:Name="DetailImage" controlsExt:ImageExtensions.FadeInOnLoaded="True"
108108
Tapped="Image_OnTapped" Margin="1,1,1,1"
109-
attachedProperties:AnimeImageExtensions.MalBaseImageSource="{Binding DetailImage}" Stretch="Fill" >
109+
attachedProperties:AnimeImageExtensions.MalBaseImageSource="{Binding DetailImage}" Stretch="Uniform" >
110110
<FlyoutBase.AttachedFlyout>
111111
<MenuFlyout x:Name="ImageSaveFlyout">
112112
<MenuFlyoutItem Text="Save" Command="{Binding SaveImageCommand}" CommandParameter="mal" />

0 commit comments

Comments
 (0)