Skip to content

Commit b510b9f

Browse files
kitUINkitUIN
committed
Style | Page Style Adjustments
1 parent d0164fb commit b510b9f

6 files changed

Lines changed: 295 additions & 286 deletions

File tree

‎ShadowViewer.Plugin.Local‎

‎ShadowViewer.Plugin.PluginManager‎

‎ShadowViewer/App.xaml‎

Lines changed: 22 additions & 251 deletions
Large diffs are not rendered by default.

‎ShadowViewer/Pages/SettingsPage.xaml‎

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<Page
2+
NavigationCacheMode="Required"
3+
mc:Ignorable="d"
24
x:Class="ShadowViewer.Pages.SettingsPage"
35
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
56
xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
67
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
78
xmlns:converters="using:CommunityToolkit.WinUI.Converters"
@@ -15,8 +16,7 @@
1516
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
1617
xmlns:shadowConverters="using:ShadowViewer.Converters"
1718
xmlns:ui="using:CommunityToolkit.WinUI"
18-
NavigationCacheMode="Required"
19-
mc:Ignorable="d">
19+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
2020
<Page.Resources>
2121
<x:Double x:Key="SettingIconWidth">30</x:Double>
2222
<x:Double x:Key="SettingIconHeight">30</x:Double>
@@ -27,22 +27,17 @@
2727
<shadowConverters:ThemeComboConverter x:Key="ThemeComboConverter" />
2828
</Page.Resources>
2929

