Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.
C# audio-converteravaloniabatch-conversionconvertercsharpdocument-converterdocx-to-pdfdotnetdrag-and-dropfile-conversionfile-converterheic-converterhwphwpximage-converterlinuxmacospdf-convertervideo-converterwindows
feat(ui): add style selector, curated pastel presets, and localization to Theme page
gtxPrime296bc4a6f546
diff --git a/src/Filee.App/Assets/i18n/ar.json b/src/Filee.App/Assets/i18n/ar.jsonindex 7ee866f4..1d916927 100644--- a/src/Filee.App/Assets/i18n/ar.json+++ b/src/Filee.App/Assets/i18n/ar.json@@ -595,11 +595,26 @@"presets.name_required": "أدخل اسمًا","presets.select": "اختر إعدادًا مسبقًا لتعديله","theme.title": "المظهر",+ "theme.style": "نمط المظهر",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "مظهر Filee الكلاسيكي بحواف دائرية ناعمة وأسطح هادئة.",+ "theme.style.material_you_hint": "تصميم Google Material 3 بأسطح لونية ديناميكية وأدوار تمييز متكيفة.","theme.mode": "نمط العرض","theme.mode.System": "حسب النظام","theme.mode.Light": "فاتح","theme.mode.Dark": "داكن","theme.accent": "اللون المميّز",+ "theme.presets_pastel": "أنماط هادئة",+ "theme.presets_vibrant": "عينات حيوية",+ "theme.preset.monochrome": "أحادي اللون",+ "theme.preset.lavender": "خزامى",+ "theme.preset.peach": "خوخي",+ "theme.preset.mint": "نعناعي",+ "theme.preset.rose": "وردي",+ "theme.preset.sky": "سماوي",+ "theme.preset.amber": "كهرماني",+ "theme.preset.sage": "مريمي","theme.custom_color": "لون مخصّص","theme.corner_radius": "استدارة الزوايا","theme.donut_opacity": "شفافية شريط الأدوات الدائري",diff --git a/src/Filee.App/Assets/i18n/en.json b/src/Filee.App/Assets/i18n/en.jsonindex d6024c30..c05ed709 100644--- a/src/Filee.App/Assets/i18n/en.json+++ b/src/Filee.App/Assets/i18n/en.json@@ -611,11 +611,26 @@"presets.select": "Select a preset to edit it","theme.title": "Theme",+ "theme.style": "Theme style",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "Classic Filee look with soft rounded corners and pastel surfaces.",+ "theme.style.material_you_hint": "Google Material 3 design with dynamic tonal surfaces and adaptive accent roles.","theme.mode": "Appearance","theme.mode.System": "System","theme.mode.Light": "Light","theme.mode.Dark": "Dark","theme.accent": "Accent colour",+ "theme.presets_pastel": "Pastel presets",+ "theme.presets_vibrant": "Vibrant swatches",+ "theme.preset.monochrome": "Monochrome",+ "theme.preset.lavender": "Lavender",+ "theme.preset.peach": "Peach",+ "theme.preset.mint": "Mint",+ "theme.preset.rose": "Rose",+ "theme.preset.sky": "Sky",+ "theme.preset.amber": "Amber",+ "theme.preset.sage": "Sage","theme.custom_color": "Custom","theme.corner_radius": "Softness","theme.donut_opacity": "Donut toolbar opacity",diff --git a/src/Filee.App/Assets/i18n/es.json b/src/Filee.App/Assets/i18n/es.jsonindex 89007a3e..589469c7 100644--- a/src/Filee.App/Assets/i18n/es.json+++ b/src/Filee.App/Assets/i18n/es.json@@ -595,11 +595,26 @@"presets.name_required": "Escribe un nombre","presets.select": "Elige un ajuste preestablecido para editarlo","theme.title": "Tema",+ "theme.style": "Estilo de tema",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "Aspecto clásico de Filee con esquinas redondeadas suaves y superficies pastel.",+ "theme.style.material_you_hint": "Diseño Google Material 3 con superficies tonales dinámicas y roles de acento adaptables.","theme.mode": "Aspecto","theme.mode.System": "Sistema","theme.mode.Light": "Claro","theme.mode.Dark": "Oscuro","theme.accent": "Color de acento",+ "theme.presets_pastel": "Ajustes pastel",+ "theme.presets_vibrant": "Muestras vibrantes",+ "theme.preset.monochrome": "Monocromo",+ "theme.preset.lavender": "Lavanda",+ "theme.preset.peach": "Melocotón",+ "theme.preset.mint": "Menta",+ "theme.preset.rose": "Rosa",+ "theme.preset.sky": "Cielo",+ "theme.preset.amber": "Ámbar",+ "theme.preset.sage": "Salvia","theme.custom_color": "Personalizado","theme.corner_radius": "Redondeo","theme.donut_opacity": "Opacidad del menú circular",diff --git a/src/Filee.App/Assets/i18n/hi.json b/src/Filee.App/Assets/i18n/hi.jsonindex dde78607..2f890280 100644--- a/src/Filee.App/Assets/i18n/hi.json+++ b/src/Filee.App/Assets/i18n/hi.json@@ -595,11 +595,26 @@"presets.name_required": "नाम दर्ज करें","presets.select": "संपादित करने के लिए कोई प्रीसेट चुनें","theme.title": "थीम",+ "theme.style": "थीम शैली",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "कोमल घुमावदार कोनों और पेस्टल सतहों के साथ क्लासिक Filee रूप।",+ "theme.style.material_you_hint": "गतिशील टोनल सतहों और अनुकूलनीय एक्सेंट भूमिकाओं के साथ Google Material 3 डिज़ाइन।","theme.mode": "रूप","theme.mode.System": "सिस्टम","theme.mode.Light": "लाइट","theme.mode.Dark": "डार्क","theme.accent": "एक्सेंट रंग",+ "theme.presets_pastel": "पेस्टल प्रीसेट",+ "theme.presets_vibrant": "चमकदार नमूने",+ "theme.preset.monochrome": "मोनोक्रोम",+ "theme.preset.lavender": "लैवेंडर",+ "theme.preset.peach": "पीच",+ "theme.preset.mint": "मिंट",+ "theme.preset.rose": "गुलाब",+ "theme.preset.sky": "आसमानी",+ "theme.preset.amber": "एम्बर",+ "theme.preset.sage": "सेज","theme.custom_color": "कस्टम","theme.corner_radius": "कोमलता","theme.donut_opacity": "डोनट टूलबार की अपारदर्शिता",diff --git a/src/Filee.App/Assets/i18n/ja.json b/src/Filee.App/Assets/i18n/ja.jsonindex afc5f5d3..1fd37fe4 100644--- a/src/Filee.App/Assets/i18n/ja.json+++ b/src/Filee.App/Assets/i18n/ja.json@@ -595,11 +595,26 @@"presets.name_required": "名前を入力してください","presets.select": "編集するプリセットを選択してください","theme.title": "テーマ",+ "theme.style": "テーマスタイル",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "やわらかな角丸とパステル調のサーフェスを持つクラシックな外観。",+ "theme.style.material_you_hint": "動的な色調サーフェスと適応型アクセントを備えたGoogle Material 3デザイン。","theme.mode": "外観","theme.mode.System": "システム設定に合わせる","theme.mode.Light": "ライト","theme.mode.Dark": "ダーク","theme.accent": "アクセントカラー",+ "theme.presets_pastel": "パステルプリセット",+ "theme.presets_vibrant": "鮮やかなスウォッチ",+ "theme.preset.monochrome": "モノクロ",+ "theme.preset.lavender": "ラベンダー",+ "theme.preset.peach": "ピーチ",+ "theme.preset.mint": "ミント",+ "theme.preset.rose": "ローズ",+ "theme.preset.sky": "スカイ",+ "theme.preset.amber": "アンバー",+ "theme.preset.sage": "セージ","theme.custom_color": "カスタム","theme.corner_radius": "角の丸み","theme.donut_opacity": "ドーナツメニューの不透明度",diff --git a/src/Filee.App/Assets/i18n/ko.json b/src/Filee.App/Assets/i18n/ko.jsonindex 115bfc7e..160ca21e 100644--- a/src/Filee.App/Assets/i18n/ko.json+++ b/src/Filee.App/Assets/i18n/ko.json@@ -611,11 +611,26 @@"presets.select": "편집할 프리셋을 선택하세요","theme.title": "테마",+ "theme.style": "테마 스타일",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "말랑말랑한 둥근 모서리와 파스텔 표면의 클래식 Filee 디자인.",+ "theme.style.material_you_hint": "동적 톤 표면과 반응형 강조색을 갖춘 구글 머티리얼 3 디자인.","theme.mode": "모드","theme.mode.System": "시스템","theme.mode.Light": "라이트","theme.mode.Dark": "다크","theme.accent": "강조색",+ "theme.presets_pastel": "파스텔 프리셋",+ "theme.presets_vibrant": "생생한 견본",+ "theme.preset.monochrome": "흑백 (모노크롬)",+ "theme.preset.lavender": "라벤더",+ "theme.preset.peach": "피치",+ "theme.preset.mint": "민트",+ "theme.preset.rose": "로즈",+ "theme.preset.sky": "스카이",+ "theme.preset.amber": "엠버",+ "theme.preset.sage": "세이지","theme.custom_color": "직접 선택","theme.corner_radius": "말랑함","theme.donut_opacity": "원형 툴바 불투명도",diff --git a/src/Filee.App/Assets/i18n/pl.json b/src/Filee.App/Assets/i18n/pl.jsonindex 2e2da36b..af32d952 100644--- a/src/Filee.App/Assets/i18n/pl.json+++ b/src/Filee.App/Assets/i18n/pl.json@@ -611,11 +611,26 @@"presets.select": "Wybierz ustawienie, aby je edytować","theme.title": "Motyw",+ "theme.style": "Styl motywu",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "Klasyczny wygląd Filee z miękko zaokrąglonymi rogami i pastelowymi powierzchniami.",+ "theme.style.material_you_hint": "Projekt Google Material 3 z dynamicznymi powierzchniami tonalnymi i adaptacyjnymi rolami akcentu.","theme.mode": "Wygląd","theme.mode.System": "Systemowy","theme.mode.Light": "Jasny","theme.mode.Dark": "Ciemny","theme.accent": "Kolor akcentu",+ "theme.presets_pastel": "Zestawy pastelowe",+ "theme.presets_vibrant": "Żywe próbki",+ "theme.preset.monochrome": "Monochromatyczny",+ "theme.preset.lavender": "Lawenda",+ "theme.preset.peach": "Brzoskwinia",+ "theme.preset.mint": "Mięta",+ "theme.preset.rose": "Różany",+ "theme.preset.sky": "Błękit",+ "theme.preset.amber": "Bursztyn",+ "theme.preset.sage": "Szałwia","theme.custom_color": "Własny","theme.corner_radius": "Zaokrąglenie","theme.donut_opacity": "Krycie paska-pierścienia",diff --git a/src/Filee.App/Assets/i18n/pt-BR.json b/src/Filee.App/Assets/i18n/pt-BR.jsonindex 0b7cd7cd..c16a4107 100644--- a/src/Filee.App/Assets/i18n/pt-BR.json+++ b/src/Filee.App/Assets/i18n/pt-BR.json@@ -611,11 +611,26 @@"presets.select": "Selecione uma predefinição para editá-la","theme.title": "Tema",+ "theme.style": "Estilo do tema",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "Visual clássico do Filee com cantos arredondados suaves e superfícies pastel.",+ "theme.style.material_you_hint": "Design Google Material 3 com superfícies tonais dinâmicas e papéis de destaque adaptáveis.","theme.mode": "Aparência","theme.mode.System": "Sistema","theme.mode.Light": "Claro","theme.mode.Dark": "Escuro","theme.accent": "Cor de destaque",+ "theme.presets_pastel": "Predefinições pastel",+ "theme.presets_vibrant": "Amostras vibrantes",+ "theme.preset.monochrome": "Monocromático",+ "theme.preset.lavender": "Lavanda",+ "theme.preset.peach": "Pêssego",+ "theme.preset.mint": "Menta",+ "theme.preset.rose": "Rosa",+ "theme.preset.sky": "Céu",+ "theme.preset.amber": "Âmbar",+ "theme.preset.sage": "Sálvia","theme.custom_color": "Personalizada","theme.corner_radius": "Suavidade","theme.donut_opacity": "Opacidade do menu circular",diff --git a/src/Filee.App/Assets/i18n/ru.json b/src/Filee.App/Assets/i18n/ru.jsonindex 3eb526c7..43a1986c 100644--- a/src/Filee.App/Assets/i18n/ru.json+++ b/src/Filee.App/Assets/i18n/ru.json@@ -611,11 +611,26 @@"presets.select": "Выберите пресет, чтобы изменить его","theme.title": "Тема",+ "theme.style": "Стиль темы",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "Классический вид Filee с мягкими скругленными углами и пастельными поверхностями.",+ "theme.style.material_you_hint": "Дизайн Google Material 3 с динамическими тональными поверхностями и адаптивными акцентными ролями.","theme.mode": "Оформление","theme.mode.System": "Как в системе","theme.mode.Light": "Светлое","theme.mode.Dark": "Тёмное","theme.accent": "Акцентный цвет",+ "theme.presets_pastel": "Пастельные пресеты",+ "theme.presets_vibrant": "Яркие образцы",+ "theme.preset.monochrome": "Монохром",+ "theme.preset.lavender": "Лаванда",+ "theme.preset.peach": "Персик",+ "theme.preset.mint": "Мята",+ "theme.preset.rose": "Роза",+ "theme.preset.sky": "Небо",+ "theme.preset.amber": "Янтарь",+ "theme.preset.sage": "Шалфей","theme.custom_color": "Свой","theme.corner_radius": "Скругление","theme.donut_opacity": "Непрозрачность кругового меню",diff --git a/src/Filee.App/Assets/i18n/zh-CN.json b/src/Filee.App/Assets/i18n/zh-CN.jsonindex 6247a2b0..87daeda7 100644--- a/src/Filee.App/Assets/i18n/zh-CN.json+++ b/src/Filee.App/Assets/i18n/zh-CN.json@@ -611,11 +611,26 @@"presets.select": "选择要编辑的预设","theme.title": "主题",+ "theme.style": "主题样式",+ "theme.style.Soft": "Filee Soft",+ "theme.style.MaterialYou": "Material You",+ "theme.style.soft_hint": "经典 Filee 外观,柔和的圆角与浅色表面。",+ "theme.style.material_you_hint": "Google Material 3 设计,具有动态色调表面和自适应强调色。","theme.mode": "外观","theme.mode.System": "跟随系统","theme.mode.Light": "浅色","theme.mode.Dark": "深色","theme.accent": "强调色",+ "theme.presets_pastel": "柔和预设",+ "theme.presets_vibrant": "鲜明色板",+ "theme.preset.monochrome": "黑白单色",+ "theme.preset.lavender": "薰衣草",+ "theme.preset.peach": "桃粉",+ "theme.preset.mint": "薄荷",+ "theme.preset.rose": "玫瑰",+ "theme.preset.sky": "天蓝",+ "theme.preset.amber": "琥珀",+ "theme.preset.sage": "鼠尾草","theme.custom_color": "自定义","theme.corner_radius": "圆角","theme.donut_opacity": "环形工具栏不透明度",diff --git a/src/Filee.App/ViewModels/Pages/ThemePageViewModel.cs b/src/Filee.App/ViewModels/Pages/ThemePageViewModel.csindex 63001a05..52fc60b4 100644--- a/src/Filee.App/ViewModels/Pages/ThemePageViewModel.cs+++ b/src/Filee.App/ViewModels/Pages/ThemePageViewModel.cs@@ -2,7 +2,9 @@using Avalonia;using Avalonia.Media;+using Avalonia.Styling;using CommunityToolkit.Mvvm.ComponentModel;+using CommunityToolkit.Mvvm.Input;using Filee.App.Controls;using Filee.App.Services;using Filee.Core.Localization;@@ -14,13 +16,17 @@ namespace Filee.App.ViewModels.Pages;public sealed partial class ThemePageViewModel : ObservableObject{private readonly UserDataStore _store;+ private readonly ILocalizer _loc;private readonly bool _loading;public ThemePageViewModel(UserDataStore store, ILocalizer loc, IPlatformServices platform){_store = store;+ _loc = loc;_loading = true;var theme = store.Settings.Theme;+ Styles = Enum.GetValues<ThemeStyle>().Select(s => new Choice<ThemeStyle>(s, loc[$"theme.style.{s}"])).ToList();+ Style = Styles.FirstOrDefault(s => s.Value == theme.Style) ?? Styles[0];Modes = Enum.GetValues<ThemeMode>().Select(m => new Choice<ThemeMode>(m, loc[$"theme.mode.{m}"])).ToList();Mode = Modes.First(m => m.Value == theme.Mode);Accent = Color.TryParse(theme.Accent, out var c) ? c : Colors.MediumPurple;@@ -40,10 +46,26 @@ public sealed partial class ThemePageViewModel : ObservableObject_loading = false;}+ public IReadOnlyList<Choice<ThemeStyle>> Styles { get; }public IReadOnlyList<Choice<ThemeMode>> Modes { get; }public IReadOnlyList<Color> Swatches { get; } = ThemeService.Swatches.Select(Color.Parse).ToList();public IReadOnlyList<DonutItem> PreviewItems { get; }+ public sealed record PresetItem(string Key, string Name, Color Color);++ public IReadOnlyList<PresetItem> PastelPresets =>+ ThemeService.Presets.Select(p => new PresetItem(+ p.Key,+ _loc[$"theme.preset.{p.Key}"],+ p.ActiveColor(IsDarkNow))).ToList();++ private bool IsDarkNow =>+ Mode?.Value == ThemeMode.Dark ||+ (Mode?.Value == ThemeMode.System && Application.Current?.ActualThemeVariant == ThemeVariant.Dark);++ public bool IsMaterialYou => Style?.Value == ThemeStyle.MaterialYou;++ [ObservableProperty] private Choice<ThemeStyle> _style = null!;[ObservableProperty] private Choice<ThemeMode> _mode = null!;[ObservableProperty, NotifyPropertyChangedFor(nameof(AccentBrush), nameof(PreviewBackdrop))] private Color _accent;[ObservableProperty] private string _accentHex = "";@@ -74,11 +96,34 @@ public sealed partial class ThemePageViewModel : ObservableObject/// </summary>[ObservableProperty] private double _donutOpacity;+ partial void OnStyleChanged(Choice<ThemeStyle>? oldValue, Choice<ThemeStyle> newValue)+ {+ OnPropertyChanged(nameof(IsMaterialYou));+ if (!Choices.Restore(oldValue, newValue, v => Style = v))+ Save(t => t.Style = newValue.Value);+ }+partial void OnModeChanged(Choice<ThemeMode>? oldValue, Choice<ThemeMode> newValue){+ OnPropertyChanged(nameof(PastelPresets));if (!Choices.Restore(oldValue, newValue, v => Mode = v))Save(t => t.Mode = newValue.Value);}++ [RelayCommand]+ private void PickPreset(PresetItem preset) => Accent = preset.Color;++ [RelayCommand]+ private void PickSwatch(Color color) => Accent = color;++ [RelayCommand]+ private void SetStyle(ThemeStyle target)+ {+ var match = Styles.FirstOrDefault(s => s.Value == target);+ if (match != null && Style != match)+ Style = match;+ }+partial void OnAccentChanged(Color value){var hex = $"#{value.R:X2}{value.G:X2}{value.B:X2}";diff --git a/src/Filee.App/Views/Pages/ThemePage.axaml b/src/Filee.App/Views/Pages/ThemePage.axamlindex bdb8574d..9c087eba 100644--- a/src/Filee.App/Views/Pages/ThemePage.axaml+++ b/src/Filee.App/Views/Pages/ThemePage.axaml@@ -2,12 +2,126 @@xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"xmlns:vm="using:Filee.App.ViewModels.Pages"xmlns:c="using:Filee.App.Controls"+ xmlns:settings="using:Filee.Core.Settings"x:Class="Filee.App.Views.Pages.ThemePage"x:DataType="vm:ThemePageViewModel">+ <UserControl.Styles>+ <Style Selector="Button.choice-card">+ <Setter Property="CornerRadius" Value="{DynamicResource SoftRadius}" />+ <Setter Property="Padding" Value="16,14" />+ <Setter Property="MinHeight" Value="100" />+ <Setter Property="Background" Value="{DynamicResource SurfaceBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource SubtleBorderBrush}" />+ <Setter Property="BorderThickness" Value="1.5" />+ <Setter Property="HorizontalAlignment" Value="Stretch" />+ <Setter Property="VerticalAlignment" Value="Stretch" />+ <Setter Property="HorizontalContentAlignment" Value="Stretch" />+ <Setter Property="VerticalContentAlignment" Value="Stretch" />+ <Setter Property="Transitions">+ <Transitions>+ <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.18" Easing="{StaticResource SoftEase}" />+ <BrushTransition Property="Background" Duration="0:0:0.18" />+ <BrushTransition Property="BorderBrush" Duration="0:0:0.18" />+ </Transitions>+ </Setter>+ </Style>+ <Style Selector="Button.choice-card:pointerover">+ <Setter Property="Background" Value="{DynamicResource SurfaceAltBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource AccentSoftBrush}" />+ </Style>+ <Style Selector="Button.choice-card.selected">+ <Setter Property="Background" Value="{DynamicResource AccentSoftBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />+ <Setter Property="BorderThickness" Value="1.5" />+ </Style>+ <Style Selector="Button.choice-card TextBlock.choice-title">+ <Setter Property="FontSize" Value="13" />+ <Setter Property="FontWeight" Value="SemiBold" />+ <Setter Property="Foreground" Value="{DynamicResource TextPrimaryBrush}" />+ </Style>+ <Style Selector="Button.choice-card.selected TextBlock.choice-title">+ <Setter Property="Foreground" Value="{DynamicResource AccentStrongBrush}" />+ <Setter Property="FontWeight" Value="Bold" />+ </Style>+ <Style Selector="Button.choice-card TextBlock.choice-desc">+ <Setter Property="FontSize" Value="12" />+ <Setter Property="Foreground" Value="{DynamicResource TextSecondaryBrush}" />+ <Setter Property="LineHeight" Value="17" />+ </Style>+ <Style Selector="Button.preset-pill">+ <Setter Property="CornerRadius" Value="999" />+ <Setter Property="Padding" Value="10,6" />+ <Setter Property="Background" Value="{DynamicResource SurfaceBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource SubtleBorderBrush}" />+ <Setter Property="BorderThickness" Value="1" />+ <Setter Property="Transitions">+ <Transitions>+ <TransformOperationsTransition Property="RenderTransform" Duration="0:0:0.18" Easing="{StaticResource SoftEase}" />+ <BrushTransition Property="Background" Duration="0:0:0.18" />+ <BrushTransition Property="BorderBrush" Duration="0:0:0.18" />+ </Transitions>+ </Setter>+ </Style>+ <Style Selector="Button.preset-pill:pointerover">+ <Setter Property="RenderTransform" Value="scale(1.03)" />+ <Setter Property="Background" Value="{DynamicResource SurfaceAltBrush}" />+ <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />+ </Style>+ <Style Selector="Button.preset-pill:pressed">+ <Setter Property="RenderTransform" Value="scale(0.96)" />+ </Style>+ </UserControl.Styles>+<Grid ColumnDefinitions="*,20,340" RowDefinitions="Auto,*"><TextBlock Grid.ColumnSpan="3" Classes="h1" Text="{DynamicResource theme.title}" Margin="0,0,0,18" /><StackPanel Grid.Row="1" Spacing="16">+ <!-- Theme Style: Filee Soft vs Material You -->+ <Border Classes="card">+ <StackPanel Spacing="12">+ <DockPanel>+ <Border DockPanel.Dock="Right" CornerRadius="999" Background="{DynamicResource AccentSoftBrush}" Padding="8,2"+ IsVisible="{Binding IsMaterialYou}">+ <TextBlock Text="Material 3" FontSize="11" FontWeight="SemiBold" Foreground="{DynamicResource AccentStrongBrush}" />+ </Border>+ <TextBlock Classes="label" Text="{DynamicResource theme.style}" VerticalAlignment="Center" Margin="0" />+ </DockPanel>++ <Grid ColumnDefinitions="*,12,*" RowDefinitions="Auto">+ <Button Classes="choice-card"+ Classes.selected="{Binding !IsMaterialYou}"+ Command="{Binding SetStyleCommand}"+ CommandParameter="{x:Static settings:ThemeStyle.Soft}"+ HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"+ VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">+ <StackPanel Spacing="6" VerticalAlignment="Top">+ <TextBlock Classes="choice-title" Text="{DynamicResource theme.style.Soft}" />+ <TextBlock Classes="choice-desc" Text="{DynamicResource theme.style.soft_hint}" TextWrapping="Wrap" />+ </StackPanel>+ </Button>++ <Button Grid.Column="2"+ Classes="choice-card"+ Classes.selected="{Binding IsMaterialYou}"+ Command="{Binding SetStyleCommand}"+ CommandParameter="{x:Static settings:ThemeStyle.MaterialYou}"+ HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"+ VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">+ <StackPanel Spacing="6" VerticalAlignment="Top">+ <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">+ <TextBlock Classes="choice-title" Text="{DynamicResource theme.style.MaterialYou}" />+ <Border CornerRadius="999" Background="{DynamicResource AccentBrush}" Padding="6,1">+ <TextBlock Text="M3" FontSize="10" FontWeight="Bold" Foreground="{DynamicResource OnAccentBrush}" />+ </Border>+ </StackPanel>+ <TextBlock Classes="choice-desc" Text="{DynamicResource theme.style.material_you_hint}" TextWrapping="Wrap" />+ </StackPanel>+ </Button>+ </Grid>+ </StackPanel>+ </Border>++ <!-- Appearance Mode: System / Light / Dark --><Border Classes="card"><StackPanel Spacing="8"><TextBlock Classes="label" Text="{DynamicResource theme.mode}" />@@ -15,9 +129,41 @@</StackPanel></Border>+ <!-- Accent Colour & Curated Presets --><Border Classes="card">- <StackPanel Spacing="10">+ <StackPanel Spacing="12"><TextBlock Classes="label" Text="{DynamicResource theme.accent}" />++ <!-- Curated Pastel Presets -->+ <TextBlock Classes="caption" Text="{DynamicResource theme.presets_pastel}" FontWeight="SemiBold" Margin="0,2,0,0" />+ <ItemsControl ItemsSource="{Binding PastelPresets}">+ <ItemsControl.ItemsPanel>+ <ItemsPanelTemplate>+ <UniformGrid Columns="2" />+ </ItemsPanelTemplate>+ </ItemsControl.ItemsPanel>+ <ItemsControl.ItemTemplate>+ <DataTemplate x:DataType="vm:ThemePageViewModel+PresetItem">+ <Button Classes="preset-pill" Margin="0,0,6,6"+ Command="{Binding $parent[ItemsControl].((vm:ThemePageViewModel)DataContext).PickPresetCommand}"+ CommandParameter="{Binding}">+ <DockPanel>+ <Border DockPanel.Dock="Left" Width="18" Height="18" CornerRadius="999" Margin="0,0,8,0"+ BorderBrush="{DynamicResource SubtleBorderBrush}" BorderThickness="1">+ <Border.Background>+ <SolidColorBrush Color="{Binding Color}" />+ </Border.Background>+ </Border>+ <TextBlock Text="{Binding Name}" VerticalAlignment="Center" FontSize="12" FontWeight="Medium"+ TextTrimming="CharacterEllipsis" />+ </DockPanel>+ </Button>+ </DataTemplate>+ </ItemsControl.ItemTemplate>+ </ItemsControl>++ <!-- Vibrant / Classic Swatches -->+ <TextBlock Classes="caption" Text="{DynamicResource theme.presets_vibrant}" FontWeight="SemiBold" Margin="0,4,0,0" /><ListBox x:Name="AccentSwatches" ItemsSource="{Binding Swatches}" SelectedItem="{Binding Accent, Mode=TwoWay}"Background="Transparent" BorderThickness="0" Padding="0"AutomationProperties.Name="{DynamicResource theme.accent}">@@ -58,7 +204,9 @@</DataTemplate></ListBox.ItemTemplate></ListBox>- <StackPanel Orientation="Horizontal" Spacing="10">++ <!-- Custom Colour Picker & Hex -->+ <StackPanel Orientation="Horizontal" Spacing="10" Margin="0,4,0,0"><TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource theme.custom_color}" Margin="0" /><ColorPicker x:Name="AccentPicker" Color="{Binding Accent, Mode=TwoWay}" IsAlphaEnabled="False"MinHeight="44" MinWidth="90"@@ -71,6 +219,7 @@</StackPanel></Border>+ <!-- Softness / Corner Radius --><Border Classes="card"><StackPanel Spacing="8"><DockPanel>@@ -93,6 +242,7 @@</StackPanel></Border>+ <!-- Reduced Motion --><Border Classes="card"><StackPanel Spacing="4"><CheckBox Content="{DynamicResource theme.reduce_motion}" IsChecked="{Binding ReduceMotion}" FontWeight="SemiBold" />