diff --git a/LanMountainDesktop.Launcher/App.axaml.cs b/LanMountainDesktop.Launcher/App.axaml.cs index b09554b..8405ee3 100644 --- a/LanMountainDesktop.Launcher/App.axaml.cs +++ b/LanMountainDesktop.Launcher/App.axaml.cs @@ -143,8 +143,7 @@ public partial class App : Application private static SplashWindow CreateSplashWindow() { - var preferences = StartupVisualPreferencesResolver.Resolve(); - var window = new SplashWindow(preferences.Mode); + var window = new SplashWindow(); TrySetSplashVersionInfo(window, LauncherRuntimeContext.Current); return window; } diff --git a/LanMountainDesktop.Launcher/Views/SplashWindow.axaml b/LanMountainDesktop.Launcher/Views/SplashWindow.axaml index 56926f1..729bcc8 100644 --- a/LanMountainDesktop.Launcher/Views/SplashWindow.axaml +++ b/LanMountainDesktop.Launcher/Views/SplashWindow.axaml @@ -22,37 +22,15 @@ - - - - - - - - - - - - - - + + await DismissAsync()); return; } - ConfigureForVisualMode(); - - if (_mode == StartupVisualMode.SlideSplash) - { - var from = Position; - await AnimateWindowPositionAsync(from, _slideHiddenPosition, SlideAnimationDuration, EaseInCubic).ConfigureAwait(false); - } - else if (_mode == StartupVisualMode.Fade) - { - await AnimateOpacityAsync(Opacity, 0d, FadeAnimationDuration).ConfigureAwait(false); - } - + await AnimateOpacityAsync(Opacity, 0d, FadeAnimationDuration).ConfigureAwait(false); Close(); } @@ -194,46 +159,6 @@ public partial class SplashWindow : Window, ISplashStageReporter UpdateStatus("[Debug Mode] Splash Preview"); } - private void ConfigureForVisualMode() - { - if (_layoutConfigured) - { - return; - } - - _layoutConfigured = true; - var compactHero = this.FindControl("CompactHero"); - var fullscreenHero = this.FindControl("FullscreenHero"); - - if (_mode == StartupVisualMode.Fade) - { - compactHero?.SetCurrentValue(IsVisibleProperty, true); - fullscreenHero?.SetCurrentValue(IsVisibleProperty, false); - Background = new SolidColorBrush(Color.Parse("#0B0B0B")); - Width = 480; - Height = 320; - WindowStartupLocation = WindowStartupLocation.CenterScreen; - return; - } - - compactHero?.SetCurrentValue(IsVisibleProperty, false); - fullscreenHero?.SetCurrentValue(IsVisibleProperty, true); - Background = Brushes.Black; - WindowStartupLocation = WindowStartupLocation.Manual; - - var screen = Screens?.Primary ?? Screens?.All.FirstOrDefault(); - var workingArea = screen?.WorkingArea ?? new PixelRect(0, 0, 1920, 1080); - var scale = Math.Max(screen?.Scaling ?? 1d, 0.01d); - - Width = workingArea.Width / scale; - Height = workingArea.Height / scale; - _targetPosition = new PixelPoint(workingArea.X, workingArea.Y); - _slideHiddenPosition = new PixelPoint(workingArea.X + workingArea.Width, workingArea.Y); - Position = _mode == StartupVisualMode.SlideSplash - ? _slideHiddenPosition - : _targetPosition; - } - private void OnVersionTextClick(object? sender, PointerPressedEventArgs e) { if (_isDebugModeOpened) @@ -292,20 +217,6 @@ public partial class SplashWindow : Window, ISplashStageReporter }, duration, EaseOutCubic).ConfigureAwait(false); } - private async Task AnimateWindowPositionAsync( - PixelPoint from, - PixelPoint to, - TimeSpan duration, - Func easing) - { - await AnimateAsync(progress => - { - var currentX = (int)Math.Round(from.X + ((to.X - from.X) * progress)); - var currentY = (int)Math.Round(from.Y + ((to.Y - from.Y) * progress)); - Position = new PixelPoint(currentX, currentY); - }, duration, easing).ConfigureAwait(false); - } - private async Task AnimateAsync(Action update, TimeSpan duration, Func easing) { if (duration <= TimeSpan.Zero) @@ -347,6 +258,4 @@ public partial class SplashWindow : Window, ISplashStageReporter var inverse = 1d - value; return 1d - (inverse * inverse * inverse); } - - private static double EaseInCubic(double value) => value * value * value; } diff --git a/LanMountainDesktop/Assets/about_banner.png b/LanMountainDesktop/Assets/about_banner.png deleted file mode 100644 index db9d81c..0000000 Binary files a/LanMountainDesktop/Assets/about_banner.png and /dev/null differ diff --git a/LanMountainDesktop/Assets/about_banner_dark.png b/LanMountainDesktop/Assets/about_banner_dark.png new file mode 100644 index 0000000..11304ec Binary files /dev/null and b/LanMountainDesktop/Assets/about_banner_dark.png differ diff --git a/LanMountainDesktop/Assets/about_banner_light.png b/LanMountainDesktop/Assets/about_banner_light.png new file mode 100644 index 0000000..98d5a52 Binary files /dev/null and b/LanMountainDesktop/Assets/about_banner_light.png differ diff --git a/LanMountainDesktop/Views/SettingsPages/AboutSettingsPage.axaml b/LanMountainDesktop/Views/SettingsPages/AboutSettingsPage.axaml index e9c5551..c26f2e7 100644 --- a/LanMountainDesktop/Views/SettingsPages/AboutSettingsPage.axaml +++ b/LanMountainDesktop/Views/SettingsPages/AboutSettingsPage.axaml @@ -6,6 +6,19 @@ xmlns:fi="using:FluentIcons.Avalonia.Fluent" x:Class="LanMountainDesktop.Views.SettingsPages.AboutSettingsPage" x:DataType="vm:AboutSettingsPageViewModel"> + + + + + + + + + + + + +