Skip to content

Commit

Permalink
replaced toolkitpreview with preview nuget package
Browse files Browse the repository at this point in the history
  • Loading branch information
@nmetulev
nmetulev committed Oct 19, 2017
1 parent 9ac2b10 commit c0ef42b
Show file tree
Hide file tree
Showing 11 changed files with 100 additions and 108 deletions.
70 changes: 35 additions & 35 deletions src/BuildCast/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,43 +16,43 @@
x:Class="BuildCast.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:toolkit="using:ToolkitPreview">
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations">
<Application.Resources>
<ResourceDictionary>
<toolkit:CAnimationCollection x:Key="LayoutImplicitAnimations">
<toolkit:OffsetAnimation Duration="0:0:0.1"></toolkit:OffsetAnimation>
</toolkit:CAnimationCollection>

<toolkit:CAnimationCollection x:Key="DefaultShowAnimations">
<toolkit:TranslationAnimation Duration="0:0:0.35" From="0,-450, 0" To="0"></toolkit:TranslationAnimation>
</toolkit:CAnimationCollection>

<toolkit:CAnimationCollection x:Key="DefaultHideAnimations">
<toolkit:TranslationAnimation Duration="0:0:0.45" To="0,-30,0"></toolkit:TranslationAnimation>
</toolkit:CAnimationCollection>

<toolkit:CAnimationCollection x:Key="DefaultListShowAnimations">
<toolkit:TranslationAnimation Duration="0:0:0.45" Delay="0:0:0.2" From="0,50,0" To="0"></toolkit:TranslationAnimation>
<toolkit:OpacityAnimation Duration="0:0:0.8" From="0" To="1">
<toolkit:ScalarKeyFrame Key="0.25" Value="0"></toolkit:ScalarKeyFrame>
</toolkit:OpacityAnimation>
</toolkit:CAnimationCollection>

<toolkit:CAnimationCollection x:Key="DefaultListHideAnimations">
<toolkit:TranslationAnimation Duration="0:0:0.4" To="0,50,0"></toolkit:TranslationAnimation>
<toolkit:OpacityAnimation Duration="0:0:0.4" To="0"></toolkit:OpacityAnimation>
</toolkit:CAnimationCollection>

<toolkit:CAnimationCollection x:Key="DefaultPageHideAnimation">
<toolkit:OpacityAnimation Duration="0:0:0.4" To="0"></toolkit:OpacityAnimation>
</toolkit:CAnimationCollection>

<toolkit:CAnimationCollection x:Key="DefaultTitleShowAnimations">
<toolkit:TranslationAnimation Duration="0:0:0.45" From="0, -50, 0" To="0"></toolkit:TranslationAnimation>
<toolkit:OpacityAnimation Duration="0:0:0.5" From="0" To="1">
<toolkit:ScalarKeyFrame Key="0.25" Value="0"></toolkit:ScalarKeyFrame>
</toolkit:OpacityAnimation>
</toolkit:CAnimationCollection>
<animations:AnimationCollection x:Key="LayoutImplicitAnimations">
<animations:OffsetAnimation Duration="0:0:0.1"></animations:OffsetAnimation>
</animations:AnimationCollection>

<animations:AnimationCollection x:Key="DefaultShowAnimations">
<animations:TranslationAnimation Duration="0:0:0.35" From="0,-450, 0" To="0"></animations:TranslationAnimation>
</animations:AnimationCollection>

<animations:AnimationCollection x:Key="DefaultHideAnimations">
<animations:TranslationAnimation Duration="0:0:0.45" To="0,-30,0"></animations:TranslationAnimation>
</animations:AnimationCollection>

<animations:AnimationCollection x:Key="DefaultListShowAnimations">
<animations:TranslationAnimation Duration="0:0:0.45" Delay="0:0:0.2" From="0,50,0" To="0"></animations:TranslationAnimation>
<animations:OpacityAnimation Duration="0:0:0.8" From="0" To="1">
<animations:ScalarKeyFrame Key="0.25" Value="0"></animations:ScalarKeyFrame>
</animations:OpacityAnimation>
</animations:AnimationCollection>

<animations:AnimationCollection x:Key="DefaultListHideAnimations">
<animations:TranslationAnimation Duration="0:0:0.4" To="0,50,0"></animations:TranslationAnimation>
<animations:OpacityAnimation Duration="0:0:0.4" To="0"></animations:OpacityAnimation>
</animations:AnimationCollection>

<animations:AnimationCollection x:Key="DefaultPageHideAnimation">
<animations:OpacityAnimation Duration="0:0:0.4" To="0"></animations:OpacityAnimation>
</animations:AnimationCollection>

