Skip to content
This repository has been archived by the owner on Apr 17, 2024. It is now read-only.

Commit

Permalink
merge #225
Browse files Browse the repository at this point in the history
  • Loading branch information
@xiaoyaocz
xiaoyaocz committed Sep 20, 2022
2 parents 72ccb81 + d9768ed commit aecbaa0
Show file tree
Hide file tree
Showing 38 changed files with 66 additions and 53 deletions.
11 changes: 9 additions & 2 deletions src/BiliLite.UWP/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,27 @@
<ResourceDictionary Source="ms-appx:///Controls/RoundButton/RoundButton.xaml"/>
<ResourceDictionary Source="ms-appx:///Controls/ScrollGridView/ScrollGridView.xaml"/>
<ResourceDictionary>
<StaticResource x:Key="NavigationViewContentBackground" ResourceKey="LayerFillColorDefaultBrush" />
<StaticResource x:Key="NavigationViewContentGridBorderBrush" ResourceKey="CardStrokeColorDefaultBrush" />

<SolidColorBrush x:Key="LayerFillColorDefaultBrush" Color="Transparent" />
<SolidColorBrush x:Key="CardStrokeColorDefaultBrush" Color="Transparent" />
<SolidColorBrush x:Key="TabViewBorderBrush" Color="Transparent"/>

<SolidColorBrush x:Key="NavigationViewTopPaneBackground" Color="{ThemeResource TopPaneBackground}" />
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundSelected" Color="{ThemeResource TopPaneBackground}"/>
</ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
<ResourceDictionary.ThemeDictionaries>
<ResourceDictionary x:Key="Light">
<Color x:Key="TopPaneBackground">#FFF9F9F9</Color>
<Color x:Key="TopPaneBackground">#00000000</Color>
<Color x:Key="HighLightColor">#ec407a</Color>
<Color x:Key="TextColor">#CC000000</Color>
<Color x:Key="SystemColorHighlightColor">#ec407a</Color>
<Color x:Key="CardColor">#C8FFFFFF</Color>
</ResourceDictionary>
<ResourceDictionary x:Key="Dark">
<Color x:Key="TopPaneBackground">#FF282828</Color>
<Color x:Key="TopPaneBackground">#00000000</Color>
<Color x:Key="HighLightColor">#ec407a</Color>
<Color x:Key="TextColor">#CCFFFFFF</Color>
<Color x:Key="SystemColorHighlightColor">#ec407a</Color>
Expand Down
6 changes: 4 additions & 2 deletions src/BiliLite.UWP/MainPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
winui:BackdropMaterial.ApplyToRootOrPageBackground="True"
xmlns:fa="using:FontAwesome5"
xmlns:pages="using:BiliLite.Pages"
xmlns:muxm="using:Microsoft.UI.Xaml.Media" xmlns:controls="using:BiliLite.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
xmlns:muxm="using:Microsoft.UI.Xaml.Media"
xmlns:controls="using:BiliLite.Controls"
Background="Transparent">

