UIのアクセントカラーを設定できるようにした

b-editor · Sep 5, 2023 · 23cac81 · 23cac81
1 parent b677c8c
commit 23cac81
Show file tree

Hide file tree

Showing 11 changed files with 421 additions and 89 deletions.
diff --git a/src/Beutl.Configuration/ViewConfig.cs b/src/Beutl.Configuration/ViewConfig.cs
@@ -15,6 +15,8 @@ public sealed class ViewConfig : ConfigurationBase
     public static readonly CoreProperty<(int X, int Y)?> WindowPositionProperty;
     public static readonly CoreProperty<(int Width, int Height)?> WindowSizeProperty;
     public static readonly CoreProperty<bool?> IsWindowMaximizedProperty;
+    public static readonly CoreProperty<bool> UseCustomAccentColorProperty;
+    public static readonly CoreProperty<string?> CustomAccentColorProperty;
     public static readonly CoreProperty<CoreList<string>> PrimaryPropertiesProperty;
     public static readonly CoreProperty<CoreList<string>> RecentFilesProperty;
     public static readonly CoreProperty<CoreList<string>> RecentProjectsProperty;
@@ -51,6 +53,14 @@ static ViewConfig()
             .DefaultValue(null)
             .Register();
 
+        UseCustomAccentColorProperty = ConfigureProperty<bool, ViewConfig>(nameof(UseCustomAccentColor))
+            .DefaultValue(false)
+            .Register();
+
+        CustomAccentColorProperty = ConfigureProperty<string?, ViewConfig>(nameof(CustomAccentColor))
+            .DefaultValue(null)
+            .Register();
+
         PrimaryPropertiesProperty = ConfigureProperty<CoreList<string>, ViewConfig>(nameof(PrimaryProperties))
             .Accessor(o => o.PrimaryProperties, (o, v) => o.PrimaryProperties = v)
             .Register();
@@ -109,6 +119,18 @@ public bool? IsWindowMaximized
         set => SetValue(IsWindowMaximizedProperty, value);
     }
 
+    public bool UseCustomAccentColor
+    {
+        get => GetValue(UseCustomAccentColorProperty);
+        set => SetValue(UseCustomAccentColorProperty,value);
+    }
+
+    public string? CustomAccentColor
+    {
+        get => GetValue(CustomAccentColorProperty);
+        set => SetValue(CustomAccentColorProperty,value);
+    }
+
     [NotAutoSerialized()]
     public CoreList<string> PrimaryProperties
     {
@@ -238,7 +260,7 @@ public void ResetPrimaryProperties()
     protected override void OnPropertyChanged(PropertyChangedEventArgs args)
     {
         base.OnPropertyChanged(args);
-        if (args.PropertyName is "Theme" or "UICulture" or "HidePrimaryProperties")
+        if (args.PropertyName is nameof(Theme) or nameof(UICulture) or nameof(HidePrimaryProperties) or nameof(UseCustomAccentColor) or nameof(CustomAccentColor))
         {
             OnChanged();
         }

diff --git a/src/Beutl.Language/SettingsPage.Designer.cs b/src/Beutl.Language/SettingsPage.Designer.cs
diff --git a/src/Beutl.Language/SettingsPage.ja.resx b/src/Beutl.Language/SettingsPage.ja.resx
@@ -216,4 +216,13 @@
   <data name="DecoderPriority_Description" xml:space="preserve">
     <value>デコーダーの優先順位を変更できます。上のデコーダーが優先されます。</value>
   </data>
+  <data name="AccentColor" xml:space="preserve">
+    <value>アクセントカラー</value>
+  </data>
+  <data name="CustomColor" xml:space="preserve">
+    <value>ユーザー設定の色</value>
+  </data>
+  <data name="UseCustomAccentColor" xml:space="preserve">
+    <value>アクセントカラーをカスタマイズ</value>
+  </data>
 </root>
diff --git a/src/Beutl.Language/SettingsPage.resx b/src/Beutl.Language/SettingsPage.resx
@@ -216,4 +216,13 @@
   <data name="DecoderPriority_Description" xml:space="preserve">
     <value>You can change the priority order of decoders. The upper decoder has priority.</value>
   </data>
+  <data name="AccentColor" xml:space="preserve">
+    <value>Accent color</value>
+  </data>
+  <data name="CustomColor" xml:space="preserve">
+    <value>Custom color</value>
+  </data>
+  <data name="UseCustomAccentColor" xml:space="preserve">
+    <value>Use custom accent color</value>
+  </data>
 </root>
diff --git a/src/Beutl.Language/Strings.Designer.cs b/src/Beutl.Language/Strings.Designer.cs
diff --git a/src/Beutl.Language/Strings.ja.resx b/src/Beutl.Language/Strings.ja.resx
@@ -943,4 +943,7 @@ b-editorがダウンロードURLを管理します。</value>
   <data name="RemoveAnimation" xml:space="preserve">
     <value>アニメーションを削除</value>
   </data>
+  <data name="ColorPallete" xml:space="preserve">
+    <value>カラーパレット</value>
+  </data>
 </root>
diff --git a/src/Beutl.Language/Strings.resx b/src/Beutl.Language/Strings.resx
@@ -943,4 +943,7 @@ and b-editor maintains the download URL.</value>
   <data name="RemoveAnimation" xml:space="preserve">
     <value>Remove animation</value>
   </data>
+  <data name="ColorPallete" xml:space="preserve">
+    <value>Color Pallete</value>
+  </data>
 </root>
diff --git a/src/Beutl/App.axaml.cs b/src/Beutl/App.axaml.cs
@@ -39,7 +39,6 @@ public override void Initialize()
         Color[] colors = colorProperties.Select(p => p.GetValue(null)).OfType<Color>().ToArray();
 
         GlobalConfiguration config = GlobalConfiguration.Instance;
-        config.Restore(GlobalConfiguration.DefaultFilePath);
         ViewConfig view = config.ViewConfig;
         CultureInfo.CurrentUICulture = view.UICulture;
 
@@ -69,6 +68,11 @@ public override void Initialize()
                 }
             }, DispatcherPriority.Send);
         });
+
+        if (view.UseCustomAccentColor && Color.TryParse(view.CustomAccentColor, out Color customColor))
+        {
+            _theme.CustomAccentColor = customColor;
+        }
     }
 
     public override void RegisterServices()
@@ -121,6 +125,11 @@ public override void OnFrameworkInitializationCompleted()
         };
     }
 
+    public static FluentAvaloniaTheme? GetFATheme()
+    {
+        return (Current as App)?._theme;
+    }
+
     private MainViewModel GetMainViewModel()
     {
         return _mainViewModel ??= new MainViewModel();