release: Improve image loading + wait for initialization.

Author: Aetopia

src/Flarial.Launcher/Controls/InitializationTypeBox.cs

@@ -61,5 +61,4 @@ sealed class WaitForGlobalResources : ContentItem<bool?>
         internal override bool? Value => true;
         protected override string String => "Wait for global resources, safe & slow.";
     }
-
 }

src/Flarial.Launcher/Controls/PromotionImageButton.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Management.Automation;
 using Flarial.Launcher.Xaml;
 using Windows.UI.Core;
 using Windows.UI.Xaml;
@@ -12,8 +13,8 @@ namespace Flarial.Launcher.Controls;
 
 abstract class PromotionImageButton : XamlElement<Image>
 {
-    protected abstract string? ImageUri { get; }
-    protected abstract string? NavigateUri { get; }
+    protected abstract string ImageUri { get; }
+    protected abstract string NavigateUri { get; }
 
     static readonly CoreCursor _hand = new(CoreCursorType.Hand, 0);
     static readonly CoreCursor _arrow = new(CoreCursorType.Arrow, 0);
@@ -22,21 +23,19 @@ protected PromotionImageButton() : base(new())
     {
         (~this).Width = 320 * 0.95;
         (~this).Height = 50 * 0.95;
-        (~this).VerticalAlignment = VerticalAlignment.Bottom;
+        (~this).Visibility = Visibility.Collapsed;
 
-        (~this).Source = new BitmapImage
-        {
-            DecodePixelType = DecodePixelType.Logical,
-            UriSource = ImageUri is { } ? new(ImageUri) : null
-        };
-
-        (~this).ImageOpened += OnImageOpened;
-        (~this).PointerPressed += OnImagePointerPressed;
-
-        (~this).PointerEntered += OnImagePointerEntered;
+        (~this).Tag = NavigateUri;
+        (~this).ImageFailed += OnImageFailed;
         (~this).PointerExited += OnImagePointerExited;
+        (~this).PointerEntered += OnImagePointerEntered;
+        (~this).PointerPressed += OnImagePointerPressed;
 
-        (~this).Tag = NavigateUri;
+        if (ImageUri is { })
+        {
+            (~this).Visibility = Visibility.Visible;
+            (~this).Source = new BitmapImage { UriSource = new(ImageUri) };
+        }
     }
 
     unsafe static void OnImagePointerPressed(object sender, RoutedEventArgs args)
@@ -45,10 +44,8 @@ unsafe static void OnImagePointerPressed(object sender, RoutedEventArgs args)
             ShellExecute(Null, null, lpFile, null, null, SW_NORMAL);
     }
 
-    static void OnImageOpened(object sender, RoutedEventArgs args) => ((Image)sender).Visibility = Visibility.Visible;
-
+    static void OnImageFailed(object sender, RoutedEventArgs args) => ((Image)sender).Visibility = Visibility.Collapsed;
     static void OnImagePointerEntered(object sender, RoutedEventArgs args) => CoreWindow.GetForCurrentThread().PointerCursor = _hand;
-
     static void OnImagePointerExited(object sender, RoutedEventArgs args) => CoreWindow.GetForCurrentThread().PointerCursor = _arrow;
 }
 
@@ -64,15 +61,15 @@ sealed class LiteByteHostingImageButton : PromotionImageButton
     protected override string NavigateUri => "https://litebyte.co/minecraft?utm_source=flarial-client&utm_medium=app&utm_campaign=bedrock-launch";
 }
 
+sealed class InfinityNetworkImageButton : PromotionImageButton
+{
+    protected override string ImageUri => "https://assets.infinitymcpe.com/banner.png";
+    protected override string NavigateUri => "https://discord.gg/infinitymcpe";
+}
+
 [Obsolete("", true)]
 sealed class CollapseNetworkImageButton : PromotionImageButton
 {
     protected override string ImageUri => "https://collapsemc.com/assets/other/ad-banner.png";
     protected override string NavigateUri => "minecraft://?addExternalServer=Collapse|clps.gg:19132";
-}
-
-sealed class InfinityNetworkImageButton : PromotionImageButton
-{
-    protected override string ImageUri => "https://assets.infinitymcpe.com/banner.png";
-    protected override string NavigateUri => "https://discord.gg/infinitymcpe";
 }

src/Flarial.Launcher/Controls/PromotionImagesBox.cs

@@ -0,0 +1,30 @@
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+namespace Flarial.Launcher.Controls;
+
+sealed class PromotionImagesBox : Grid
+{
+    readonly PromotionImageButton _left = new LiteByteHostingImageButton();
+    readonly PromotionImageButton _middle = new StubImageButton();
+    readonly PromotionImageButton _right = new InfinityNetworkImageButton();
+
+    internal PromotionImagesBox()
+    {
+        Margin = new(12);
+        RowSpacing = 12;
+        ColumnSpacing = 12;
+
+        ColumnDefinitions.Add(new() { Width = GridLength.Auto });
+        ColumnDefinitions.Add(new() { Width = GridLength.Auto });
+        ColumnDefinitions.Add(new() { Width = GridLength.Auto });
+
+        SetColumn(~_left, 0);
+        SetColumn(~_middle, 1);
+        SetColumn(~_right, 2);
+
+        Children.Add(~_left);
+        Children.Add(~_right);
+        Children.Add(~_middle);
+    }
+}

src/Flarial.Launcher/Pages/HomePage.cs

@@ -22,9 +22,9 @@ sealed class HomePage : Grid
         Width = 96,
         Height = 96,
         Margin = new(0, 0, 0, 90),
+        Source = new BitmapImage(),
         VerticalAlignment = VerticalAlignment.Center,
-        HorizontalAlignment = HorizontalAlignment.Center,
-        Source = new BitmapImage { DecodePixelType = DecodePixelType.Logical }
+        HorizontalAlignment = HorizontalAlignment.Center
     };
 
     internal readonly Button _button = new()
@@ -56,10 +56,6 @@ sealed class HomePage : Grid
     readonly MainNavigationView _view;
     readonly ApplicationSettings _settings;
 
-    readonly PromotionImageButton _leftImageButton = new LiteByteHostingImageButton();
-    readonly PromotionImageButton _centerImageButton = new StubImageButton();
-    readonly PromotionImageButton _rightImageButton = new InfinityNetworkImageButton();
-
     UnsupportedVersionDialog UnsupportedVersion
     {
         get
@@ -84,24 +80,17 @@ internal HomePage(MainNavigationView view, ApplicationSettings settings)
             logoBitmap.SetSource(stream.AsRandomAccessStream());
         }
 
-        (~_leftImageButton).Margin = new(12, 0, 0, 12);
-        (~_leftImageButton).HorizontalAlignment = HorizontalAlignment.Left;
-
-        (~_centerImageButton).Margin = new(0, 0, 0, 12);
-        (~_centerImageButton).HorizontalAlignment = HorizontalAlignment.Center;
-
-        (~_rightImageButton).Margin = new(0, 0, 12, 12);
-        (~_rightImageButton).HorizontalAlignment = HorizontalAlignment.Right;
-
         Children.Add(_leftText);
         Children.Add(_rightText);
 
         Children.Add(_button);
         Children.Add(_logoImage);
 
-        Children.Add(~_leftImageButton);
-        Children.Add(~_centerImageButton);
-        Children.Add(~_rightImageButton);
+        Children.Add(new PromotionImagesBox()
+        {
+            VerticalAlignment = VerticalAlignment.Bottom,
+            HorizontalAlignment = HorizontalAlignment.Center
+        });
 
         _button.Click += OnButtonClick;
     }