fix: 优化暗黑模式表现并修复dialog暗黑模式异常问题

2025-08-10 00:52:31 +00:00 · 2024-04-08 21:49:18 +08:00
parent 5d8c39d5c7
commit 8922ab421b
19 changed files with 109 additions and 157 deletions
--- a/DownKyi/PrismExtension/Dialog/DialogWindow.axaml
+++ b/DownKyi/PrismExtension/Dialog/DialogWindow.axaml
@@ -5,18 +5,23 @@
        Title="{Binding Title}"
        WindowStartupLocation="CenterOwner">
    <Window.Styles>
-        <SimpleTheme />
        <Style Selector="Window">
            <Setter Property="SizeToContent" Value="WidthAndHeight" />
            <Setter Property="UseLayoutRounding" Value="True" />
            <Setter Property="TransparencyLevelHint" Value="AcrylicBlur" />
            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="CanResize" Value="False" />
+            <Setter Property="ShowInTaskbar" Value="False" />
+            <Setter Property="SystemDecorations" Value="None" />
        </Style>
-        <Style Selector="Window">
-            <Setter Property="FontFamily" Value="{DynamicResource ProgramFont}" />
-        </Style>
-        <Style Selector="TemplatedControl">
-            <Setter Property="FontFamily" Value="{DynamicResource ProgramFont}" />
-        </Style>
+        <!-- <Style Selector="Window"> -->
+        <!--     <Setter Property="FontFamily" Value="{DynamicResource ProgramFont}" /> -->
+        <!-- </Style> -->
+        <!-- <Style Selector="TemplatedControl"> -->
+        <!--     <Setter Property="FontFamily" Value="{DynamicResource ProgramFont}" /> -->
+        <!-- </Style> -->
+        
+        <!-- <SimpleTheme /> -->
+        <!-- <StyleInclude Source="avares://Avalonia.Themes.Simple/SimpleTheme.xaml" /> -->
    </Window.Styles>
 </Window>
--- a/DownKyi/Themes/Colors/ColorDark.axaml
+++ b/DownKyi/Themes/Colors/ColorDark.axaml
@@ -1,7 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
    <Color x:Key="ColorWindowBorder">Black</Color>
-    <Color x:Key="ColorCaptionForeground">Black</Color>
+    <Color x:Key="ColorCaptionForeground">white</Color>
    <Color x:Key="ColorCaptionBackground">#7FD0D0D0</Color>
    <Color x:Key="ColorSystemBtnTint">white</Color>
    <Color x:Key="ColorSystemBtnTintDark">black</Color>
@@ -16,7 +16,7 @@
    <Color x:Key="ColorBackgroundDark">#FF00A1D6</Color>
    <Color x:Key="ColorImageBorder">#7FD0D0D0</Color>
    <Color x:Key="ColorImageBackground">#7FD0D0D0</Color>
-    <Color x:Key="ColorText">white</Color>
+    <Color x:Key="ColorText">Black</Color>
    <Color x:Key="ColorTextDark">white</Color>
    <Color x:Key="ColorTabHeaderGrey">#FF141414</Color>

--- a/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs
+++ b/DownKyi/ViewModels/ViewDownloadManagerViewModel.cs
@@ -18,28 +18,20 @@ public class ViewDownloadManagerViewModel : ViewModelBase

    #region 页面属性申明

-    private VectorImage arrowBack;
-
-    public VectorImage ArrowBack
-    {
-        get => arrowBack;
-        set => SetProperty(ref arrowBack, value);
-    }
-
-    private List<TabHeader> tabHeaders;
+    private List<TabHeader> _tabHeaders;

    public List<TabHeader> TabHeaders
    {
-        get => tabHeaders;
-        set => SetProperty(ref tabHeaders, value);
+        get => _tabHeaders;
+        set => SetProperty(ref _tabHeaders, value);
    }

-    private int selectTabId;
+    private int _selectTabId;

    public int SelectTabId
    {
-        get => selectTabId;
-        set => SetProperty(ref selectTabId, value);
+        get => _selectTabId;
+        set => SetProperty(ref _selectTabId, value);
    }

    #endregion
@@ -51,9 +43,6 @@ public class ViewDownloadManagerViewModel : ViewModelBase

        #region 属性初始化

