修改部分画笔

修改了之后UI可能会崩坏, 麻烦@aaaaaaccd 修改一下
TonyDing1998 · Feb 26, 2021 · da23b23 · da23b23
1 parent 528ce29
commit da23b23
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 25 deletions.
diff --git a/HyPlayer/Controls/PlayBar.xaml.cs b/HyPlayer/Controls/PlayBar.xaml.cs
@@ -44,6 +44,7 @@ public sealed partial class PlayBar : UserControl
     {
         private bool canslide;
         public TimeSpan nowtime => HyPlayList.Player.PlaybackSession.Position;
+        private Brush originPlaybarBrush;
 
         public PlayBar()
         {
@@ -182,7 +183,7 @@ private void ButtonExpand_OnClick(object sender, RoutedEventArgs e)
         {
             ButtonExpand.Visibility = Visibility.Collapsed;
             ButtonCollapse.Visibility = Visibility.Visible;
-
+            originPlaybarBrush = Common.PageMain.GridPlayBar.Background;
             Common.PageMain.GridPlayBar.Background = null;
             //Common.PageMain.MainFrame.Visibility = Visibility.Collapsed;
             Common.PageMain.ExpandedPlayer.Visibility = Visibility.Visible;
@@ -216,7 +217,7 @@ private void ButtonCollapse_OnClick(object sender, RoutedEventArgs e)
             Common.PageMain.ExpandedPlayer.Navigate(typeof(BlankPage));
             //Common.PageMain.MainFrame.Visibility = Visibility.Visible;
             Common.PageMain.ExpandedPlayer.Visibility = Visibility.Collapsed;
-            Common.PageMain.GridPlayBar.Background = new Windows.UI.Xaml.Media.AcrylicBrush() { BackgroundSource = AcrylicBackgroundSource.Backdrop, TintOpacity = 0.67500003206078, TintLuminosityOpacity = 0.183000008692034, TintColor = Windows.UI.Color.FromArgb(255, 62, 62, 62), FallbackColor = Windows.UI.Color.FromArgb(255, 62, 62, 62) };
+            Common.PageMain.GridPlayBar.Background = originPlaybarBrush;
         }
 
         private void ButtonCleanAll_OnClick(object sender, RoutedEventArgs e)

diff --git a/HyPlayer/Controls/SingleNCSong.xaml.cs b/HyPlayer/Controls/SingleNCSong.xaml.cs
@@ -29,18 +29,20 @@ public sealed partial class SingleNCSong : UserControl
     {
         private NCSong ncsong;
         private bool CanPlay;
-        public SingleNCSong(NCSong song,int order,bool canplay=true)
+        public SingleNCSong(NCSong song, int order, bool canplay = true)
         {
             this.InitializeComponent();
             ncsong = song;
             CanPlay = canplay;
-            if (!CanPlay) {BtnPlay.Visibility = Visibility.Collapsed;
+            if (!CanPlay)
+            {
+                BtnPlay.Visibility = Visibility.Collapsed;
                 TextBlockSongname.Foreground = new SolidColorBrush(Color.FromArgb(255, 128, 128, 128));
             }
-            ImageRect.ImageSource = new BitmapImage(new Uri(song.Album.cover+ "?param="+StaticSource.PICSIZE_SINGLENCSONG_COVER));
+            ImageRect.ImageSource = new BitmapImage(new Uri(song.Album.cover + "?param=" + StaticSource.PICSIZE_SINGLENCSONG_COVER));
             TextBlockSongname.Text = song.songname;
             TextBlockAlbum.Text = song.Album.name;
-            OrderId.Text = order.ToString();
+            OrderId.Text = (order + 1).ToString();
             TextBlockArtist.Text = string.Join(" / ", song.Artist.Select(ar => ar.name));
         }
 
@@ -61,17 +63,11 @@ private void UIElement_OnDoubleTapped(object sender, DoubleTappedRoutedEventArgs
                 TintColor = Windows.UI.Color.FromArgb(255, 0, 142, 230),
                 FallbackColor = Windows.UI.Color.FromArgb(255, 54, 54, 210)
             };
-
         }
 
         private void UIElement_OnPointerEntered(object sender, PointerRoutedEventArgs e)
         {
-            Grid1.Background = new Windows.UI.Xaml.Media.AcrylicBrush()
-            {
-                BackgroundSource = AcrylicBackgroundSource.Backdrop, TintOpacity = 0.67500003206078,
-                TintLuminosityOpacity = 0.183000008692034, TintColor = Windows.UI.Color.FromArgb(255, 54, 54, 54),
-                FallbackColor = Windows.UI.Color.FromArgb(255, 54, 54, 54)
-            };
+            Grid1.Background = Application.Current.Resources["SystemControlAltLowAcrylicElementBrush"] as Brush;
         }
 
         private void Grid1_OnPointerExited(object sender, PointerRoutedEventArgs e)
@@ -81,14 +77,7 @@ private void Grid1_OnPointerExited(object sender, PointerRoutedEventArgs e)
 
         private void Grid1_OnTapped(object sender, TappedRoutedEventArgs e)
         {
-            Grid1.Background = new Windows.UI.Xaml.Media.AcrylicBrush()
-            {
-                BackgroundSource = AcrylicBackgroundSource.Backdrop,
-                TintOpacity = 0.67500003206078,
-                TintLuminosityOpacity = 0.183000008692034,
-                TintColor = Windows.UI.Color.FromArgb(10, 147, 205, 241),
-                FallbackColor = Windows.UI.Color.FromArgb(10, 135, 206, 235)
-            };
+            Grid1.Background = Application.Current.Resources["SystemControlChromeMediumAcrylicElementMediumBrush"] as Brush;
         }
 
         private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
@@ -98,6 +87,7 @@ private void ButtonBase_OnClick(object sender, RoutedEventArgs e)
 
         private void Grid1_OnDoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
         {
+            Grid1.Background = Application.Current.Resources["SystemControlAccentAcrylicElementAccentMediumHighBrush"] as Brush;
             _ = AppendMe();
         }
     }

diff --git a/HyPlayer/MainPage.xaml b/HyPlayer/MainPage.xaml
@@ -11,6 +11,7 @@
     xmlns:hyPlayer="using:HyPlayer"
     xmlns:triggers="using:Microsoft.Toolkit.Uwp.UI.Triggers"
     xmlns:hyPlayerPage="using:HyPlayer.Pages"
+    Background="{ThemeResource SystemControlChromeMediumAcrylicWindowMediumBrush}"
     mc:Ignorable="d">
     <Grid>
         <Frame
@@ -27,7 +28,7 @@
             Name="GridPlayBar"
             Margin="16"
             CornerRadius="4"
-            Background="{StaticResource PlaybackAcrylicInAppLuminosity}"
+            Background="{ThemeResource SystemControlAcrylicElementMediumHighBrush}"
             VerticalAlignment="Bottom"
             Height="100">
             <controls2:PlayBar />

diff --git a/HyPlayer/Pages/BasePage.xaml b/HyPlayer/Pages/BasePage.xaml
@@ -14,7 +14,7 @@
             x:Name="NavMain"
             Margin="0,0,0,0"
             BackRequested="OnNavigateBack"
-            Background="{ThemeResource AccentPanelAcrylic}"
+            Background="{ThemeResource SystemControlChromeMediumAcrylicWindowMediumBrush}"
             IsBackButtonVisible="Visible"
             IsBackEnabled="True"
             IsSettingsVisible="False"

diff --git a/HyPlayer/Pages/SongListDetail.xaml b/HyPlayer/Pages/SongListDetail.xaml
@@ -54,7 +54,6 @@
             <StackPanel
 				Orientation="Vertical">
                 <controls:DockPanel
-                    Background="{ThemeResource AccentPanelAcrylic}"
                     LastChildFill="True"
                     x:Name="GridPersonalInformation">
                     <Rectangle
@@ -105,6 +104,7 @@
                     </StackPanel>
                 </controls:DockPanel>
                 <StackPanel
+                    Background="{ThemeResource SystemControlAcrylicElementBrush}"
                     Margin="20,30,0,0"
                     Spacing="10"
 					Name="SongContainer"

diff --git a/HyPlayer/Pages/SongListFrame.xaml b/HyPlayer/Pages/SongListFrame.xaml
@@ -7,7 +7,7 @@
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
     mc:Ignorable="d"
-    Background="{ThemeResource BackgroundInAppLuminosity}">
+    Background="{ThemeResource SystemControlAcrylicElementBrush}">
 
     <Grid>
         <controls:WrapPanel Margin="0,0,0,350" HorizontalAlignment="Center" HorizontalSpacing="15" VerticalSpacing="15" x:Name="GridContainer" />