Skip to content

B
Bili.Uwp

jobily / Bili.Uwp

通知 1
Star 0
Fork 0
B
Bili.Uwp

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 d9f8006d 编写于 作者: R Richasy
浏览文件
操作

移除触发器包

上级 975e401b
隐藏空白更改
内联 并排
Showing with 55 addition and 80 deletion
src/App/App.csproj
浏览文件 @ d9f8006d
......@@ -675,9 +675,6 @@
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="AdaptiveTriggerLibrary">
<Version>1.2.2</Version>
</PackageReference>
<PackageReference Include="FFmpegInteropX">
<Version>0.9.2</Version>
</PackageReference>
......@@ -691,7 +688,7 @@
<Version>6.2.12</Version>
</PackageReference>
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Animations">
<Version>7.0.0</Version>
<Version>7.0.2</Version>
</PackageReference>
<PackageReference Include="Microsoft.UI.Xaml">
<Version>2.6.1</Version>
......
src/App/Controls/App/AppTitleBar.xaml
浏览文件 @ d9f8006d
......@@ -9,7 +9,7 @@
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
Height="48"
d:DesignHeight="300"
d:DesignWidth="400"
......@@ -35,12 +35,12 @@
<VisualStateGroup.States>
<VisualState x:Name="Wide">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="Narrow">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="MenuButton.Visibility" Value="Visible" />
......
src/App/Controls/App/RootNavigationView.xaml
浏览文件 @ d9f8006d
......@@ -9,9 +9,7 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:modifier="using:AdaptiveTriggerLibrary.ConditionModifiers.ComparableModifiers"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
d:DesignHeight="300"
d:DesignWidth="400"
mc:Ignorable="d">
......@@ -31,12 +29,12 @@
<VisualStateGroup x:Name="LayoutVisualGroups">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="MainGrid.Padding" Value="{StaticResource NarrowPagePadding}" />
......
src/App/Controls/App/SearchSuggestBox.xaml
浏览文件 @ d9f8006d
......@@ -8,7 +8,6 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
d:DesignHeight="300"
d:DesignWidth="400"
SizeChanged="OnSizeChanged"
......@@ -20,12 +19,12 @@
<VisualStateGroup.States>
<VisualState x:Name="Wide">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="Narrow">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="AppSearchBox.PlaceholderText" Value="{loc:LocaleLocator Name=SearchTipSlim}" />
......
src/App/Controls/Common/HorizontalRepeaterView.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
d:DesignHeight="300"
d:DesignWidth="400"
SizeChanged="OnSizeChanged"
......@@ -18,7 +17,7 @@
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid ColumnSpacing="12" Margin="0,0,0,4">
<Grid Margin="0,0,0,4" ColumnSpacing="12">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
......
src/App/Controls/Player/PlayerRelatedView.xaml
浏览文件 @ d9f8006d
......@@ -9,7 +9,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:related="using:Richasy.Bili.App.Controls.Player.Related"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
d:DesignHeight="300"
d:DesignWidth="400"
......@@ -20,12 +19,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="SideWideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource WideWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource WideWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="SideNarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="DetailGrid.MaxWidth" Value="320" />
......@@ -33,7 +32,7 @@
</VisualState>
<VisualState x:Name="RowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="DetailGrid.MaxWidth" Value="999" />
......
src/App/Controls/Search/SearchArticleView.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
d:DesignHeight="300"
d:DesignWidth="400"
......@@ -17,12 +16,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ArticleView.ItemOrientation" Value="Horizontal" />
......
src/App/Controls/Search/SearchLiveView.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
d:DesignHeight="300"
d:DesignWidth="400"
......@@ -17,12 +16,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="LiveView.ItemOrientation" Value="Horizontal" />
......@@ -33,9 +32,9 @@
<local:VerticalRepeaterView
x:Name="LiveView"
HeaderVisibility="Collapsed"
ItemsSource="{x:Bind ViewModel.LiveModule.VideoCollection, Mode=OneWay}"
MinWideItemHeight="220"
MinWideItemWidth="200"
ItemsSource="{x:Bind ViewModel.LiveModule.VideoCollection, Mode=OneWay}"
RequestLoadMore="OnViewRequestLoadMoreAsync">
<local:VerticalRepeaterView.ItemTemplate>
<DataTemplate x:DataType="uwp:VideoViewModel">
......
src/App/Controls/Search/SearchPgcView.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
d:DesignHeight="300"
d:DesignWidth="400"
......@@ -37,12 +36,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="PgcView.ItemOrientation" Value="Horizontal" />
......
src/App/Controls/Search/SearchVideoView.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
d:DesignHeight="300"
d:DesignWidth="400"
......@@ -17,12 +16,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="VideoView.ItemOrientation" Value="Horizontal" />
......
src/App/Package.appxmanifest
浏览文件 @ d9f8006d
......@@ -22,7 +22,7 @@
</Properties>
<Dependencies>
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.22000.0" />
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.22000.0" />
</Dependencies>
<Resources>
......@@ -49,8 +49,8 @@
<uap:SplashScreen Image="Assets\Logo\SplashScreen.png" />
</uap:VisualElements>
<Extensions>
<uap5:Extension Category="windows.startupTask" EntryPoint="App.App" Executable="$targetnametoken$.exe">
<uap5:StartupTask DisplayName="ms-resource:AppName" Enabled="true" TaskId="Richasy.Bili"/>
<uap5:Extension Category="windows.startupTask">
<uap5:StartupTask DisplayName="ms-resource:AppName" Enabled="false" TaskId="Richasy.Bili"/>
</uap5:Extension>
</Extensions>
</Application>
......
src/App/Pages/BangumiPage.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
mc:Ignorable="d">
<Grid>
......
src/App/Pages/LivePage.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -24,12 +23,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:ControlWidthTrigger Condition="{StaticResource WidePageThresholdWidth}" TargetElement="{x:Bind RootContainer}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource WidePageThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:ControlWidthTrigger Condition="0" TargetElement="{x:Bind RootContainer}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootContainer.ColumnSpacing" Value="0" />
......@@ -41,12 +40,12 @@
<VisualStateGroup x:Name="PaddingGroup">
<VisualState x:Name="DefaultPaddingState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource WideWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource WideWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="MediumPaddingState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootContainer.Padding" Value="0" />
......@@ -55,7 +54,7 @@
</VisualState>
<VisualState x:Name="NarrowPaddingState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootContainer.Padding" Value="0" />
......
src/App/Pages/Overlay/PartitionDetailPage.xaml
浏览文件 @ d9f8006d
......@@ -10,7 +10,7 @@
xmlns:local="using:Richasy.Bili.App.Pages.Overlay"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -23,12 +23,12 @@
<VisualStateGroup x:Name="Common">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/Overlay/PlayerPage.xaml
浏览文件 @ d9f8006d
......@@ -6,7 +6,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
mc:Ignorable="d">
<Grid x:Name="RootGrid">
......@@ -14,12 +13,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentContainer.Padding" Value="{StaticResource NarrowPagePadding}" />
......@@ -37,12 +36,12 @@
<VisualStateGroup x:Name="DashboardGroup">
<VisualState x:Name="DashboardSplitState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource WideWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource WideWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="DashboardCombineState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="InformationContainer.ColumnSpacing" Value="0" />
......
src/App/Pages/Overlay/SearchPage.xaml
浏览文件 @ d9f8006d
......@@ -8,7 +8,6 @@
xmlns:local="using:Richasy.Bili.App.Pages.Overlay"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -28,12 +27,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/PartitionPage.xaml
浏览文件 @ d9f8006d
......@@ -9,7 +9,6 @@
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -18,12 +17,12 @@
<VisualStateGroup>
<VisualState x:Name="Wide">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="Narrow">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootContainer.Padding" Value="{StaticResource NarrowContainerWithBottomPadding}" />
......
src/App/Pages/PopularPage.xaml
浏览文件 @ d9f8006d
......@@ -8,7 +8,6 @@
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -17,12 +16,12 @@
<VisualStateGroup x:Name="Common">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/RankPage.xaml
浏览文件 @ d9f8006d
......@@ -9,7 +9,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:other="using:Richasy.Bili.Models.App.Other"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -18,12 +17,12 @@
<VisualStateGroup x:Name="Common">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/RecommendPage.xaml
浏览文件 @ d9f8006d
......@@ -8,7 +8,6 @@
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -17,12 +16,12 @@
<VisualStateGroup x:Name="Common">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/Reuse/AnimePage.xaml
浏览文件 @ d9f8006d
......@@ -4,12 +4,9 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:controls="using:Richasy.Bili.App.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:icons="using:Richasy.FluentIcon.Uwp"
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -22,12 +19,12 @@
<VisualStateGroup x:Name="Common">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/Reuse/FeedPage.xaml
浏览文件 @ d9f8006d
......@@ -7,7 +7,7 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -36,12 +36,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootGrid.Margin" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/SettingPage.xaml
浏览文件 @ d9f8006d
......@@ -7,7 +7,6 @@
xmlns:loc="using:Richasy.Bili.Locator.Uwp"
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
mc:Ignorable="d">
<Grid>
......@@ -15,12 +14,12 @@
<VisualStateGroup x:Name="LayoutGroup">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="RootPanel.Margin" Value="{StaticResource NarrowContainerPadding}" />
......
src/App/Pages/SpecialColumnPage.xaml
浏览文件 @ d9f8006d
......@@ -9,7 +9,6 @@
xmlns:local="using:Richasy.Bili.App.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:trigger="using:AdaptiveTriggerLibrary.Triggers.UserInterfaceTriggers"
xmlns:uwp="using:Richasy.Bili.ViewModels.Uwp"
mc:Ignorable="d">
......@@ -18,12 +17,12 @@
<VisualStateGroup x:Name="Common">
<VisualState x:Name="WideState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="{StaticResource MediumWindowThresholdWidth}" />
<AdaptiveTrigger MinWindowWidth="{StaticResource MediumWindowThresholdWidth}" />
</VisualState.StateTriggers>
</VisualState>
<VisualState x:Name="NarrowState">
<VisualState.StateTriggers>
<trigger:WindowWidthTrigger Condition="0" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="ContentScrollViewer.Padding" Value="{StaticResource NarrowContainerPadding}" />
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或