<Grid>
<winui:TabView x:Name="tabView" TabItemsChanged="tabView_TabItemsChanged" VerticalAlignment="Stretch" VerticalContentAlignment="Stretch" Loaded="tabView_Loaded" IsAddTabButtonVisible="True" TabCloseRequested="TabView_TabCloseRequested" AddTabButtonClick="TabView_AddTabButtonClick">
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/NoTabMainPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:BiliLite.Controls"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid Background="#66AEAEAE">
<Grid.RowDefinitions>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Bangumi/AnimeIndexPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<Grid.RowDefinitions>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Bangumi/SeasonRankPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xmlns:convert="using:BiliLite.Converters"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:modules="using:BiliLite.Modules.Season"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Bangumi/TimelinePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:fa="using:FontAwesome5"

Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/DownloadPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xmlns:convert="using:BiliLite.Converters"
xmlns:controls="using:BiliLite.Controls"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:modules="using:BiliLite.Modules"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/Home/AnimePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
xmlns:models="using:BiliLite.Models"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<DataTemplate x:Key="HotAnimeItem" x:DataType="model:AnimeRankModel">
<Grid>
Expand Down Expand Up @@ -307,7 +307,7 @@
<controls:RoundButton x:Name="btnRefresh" Click="btnRefresh_Click" VerticalAlignment="Bottom" Padding="12" Margin="12" HorizontalAlignment="Right">
<SymbolIcon Symbol="Refresh" Foreground="White"></SymbolIcon>
</controls:RoundButton>
<Grid x:Name="gridLoading" Visibility="{x:Bind Path=homeBangumi.Loading,Mode=OneWay}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid x:Name="gridLoading" Visibility="{x:Bind Path=homeBangumi.Loading,Mode=OneWay}" Background="Transparent">
<ProgressRing IsActive="True" VerticalAlignment="Center" HorizontalAlignment="Center"></ProgressRing>
</Grid>
</Grid>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Home/ChannelPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<WebView x:Name="web"></WebView>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Home/DynamicPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<convert:DatetimeConvert x:Key="time"/>
<DataTemplate x:Key="DynamicVideo" x:DataType="modules:DynamicItemModel">
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Home/HotPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:covert="using:BiliLite.Converters"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<covert:ColorConvert x:Key="colorConvert"></covert:ColorConvert>
</Page.Resources>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/Home/LivePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<winui:RefreshContainer RefreshRequested="RefreshContainer_RefreshRequested">
Expand Down Expand Up @@ -212,7 +212,7 @@
<controls:RoundButton x:Name="btnRefresh" Click="btnRefresh_Click" VerticalAlignment="Bottom" Padding="12" Margin="12" HorizontalAlignment="Right">
<SymbolIcon Symbol="Refresh" Foreground="White"></SymbolIcon>
</controls:RoundButton>
<Grid x:Name="gridLoading" Visibility="{x:Bind Path=liveVM.Loading,Mode=OneWay}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid x:Name="gridLoading" Visibility="{x:Bind Path=liveVM.Loading,Mode=OneWay}" Background="Transparent">
<ProgressRing IsActive="True" VerticalAlignment="Center" HorizontalAlignment="Center"></ProgressRing>
</Grid>
</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/Home/MoviePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
xmlns:models="using:BiliLite.Models"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<DataTemplate x:Key="HotAnimeItem" x:DataType="model:CinemaHomeHotItem">
<Grid>
Expand Down Expand Up @@ -384,7 +384,7 @@
<controls:RoundButton x:Name="btnRefresh" Click="btnRefresh_Click" VerticalAlignment="Bottom" Padding="12" Margin="12" HorizontalAlignment="Right">
<SymbolIcon Symbol="Refresh" Foreground="White"></SymbolIcon>
</controls:RoundButton>
<Grid x:Name="gridLoading" Visibility="{x:Bind Path=cinemaVM.Loading,Mode=OneWay}" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid x:Name="gridLoading" Visibility="{x:Bind Path=cinemaVM.Loading,Mode=OneWay}" Background="Transparent">
<ProgressRing IsActive="True" VerticalAlignment="Center" HorizontalAlignment="Center"></ProgressRing>
</Grid>
</Grid>
Expand Down
9 changes: 4 additions & 5 deletions src/BiliLite.UWP/Pages/Home/RecommendPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"

Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Page.Resources>
<covert:ColorConvert x:Key="colorConvert"></covert:ColorConvert>
Expand Down Expand Up @@ -212,15 +211,15 @@
</Grid>
</winui:RefreshContainer>
<StackPanel Orientation="Vertical" VerticalAlignment="Bottom" Margin="20 12" HorizontalAlignment="Right">
<controls:RoundButton x:Name="btnTop" Click="btnTop_Click" ToolTipService.ToolTip="返回顶部" Margin="0 0 0 8" Padding="12">
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE110;" Foreground="White"/>
</controls:RoundButton>
<controls:RoundButton x:Name="btnGrid" Visibility="Collapsed" ToolTipService.ToolTip="切换为网格显示" Click="btnGrid_Click" Margin="0 0 0 8" Padding="12">
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE80A;" Foreground="White"/>
</controls:RoundButton>
<controls:RoundButton x:Name="btnList" ToolTipService.ToolTip="切换为列表显示" Click="btnList_Click" Margin="0 0 0 8" Padding="12">
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE292;" Foreground="White"/>
</controls:RoundButton>
<controls:RoundButton x:Name="btnTop" Click="btnTop_Click" ToolTipService.ToolTip="返回顶部" Margin="0 0 0 8" Padding="12">
<FontIcon FontFamily="Segoe MDL2 Assets" Glyph="&#xE110;" Foreground="White"/>
</controls:RoundButton>
<controls:RoundButton Padding="12" Command="{x:Bind Path=recommendVM.RefreshCommand}" >
<SymbolIcon Symbol="Refresh" Foreground="White"></SymbolIcon>
</controls:RoundButton>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Home/RegionsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:model="using:BiliLite.Modules.Home"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<ScrollViewer VerticalScrollBarVisibility="Auto">
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/HomePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:ip="using:MahApps.Metro.IconPacks"
xmlns:modules="using:BiliLite.Modules" xmlns:converters="using:BiliLite.Converters"
NavigationCacheMode="Required"
>
Background="Transparent">
<Page.Resources>
<converters:CountDisplayConvert x:Name="countDisplayConvert"></converters:CountDisplayConvert>
</Page.Resources>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Live/LiveAreaDetailPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:controls="using:BiliLite.Controls" xmlns:winui="using:Microsoft.UI.Xaml.Controls" xmlns:modules="using:BiliLite.Modules.Live" xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:fa="using:FontAwesome5"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Live/LiveAreaPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:modules="using:BiliLite.Modules.Live"
mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Live/LiveCenterPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:modules="using:BiliLite.Modules.Live.LiveCenter"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:convert="using:BiliLite.Converters"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<convert:DatetimeConvert x:Key="time"/>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Live/LiveRecommendPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xmlns:convert="using:BiliLite.Converters"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:modules="using:BiliLite.Modules.Live" xmlns:fa="using:FontAwesome5" xmlns:controls="using:BiliLite.Controls" xmlns:winui="using:Microsoft.UI.Xaml.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/LiveDetailPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
xmlns:model_live="using:BiliLite.Modules.Live"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<convert:DatetimeConvert x:Key="datetime" ></convert:DatetimeConvert>
<convert:ColorConvert x:Key="colorConvert" ></convert:ColorConvert>
Expand Down Expand Up @@ -803,7 +803,7 @@
</Grid>