<animations:AnimationCollection x:Key="DefaultTitleShowAnimations">
<animations:TranslationAnimation Duration="0:0:0.45" From="0, -50, 0" To="0"></animations:TranslationAnimation>
<animations:OpacityAnimation Duration="0:0:0.5" From="0" To="1">
<animations:ScalarKeyFrame Key="0.25" Value="0"></animations:ScalarKeyFrame>
</animations:OpacityAnimation>
</animations:AnimationCollection>

<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/Styles/Common.xaml"/>
Expand Down
15 changes: 3 additions & 12 deletions src/BuildCast/BuildCast.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,15 +107,6 @@
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\..\..\XamlCompositionPlayground\App6\Connected.cs">
<Link>Connected.cs</Link>
</Compile>
<Compile Include="..\..\..\..\XamlCompositionPlayground\App6\ImplicitAnimations.cs">
<Link>ImplicitAnimations.cs</Link>
</Compile>
<Compile Include="..\..\..\..\XamlCompositionPlayground\App6\Visual.cs">
<Link>Visual.cs</Link>
</Compile>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -392,13 +383,13 @@
<Version>2.0.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI">
<Version>2.0.0</Version>
<Version>2.1.0-build.82.gaebb96c553</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
<Version>2.0.0</Version>
<Version>2.1.0-build.82.gaebb96c553</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
<Version>2.0.0</Version>
<Version>2.1.0-build.82.gaebb96c553</Version>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers">
<Version>1.1.0-beta004</Version>
Expand Down
6 changes: 3 additions & 3 deletions src/BuildCast/Views/Downloads.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
xmlns:views="using:BuildCast.Views"
mc:Ignorable="d" Loaded="Downloads_Loaded"
xmlns:helpers="using:BuildCast.Helpers"
xmlns:toolkit="using:ToolkitPreview"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
Canvas.ZIndex="1"
toolkit:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}">
animations:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}">

<Page.Resources>
<helpers:DeleteEpisodeCommand x:Key="deleteEpisodeCommand"/>
Expand Down Expand Up @@ -94,7 +94,7 @@
Grid.Row="0"
x:Uid="Downloads_Title"
Style="{StaticResource PageTitleStyle}"
toolkit:Implicit.ShowAnimations="{StaticResource DefaultTitleShowAnimations}"
animations:Implicit.ShowAnimations="{StaticResource DefaultTitleShowAnimations}"
/>
<ListView
x:Name="downloadListView"
Expand Down
18 changes: 9 additions & 9 deletions src/BuildCast/Views/EpisodeDetails.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,21 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:localfunc="using:BuildCast.Views"
xmlns:toolkit="using:ToolkitPreview"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
xmlns:helpers="using:BuildCast.Helpers"
mc:Ignorable="d"
Loaded="EpisodeDetails_Loaded"
Canvas.ZIndex="1"
toolkit:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
animations:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
>
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}" x:Name="root">
<Grid.RowDefinitions>
<RowDefinition Height="415" x:Name="TopBorderRow"/>
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid Grid.Row="0" Background="LightSlateGray" x:Name="TopBorder"
toolkit:Implicit.ShowAnimations="{StaticResource DefaultShowAnimations}"
toolkit:Implicit.HideAnimations="{StaticResource DefaultHideAnimations}">
animations:Implicit.ShowAnimations="{StaticResource DefaultShowAnimations}"
animations:Implicit.HideAnimations="{StaticResource DefaultHideAnimations}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>
Expand All @@ -53,20 +53,20 @@
<Image x:Name="feedItemImage" Height="300" Margin="25,75,24,40"
VerticalAlignment="Top"
HorizontalAlignment="Left" ImageOpened="FeedItemImage_ImageOpened"
toolkit:Connected.Key="FeedItemImage">
animations:Connected.Key="FeedItemImage">
<Image.Source>
<BitmapImage UriSource="{x:Bind ViewModel.CurrentEpisode.ItemThumbnail}" />
</Image.Source>
</Image>

<Grid x:Name="DescriptionRoot" Grid.Column="1" Margin="0,80,50,0" Height="200" VerticalAlignment="Top" toolkit:Connected.AnchorElement="{x:Bind feedItemImage}">
<Grid x:Name="DescriptionRoot" Grid.Column="1" Margin="0,80,50,0" Height="200" VerticalAlignment="Top" animations:Connected.AnchorElement="{x:Bind feedItemImage}">
<Grid.RowDefinitions>
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>
<StackPanel Grid.Row="0">
<TextBlock x:Name="episodetitle" Foreground="White" FontSize="16" FontWeight="Bold" Text="{x:Bind Path=ViewModel.CurrentEpisode.Title}" toolkit:Connected.Key="feedtitle" />
<TextBlock x:Name="episodetitle" Foreground="White" FontSize="16" FontWeight="Bold" Text="{x:Bind Path=ViewModel.CurrentEpisode.Title}" animations:Connected.Key="feedtitle" />
<TextBlock x:Name="episodesubtitle" Foreground="White" FontSize="16" Text="{x:Bind Path=ViewModel.CurrentEpisode.Subtitle}" />
</StackPanel>
<StackPanel Grid.Row="1">
Expand All @@ -82,8 +82,8 @@
</Grid>

