Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

更新主题颜色 #946

Merged
merged 22 commits into from
Dec 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/BiliLite.UWP/Controls/CommentControl.xaml
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:comment="using:BiliLite.ViewModels.Comment"
xmlns:common="using:BiliLite.Models.Common"
xmlns:viewModels="using:BiliLite.ViewModels"
xmlns:viewModels="using:BiliLite.ViewModels" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
d:DesignHeight="300"
d:DesignWidth="400"
x:Name="CommentControlContent"
Expand Down Expand Up @@ -388,7 +388,7 @@
</ListView.ItemTemplate>

</ListView>
<ProgressBar Visibility="{x:Bind Path=ShowLoading,Mode=OneWay}" IsIndeterminate="True" ></ProgressBar>
<muxc:ProgressBar Visibility="{x:Bind Path=ShowLoading,Mode=OneWay}" IsIndeterminate="True" ></muxc:ProgressBar>
<StackPanel HorizontalAlignment="Center" >

<HyperlinkButton HorizontalAlignment="Center" FontSize="14" Click="BtnLoadMoreReply_Click" Visibility="{Binding ShowReplyMore}" >
Expand Down Expand Up @@ -462,7 +462,7 @@

<ListView.Footer>
<StackPanel>
<ProgressBar x:Name="PrLoad" Visibility="{x:Bind m_viewModel.PrLoadVisibility, Mode=OneWay}" IsIndeterminate="True"></ProgressBar>
<muxc:ProgressBar x:Name="PrLoad" Visibility="{x:Bind m_viewModel.PrLoadVisibility, Mode=OneWay}" IsIndeterminate="True"></muxc:ProgressBar>
<HyperlinkButton x:Name="BtnLoadMore" Click="BtnLoadMore_Click" Visibility="{x:Bind m_viewModel.BtnLoadMoreVisibility,Mode=OneWay}" HorizontalAlignment="Center">
<TextBlock>加载更多</TextBlock>
</HyperlinkButton>
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Controls/Dynamic/DynamicItemControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
<Grid Height="56" >
<StackPanel VerticalAlignment="Center" >
<StackPanel Orientation="Horizontal" >
<Border Visibility="{x:Bind Path=ViewModel.ShowTag,Mode=OneWay}" Margin="0 0 4 0" Background="HotPink" CornerRadius="2">
<Border Visibility="{x:Bind Path=ViewModel.ShowTag,Mode=OneWay}" Margin="0 0 4 0" Background="{ThemeResource SystemAccentColor}" CornerRadius="2">
<TextBlock Foreground="White" FontSize="12" Margin="4 2" Text="{x:Bind Path=ViewModel.TagName,Mode=OneWay}"></TextBlock>
</Border>
<TextBlock Text="{x:Bind Path=ViewModel.UserName,Mode=OneWay}" Foreground="DeepPink" Opacity=".8" Visibility="{x:Bind Path=ViewModel.IsYearVip,Mode=OneWay}"></TextBlock>
Expand Down
8 changes: 4 additions & 4 deletions src/BiliLite.UWP/Controls/PlayerControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
xmlns:common="using:BiliLite.Models.Common"
xmlns:player1="using:BiliLite.Models.Common.Player"
xmlns:modules="using:BiliLite.Modules"
xmlns:video="using:BiliLite.Models.Common.Video"
xmlns:video="using:BiliLite.Models.Common.Video" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
d:DesignHeight="800"
d:DesignWidth="1000">
<UserControl.Resources>
Expand Down Expand Up @@ -694,9 +694,9 @@
<RowDefinition Height="Auto"></RowDefinition>
</Grid.RowDefinitions>

<ProgressBar Grid.Row="1"
<muxc:ProgressBar Grid.Row="1"
Value="{Binding ElementName=Player,Path=Position,Mode=OneWay}"
Maximum="{Binding ElementName=Player,Path=Duration,Mode=OneWay}"></ProgressBar>
Maximum="{Binding ElementName=Player,Path=Duration,Mode=OneWay}"></muxc:ProgressBar>
</Grid>