-        ArrowBack = NavigationIcon.Instance().ArrowBack;
-        ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
-
        TabHeaders = new List<TabHeader>
        {
            new()
@@ -107,7 +96,7 @@ public class ViewDownloadManagerViewModel : ViewModelBase
            return;
        }

-        NavigationParameters param = new NavigationParameters();
+        var param = new NavigationParameters();

        switch (tabHeader.Id)
        {
@@ -136,7 +125,5 @@ public class ViewDownloadManagerViewModel : ViewModelBase
        SelectTabId = 0;

        PropertyChangeAsync(() => { regionManager.RequestNavigate("DownloadManagerContentRegion", ViewDownloadingViewModel.Tag, new NavigationParameters()); });
-
-        ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
    }
 }
--- a/DownKyi/ViewModels/ViewLoginViewModel.cs
+++ b/DownKyi/ViewModels/ViewLoginViewModel.cs
@@ -5,7 +5,6 @@ using Avalonia.Media.Imaging;
 using DownKyi.Core.BiliApi.Login;
 using DownKyi.Core.Logging;
 using DownKyi.Events;
-using DownKyi.Images;
 using DownKyi.Utils;
 using Prism.Commands;
 using Prism.Events;
@@ -22,14 +21,6 @@ public class ViewLoginViewModel : ViewModelBase

    #region 页面属性申明

-    private VectorImage _arrowBack;
-
-    public VectorImage ArrowBack
-    {
-        get => _arrowBack;
-        set => SetProperty(ref _arrowBack, value);
-    }
-
    private Bitmap? _loginQrCode;

    public Bitmap? LoginQrCode
@@ -60,9 +51,6 @@ public class ViewLoginViewModel : ViewModelBase
    {
        #region 属性初始化

-        ArrowBack = NavigationIcon.Instance().ArrowBack;
-        ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
-
        #endregion
    }

@@ -78,7 +66,7 @@ public class ViewLoginViewModel : ViewModelBase

        // 结束任务
        _tokenSource.Cancel();
