Skip to content

Commit

Permalink
A lot of changes, bugfixes and tests...
Browse files Browse the repository at this point in the history 
- Upped SDKs.
- Updated all libs, except the ones used in android. Related to this, the android project might fail due to CommonServiceLocator missing, add the lib manually to fix.
- Fixed blurry images in grid view.
- Fixed some elements with wrong size.
- Added reveal to settings pages.
  • Loading branch information
@Guerra24
Guerra24 committed Mar 22, 2018
1 parent 98140e2 commit 7415073
Show file tree
Hide file tree
Showing 41 changed files with 187 additions and 166 deletions.
2 changes: 1 addition & 1 deletion ExpressionBuilder/ExpressionBuilder/ExpressionBuilder.csproj
View file
Expand Up @@ -141,7 +141,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.6</Version>
<Version>6.0.8</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
Expand Down
2 changes: 1 addition & 1 deletion MALCLient.UrlInterceptor/project.json
View file
@@ -1,6 +1,6 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6"
"Microsoft.NETCore.UniversalWindowsPlatform": "6.0.8"
},
"frameworks": {
"uap10.0.10586": {}
Expand Down
2 changes: 1 addition & 1 deletion MALClient.Android/AndroidViewModelLocator.cs
View file
Expand Up @@ -21,7 +21,7 @@
using MALClient.Android.ViewModels;
using MALClient.XShared.Interfaces;
using MALClient.XShared.ViewModels;
using Microsoft.Practices.ServiceLocation;
using CommonServiceLocator;

namespace MALClient.Android
{
Expand Down
6 changes: 3 additions & 3 deletions MALClient.CommTest/project.json
View file
@@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.NETCore.UniversalWindowsPlatform": "6.0.6",
"xunit": "2.1.0",
"xunit.runner.visualstudio": "2.1.0"
"Microsoft.NETCore.UniversalWindowsPlatform": "6.0.8",
"xunit": "2.3.1",
"xunit.runner.visualstudio": "2.3.1"
},
"frameworks": {
"uap10.0.10586": {}
Expand Down
16 changes: 8 additions & 8 deletions MALClient.Desktop/MALClient.UWP.Desktop.csproj
View file
Expand Up @@ -252,7 +252,7 @@
<Compile Include="Managers\NavMgr.cs" />
<Compile Include="ViewModels\HamburgerControlViewModel.cs" />
<Compile Include="ViewModels\MainViewModel.cs" />
<Compile Include="ViewModels\DekstopViewModelLocator.cs" />
<Compile Include="ViewModels\DesktopViewModelLocator.cs" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
Expand Down Expand Up @@ -578,7 +578,7 @@
<Version>4.1.6</Version>
</PackageReference>
<PackageReference Include="HtmlAgilityPack">
<Version>1.6.13</Version>
<Version>1.7.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.Advertising.XAML">
<Version>10.1705.16001</Version>
Expand All @@ -587,25 +587,25 @@
<Version>2.2.29</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>6.0.6</Version>
<Version>6.0.8</Version>
</PackageReference>
<PackageReference Include="Microsoft.Services.Store.SDK">
<Version>10.1705.16001</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.1.1</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
<Version>2.1.1</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>2.1.1</Version>
<Version>2.2.0</Version>
</PackageReference>
<PackageReference Include="MvvmLightLibs">
<Version>5.3.0</Version>
<Version>5.4.1</Version>
</PackageReference>
<PackageReference Include="Newtonsoft.Json">
<Version>10.0.3</Version>
<Version>11.0.1</Version>
</PackageReference>
<PackageReference Include="WinRTXamlToolkit">
<Version>2.3.0</Version>
Expand Down
10 changes: 4 additions & 6 deletions MALClient.Desktop/MainPage.xaml
View file
Expand Up @@ -118,7 +118,6 @@
<Grid>
<Button IsTabStop="False" HorizontalAlignment="Left"
BorderThickness="1"
Visibility="Visible"
Width="48" Height="48" Background="Transparent"
Command="{Binding ReversePaneCommand}"
Style="{StaticResource ButtonRevealStyle}">
Expand Down Expand Up @@ -195,10 +194,10 @@
<Grid x:Name="MainTitleBar" Width="Auto" Height="Auto" Background="Transparent">
</Grid>
<Button Grid.Column="0" IsTabStop="False" HorizontalAlignment="Left"
VerticalAlignment="Center" Width="48" Height="32"
VerticalAlignment="Stretch" Width="48" Height="Auto"
Command="{Binding NavigateMainBackCommand}"
Visibility="{Binding NavigateMainBackButtonVisibility,Converter={StaticResource BoolToVisibilityConverter}}"
Background="Transparent" BorderThickness="0">
Style="{StaticResource NavigationBackButtonNormalStyle}">
<TextBlock x:Name="BackButtonText" FontFamily="Segoe MDL2 Assets" FontSize="12" Text="&#xE830;"/>
</Button>
<!-- Start Integrated Header -->
Expand Down Expand Up @@ -334,7 +333,7 @@
QuerySubmitted="SearchInput_OnQuerySubmitted"
Text="{Binding CurrentSearchQuery, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Visibility="{Binding SearchInputVisibility, Converter={StaticResource BoolToVisibilityConverter}}"
PlaceholderText="Search..." Height="32" MinWidth="250" />
PlaceholderText="Search..." Height="32" MinWidth="250" Margin="0,0,5,0" />
<userControls:LockableToggleButton IsTabStop="False" LockToggle="{Binding SearchToggleLock}"
IsThreeState="False"
VerticalAlignment="Center" Width="48" Height="48"
Expand Down Expand Up @@ -403,8 +402,7 @@
<Grid Background="Transparent">
<TextBlock Text="New update! What's new?" FontWeight="Bold" Foreground="White"
HorizontalAlignment="Left" Margin="10,5" />
<Button Style="{StaticResource TextBlockButtonStyle}" HorizontalAlignment="Right" Foreground="White"
Click="ButtonCloseChangelogOnClick">
<Button HorizontalAlignment="Right" Foreground="White" Background="Transparent" Click="ButtonCloseChangelogOnClick" BorderThickness="1">
<SymbolIcon Symbol="Cancel"/>
</Button>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml
View file
Expand Up @@ -91,7 +91,7 @@
TintOpacity="0.7"
FallbackColor="{StaticResource ColorPivotInnerHeaderBarBackground}"/>
</Grid.Background>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
<StackPanel x:Name="DestStack" Orientation="Horizontal" HorizontalAlignment="Center">
<uwp:FontAwesome Icon="{Binding Icon,Converter={StaticResource DummyFontAwesomeToRealFontAwesomeConverter}}" FontSize="28" Margin="10,0" VerticalAlignment="Center"/>
<TextBlock Text="{Binding Title}" HorizontalAlignment="Center" FontSize="28" FontWeight="Medium" VerticalAlignment="Center" Margin="0,5"/>
</StackPanel>
Expand Down
9 changes: 8 additions & 1 deletion MALClient.Desktop/Pages/Forums/ForumBoardPage.xaml.cs
View file
Expand Up @@ -8,6 +8,7 @@
using MALClient.XShared.ViewModels;
using MALClient.XShared.ViewModels.Forums;
using MALClient.XShared.ViewModels.Forums.Items;
using Windows.UI.Xaml.Media.Animation;

// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238

Expand Down Expand Up @@ -37,7 +38,13 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
{
_args = e.Parameter as ForumsBoardNavigationArgs;
base.OnNavigatedTo(e);
}

ConnectedAnimation anim = ConnectedAnimationService.GetForCurrentView().GetAnimation("header");
if (anim != null)
{
anim.TryStart(DestStack);
}
}

private void TopicOnClick(object sender, ItemClickEventArgs e)
{
Expand Down
2 changes: 1 addition & 1 deletion MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml
View file
Expand Up @@ -90,7 +90,7 @@
CommandParameter="{Binding Board}" />
</MenuFlyout>
</FlyoutBase.AttachedFlyout>
<StackPanel Orientation="Horizontal">
<StackPanel x:Name="SourceStack" Orientation="Horizontal">
<fa:FontAwesome Icon="{Binding Icon,Converter={StaticResource DummyFontAwesomeToRealFontAwesomeConverter}}" FontSize="21" Margin="10,0" />
<TextBlock Text="{Binding Entry.Name}" FontWeight="Medium"
FontSize="19" />
Expand Down
4 changes: 3 additions & 1 deletion MALClient.Desktop/Pages/Forums/ForumIndexPage.xaml.cs
View file
Expand Up @@ -9,6 +9,7 @@
using MALClient.XShared.ViewModels;
using MALClient.XShared.ViewModels.Forums;
using MALClient.XShared.ViewModels.Forums.Items;
using Windows.UI.Xaml.Media.Animation;

// The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238

Expand All @@ -34,7 +35,8 @@ protected override void OnNavigatedTo(NavigationEventArgs e)

private void BoardGridOnItemClick(object sender, ItemClickEventArgs e)
{
ViewModel.NavigateBoardCommand.Execute((e.ClickedItem as ForumBoardEntryViewModel).Board);
(sender as GridView).PrepareConnectedAnimation("header", e.ClickedItem, "SourceStack");
ViewModel.NavigateBoardCommand.Execute((e.ClickedItem as ForumBoardEntryViewModel).Board);
}

private void BoardGridOnRightClick(object sender, RightTappedRoutedEventArgs e)
Expand Down
3 changes: 1 addition & 2 deletions MALClient.Desktop/Pages/Main/AnimeListPage.xaml
View file
Expand Up @@ -165,8 +165,7 @@
</GridView.ItemContainerTransitions>
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<ItemsWrapGrid Margin="0,0,0,0" Orientation="Horizontal" HorizontalAlignment="Center"
ItemWidth="200" ItemHeight="350" />
<ItemsWrapGrid Orientation="Horizontal" HorizontalAlignment="Center" CacheLength="8.0" />
</ItemsPanelTemplate>
</GridView.ItemsPanel>
<GridView.ItemTemplate>
Expand Down
5 changes: 2 additions & 3 deletions MALClient.Desktop/Pages/Main/CalendarPage.xaml
View file
Expand Up @@ -55,8 +55,7 @@
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<ItemsWrapGrid Margin="0,0,16,0" Orientation="Horizontal"
HorizontalAlignment="Stretch"
ItemWidth="200" ItemHeight="350" />
HorizontalAlignment="Stretch" />
</ItemsPanelTemplate>
</GridView.ItemsPanel>
</GridView>
Expand All @@ -83,7 +82,7 @@
<Pivot.Resources>
<Style TargetType="PivotHeaderItem" BasedOn="{StaticResource PivotHeaderOuterProfilePage}" />
<Style TargetType="GridView">
<Setter Property="Margin" Value="1,1-5,0" />
<Setter Property="Margin" Value="0" />
<Setter Property="MinWidth" Value="200" />
<Setter Property="IsItemClickEnabled" Value="True" />
<Setter Property="ShowsScrollingPlaceholders" Value="False" />
Expand Down
16 changes: 12 additions & 4 deletions MALClient.Desktop/Pages/Main/HistoryPage.xaml
View file
Expand Up @@ -41,25 +41,33 @@
<Style TargetType="GridViewItem">
<Setter Property="Margin" Value="5"/>
<Setter Property="Padding" Value="0"/>
<Setter Property="Height" Value="340"/>
<Setter Property="Height" Value="350"/>
<Setter Property="Background" Value="{ThemeResource BrushAnimeItemInnerBackground}"/>
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
</Style>
</GridView.ItemContainerStyle>
<GridView.ItemTemplate>
<GridView.ItemContainerTransitions>
<TransitionCollection>
<PopupThemeTransition FromVerticalOffset="100" />
<AddDeleteThemeTransition />
<ReorderThemeTransition />
<RepositionThemeTransition />
</TransitionCollection>
</GridView.ItemContainerTransitions>
<GridView.ItemTemplate>
<DataTemplate>
<Grid Background="{ThemeResource BrushHamburgerInnerBackground}" BorderThickness="3,0,0,0" BorderBrush="{StaticResource SystemControlBackgroundAccentBrush}" >
<Grid.ColumnDefinitions>
<ColumnDefinition Width="200"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<items:AnimeGridItem IsRightTapEnabled="True" RightTapped="AnimeItemOnRightClick" Width="188" Height="340" HorizontalAlignment="Left" DataContext="{Binding Item1}"/>
<items:AnimeGridItem IsRightTapEnabled="True" RightTapped="AnimeItemOnRightClick" HorizontalAlignment="Left" DataContext="{Binding Item1}"/>
<ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto" PointerPressed="HistoryScrollViewerOnPointerPressed" HorizontalAlignment="Stretch">
<ItemsControl ItemsSource="{Binding Item2}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<ItemsStackPanel Margin="0,0,16,0" GroupPadding="0,0,5,0"/>
<ItemsStackPanel Margin="8,0,16,0" GroupPadding="0,0,0,0"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemContainerStyle>
Expand Down
2 changes: 1 addition & 1 deletion MALClient.Desktop/Pages/Main/PopularVideosPage.xaml
View file
Expand Up @@ -29,7 +29,7 @@
</GridView.ItemContainerStyle>
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<ItemsWrapGrid ItemWidth="200" ItemHeight="350" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,10,0" />
<ItemsWrapGrid ItemWidth="212" ItemHeight="360" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,0,10,0" />
</ItemsPanelTemplate>
</GridView.ItemsPanel>
<GridView.ItemContainerTransitions>
Expand Down
6 changes: 3 additions & 3 deletions MALClient.Desktop/Pages/Main/ProfilePage.xaml
View file
Expand Up @@ -308,7 +308,7 @@
</GridView.ItemContainerStyle>
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<ItemsWrapGrid Orientation="Horizontal" ItemWidth="200" ItemHeight="350" />
<ItemsWrapGrid Orientation="Horizontal"/>
</ItemsPanelTemplate>
</GridView.ItemsPanel>
<GridView.ItemTemplate>
Expand Down Expand Up @@ -479,7 +479,7 @@
</GridView.ItemContainerStyle>
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<ItemsWrapGrid Orientation="Horizontal" ItemWidth="200" ItemHeight="350" />
<ItemsWrapGrid Orientation="Horizontal"/>
</ItemsPanelTemplate>
</GridView.ItemsPanel>
<GridView.ItemTemplate>
Expand Down Expand Up @@ -519,7 +519,7 @@
</GridView.ItemContainerStyle>
<GridView.ItemsPanel>
<ItemsPanelTemplate>
<ItemsWrapGrid Orientation="Horizontal" ItemWidth="200" ItemHeight="350" />
<ItemsWrapGrid Orientation="Horizontal" />
</ItemsPanelTemplate>
</GridView.ItemsPanel>
<GridView.ItemTemplate>
Expand Down
4 changes: 2 additions & 2 deletions MALClient.Desktop/Pages/Off/AnimeDetailsPage.xaml
View file
Expand Up @@ -789,7 +789,7 @@
Margin="5,10"
BorderThickness="1"
Style="{StaticResource ButtonRevealStyle}"/>
<ProgressRing IsActive="True" Width="40" Height="40" Margin="0,5"
<ProgressRing IsActive="True" Width="40" Height="40" Margin="0,15"
Visibility="{Binding LoadingCharactersVisibility,Converter={StaticResource BoolToVisibilityConverter}}" />
<Grid HorizontalAlignment="Center"
Visibility="{Binding CharactersGridVisibility,Converter={StaticResource BoolToVisibilityConverter}}">
Expand Down Expand Up @@ -1591,7 +1591,7 @@
<Setter Property="BorderBrush"
Value="{StaticResource SystemControlBackgroundAccentBrush}" />
<Setter Property="BorderThickness" Value="5,0,0,0" />
<Setter Property="Margin" Value="5" />
<Setter Property="Margin" Value="0,0,0,10" />
<Setter Property="Background"
Value="{ThemeResource BrushDetailsRelatedBackground}" />
<Setter Property="Padding" Value="0" />
Expand Down
4 changes: 2 additions & 2 deletions MALClient.Desktop/Pages/Off/SettingsPages/SettingsArticlesPage.xaml
View file
Expand Up @@ -30,8 +30,8 @@
<TextBlock Text="Live Tiles" FontWeight="Medium"
HorizontalAlignment="Center"
TextWrapping="WrapWholeWords" />
<Button Content="Pin articles live tile" Click="ButtonPinArticlesOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300"/>
<Button Content="Pin news live tile" Click="ButtonPinNewsOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300"/>
<Button Content="Pin articles live tile" Click="ButtonPinArticlesOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
<Button Content="Pin news live tile" Click="ButtonPinNewsOnClick" HorizontalAlignment="Center" Margin="0,5" Width="300" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
<TextBlock
Text="Tiles are updated every 12 hours from background."
FontWeight="SemiLight" TextWrapping="WrapWholeWords" FontSize="15" TextAlignment="Center"
Expand Down
3 changes: 2 additions & 1 deletion MALClient.Desktop/Pages/Off/SettingsPages/SettingsCachingPage.xaml
View file
Expand Up @@ -83,7 +83,8 @@
VerticalAlignment="Center" TextAlignment="Center" Margin="10,0,0,0" />
</StackPanel>
</Button>-->
<Button x:Name="BtnClearImageCache" Margin="2,5" Click="ClearImageCache" HorizontalAlignment="Center">
<Button x:Name="BtnClearImageCache" Margin="2,5" Click="ClearImageCache" HorizontalAlignment="Center"
Style="{StaticResource ButtonRevealStyle}" BorderThickness="1">
<StackPanel Orientation="Horizontal">
<SymbolIcon Symbol="Delete" VerticalAlignment="Center" />
<TextBlock Text="Clear image cache." VerticalAlignment="Center" TextAlignment="Center" Margin="10,0,0,0" />
Expand Down
3 changes: 2 additions & 1 deletion MALClient.Desktop/Pages/Off/SettingsPages/SettingsGeneralPage.xaml
View file
Expand Up @@ -577,7 +577,8 @@
IsOn="{Binding SyncFavsFromTimeToTime,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
OnContent="Sync" OffContent="Don't sync" HorizontalAlignment="Center" />
</Grid>
<Button Content="Sync now!" HorizontalAlignment="Center" Margin="0,5" IsEnabled="{Binding IsSyncFavsButtonEnabled}" Command="{Binding SyncFavsCommand}"/>
<Button Content="Sync now!" HorizontalAlignment="Center" Margin="0,5" IsEnabled="{Binding IsSyncFavsButtonEnabled}" Command="{Binding SyncFavsCommand}"
Style="{StaticResource ButtonRevealStyle}" BorderThickness="1"/>
<TextBlock
Text="Getting and updating favourites is pretty tricky and that's why I have to cache them, visiting and forcing update on your profile page will sync your favourites too. Favourites will sync accross devices."
FontWeight="SemiLight" TextWrapping="WrapWholeWords" FontSize="15" TextAlignment="Center"
Expand Down
2 changes: 1 addition & 1 deletion MALClient.Desktop/Pages/Off/SettingsPages/SettingsMiscPage.xaml
View file
Expand Up @@ -44,7 +44,7 @@
</StackPanel>
<Button Content="Rate now!" Command="{Binding ReviewCommand}"
HorizontalAlignment="Center"
Margin="0,10,0,0" />
Margin="0,10,0,0" Style="{StaticResource ButtonRevealStyle}" BorderThickness="1" />
<MenuFlyoutSeparator Margin="0,5" />
<Grid Margin="10" HorizontalAlignment="Center">
<StackPanel>
Expand Down

0 comments on commit 7415073

Please sign in to comment.