<Grid x:Name="control" >
Expand Down Expand Up @@ -939,7 +939,7 @@
<fa:FontAwesome Icon="Regular_WindowMaximize" FontSize="20"></fa:FontAwesome>
</HyperlinkButton>
</StackPanel>
<ProgressBar VerticalAlignment="Bottom" Foreground="White" Value="{Binding ElementName=BottomProgress,Path=Value,Mode=OneWay}" Maximum="{Binding ElementName=BottomProgress,Path=Maximum,Mode=OneWay}"></ProgressBar>
<muxc:ProgressBar VerticalAlignment="Bottom" Foreground="White" Value="{Binding ElementName=BottomProgress,Path=Value,Mode=OneWay}" Maximum="{Binding ElementName=BottomProgress,Path=Maximum,Mode=OneWay}"></muxc:ProgressBar>
</Grid>

</Grid>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Controls/VideoListView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:local="using:BiliLite.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:video="using:BiliLite.ViewModels.Video"
xmlns:video1="using:BiliLite.Models.Common.Video"
xmlns:common="using:BiliLite.Controls.Common"
Expand Down Expand Up @@ -33,7 +33,7 @@
ItemsSource="{x:Bind m_viewModel.Sections,Mode=OneWay}">
<ListView.ItemTemplate>
<DataTemplate x:DataType="video:VideoListSectionViewModel">
<muxc:Expander
<muxc:Expander HorizontalAlignment="Stretch"
ContextRequested="UIElement_OnContextRequested" ContextFlyout="{StaticResource SectionFlyout}"
HorizontalContentAlignment="Left"
IsExpanded="{x:Bind Selected,Mode=OneWay}">
Expand Down
2 changes: 1 addition & 1 deletion src/BiliLite.UWP/Dialogs/DownloadDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<TextBlock TextTrimming="CharacterEllipsis" VerticalAlignment="Center" HorizontalAlignment="Left" Text="{x:Bind Path=Title}" ToolTipService.ToolTip="{x:Bind Path=Title}"></TextBlock>
<Border Grid.Column="1" Visibility="{x:Bind Path=ShowBadge,Mode=OneWay}" HorizontalAlignment="Right" Background="HotPink" CornerRadius="4">
<Border Grid.Column="1" Visibility="{x:Bind Path=ShowBadge,Mode=OneWay}" HorizontalAlignment="Right" Background="{ThemeResource SystemAccentColor}" CornerRadius="4">
<TextBlock FontSize="12" Foreground="White" Margin="4" Text="{x:Bind Path=Badge,Mode=OneWay}"></TextBlock>
</Border>
<TextBlock Grid.Column="2" FontSize="12" VerticalAlignment="Center" Foreground="Red" Visibility="{x:Bind Path=State,Mode=OneWay,Converter={StaticResource display},ConverterParameter=99}" Text="{x:Bind Path=ErrorMessage,Mode=OneWay}"></TextBlock>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Dialogs/SendDynamicDialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:modules="using:BiliLite.Modules"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="using:BiliLite.ViewModels"
xmlns:viewModels="using:BiliLite.ViewModels" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d">
<ContentDialog.Resources>
<Flyout x:Key="FaceFlyout" x:Name="FaceFlyout">
Expand Down Expand Up @@ -165,7 +165,7 @@
</StackPanel>
</Grid>
<StackPanel x:Name="pr_Upload" Margin="0 4" Visibility="{x:Bind Path=m_viewModel.Uploading,Mode=OneWay}">
<ProgressBar Background="#00000000" IsIndeterminate="True" ></ProgressBar>
<muxc:ProgressBar Background="#00000000" IsIndeterminate="True" ></muxc:ProgressBar>
<TextBlock FontSize="14" Foreground="Gray" Margin="4 0" VerticalAlignment="Center">图片上传中...</TextBlock>
</StackPanel>

Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Dialogs/SendDynamicV2Dialog.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:modules="using:BiliLite.Modules"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:viewModels="using:BiliLite.ViewModels"
xmlns:viewModels="using:BiliLite.ViewModels" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d">
<ContentDialog.Resources>
<Flyout x:Key="FaceFlyout" x:Name="FaceFlyout">
Expand Down Expand Up @@ -165,7 +165,7 @@
</StackPanel>
</Grid>
<StackPanel x:Name="pr_Upload" Margin="0 4" Visibility="{x:Bind Path=m_viewModel.Uploading,Mode=OneWay}">
<ProgressBar Background="#00000000" IsIndeterminate="True" ></ProgressBar>
<muxc:ProgressBar Background="#00000000" IsIndeterminate="True" ></muxc:ProgressBar>
<TextBlock FontSize="14" Foreground="Gray" Margin="4 0" VerticalAlignment="Center">图片上传中...</TextBlock>
</StackPanel>