-        NavigationParam parameter = new NavigationParam
+        var parameter = new NavigationParam
        {
            ViewName = ParentView,
            ParentViewName = null,
@@ -131,7 +119,7 @@ public class ViewLoginViewModel : ViewModelBase
    /// <param name="oauthKey"></param>
    private void GetLoginStatus(string oauthKey)
    {
-        CancellationToken cancellationToken = _tokenSource.Token;
+        var cancellationToken = _tokenSource.Token;
        while (true)
        {
            Thread.Sleep(1000);
@@ -196,7 +184,7 @@ public class ViewLoginViewModel : ViewModelBase
                    // 保存登录信息
                    try
                    {
-                        bool isSucceed = LoginHelper.SaveLoginInfoCookies(loginStatus.Data.Url);
+                        var isSucceed = LoginHelper.SaveLoginInfoCookies(loginStatus.Data.Url);
                        if (!isSucceed)
                        {
                            EventAggregator.GetEvent<MessageEvent>()
@@ -236,8 +224,6 @@ public class ViewLoginViewModel : ViewModelBase
    /// </summary>
    private void InitStatus()
    {
-        ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
-
        LoginQrCode = null;
        LoginQrCodeOpacity = 1;
        LoginQrCodeStatus = false;
--- a/DownKyi/ViewModels/ViewToolboxViewModel.cs
+++ b/DownKyi/ViewModels/ViewToolboxViewModel.cs
@@ -1,6 +1,5 @@
 using System.Collections.Generic;
 using DownKyi.Events;
-using DownKyi.Images;
 using DownKyi.Utils;
 using DownKyi.ViewModels.PageViewModels;
 using DownKyi.ViewModels.Toolbox;
@@ -18,28 +17,20 @@ namespace DownKyi.ViewModels

        #region 页面属性申明

-        private VectorImage arrowBack;
-
-        public VectorImage ArrowBack
-        {
-            get => arrowBack;
-            set => SetProperty(ref arrowBack, value);
-        }
-
-        private List<TabHeader> tabHeaders;
+        private List<TabHeader> _tabHeaders;

        public List<TabHeader> TabHeaders
        {
-            get => tabHeaders;
-            set => SetProperty(ref tabHeaders, value);
+            get => _tabHeaders;
+            set => SetProperty(ref _tabHeaders, value);
        }

-        private int selectTabId;
+        private int _selectTabId;

        public int SelectTabId
        {
-            get => selectTabId;
-            set => SetProperty(ref selectTabId, value);
+            get => _selectTabId;
+            set => SetProperty(ref _selectTabId, value);
        }

        #endregion
@@ -51,9 +42,6 @@ namespace DownKyi.ViewModels

            #region 属性初始化

-            ArrowBack = NavigationIcon.Instance().ArrowBack;
-            ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
-
            TabHeaders = new List<TabHeader>
            {
                new() { Id = 0, Title = DictionaryResource.GetString("BiliHelper") },
@@ -67,17 +55,16 @@ namespace DownKyi.ViewModels
        #region 命令申明

        // 返回事件
-        private DelegateCommand backSpaceCommand;
+        private DelegateCommand? _backSpaceCommand;

-        public DelegateCommand BackSpaceCommand =>
-            backSpaceCommand ?? (backSpaceCommand = new DelegateCommand(ExecuteBackSpace));
+        public DelegateCommand BackSpaceCommand => _backSpaceCommand ??= new DelegateCommand(ExecuteBackSpace);

        /// <summary>
        /// 返回事件
        /// </summary>
        private void ExecuteBackSpace()
        {
-            NavigationParam parameter = new NavigationParam
+            var parameter = new NavigationParam
            {
                ViewName = ParentView,
                ParentViewName = null,
@@ -87,12 +74,9 @@ namespace DownKyi.ViewModels
        }

        // 左侧tab点击事件
-        private DelegateCommand<object> leftTabHeadersCommand;
+        private DelegateCommand<object>? _leftTabHeadersCommand;

-        public DelegateCommand<object> LeftTabHeadersCommand => leftTabHeadersCommand ??
-                                                                (leftTabHeadersCommand =
-                                                                    new DelegateCommand<object>(
-                                                                        ExecuteLeftTabHeadersCommand));
+        public DelegateCommand<object> LeftTabHeadersCommand => _leftTabHeadersCommand ??= new DelegateCommand<object>(ExecuteLeftTabHeadersCommand);

        /// <summary>
        /// 左侧tab点击事件
@@ -100,12 +84,12 @@ namespace DownKyi.ViewModels
        /// <param name="parameter"></param>
        private void ExecuteLeftTabHeadersCommand(object parameter)
        {
-            if (!(parameter is TabHeader tabHeader))
+            if (parameter is not TabHeader tabHeader)
            {
                return;
            }

-            NavigationParameters param = new NavigationParameters();
+            var param = new NavigationParameters();

            switch (tabHeader.Id)
            {
@@ -138,8 +122,6 @@ namespace DownKyi.ViewModels
                regionManager.RequestNavigate("ToolboxContentRegion", ViewBiliHelperViewModel.Tag,
                    new NavigationParameters());
            });
-
-            ArrowBack.Fill = DictionaryResource.GetColor("ColorTextDark");
        }
    }
 }
--- a/DownKyi/Views/Dialogs/ViewAlertDialog.axaml
+++ b/DownKyi/Views/Dialogs/ViewAlertDialog.axaml
@@ -7,14 +7,14 @@
             xmlns:prismExtension="clr-namespace:DownKyi.PrismExtension.Dialog"
             x:DataType="vmd:ViewAlertDialogViewModel">

-    <prismExtension:Dialog.Theme>
-        <ControlTheme TargetType="Window">
-            <Setter Property="CanResize" Value="False" />
-            <Setter Property="ShowInTaskbar" Value="False" />
-            <Setter Property="SizeToContent" Value="WidthAndHeight" />
-            <Setter Property="SystemDecorations" Value="None" />
-        </ControlTheme>
-    </prismExtension:Dialog.Theme>
+    <!-- <prismExtension:Dialog.Theme> -->
+    <!--     <ControlTheme TargetType="Window"> -->
+    <!--         <Setter Property="CanResize" Value="False" /> -->
+    <!--         <Setter Property="ShowInTaskbar" Value="False" /> -->
+    <!--         <Setter Property="SizeToContent" Value="WidthAndHeight" /> -->
+    <!--         <Setter Property="SystemDecorations" Value="None" /> -->
+    <!--     </ControlTheme> -->
+    <!-- </prismExtension:Dialog.Theme> -->

    <Border BorderBrush="{DynamicResource BrushWindowBorder}" BorderThickness="1,1,0.6,0.6">
        <Grid RowDefinitions="40,*">
--- a/DownKyi/Views/Dialogs/ViewAlreadyDownloadedDialog.axaml
+++ b/DownKyi/Views/Dialogs/ViewAlreadyDownloadedDialog.axaml
@@ -7,14 +7,14 @@
             xmlns:prismExtension="clr-namespace:DownKyi.PrismExtension.Dialog"
             x:DataType="vmd:ViewAlreadyDownloadedDialogViewModel">

-    <prismExtension:Dialog.Theme>
-        <ControlTheme TargetType="Window">
-            <Setter Property="CanResize" Value="False" />
-            <Setter Property="ShowInTaskbar" Value="False" />
-            <Setter Property="SizeToContent" Value="WidthAndHeight" />
-            <Setter Property="SystemDecorations" Value="None" />
-        </ControlTheme>
-    </prismExtension:Dialog.Theme>
+    <!-- <prismExtension:Dialog.Theme> -->
+    <!--     <ControlTheme TargetType="Window"> -->
+    <!--         <Setter Property="CanResize" Value="False" /> -->
+    <!--         <Setter Property="ShowInTaskbar" Value="False" /> -->
+    <!--         <Setter Property="SizeToContent" Value="WidthAndHeight" /> -->
+    <!--         <Setter Property="SystemDecorations" Value="None" /> -->
+    <!--     </ControlTheme> -->
+    <!-- </prismExtension:Dialog.Theme> -->

    <Border BorderBrush="{DynamicResource BrushWindowBorder}" BorderThickness="1,1,0.6,0.6">
        <Grid RowDefinitions="40,*">
--- a/DownKyi/Views/Dialogs/ViewDownloadSetter.axaml
+++ b/DownKyi/Views/Dialogs/ViewDownloadSetter.axaml
@@ -6,14 +6,14 @@
             prism:ViewModelLocator.AutoWireViewModel="True"
             xmlns:prismExtension="clr-namespace:DownKyi.PrismExtension.Dialog"
             x:DataType="vmd:ViewDownloadSetterViewModel">
-    <prismExtension:Dialog.Theme>
-        <ControlTheme TargetType="Window">
-            <Setter Property="CanResize" Value="False" />
-            <Setter Property="ShowInTaskbar" Value="False" />
-            <Setter Property="SizeToContent" Value="WidthAndHeight" />
-            <Setter Property="SystemDecorations" Value="None" />
-        </ControlTheme>
-    </prismExtension:Dialog.Theme>
+    <!-- <prismExtension:Dialog.Theme> -->
+    <!--     <ControlTheme TargetType="Window"> -->
+    <!--         <Setter Property="CanResize" Value="False" /> -->
+    <!--         <Setter Property="ShowInTaskbar" Value="False" /> -->
+    <!--         <Setter Property="SizeToContent" Value="WidthAndHeight" /> -->
+    <!--         <Setter Property="SystemDecorations" Value="None" /> -->
+    <!--     </ControlTheme> -->
+    <!-- </prismExtension:Dialog.Theme> -->
    <Border BorderBrush="{DynamicResource BrushWindowBorder}" BorderThickness="1,1,1,0.6">
        <Grid RowDefinitions="40,*">

@@ -141,8 +141,7 @@
                        Command="{Binding DownloadAllCommand}"
                        Content="{DynamicResource DownloadAll}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding DownloadAll, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding DownloadAll, Mode=TwoWay}" />

                    <CheckBox
                        Grid.Column="2"
@@ -151,8 +150,7 @@
                        Command="{Binding DownloadAudioCommand}"
                        Content="{DynamicResource DownloadAudio}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding DownloadAudio, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding DownloadAudio, Mode=TwoWay}" />
                    <CheckBox
                        Grid.Column="3"
                        HorizontalAlignment="Center"
@@ -160,8 +158,7 @@
                        Command="{Binding DownloadVideoCommand}"
                        Content="{DynamicResource DownloadVideo}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding DownloadVideo, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding DownloadVideo, Mode=TwoWay}" />
                    <CheckBox
                        Grid.Column="4"
                        HorizontalAlignment="Center"
@@ -169,8 +166,7 @@
                        Command="{Binding DownloadDanmakuCommand}"
                        Content="{DynamicResource DownloadDanmaku}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding DownloadDanmaku, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding DownloadDanmaku, Mode=TwoWay}" />
                    <CheckBox
                        Grid.Column="5"
                        HorizontalAlignment="Center"
@@ -178,8 +174,7 @@
                        Command="{Binding DownloadSubtitleCommand}"
                        Content="{DynamicResource DownloadSubtitle}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding DownloadSubtitle, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding DownloadSubtitle, Mode=TwoWay}" />
                    <CheckBox
                        Grid.Column="6"
                        HorizontalAlignment="Center"
@@ -187,8 +182,7 @@
                        Command="{Binding DownloadCoverCommand}"
                        Content="{DynamicResource DownloadCover}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding DownloadCover, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding DownloadCover, Mode=TwoWay}" />
                </Grid>

                <Grid Grid.Row="3" Margin="0,30,0,0" ColumnDefinitions="*,*,100,100">
@@ -199,8 +193,7 @@
                        VerticalAlignment="Bottom"
                        Content="{DynamicResource IsDefaultDownloadDirectory}"
                        Foreground="{DynamicResource BrushTextDark}"
-                        IsChecked="{Binding IsDefaultDownloadDirectory, Mode=TwoWay}"
-                        Theme="{StaticResource CheckBoxStyle}" />
+                        IsChecked="{Binding IsDefaultDownloadDirectory, Mode=TwoWay}" />
                    <Button
                        Grid.Column="2"
                        Width="75"
--- a/DownKyi/Views/Dialogs/ViewParsingSelector.axaml
+++ b/DownKyi/Views/Dialogs/ViewParsingSelector.axaml
@@ -7,14 +7,14 @@
             xmlns:prismExtension="clr-namespace:DownKyi.PrismExtension.Dialog"
             x:DataType="vmd:ViewParsingSelectorViewModel">

-    <prismExtension:Dialog.Theme>
-        <ControlTheme TargetType="Window">
-            <Setter Property="CanResize" Value="False" />
-            <Setter Property="ShowInTaskbar" Value="False" />
-            <Setter Property="SizeToContent" Value="WidthAndHeight" />
-            <Setter Property="SystemDecorations" Value="None" />
-        </ControlTheme>
-    </prismExtension:Dialog.Theme>
+    <!-- <prismExtension:Dialog.Theme> -->
+    <!--     <ControlTheme TargetType="Window"> -->
+    <!--         <Setter Property="CanResize" Value="False" /> -->
+    <!--         <Setter Property="ShowInTaskbar" Value="False" /> -->
+    <!--         <Setter Property="SizeToContent" Value="WidthAndHeight" /> -->
+    <!--         <Setter Property="SystemDecorations" Value="None" /> -->
+    <!--     </ControlTheme> -->
+    <!-- </prismExtension:Dialog.Theme> -->

    <Border BorderBrush="{DynamicResource BrushWindowBorder}" BorderThickness="1,1,1,0.6">
        <Grid RowDefinitions="40,*">
@@ -92,8 +92,7 @@
                    VerticalAlignment="Center"
                    FontSize="12"
                    Content="{DynamicResource SetParseDefault}"
-                    IsChecked="{Binding IsParseDefault, Mode=TwoWay}"
-                    Foreground="{DynamicResource BrushTextDark}" />
+                    IsChecked="{Binding IsParseDefault, Mode=TwoWay}" />
            </StackPanel>
        </Grid>
    </Border>
--- a/DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml
+++ b/DownKyi/Views/DownloadManager/ViewDownloadFinished.axaml
@@ -225,7 +225,7 @@
                    Command="{Binding ClearAllDownloadedCommand}"
                    Content="{DynamicResource ClearAllDownloaded}"
                    FontSize="12"
-                    Theme="{StaticResource BtnStyle}"/>
+                    Theme="{StaticResource BtnBorderStyle}" />
            </Grid>
        </Grid>
        <!--  TODO 没有数据时显示图片或文字  -->
--- a/DownKyi/Views/DownloadManager/ViewDownloading.axaml
+++ b/DownKyi/Views/DownloadManager/ViewDownloading.axaml
@@ -254,7 +254,7 @@
                    Command="{Binding PauseAllDownloadingCommand}"
                    Content="{DynamicResource PauseAllDownloading}"
                    FontSize="12"
-                    Theme="{StaticResource BtnStyle}" />
+                    Theme="{StaticResource BtnBorderStyle}" />
                <Button
                    Grid.Column="2"
                    Width="75"
@@ -263,7 +263,7 @@
                    Command="{Binding ContinueAllDownloadingCommand}"
                    Content="{DynamicResource ContinueAllDownloading}"
                    FontSize="12"
-                    Theme="{StaticResource BtnStyle}" />
+                    Theme="{StaticResource BtnBorderStyle}" />
                <Button
                    Grid.Column="3"
                    Width="75"
@@ -272,7 +272,7 @@
                    Command="{Binding DeleteAllDownloadingCommand}"
                    Content="{DynamicResource DeleteAllDownloading}"
                    FontSize="12"
-                    Theme="{StaticResource BtnStyle}" />
+                    Theme="{StaticResource BtnBorderStyle}" />
            </Grid>
        </Grid>
        <!--  TODO 没有数据时显示图片或文字  -->
--- a/DownKyi/Views/Settings/ViewAbout.axaml
+++ b/DownKyi/Views/Settings/ViewAbout.axaml
@@ -65,13 +65,15 @@
                    Margin="30,0,0,0"
                    Command="{Binding CheckUpdateCommand}"
                    Content="{DynamicResource CheckUpdate}"
-                    FontSize="12" />
+                    FontSize="12"
+                    Theme="{StaticResource BtnBorderStyle}" />
                <Button
                    Width="75"
                    Margin="20,0,0,0"
                    Command="{Binding FeedbackCommand}"
                    Content="{DynamicResource Feedback}"
-                    FontSize="12" />
+                    FontSize="12"
+                    Theme="{StaticResource BtnBorderStyle}" />
            </StackPanel>
            <CheckBox
                Grid.Column="0"
--- a/DownKyi/Views/Toolbox/ViewBiliHelper.axaml
+++ b/DownKyi/Views/Toolbox/ViewBiliHelper.axaml
@@ -70,7 +70,7 @@
                            Command="{Binding GotoWebCommand}"
                            Content="{DynamicResource GotoWeb}"
                            FontSize="12"
-                            Theme="{StaticResource BtnStyle}"/>
+                            Theme="{StaticResource BtnBorderStyle}" />
                    </StackPanel>

                    <StackPanel>
@@ -104,7 +104,7 @@
                        Command="{Binding FindDanmakuSenderCommand}"
                        Content="{DynamicResource FindDanmakuSender}"
                        FontSize="12"
-                        Theme="{StaticResource BtnStyle}" />
+                        Theme="{StaticResource BtnBorderStyle}" />

                    <StackPanel Width="100" Orientation="Horizontal">
                        <TextBox
--- a/DownKyi/Views/Toolbox/ViewDelogo.axaml
+++ b/DownKyi/Views/Toolbox/ViewDelogo.axaml
@@ -35,7 +35,7 @@
                        VerticalAlignment="Center"
                        Command="{Binding SelectVideoCommand}"
                        Content="{DynamicResource SelectVideo}"
-                        Theme="{StaticResource BtnStyle}"/>
+                        Theme="{StaticResource BtnBorderStyle}" />
                </StackPanel>

                <Grid Margin="0,20,0,0" VerticalAlignment="Center" ColumnDefinitions="400,*">
@@ -80,7 +80,7 @@
                        VerticalAlignment="Bottom"
                        Command="{Binding DelogoCommand}"
                        Content="{DynamicResource Delogo}"
-                        Theme="{StaticResource BtnStyle}"/>
+                        Theme="{StaticResource BtnBorderStyle}" />
                </Grid>

            </StackPanel>
--- a/DownKyi/Views/Toolbox/ViewExtractMedia.axaml
+++ b/DownKyi/Views/Toolbox/ViewExtractMedia.axaml
@@ -33,7 +33,7 @@
                        VerticalAlignment="Center"
                        Command="{Binding SelectVideoCommand}"
                        Content="{DynamicResource SelectVideo}"
-                        Theme="{StaticResource BtnStyle}"/>
+                        Theme="{StaticResource BtnBorderStyle}" />
                </StackPanel>
                <Grid Margin="0,20,0,0" ColumnDefinitions="200,200">

@@ -44,7 +44,7 @@
                        VerticalAlignment="Center"
                        Command="{Binding ExtractAudioCommand}"
                        Content="{DynamicResource ExtractAudio}"
-                        Theme="{StaticResource BtnStyle}"/>
+                        Theme="{StaticResource BtnBorderStyle}" />
                    <Button
                        Grid.Column="1"
                        Width="90"
@@ -52,7 +52,7 @@
                        VerticalAlignment="Center"
                        Command="{Binding ExtractVideoCommand}"
                        Content="{DynamicResource ExtractVideo}"
-                        Theme="{StaticResource BtnStyle}"/>
+                        Theme="{StaticResource BtnBorderStyle}" />
                </Grid>
            </StackPanel>
            <Grid
--- a/DownKyi/Views/ViewDownloadManager.axaml
+++ b/DownKyi/Views/ViewDownloadManager.axaml
@@ -21,11 +21,10 @@
                <StackPanel Orientation="Horizontal">
                    <ContentControl Width="24" Height="24">
                        <Path
-                            Width="{Binding ArrowBack.Width}"
-                            Height="{Binding ArrowBack.Height}"
-                            Data="{Binding ArrowBack.Data}"
-                            Fill="{Binding ArrowBack.Fill}"
-                            Stretch="None" />
+                            Theme="{StaticResource NavigationIcon.ArrowBack}"
+                            Width="24"
+                            Height="24"
+                            Fill="{DynamicResource ColorTextDark}" />
                    </ContentControl>
                    <TextBlock
                        VerticalAlignment="Center"
--- a/DownKyi/Views/ViewLogin.axaml
+++ b/DownKyi/Views/ViewLogin.axaml
@@ -26,11 +26,10 @@
                <StackPanel Orientation="Horizontal">
                    <ContentControl Width="24" Height="24">
                        <Path
-                            Width="{Binding ArrowBack.Width}"
-                            Height="{Binding ArrowBack.Height}"
-                            Data="{Binding ArrowBack.Data}"
-                            Fill="{Binding ArrowBack.Fill}"
-                            Stretch="None" />
+                            Theme="{StaticResource NavigationIcon.ArrowBack}"
+                            Width="24"
+                            Height="24"
+                            Fill="{DynamicResource ColorTextDark}" />
                    </ContentControl>
                    <TextBlock
                        VerticalAlignment="Center"
--- a/DownKyi/Views/ViewMySpace.axaml
+++ b/DownKyi/Views/ViewMySpace.axaml
@@ -338,10 +338,11 @@
                <StackPanel Orientation="Horizontal">
                    <ContentControl Width="24" Height="24">
                        <Path
-                            Theme="{StaticResource NavigationIcon.ArrowBack}"
-                            Width="24"
-                            Height="24"
-                            Fill="{DynamicResource ColorTextDark }" />
+                            Width="{Binding ArrowBack.Width}"
+                            Height="{Binding ArrowBack.Height}"
+                            Data="{Binding ArrowBack.Data}"
+                            Fill="{Binding ArrowBack.Fill}"
+                            Stretch="None" />
                    </ContentControl>
                    <TextBlock
                        VerticalAlignment="Center"
--- a/DownKyi/Views/ViewToolbox.axaml
+++ b/DownKyi/Views/ViewToolbox.axaml
@@ -21,11 +21,10 @@
                <StackPanel Orientation="Horizontal">
                    <ContentControl Width="24" Height="24">
                        <Path
-                            Width="{Binding ArrowBack.Width}"
-                            Height="{Binding ArrowBack.Height}"
-                            Data="{Binding ArrowBack.Data}"
-                            Fill="{Binding ArrowBack.Fill}"
-                            Stretch="None" />
+                            Theme="{StaticResource NavigationIcon.ArrowBack}"
+                            Width="24"
+                            Height="24"
+                            Fill="{DynamicResource ColorTextDark}" />
                    </ContentControl>
                    <TextBlock
                        VerticalAlignment="Center"