30-
<Grid
31-
Background="{ThemeResource LayerFillColorDefaultBrush}"
32-
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
33-
BorderThickness="1"
34-
CornerRadius="{ThemeResource NavigationViewContentGridCornerRadius}"
35-
RowSpacing="5">
30+
<Grid Style="{ThemeResource ShadowRootGridStyle}">
3631
<Grid.RowDefinitions>
3732
<RowDefinition Height="Auto" />
3833
<RowDefinition Height="*" />
3934
</Grid.RowDefinitions>
4035
<TextBlock
36+
FontSize="{ThemeResource ShadowRootTextFontSize}"
4137
Grid.Row="0"
42-
Margin="20,10,0,0"
43-
FontSize="25"
38+
Margin="{ThemeResource ShadowSettingRootTextMargin}"
4439
Text="{i18N:Locale Key=Settings}" />
45-
<ScrollViewer Grid.Row="1" Padding="20,5">
40+
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Hidden">
4641
<StackPanel HorizontalAlignment="Stretch" Spacing="{StaticResource SettingsCardSpacing}">
4742
<TextBlock Style="{StaticResource SettingsSectionHeaderTextBlockStyle}" Text="{i18N:Locale Key=MainSetting}" />
4843
<controls:SettingsCard
@@ -102,22 +97,22 @@
10297
IsExpanded="True">
10398
<StackPanel
10499
Height="32"
105-
VerticalAlignment="Stretch"
106100
Orientation="Horizontal"
107-
Spacing="4">
101+
Spacing="4"
102+
VerticalAlignment="Stretch">
108103
<TextBlock
109-
VerticalAlignment="Bottom"
110104
FontSize="18"
111105
Style="{StaticResource CaptionTextBlockStyle}"
112-
Text="{x:Bind ViewModel.Version}" />
106+
Text="{x:Bind ViewModel.Version}"
107+
VerticalAlignment="Bottom" />
113108
<Button
114-
Height="20"
115-
Padding="6,2"
116-
VerticalAlignment="Top"
117109
Background="#f79800"
118110
CornerRadius="8"
119111
Foreground="White"
112+
Height="20"
113+
Padding="6,2"
120114
Style="{ThemeResource NoOverButton}"
115+
VerticalAlignment="Top"
121116
Visibility="{x:Bind ViewModel.Preview, Mode=OneWay, Converter={StaticResource StringVisibilityConverter}}">
122117
<TextBlock FontSize="10" Text="{x:Bind ViewModel.Preview}" />
123118
</Button>
@@ -131,26 +126,20 @@
131126
Header="{i18N:Locale Key=BugRequest}"
132127
IsClickEnabled="True" />
133128
<controls:SettingsCard
134-
ActionIcon="{ui:FontIcon Glyph=&#xE8A7;}"
135-
Command="{x:Bind ViewModel.NavigateToUriCommand}"
136-
CommandParameter="https://ifdian.net/a/kituin"
137-
Header="{i18N:Locale Key=Sponsor}"
138-
IsClickEnabled="True" />
139-
<controls:SettingsCard
140-
HorizontalContentAlignment="Left"
141129
ContentAlignment="Vertical"
142-
Header="{i18N:Locale Key=Dependencies}">
130+
Header="{i18N:Locale Key=Dependencies}"
131+
HorizontalContentAlignment="Left">
143132
<StackPanel Orientation="Vertical">
144133
<HyperlinkButton Content="📦Windows App SDK" NavigateUri="https://github.com/microsoft/WindowsAppSDK" />
145-
<HyperlinkButton Content="🔣FluentIcon" NavigateUri="https://github.com/davidxuang/FluentIcons" />
146134
<HyperlinkButton Content="⛓️‍💥ShadowPluginLoader" NavigateUri="https://github.com/KitUIN/ShadowPluginLoader" />
135+
<HyperlinkButton Content="🔣FluentIcon" NavigateUri="https://github.com/davidxuang/FluentIcons" />
147136
<HyperlinkButton Content="📦Windows Community Toolkit" NavigateUri="https://github.com/CommunityToolkit/dotnet" />
148137
<HyperlinkButton Content="🧪Windows Community Toolkit Labs" NavigateUri="https://github.com/CommunityToolkit/Labs-Windows" />
149138
<HyperlinkButton Content="📦SharpCompress" NavigateUri="https://github.com/adamhathcock/sharpcompress" />
150139
<HyperlinkButton Content="📃Serilog" NavigateUri="https://serilog.net" />
151140
<HyperlinkButton Content="📦SQLSugarCore" NavigateUri="https://github.com/DotNetNext/SqlSugar" />
152141
<HyperlinkButton Content="📦DryIoc" NavigateUri="https://github.com/dadhi/DryIoc" />
153-
<HyperlinkButton Content="🔩CustomExtensions.WinUI" NavigateUri="https://github.com/dnchattan/winui-extensions" />
142+
<HyperlinkButton Content="🔩CustomExtensions.WinUI[Fork]" NavigateUri="https://github.com/kitUIN/CustomExtensions.WinUI" />
154143
<HyperlinkButton Content="📂WinUI Gallery" NavigateUri="https://github.com/microsoft/WinUI-Gallery" />
155144
<HyperlinkButton Content="📂Bili.Uwp" NavigateUri="https://github.com/Richasy/Bili.Uwp" />
156145
<HyperlinkButton Content="📂Windows Community Toolkit Labs[TitleBar]" NavigateUri="https://github.com/CommunityToolkit/Labs-Windows/discussions/454" />

‎ShadowViewer/Themes/AppTheme.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:converters="using:ShadowViewer.Converters">
3+
xmlns:converters="using:ShadowViewer.Converters"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
55

66
<ResourceDictionary.ThemeDictionaries>
77

88
<ResourceDictionary x:Key="Dark">
99

1010
<ResourceDictionary.MergedDictionaries>
1111
<ResourceDictionary>
12-
<BitmapImage x:Key="GithubIcon" UriSource="ms-appx:///Assets/Icons/github-white.png"/>
12+
<BitmapImage UriSource="ms-appx:///Assets/Icons/github-white.png" x:Key="GithubIcon" />
1313
</ResourceDictionary>
1414
</ResourceDictionary.MergedDictionaries>
1515
</ResourceDictionary>
1616
<ResourceDictionary x:Key="Light">
1717
<ResourceDictionary.MergedDictionaries>
1818
<ResourceDictionary>
19-
<BitmapImage x:Key="GithubIcon" UriSource="ms-appx:///Assets/Icons/github.png"/>
19+
<BitmapImage UriSource="ms-appx:///Assets/Icons/github.png" x:Key="GithubIcon" />
2020
</ResourceDictionary>
2121
</ResourceDictionary.MergedDictionaries>
2222
</ResourceDictionary>

0 commit comments

Comments
 (0)