Expand Down
8 changes: 4 additions & 4 deletions src/BiliLite.UWP/Pages/DownloadPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
xmlns:controls="using:BiliLite.Controls"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls" xmlns:modules="using:BiliLite.Modules"
xmlns:download="using:BiliLite.Models.Common.Download"
xmlns:viewModel="using:BiliLite.ViewModels.Download"
xmlns:viewModel="using:BiliLite.ViewModels.Download" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
Background="Transparent">
<Page.Resources>
<SolidColorBrush x:Key="PivotHeaderBackground" Color="Transparent"></SolidColorBrush>
Expand Down Expand Up @@ -126,7 +126,7 @@
</Grid.ColumnDefinitions>
<StackPanel>
<TextBlock Foreground="Gray" FontSize="12" Grid.Row="1" Text="{x:Bind Path=FileName}"></TextBlock>
<ProgressBar Grid.ColumnSpan="3" Maximum="100" Value="{x:Bind Path=Progress,Mode=OneWay}"></ProgressBar>
<muxc:ProgressBar Grid.ColumnSpan="3" Maximum="100" Value="{x:Bind Path=Progress,Mode=OneWay}"></muxc:ProgressBar>
<Grid>
<TextBlock FontSize="12" Foreground="Gray" Text="{x:Bind Path=Status,Mode=OneWay,Converter={StaticResource downloadStatusConvert}}"></TextBlock>
<TextBlock FontSize="12" Foreground="Gray" HorizontalAlignment="Right" >
Expand Down Expand Up @@ -272,7 +272,7 @@
<Border Margin="0 0 8 0" CornerRadius="{StaticResource ImageCornerRadius}">
<Grid>
<Image Width="128" Height="80" Stretch="UniformToFill" Source="{x:Bind Path=Cover}"></Image>
<Border Visibility="{x:Bind Path=IsSeason}" CornerRadius="4" Background="HotPink" VerticalAlignment="Top" Margin="4" HorizontalAlignment="Right">
<Border Visibility="{x:Bind Path=IsSeason}" CornerRadius="4" Background="{ThemeResource SystemAccentColor}" VerticalAlignment="Top" Margin="4" HorizontalAlignment="Right">
<TextBlock FontSize="12" Padding="8 4" Foreground="White">剧集</TextBlock>
</Border>
</Grid>
Expand Down Expand Up @@ -302,7 +302,7 @@
<TextBlock Foreground="Gray" HorizontalAlignment="Right"><Run Text="{x:Bind Path=m_viewModel.DiskUse,Mode=OneWay,Converter={StaticResource numberToStringConvert}}"/>GB/<Run Text="{x:Bind Path=m_viewModel.DiskTotal,Mode=OneWay,Converter={StaticResource numberToStringConvert}}"/>GB</TextBlock>
</Grid>

<ProgressBar Margin="0 4 0 0" Height="8" Value="{x:Bind Path=m_viewModel.DiskUse,Mode=OneWay}" Maximum="{x:Bind Path=m_viewModel.DiskTotal,Mode=OneWay}"></ProgressBar>
<muxc:ProgressBar Margin="0 4 0 0" Height="8" Value="{x:Bind Path=m_viewModel.DiskUse,Mode=OneWay}" Maximum="{x:Bind Path=m_viewModel.DiskTotal,Mode=OneWay}"></muxc:ProgressBar>

