diff --git a/AmiReel.WinUI/App.xaml b/AmiReel.WinUI/App.xaml index dbae222..cc8b137 100644 --- a/AmiReel.WinUI/App.xaml +++ b/AmiReel.WinUI/App.xaml @@ -23,6 +23,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -37,11 +85,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 10 + 18 + + 460 + + + + + + + + + + + + + + - + + diff --git a/AmiReel.WinUI/App.xaml.cs b/AmiReel.WinUI/App.xaml.cs index 96e1495..7e911c5 100644 --- a/AmiReel.WinUI/App.xaml.cs +++ b/AmiReel.WinUI/App.xaml.cs @@ -24,6 +24,7 @@ public partial class App : Application { private Window? _window; public static IntPtr MainWindowHandle { get; private set; } + public static MainWindow? MainWindowInstance { get; set; } /// /// Initializes the singleton application object. This is the first line of authored code diff --git a/AmiReel.WinUI/Assets/AppIcon.ico b/AmiReel.WinUI/Assets/AppIcon.ico index 235dad2..e3e0799 100644 Binary files a/AmiReel.WinUI/Assets/AppIcon.ico and b/AmiReel.WinUI/Assets/AppIcon.ico differ diff --git a/AmiReel.WinUI/Assets/LockScreenLogo.scale-200.png b/AmiReel.WinUI/Assets/LockScreenLogo.scale-200.png index 33f889e..15d7ea0 100644 Binary files a/AmiReel.WinUI/Assets/LockScreenLogo.scale-200.png and b/AmiReel.WinUI/Assets/LockScreenLogo.scale-200.png differ diff --git a/AmiReel.WinUI/Assets/SplashScreen.scale-200.png b/AmiReel.WinUI/Assets/SplashScreen.scale-200.png index 802c79d..a31f213 100644 Binary files a/AmiReel.WinUI/Assets/SplashScreen.scale-200.png and b/AmiReel.WinUI/Assets/SplashScreen.scale-200.png differ diff --git a/AmiReel.WinUI/Assets/Square150x150Logo.scale-200.png b/AmiReel.WinUI/Assets/Square150x150Logo.scale-200.png index ddba42a..1e781f1 100644 Binary files a/AmiReel.WinUI/Assets/Square150x150Logo.scale-200.png and b/AmiReel.WinUI/Assets/Square150x150Logo.scale-200.png differ diff --git a/AmiReel.WinUI/Assets/Square44x44Logo.scale-200.png b/AmiReel.WinUI/Assets/Square44x44Logo.scale-200.png index 9327dd7..a9b1483 100644 Binary files a/AmiReel.WinUI/Assets/Square44x44Logo.scale-200.png and b/AmiReel.WinUI/Assets/Square44x44Logo.scale-200.png differ diff --git a/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png index e51416a..ac98ace 100644 Binary files a/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png and b/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-24_altform-unplated.png differ diff --git a/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-48_altform-lightunplated.png b/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-48_altform-lightunplated.png index bf063eb..4ebc40f 100644 Binary files a/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-48_altform-lightunplated.png and b/AmiReel.WinUI/Assets/Square44x44Logo.targetsize-48_altform-lightunplated.png differ diff --git a/AmiReel.WinUI/Assets/StoreLogo.png b/AmiReel.WinUI/Assets/StoreLogo.png index be865f0..b41271a 100644 Binary files a/AmiReel.WinUI/Assets/StoreLogo.png and b/AmiReel.WinUI/Assets/StoreLogo.png differ diff --git a/AmiReel.WinUI/Assets/Wide310x150Logo.scale-200.png b/AmiReel.WinUI/Assets/Wide310x150Logo.scale-200.png index 314d297..ab79a94 100644 Binary files a/AmiReel.WinUI/Assets/Wide310x150Logo.scale-200.png and b/AmiReel.WinUI/Assets/Wide310x150Logo.scale-200.png differ diff --git a/AmiReel.WinUI/DialogHelper.cs b/AmiReel.WinUI/DialogHelper.cs new file mode 100644 index 0000000..ae9dcab --- /dev/null +++ b/AmiReel.WinUI/DialogHelper.cs @@ -0,0 +1,33 @@ +using Microsoft.UI.Xaml; +using Microsoft.UI.Xaml.Controls; +using Microsoft.UI.Xaml.Media; + +namespace AmiReel_WinUI; + +/// +/// Builds ContentDialogs styled to match the app's own palette and button shapes, +/// since ContentDialog's default Fluent look (accent-pill primary button, plain +/// square close button, ungrouped theme resources) does not follow our custom brushes. +/// +internal static class DialogHelper +{ + public static ContentDialog CreateStyled(XamlRoot xamlRoot, ElementTheme theme) + { + string themeKey = theme == ElementTheme.Dark ? "Dark" : "Light"; + ResourceDictionary themeDictionary = (ResourceDictionary)Application.Current.Resources.ThemeDictionaries[themeKey]; + + return new ContentDialog + { + XamlRoot = xamlRoot, + RequestedTheme = theme, + Background = (Brush)themeDictionary["PanelBrush"], + Foreground = (Brush)themeDictionary["TextBrush"], + BorderBrush = (Brush)themeDictionary["HeroBorderBrush"], + BorderThickness = new Thickness(1.5), + CornerRadius = new CornerRadius(18), + PrimaryButtonStyle = (Style)Application.Current.Resources["DialogPrimaryButtonStyle"], + SecondaryButtonStyle = (Style)Application.Current.Resources["DialogCloseButtonStyle"], + CloseButtonStyle = (Style)Application.Current.Resources["DialogCloseButtonStyle"] + }; + } +} diff --git a/AmiReel.WinUI/MainPage.xaml b/AmiReel.WinUI/MainPage.xaml index df230da..2922a3c 100644 --- a/AmiReel.WinUI/MainPage.xaml +++ b/AmiReel.WinUI/MainPage.xaml @@ -25,16 +25,17 @@ -