<RelativePanel x:Name="ListContent" Grid.Row="1" Margin="{ThemeResource ContentDialogPadding}" HorizontalAlignment="Stretch"
toolkit:Implicit.HideAnimations="{StaticResource DefaultListHideAnimations}"
toolkit:Implicit.ShowAnimations="{StaticResource DefaultListShowAnimations}">
animations:Implicit.HideAnimations="{StaticResource DefaultListHideAnimations}"
animations:Implicit.ShowAnimations="{StaticResource DefaultListShowAnimations}">
<TextBlock Style="{ThemeResource SubheaderTextBlockStyle}" Name="lowerepisodetitle" Text="{x:Bind Path=ViewModel.CurrentEpisode.Title}" />
<TextBlock Style="{ThemeResource TitleTextBlockStyle}" Name="lowerepisodesubtitle" Text="{x:Bind Path=ViewModel.CurrentEpisode.Subtitle}" RelativePanel.Below="lowerepisodetitle" />
<ScrollViewer x:Name="webScroller"
Expand Down
10 changes: 5 additions & 5 deletions src/BuildCast/Views/Favorites.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@
xmlns:views="using:BuildCast.Views"
mc:Ignorable="d" Loaded="Favorites_Loaded"
xmlns:helpers="using:BuildCast.Helpers"
xmlns:toolkitpreview="using:ToolkitPreview"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
Canvas.ZIndex="1"
toolkitpreview:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
animations:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
>
<Page.Resources>
<helpers:DownloadCommand x:Key="downloadCommand"/>
Expand Down Expand Up @@ -96,7 +96,7 @@
Grid.Row="0"
x:Uid="Favorites_Title"
Style="{StaticResource PageTitleStyle}"
toolkitpreview:Implicit.ShowAnimations="{StaticResource DefaultTitleShowAnimations}"/>
animations:Implicit.ShowAnimations="{StaticResource DefaultTitleShowAnimations}"/>

<ListView
Grid.Row="1"
Expand All @@ -106,8 +106,8 @@
ItemClick="FavoriteListView_Tapped"
IsItemClickEnabled="True"
SelectionMode="None"
toolkitpreview:Implicit.HideAnimations="{StaticResource DefaultListHideAnimations}"
toolkitpreview:Implicit.ShowAnimations="{StaticResource DefaultListShowAnimations}"
animations:Implicit.HideAnimations="{StaticResource DefaultListHideAnimations}"
animations:Implicit.ShowAnimations="{StaticResource DefaultListShowAnimations}"
>
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem">
Expand Down
20 changes: 10 additions & 10 deletions src/BuildCast/Views/FeedDetails.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
mc:Ignorable="d"
xmlns:localfunc="using:BuildCast.Views"
xmlns:helpers="using:BuildCast.Helpers"
xmlns:toolkit="using:ToolkitPreview"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
x:Name="FeedDetailsPage"
Canvas.ZIndex="1"
toolkit:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
animations:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
>

<RelativePanel Style="{StaticResource PageBackground}">
Expand Down Expand Up @@ -125,8 +125,8 @@
<Grid Grid.Row="0" Background="{StaticResource HeaderColor}" x:Name="TopBorder"
RelativePanel.AlignLeftWithPanel="True" RelativePanel.AlignRightWithPanel="True"
Padding="24,52,24,24" Height="348"
toolkit:Implicit.ShowAnimations="{StaticResource DefaultShowAnimations}"
toolkit:Implicit.HideAnimations="{StaticResource DefaultHideAnimations}"
animations:Implicit.ShowAnimations="{StaticResource DefaultShowAnimations}"
animations:Implicit.HideAnimations="{StaticResource DefaultHideAnimations}"
>

<Grid.ColumnDefinitions>
Expand All @@ -135,13 +135,13 @@
</Grid.ColumnDefinitions>

<Image x:Name="podimage" Width="272" Height="272" VerticalAlignment="Top" HorizontalAlignment="Left" ImageOpened="Podimage_ImageOpened" Visibility="Visible"
toolkit:Connected.Key="podimageback">
animations:Connected.Key="podimageback">
<Image.Source>
<BitmapImage UriSource="{x:Bind ViewModel.CurrentFeed.ImageUri}" />
</Image.Source>
</Image>