</StackPanel>

Expand Down
6 changes: 3 additions & 3 deletions src/BiliLite.UWP/Pages/HomePage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@
<ImageBrush ImageSource="https://i1.hdslb.com/bfs/face/3e323499026ad0019be48dcd76f8e03199bd606c.jpg@70w_70h_1c_100q.webp"/>
</Ellipse.Fill>
</Ellipse>-->
<TextBlock TextAlignment="Center" Foreground="HotPink" FontWeight="Medium" Text="{x:Bind Path=m_viewModel.Profile.name,Mode=OneWay}"></TextBlock>
<Border Background="HotPink" Visibility="{x:Bind Path=m_viewModel.Profile.show_vip,Mode=OneWay}" Margin="4" Padding="4 2" CornerRadius="4" HorizontalAlignment="Center">
<TextBlock TextAlignment="Center" Foreground="{ThemeResource SystemAccentColor}" FontWeight="Medium" Text="{x:Bind Path=m_viewModel.Profile.name,Mode=OneWay}"></TextBlock>
<Border Background="{ThemeResource SystemAccentColor}" Visibility="{x:Bind Path=m_viewModel.Profile.show_vip,Mode=OneWay}" Margin="4" Padding="4 2" CornerRadius="4" HorizontalAlignment="Center">
<TextBlock Foreground="White" FontSize="12" Text="{x:Bind Path=m_viewModel.Profile.vip,Mode=OneWay}"></TextBlock>
</Border>
<Grid Margin="12 4" >
<TextBlock Foreground="{ThemeResource TextColor}">等级<Run Text="{x:Bind Path=m_viewModel.Profile.level,Mode=OneWay}"/></TextBlock>
<TextBlock FontSize="12" VerticalAlignment="Center" Foreground="Gray" HorizontalAlignment="Right"><Run Text="{x:Bind Path=m_viewModel.Profile.current_exp,Mode=OneWay}"/>/<Run Text="{x:Bind Path=m_viewModel.Profile.next_exp,Mode=OneWay}"/></TextBlock>
</Grid>
<ProgressBar Margin="12 4" Background="#33808080" Value="{x:Bind Path=m_viewModel.Profile.current_exp,Mode=OneWay}" Maximum="{x:Bind Path=m_viewModel.Profile.next_exp,Mode=OneWay}"></ProgressBar>
<winui:ProgressBar Margin="12 4" Value="{x:Bind Path=m_viewModel.Profile.current_exp,Mode=OneWay}" Maximum="{x:Bind Path=m_viewModel.Profile.next_exp,Mode=OneWay}"></winui:ProgressBar>

<Grid Padding="0 12" BorderThickness="0 1 0 1" Margin="0 4" BorderBrush="#19808080">
<Grid.ColumnDefinitions>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/Live/LiveCenterPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns:local="using:BiliLite.Pages.Live"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
mc:Ignorable="d" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:control="using:BiliLite.Controls"
xmlns:modules="using:BiliLite.Modules.Live.LiveCenter"
xmlns:toolkit="using:Microsoft.Toolkit.Uwp.UI.Controls"
Expand All @@ -24,7 +24,7 @@

<!--<StackPanel Margin="0 0 12 0" VerticalAlignment="Center">
<TextBlock Foreground="#61c05a">UL 11</TextBlock>
<ProgressBar Foreground="#61c05a" Margin="0 4 0 0" Width="120" Value="60" Height="8"></ProgressBar>
<muxc:ProgressBar Foreground="#61c05a" Margin="0 4 0 0" Width="120" Value="60" Height="8"></muxc:ProgressBar>
</StackPanel>-->
<Button Width="80"
Margin="0 0 8 0"
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/LiveDetailPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<ProgressBar Grid.ColumnSpan="2" Height="48" Foreground="{x:Bind Path=BackgroundBottomColor,Mode=OneWay,Converter={StaticResource colorConvert}}" Background="Transparent" Value="{x:Bind Path=Time,Mode=OneWay}" Maximum="{x:Bind Path=MaxTime,Mode=OneWay}"></ProgressBar>
<muxc:ProgressBar Grid.ColumnSpan="2" Height="48" Foreground="{x:Bind Path=BackgroundBottomColor,Mode=OneWay,Converter={StaticResource colorConvert}}" Background="Transparent" Value="{x:Bind Path=Time,Mode=OneWay}" Maximum="{x:Bind Path=MaxTime,Mode=OneWay}"></muxc:ProgressBar>

