klevze
603af17e56
The repo carried two parallel UIs (WPF + WinUI) sharing Models/Services via
cross-directory Link includes. Now that WinUI is the only frontend, collapse
the structure so the WinUI project IS the repo root instead of a nested
sibling folder:
- Delete the WPF project entirely (App.xaml, MainWindow.xaml, csproj) and its
bin/obj output
- Move AmiReel.WinUI/* up to the repo root (App, MainWindow, MainPage,
DialogHelper, Assets, Package.appxmanifest, app.manifest, Properties,
.github/instructions, AGENTS.md) via git mv, preserving history
- Rename AmiReel.WinUI.csproj -> AmiReel.csproj; regenerate the solution as
AmiReel.slnx (the newer XML solution format) with a single project
- Rename namespace AmigaDB.VideoRenderer.{Models,Services} -> AmiReel.{...}
and AmiReel_WinUI -> AmiReel across all files, including the embedded
ffmpeg/ffprobe resource logical names in the csproj and ToolExtractor
- Models/ and Services/ no longer need the Link-based cross-directory
<Compile Include>; they're picked up by the SDK's default globbing now
that they live under the project directory
- Rename assets/ -> branding/ (source icon art) to avoid a case-insensitive
collision with Assets/ (packaged tile art) once both sit at repo root
- Merge the two .gitignore files into one; track the PublishProfiles pubxml
files instead of ignoring them (no secrets, and they keep publish
reproducible across machines) as branding, gitignore, etc.
- Simplify publish-win-x64.ps1 (drop the -Target Wpf/WinUI switch, there's
only one target now) and rewrite README.md to describe the single-project
layout, build/run/publish commands, and file structure
Verified: dotnet build succeeds for both AmiReel.csproj and AmiReel.slnx, and
the built exe launches and renders identically to before the move.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
270 lines
16 KiB
XML
270 lines
16 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<Application
|
|
x:Class="AmiReel.App"
|
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
|
xmlns:local="using:AmiReel">
|
|
<Application.Resources>
|
|
<ResourceDictionary>
|
|
<ResourceDictionary.MergedDictionaries>
|
|
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
|
|
</ResourceDictionary.MergedDictionaries>
|
|
<ResourceDictionary.ThemeDictionaries>
|
|
<ResourceDictionary x:Key="Dark">
|
|
<SolidColorBrush x:Key="PageBrush" Color="#0E1525"/>
|
|
<SolidColorBrush x:Key="PanelBrush" Color="#162033"/>
|
|
<SolidColorBrush x:Key="PanelAltBrush" Color="#1A2740"/>
|
|
<SolidColorBrush x:Key="FieldBrush" Color="#1D2940"/>
|
|
<SolidColorBrush x:Key="BorderBrush" Color="#2B3A58"/>
|
|
<SolidColorBrush x:Key="AccentBrush" Color="#4AB8FF"/>
|
|
<SolidColorBrush x:Key="AccentSoftBrush" Color="#13324F"/>
|
|
<SolidColorBrush x:Key="TextBrush" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="MutedBrush" Color="#9FB1CC"/>
|
|
<SolidColorBrush x:Key="ButtonBrush" Color="#243554"/>
|
|
<SolidColorBrush x:Key="ButtonHoverBrush" Color="#2E446C"/>
|
|
<SolidColorBrush x:Key="PrimaryTextBrush" Color="#07111D"/>
|
|
|
|
<!-- Fluent control theme-brush overrides so built-in controls match the palette -->
|
|
<SolidColorBrush x:Key="TextControlBackground" Color="#1D2940"/>
|
|
<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#233252"/>
|
|
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#1D2940"/>
|
|
<SolidColorBrush x:Key="TextControlBorderBrush" Color="#2B3A58"/>
|
|
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#4AB8FF"/>
|
|
<SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#4AB8FF"/>
|
|
<SolidColorBrush x:Key="TextControlForeground" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="TextControlForegroundFocused" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="TextControlHeaderForeground" Color="#9FB1CC"/>
|
|
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#7488A6"/>
|
|
|
|
<SolidColorBrush x:Key="ComboBoxBackground" Color="#1D2940"/>
|
|
<SolidColorBrush x:Key="ComboBoxBackgroundPointerOver" Color="#233252"/>
|
|
<SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#2B3A58"/>
|
|
<SolidColorBrush x:Key="ComboBoxForeground" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="ComboBoxHeaderForeground" Color="#9FB1CC"/>
|
|
<SolidColorBrush x:Key="ComboBoxItemBackgroundSelected" Color="#13324F"/>
|
|
<SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="#10192B"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackground" Color="#243554"/>
|
|
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#2E446C"/>
|
|
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#1B2A44"/>
|
|
<SolidColorBrush x:Key="ButtonForeground" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="ButtonBorderBrush" Color="#2B3A58"/>
|
|
|
|
<SolidColorBrush x:Key="ContentDialogBackground" Color="#162033"/>
|
|
<SolidColorBrush x:Key="ContentDialogForeground" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="ContentDialogBorderBrush" Color="#35507D"/>
|
|
|
|
<SolidColorBrush x:Key="ListViewItemBackgroundSelected" Color="#13324F"/>
|
|
<SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#1A2740"/>
|
|
<SolidColorBrush x:Key="ListViewItemForeground" Color="#F5F7FB"/>
|
|
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUnchecked" Color="#1D2940"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeUnchecked" Color="#2B3A58"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillChecked" Color="#4AB8FF"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeChecked" Color="#4AB8FF"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundChecked" Color="#07111D"/>
|
|
<SolidColorBrush x:Key="CheckBoxForegroundUnchecked" Color="#F5F7FB"/>
|
|
<SolidColorBrush x:Key="CheckBoxForegroundChecked" Color="#F5F7FB"/>
|
|
|
|
<SolidColorBrush x:Key="ProgressBarForeground" Color="#4AB8FF"/>
|
|
<SolidColorBrush x:Key="ProgressBarBackground" Color="#1D2940"/>
|
|
|
|
<SolidColorBrush x:Key="HeroBorderBrush" Color="#35507D"/>
|
|
</ResourceDictionary>
|
|
<ResourceDictionary x:Key="Light">
|
|
<SolidColorBrush x:Key="PageBrush" Color="#F4F7FB"/>
|
|
<SolidColorBrush x:Key="PanelBrush" Color="#FFFFFF"/>
|
|
<SolidColorBrush x:Key="PanelAltBrush" Color="#EEF4FB"/>
|
|
<SolidColorBrush x:Key="FieldBrush" Color="#F7FAFD"/>
|
|
<SolidColorBrush x:Key="BorderBrush" Color="#C7D3E3"/>
|
|
<SolidColorBrush x:Key="AccentBrush" Color="#0E9AEF"/>
|
|
<SolidColorBrush x:Key="AccentSoftBrush" Color="#D6EEFF"/>
|
|
<SolidColorBrush x:Key="TextBrush" Color="#122033"/>
|
|
<SolidColorBrush x:Key="MutedBrush" Color="#5F7390"/>
|
|
<SolidColorBrush x:Key="ButtonBrush" Color="#E5EDF7"/>
|
|
<SolidColorBrush x:Key="ButtonHoverBrush" Color="#D7E4F4"/>
|
|
<SolidColorBrush x:Key="PrimaryTextBrush" Color="#FFFFFF"/>
|
|
|
|
<SolidColorBrush x:Key="TextControlBackground" Color="#F7FAFD"/>
|
|
<SolidColorBrush x:Key="TextControlBackgroundPointerOver" Color="#EEF4FB"/>
|
|
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="#FFFFFF"/>
|
|
<SolidColorBrush x:Key="TextControlBorderBrush" Color="#C7D3E3"/>
|
|
<SolidColorBrush x:Key="TextControlBorderBrushPointerOver" Color="#0E9AEF"/>
|
|
<SolidColorBrush x:Key="TextControlBorderBrushFocused" Color="#0E9AEF"/>
|
|
<SolidColorBrush x:Key="TextControlForeground" Color="#122033"/>
|
|
<SolidColorBrush x:Key="TextControlForegroundFocused" Color="#122033"/>
|
|
<SolidColorBrush x:Key="TextControlHeaderForeground" Color="#5F7390"/>
|
|
<SolidColorBrush x:Key="TextControlPlaceholderForeground" Color="#8194AC"/>
|
|
|
|
<SolidColorBrush x:Key="ComboBoxBackground" Color="#F7FAFD"/>
|
|
<SolidColorBrush x:Key="ComboBoxBackgroundPointerOver" Color="#EEF4FB"/>
|
|
<SolidColorBrush x:Key="ComboBoxBorderBrush" Color="#C7D3E3"/>
|
|
<SolidColorBrush x:Key="ComboBoxForeground" Color="#122033"/>
|
|
<SolidColorBrush x:Key="ComboBoxHeaderForeground" Color="#5F7390"/>
|
|
<SolidColorBrush x:Key="ComboBoxItemBackgroundSelected" Color="#D6EEFF"/>
|
|
<SolidColorBrush x:Key="ComboBoxDropDownBackground" Color="#FFFFFF"/>
|
|
|
|
<SolidColorBrush x:Key="ButtonBackground" Color="#E5EDF7"/>
|
|
<SolidColorBrush x:Key="ButtonBackgroundPointerOver" Color="#D7E4F4"/>
|
|
<SolidColorBrush x:Key="ButtonBackgroundPressed" Color="#C7D9EE"/>
|
|
<SolidColorBrush x:Key="ButtonForeground" Color="#122033"/>
|
|
<SolidColorBrush x:Key="ButtonForegroundPointerOver" Color="#122033"/>
|
|
<SolidColorBrush x:Key="ButtonBorderBrush" Color="#C7D3E3"/>
|
|
|
|
<SolidColorBrush x:Key="ContentDialogBackground" Color="#FFFFFF"/>
|
|
<SolidColorBrush x:Key="ContentDialogForeground" Color="#122033"/>
|
|
<SolidColorBrush x:Key="ContentDialogBorderBrush" Color="#C7D3E3"/>
|
|
|
|
<SolidColorBrush x:Key="ListViewItemBackgroundSelected" Color="#D6EEFF"/>
|
|
<SolidColorBrush x:Key="ListViewItemBackgroundPointerOver" Color="#EEF4FB"/>
|
|
<SolidColorBrush x:Key="ListViewItemForeground" Color="#122033"/>
|
|
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillUnchecked" Color="#F7FAFD"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeUnchecked" Color="#C7D3E3"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundFillChecked" Color="#0E9AEF"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckBackgroundStrokeChecked" Color="#0E9AEF"/>
|
|
<SolidColorBrush x:Key="CheckBoxCheckGlyphForegroundChecked" Color="#FFFFFF"/>
|
|
<SolidColorBrush x:Key="CheckBoxForegroundUnchecked" Color="#122033"/>
|
|
<SolidColorBrush x:Key="CheckBoxForegroundChecked" Color="#122033"/>
|
|
|
|
<SolidColorBrush x:Key="ProgressBarForeground" Color="#0E9AEF"/>
|
|
<SolidColorBrush x:Key="ProgressBarBackground" Color="#F7FAFD"/>
|
|
|
|
<SolidColorBrush x:Key="HeroBorderBrush" Color="#A9C4E4"/>
|
|
</ResourceDictionary>
|
|
</ResourceDictionary.ThemeDictionaries>
|
|
|
|
<!-- Global corner rounding applied to built-in Fluent controls -->
|
|
<CornerRadius x:Key="ControlCornerRadius">10</CornerRadius>
|
|
<CornerRadius x:Key="OverlayCornerRadius">18</CornerRadius>
|
|
|
|
<x:Double x:Key="ContentDialogMaxWidth">460</x:Double>
|
|
|
|
<Style TargetType="Page">
|
|
<Setter Property="Background" Value="{ThemeResource PageBrush}" />
|
|
<Setter Property="FontFamily" Value="Bahnschrift" />
|
|
</Style>
|
|
|
|
<Style x:Key="CardBorderStyle" TargetType="Border">
|
|
<Setter Property="Background" Value="{ThemeResource PanelBrush}" />
|
|
<Setter Property="BorderBrush" Value="{ThemeResource BorderBrush}" />
|
|
<Setter Property="BorderThickness" Value="1" />
|
|
<Setter Property="CornerRadius" Value="16" />
|
|
</Style>
|
|
|
|
<Style x:Key="SectionTitleStyle" TargetType="TextBlock">
|
|
<Setter Property="Foreground" Value="{ThemeResource TextBrush}" />
|
|
<Setter Property="FontSize" Value="15" />
|
|
<Setter Property="FontWeight" Value="SemiBold" />
|
|
</Style>
|
|
|
|
<Style x:Key="MutedTextStyle" TargetType="TextBlock">
|
|
<Setter Property="Foreground" Value="{ThemeResource MutedBrush}" />
|
|
<Setter Property="FontSize" Value="13" />
|
|
</Style>
|
|
|
|
<Style x:Key="FieldLabelStyle" TargetType="TextBlock">
|
|
<Setter Property="Foreground" Value="{ThemeResource MutedBrush}" />
|
|
<Setter Property="FontSize" Value="12" />
|
|
<Setter Property="Margin" Value="0,0,0,4" />
|
|
</Style>
|
|
|
|
<Style TargetType="TextBlock">
|
|
<Setter Property="Foreground" Value="{ThemeResource TextBrush}" />
|
|
<Setter Property="FontSize" Value="13" />
|
|
</Style>
|
|
|
|
<Style TargetType="Button">
|
|
<Setter Property="Padding" Value="16,9" />
|
|
<Setter Property="FontSize" Value="13" />
|
|
<Setter Property="CornerRadius" Value="10" />
|
|
</Style>
|
|
|
|
<Style x:Key="PrimaryButtonStyle" TargetType="Button">
|
|
<Setter Property="Background" Value="{ThemeResource AccentBrush}" />
|
|
<Setter Property="Foreground" Value="{ThemeResource PrimaryTextBrush}" />
|
|
<Setter Property="BorderBrush" Value="{ThemeResource AccentBrush}" />
|
|
<Setter Property="FontWeight" Value="SemiBold" />
|
|
<Setter Property="Padding" Value="22,10" />
|
|
<Setter Property="CornerRadius" Value="10" />
|
|
</Style>
|
|
|
|
<Style x:Key="IconButtonStyle" TargetType="Button">
|
|
<Setter Property="Width" Value="40" />
|
|
<Setter Property="Height" Value="40" />
|
|
<Setter Property="Padding" Value="0" />
|
|
<Setter Property="FontSize" Value="16" />
|
|
<Setter Property="CornerRadius" Value="10" />
|
|
<Setter Property="HorizontalContentAlignment" Value="Center" />
|
|
<Setter Property="VerticalContentAlignment" Value="Center" />
|
|
</Style>
|
|
|
|
<!-- Explicit styles bound to ContentDialog.PrimaryButtonStyle / CloseButtonStyle so its
|
|
built-in buttons match the app's own Button look instead of the default Fluent
|
|
accent-pill / plain styles. -->
|
|
<Style x:Key="DialogPrimaryButtonStyle" TargetType="Button">
|
|
<Setter Property="Background" Value="{ThemeResource AccentBrush}" />
|
|
<Setter Property="Foreground" Value="{ThemeResource PrimaryTextBrush}" />
|
|
<Setter Property="BorderBrush" Value="{ThemeResource AccentBrush}" />
|
|
<Setter Property="BorderThickness" Value="1" />
|
|
<Setter Property="FontWeight" Value="SemiBold" />
|
|
<Setter Property="FontSize" Value="13" />
|
|
<Setter Property="Padding" Value="22,10" />
|
|
<Setter Property="CornerRadius" Value="10" />
|
|
<Setter Property="MinHeight" Value="40" />
|
|
<Setter Property="MinWidth" Value="110" />
|
|
</Style>
|
|
|
|
<Style x:Key="DialogCloseButtonStyle" TargetType="Button">
|
|
<Setter Property="Background" Value="{ThemeResource ButtonBrush}" />
|
|
<Setter Property="Foreground" Value="{ThemeResource TextBrush}" />
|
|
<Setter Property="BorderBrush" Value="{ThemeResource BorderBrush}" />
|
|
<Setter Property="BorderThickness" Value="1" />
|
|
<Setter Property="FontSize" Value="13" />
|
|
<Setter Property="Padding" Value="16,9" />
|
|
<Setter Property="CornerRadius" Value="10" />
|
|
<Setter Property="MinHeight" Value="40" />
|
|
<Setter Property="MinWidth" Value="110" />
|
|
</Style>
|
|
|
|
<Style TargetType="TextBox">
|
|
<Setter Property="FontSize" Value="13" />
|
|
<Setter Property="MinHeight" Value="38" />
|
|
</Style>
|
|
|
|
<Style TargetType="ComboBox">
|
|
<Setter Property="FontSize" Value="13" />
|
|
<Setter Property="MinHeight" Value="38" />
|
|
</Style>
|
|
|
|
<Style TargetType="CheckBox">
|
|
<Setter Property="FontSize" Value="13" />
|
|
</Style>
|
|
|
|
<Style TargetType="ProgressBar">
|
|
<Setter Property="MinHeight" Value="8" />
|
|
</Style>
|
|
|
|
<Style TargetType="ListView">
|
|
<Setter Property="Background" Value="{ThemeResource FieldBrush}" />
|
|
<Setter Property="BorderBrush" Value="{ThemeResource BorderBrush}" />
|
|
<Setter Property="BorderThickness" Value="1" />
|
|
<Setter Property="CornerRadius" Value="10" />
|
|
<Setter Property="FontSize" Value="13" />
|
|
<Setter Property="Padding" Value="4" />
|
|
</Style>
|
|
|
|
<Style TargetType="ListViewItem">
|
|
<Setter Property="MinHeight" Value="32" />
|
|
<Setter Property="Padding" Value="8,6" />
|
|
<Setter Property="CornerRadius" Value="6" />
|
|
</Style>
|
|
|
|
<Style TargetType="ContentDialog">
|
|
<Setter Property="CornerRadius" Value="18" />
|
|
</Style>
|
|
</ResourceDictionary>
|
|
</Application.Resources>
|
|
</Application>
|