<Grid x:Name="DescriptionRoot" Grid.Column="1" VerticalAlignment="Stretch" Margin="24,0,0,0" Visibility="Visible" toolkit:Connected.AnchorElement="{x:Bind podimage}">
<Grid x:Name="DescriptionRoot" Grid.Column="1" VerticalAlignment="Stretch" Margin="24,0,0,0" Visibility="Visible" animations:Connected.AnchorElement="{x:Bind podimage}">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
Expand Down Expand Up @@ -173,10 +173,10 @@
RelativePanel.Below="episodesheader"
Grid.Row="1"
Padding="12,7,12,10"
toolkit:Connected.ListItemKey="FeedItemImage"
toolkit:Connected.ListItemElementName="itemImage"
toolkit:Implicit.ShowAnimations="{StaticResource DefaultListShowAnimations}"
toolkit:Implicit.HideAnimations="{StaticResource DefaultListHideAnimations}">
animations:Connected.ListItemKey="FeedItemImage"
animations:Connected.ListItemElementName="itemImage"
animations:Implicit.ShowAnimations="{StaticResource DefaultListShowAnimations}"
animations:Implicit.HideAnimations="{StaticResource DefaultListHideAnimations}">
<ListView.ItemContainerStyle>
<Style TargetType="ListViewItem" BasedOn="{StaticResource ListViewItemRevealStyle}" >
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
Expand Down
26 changes: 13 additions & 13 deletions src/BuildCast/Views/Home.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:datamodel="using:BuildCast.DataModel"
RequestedTheme="{x:Bind HomeTheme}"
xmlns:toolkit="using:ToolkitPreview"
xmlns:animations="using:Microsoft.Toolkit.Uwp.UI.Animations"
mc:Ignorable="d"
toolkit:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
animations:Implicit.HideAnimations="{StaticResource DefaultPageHideAnimation}"
Canvas.ZIndex="1">

<Page.Resources>
Expand Down Expand Up @@ -77,21 +77,21 @@
<BitmapImage UriSource="{x:Bind ParallaxImage}" />
</Image.Source>
</Image>
<toolkit:Implicit.ShowAnimations>
<toolkit:TranslationAnimation Duration="0:0:0.55" To="0" From="0, -150, 0"></toolkit:TranslationAnimation>
</toolkit:Implicit.ShowAnimations>
<toolkit:Implicit.HideAnimations>
<toolkit:TranslationAnimation Duration="0:0:0.55" To="0, -150, 0"></toolkit:TranslationAnimation>
<toolkit:OpacityAnimation Duration="0:0:0.4" To="0"></toolkit:OpacityAnimation>
</toolkit:Implicit.HideAnimations>
<animations:Implicit.ShowAnimations>
<animations:TranslationAnimation Duration="0:0:0.55" To="0" From="0, -150, 0"></animations:TranslationAnimation>
</animations:Implicit.ShowAnimations>
<animations:Implicit.HideAnimations>
<animations:TranslationAnimation Duration="0:0:0.55" To="0, -150, 0"></animations:TranslationAnimation>
<animations:OpacityAnimation Duration="0:0:0.4" To="0"></animations:OpacityAnimation>
</animations:Implicit.HideAnimations>
</ParallaxView>

<Image x:Name="Logo"
VerticalAlignment="Top"
Margin="0,30,0,0"
Grid.Row="0"
Width="370"
toolkit:Implicit.Animations="{StaticResource LayoutImplicitAnimations}">
animations:Implicit.Animations="{StaticResource LayoutImplicitAnimations}">
<Image.Source>
<SvgImageSource UriSource="{x:Bind LogoSource}" />
</Image.Source>
Expand All @@ -101,7 +101,7 @@
TextChanged="AutoSuggestBox_TextChanged"
SuggestionChosen="AutoSuggestBox_SuggestionChosen"
RequestedTheme="Light"
toolkit:Implicit.Animations="{StaticResource LayoutImplicitAnimations}"/>
animations:Implicit.Animations="{StaticResource LayoutImplicitAnimations}"/>
<TextBlock Grid.Row="1" VerticalAlignment="Top" Style="{ThemeResource SubtitleTextBlockStyle}" FontWeight="Medium" Margin="24,12,0,0" Text="Recommended" />

<GridView Grid.Row="1" x:Name="HomeFeedGrid" IsItemClickEnabled="True" ItemClick="HomeFeedGrid_ItemClick"
Expand All @@ -115,8 +115,8 @@
ScrollViewer.VerticalScrollBarVisibility="Hidden"
VerticalAlignment="Stretch"
Margin="0,40,0,0"
toolkit:Connected.ListItemKey="podimageback"
toolkit:Connected.ListItemElementName="Image"
animations:Connected.ListItemKey="podimageback"
animations:Connected.ListItemElementName="Image"
>
<GridView.ItemsPanel>
<ItemsPanelTemplate>
Expand Down
Loading

0 comments on commit c0ef42b

Please sign in to comment.