</Grid>
<Grid Grid.Column="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid Grid.Column="1" Background="Transparent">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/LocalPlayerPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:controls="using:BiliLite.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<controls:PlayerControl x:Name="player"></controls:PlayerControl>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/NewPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<Image x:Name="backgroundImage" Stretch="UniformToFill" ></Image>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Other/FindMorePage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:modules="using:BiliLite.Modules.Other"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">

<Grid>
<toolkit:AdaptiveGridView OneRowModeEnabled="False"
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/Other/TopicPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:convert="using:BiliLite.Converters"
xmlns:modules="using:BiliLite.Modules.User"
xmlns:control="using:BiliLite.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/RankPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
<SolidColorBrush x:Key="SystemControlHighlightAltAccentBrush" Color="White"></SolidColorBrush>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/RegionDetailPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:winui="using:Microsoft.UI.Xaml.Controls"
xmlns:fa="using:FontAwesome5"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>

<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Pages/SearchPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:convert="using:BiliLite.Converters"
xmlns:modules="using:BiliLite.Modules"
xmlns:control="using:BiliLite.Controls"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<convert:DatetimeConvert x:Key="ts"/>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="{ThemeResource TopPaneBackground}"></SolidColorBrush>
Expand Down
6 changes: 3 additions & 3 deletions src/BiliLite.UWP/Pages/SeasonDetailPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
xmlns:convert="using:BiliLite.Converters"
xmlns:modules="using:BiliLite.Modules"
xmlns:control="using:BiliLite.Controls" xmlns:season="using:BiliLite.Modules.Season"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
Background="Transparent">
<Page.Resources>
<convert:DatetimeConvert x:Key="datetime" ></convert:DatetimeConvert>
<convert:ColorSelecteConvert x:Key="colorSelct" ></convert:ColorSelecteConvert>
Expand Down Expand Up @@ -140,7 +140,7 @@
</StackPanel>
</Grid>
</Grid>
<Pivot x:Name="pivot" SelectionChanged="pivot_SelectionChanged" Grid.Column="1" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Pivot x:Name="pivot" SelectionChanged="pivot_SelectionChanged" Grid.Column="1" Background="Transparent">
<PivotItem Margin="0">
<PivotItem.Header>
<TextBlock Text="选集" FontSize="18"></TextBlock>
Expand Down Expand Up @@ -418,7 +418,7 @@
</PivotItem>
</Pivot>
</Grid>
<Border Visibility="{x:Bind Path=seasonDetailVM.ShowError,Mode=OneWay}" CornerRadius="4" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="48 24" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Border Visibility="{x:Bind Path=seasonDetailVM.ShowError,Mode=OneWay}" CornerRadius="4" VerticalAlignment="Center" HorizontalAlignment="Center" Padding="48 24" Background="Transparent">
<StackPanel VerticalAlignment="Center">
<FontIcon FontFamily="{StaticResource BiliIconFont}" HorizontalAlignment="Center" FontSize="36" Glyph="&#xE68E;" />
<TextBlock Text="{x:Bind Path=seasonDetailVM.ErrorMsg,Mode=OneWay}" TextAlignment="Center" Margin="0 8 0 0"></TextBlock>
Expand Down
Loading

0 comments on commit aecbaa0

Please sign in to comment.