<Ellipse Width="32" Height="32" Margin="2 0 0 0">
<Ellipse.Fill>
Expand Down Expand Up @@ -1222,7 +1222,7 @@
<ListView.ItemTemplate>
<DataTemplate x:DataType="live:GiftMsgModel">
<StackPanel Orientation="Horizontal">
<TextBlock Foreground="HotPink" VerticalAlignment="Center" Text="{x:Bind Path=UserName}"></TextBlock>
<TextBlock Foreground="{ThemeResource SystemAccentColor}" VerticalAlignment="Center" Text="{x:Bind Path=UserName}"></TextBlock>
<TextBlock VerticalAlignment="Center" Margin="4 0">赠送</TextBlock>
<TextBlock VerticalAlignment="Center" Text="{x:Bind Path=GiftName}"></TextBlock>
<Image Width="24" Source="{x:Bind Path=Gif}"></Image>
Expand Down
4 changes: 2 additions & 2 deletions src/BiliLite.UWP/Pages/UserInfoPage.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -564,12 +564,12 @@
<StackPanel Margin="0 24 12 0" Grid.Column="1">

<StackPanel Orientation="Horizontal">
<TextBlock Visibility="{x:Bind Path=m_viewModel.UserSpaceInfo.Vip.Status,Mode=OneWay,Converter={StaticResource display},ConverterParameter=1}" FontWeight="Bold" Foreground="HotPink" VerticalAlignment="Center" Text="{x:Bind Path=m_viewModel.UserSpaceInfo.Name,Mode=OneWay}"></TextBlock>
<TextBlock Visibility="{x:Bind Path=m_viewModel.UserSpaceInfo.Vip.Status,Mode=OneWay,Converter={StaticResource display},ConverterParameter=1}" FontWeight="Bold" Foreground="{ThemeResource SystemAccentColor}" VerticalAlignment="Center" Text="{x:Bind Path=m_viewModel.UserSpaceInfo.Name,Mode=OneWay}"></TextBlock>
<TextBlock Visibility="{x:Bind Path=m_viewModel.UserSpaceInfo.Vip.Status,Mode=OneWay,Converter={StaticResource display},ConverterParameter=0}" FontWeight="Bold" VerticalAlignment="Center" Text="{x:Bind Path=m_viewModel.UserSpaceInfo.Name,Mode=OneWay}"></TextBlock>
<Border Background="{x:Bind Path=m_viewModel.UserSpaceInfo.LevelColor,Mode=OneWay}" Opacity=".8" Margin="8 0" CornerRadius="2">
<TextBlock Margin="4 2" Foreground="White" FontSize="12">LV<Run Text="{x:Bind Path=m_viewModel.UserSpaceInfo.Level,Mode=OneWay}"/></TextBlock>
</Border>
<Border Visibility="{x:Bind Path=m_viewModel.UserSpaceInfo.Vip.Status,Mode=OneWay,Converter={StaticResource display},ConverterParameter=1}" Background="HotPink" Opacity=".8" CornerRadius="2">
<Border Visibility="{x:Bind Path=m_viewModel.UserSpaceInfo.Vip.Status,Mode=OneWay,Converter={StaticResource display},ConverterParameter=1}" Background="{ThemeResource SystemAccentColor}" Opacity=".8" CornerRadius="2">
<TextBlock Margin="4 2" Foreground="White" FontSize="12" Text="{x:Bind Path=m_viewModel.UserSpaceInfo.Vip.Label.Text,Mode=OneWay}"></TextBlock>
</Border>
</StackPanel>
Expand Down
Loading