TextBlock のスタイルをResourceDictionaryに移動

b-editor · Nov 3, 2023 · 6527df3 · 6527df3
1 parent d62881a
commit 6527df3
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 23 deletions.
diff --git a/src/Beutl.Controls/Styles.axaml b/src/Beutl.Controls/Styles.axaml
@@ -11,6 +11,7 @@
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="/Styling/ButtonStyles.axaml" />
                 <ResourceInclude Source="/Styling/ComboBoxStyles.axaml" />
+                <ResourceInclude Source="/Styling/TextBlockStyles.axaml" />
                 <ResourceInclude Source="/Styling/ToggleSwitchStyles.axaml" />
                 <ResourceInclude Source="/Styling/ToggleButtonStyles.axaml" />
                 <ResourceInclude Source="/Styling/SimpleBreadcrumbBar.axaml" />

diff --git a/src/Beutl.Controls/Styling/TextBlockStyles.axaml b/src/Beutl.Controls/Styling/TextBlockStyles.axaml
@@ -0,0 +1,25 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <Design.PreviewWith>
+        <StackPanel>
+            <TextBlock Text="Label" Theme="{DynamicResource LabelTextBlockStyle}" />
+            <TextBlock Text="Error" Theme="{DynamicResource ErrorTextBlockStyle}" />
+        </StackPanel>
+    </Design.PreviewWith>
+
+    <ControlTheme x:Key="LabelTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
+        <Setter Property="FontSize" Value="14" />
+        <Setter Property="FontWeight" Value="Normal" />
+        <Setter Property="TextTrimming" Value="CharacterEllipsis" />
+        <Setter Property="TextWrapping" Value="Wrap" />
+        <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
+    </ControlTheme>
+
+
+    <ControlTheme x:Key="ErrorTextBlockStyle" TargetType="TextBlock">
+        <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCriticalBrush}" />
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </ControlTheme>
+
+</ResourceDictionary>
diff --git a/src/Beutl/App.axaml b/src/Beutl/App.axaml
@@ -12,15 +12,6 @@
         <ResourceDictionary>
             <aconverters:ColorToBrushConverter x:Key="ColorToBrushConverter" />
 
-            <ControlTheme x:Key="LabelTextBlockStyle" TargetType="TextBlock">
-                <Setter Property="FontFamily" Value="XamlAutoFontFamily" />
-                <Setter Property="FontSize" Value="14" />
-                <Setter Property="FontWeight" Value="Normal" />
-                <Setter Property="TextTrimming" Value="CharacterEllipsis" />
-                <Setter Property="TextWrapping" Value="Wrap" />
-                <Setter Property="Foreground" Value="{DynamicResource TextFillColorSecondaryBrush}" />
-            </ControlTheme>
-
             <KeyGesture x:Key="CreateNewProjectKeyGesture">Ctrl+Shift+N</KeyGesture>
             <KeyGesture x:Key="CreateNewKeyGesture">Ctrl+N</KeyGesture>
             <KeyGesture x:Key="OpenProjectKeyGesture">Ctrl+Shift+O</KeyGesture>
@@ -64,11 +55,6 @@
             </Setter>
         </Style>
 
-        <Style Selector="TextBlock.error">
-            <Setter Property="Foreground" Value="{DynamicResource SystemFillColorCriticalBrush}" />
-            <Setter Property="FontWeight" Value="SemiBold" />
-        </Style>
-
         <Style Selector="TextBox">
             <Setter Property="(TextBoxAttachment.EnterDownBehavior)" Value="Auto" />
         </Style>

diff --git a/src/Beutl/Pages/ExtensionsPages/DevelopPages/Dialogs/AddReleaseDialog.axaml b/src/Beutl/Pages/ExtensionsPages/DevelopPages/Dialogs/AddReleaseDialog.axaml
@@ -35,9 +35,9 @@
                    Theme="{StaticResource LabelTextBlockStyle}" />
         <TextBox Text="{CompiledBinding Version.Value}" ToolTip.Tip="{x:Static lang:ExtensionsPage.Release_Version_Tip}" />
 
-        <TextBlock Classes="error"
-                   IsVisible="{CompiledBinding Error.Value, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+        <TextBlock IsVisible="{CompiledBinding Error.Value, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                    Text="{CompiledBinding Error.Value}"
-                   TextWrapping="WrapWithOverflow" />
+                   TextWrapping="WrapWithOverflow"
+                   Theme="{StaticResource ErrorTextBlockStyle}" />
     </StackPanel>
 </ui:ContentDialog>
diff --git a/src/Beutl/Pages/ExtensionsPages/DevelopPages/Dialogs/CreatePackageDialog.axaml b/src/Beutl/Pages/ExtensionsPages/DevelopPages/Dialogs/CreatePackageDialog.axaml
@@ -31,7 +31,7 @@
             <ProgressBar IsIndeterminate="{Binding IsFileLoading.Value}" IsVisible="{Binding IsFileLoading.Value}" />
         </FileInputArea>
 
-        <TextBlock Classes="error"
+        <TextBlock Theme="{StaticResource ErrorTextBlockStyle}"
                    IsVisible="{Binding Error.Value, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                    Text="{Binding Error.Value}"
                    TextWrapping="WrapWithOverflow" />

diff --git a/src/Beutl/Pages/ExtensionsPages/DevelopPages/Dialogs/UpdatePackageDialog.axaml b/src/Beutl/Pages/ExtensionsPages/DevelopPages/Dialogs/UpdatePackageDialog.axaml
@@ -28,7 +28,7 @@
             <ProgressBar IsIndeterminate="{Binding IsFileLoading.Value}" IsVisible="{Binding IsFileLoading.Value}" />
         </FileInputArea>
 
-        <TextBlock Classes="error"
+        <TextBlock Theme="{StaticResource ErrorTextBlockStyle}"
                    IsVisible="{Binding Error.Value, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                    Text="{Binding Error.Value}"
                    TextWrapping="WrapWithOverflow" />

diff --git a/src/Beutl/Pages/SettingsPages/SignInScreen.axaml b/src/Beutl/Pages/SettingsPages/SignInScreen.axaml
@@ -58,7 +58,7 @@
 
         <TextBlock MinHeight="16"
                    Margin="0,16,0,0"
-                   Classes="error"
+                   Theme="{StaticResource ErrorTextBlockStyle}"
                    Text="{CompiledBinding Error.Value}" />
 
         <Button Height="40"

diff --git a/src/Beutl/Views/Dialogs/CreateAsset.axaml b/src/Beutl/Views/Dialogs/CreateAsset.axaml
@@ -108,10 +108,10 @@
                 <TextBlock Text="{Binding ProgressStatus.Value}" Theme="{StaticResource BodyStrongTextBlockStyle}" />
                 <ProgressBar Maximum="100" Value="{Binding ProgressValue.Value}" />
 
-                <TextBlock Classes="error"
-                           IsVisible="{Binding Error.Value, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
+                <TextBlock IsVisible="{Binding Error.Value, Converter={x:Static StringConverters.IsNotNullOrEmpty}}"
                            Text="{Binding Error.Value}"
-                           TextWrapping="WrapWithOverflow" />
+                           TextWrapping="WrapWithOverflow"
+                           Theme="{StaticResource ErrorTextBlockStyle}" />
             </StackPanel>
 
         </Carousel.Items>