Fix binding due to merge conflict

Author: neon-nyan

CollapseLauncher/Classes/GameManagement/ImageBackground/ImageBackgroundManager.Loaders.cs

@@ -21,6 +21,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Windows.UI;
+// ReSharper disable IdentifierTypo
 
 // ReSharper disable CheckNamespace
 
@@ -33,10 +34,6 @@ public partial class ImageBackgroundManager
 
     private CancellationTokenSource? _imageLoadingTokenSource;
 
-    private static IValueConverter BoolInvertConverter => field ??= new InverseBooleanConverter();
-
-    private static IValueConverter MediaAutoplayWindowOverrideConverter => field ??= new MediaAutoplayWindowOverrideConverter();
-
     #endregion
 
     private void LoadImageAtIndex(int index, CancellationToken token) =>
@@ -177,67 +174,78 @@ private void SpawnImageLayer(Uri? overlayFilePath,
         if (!CurrentIsEnableCustomImage &&
             !GlobalIsEnableCustomImage)
         {
-            layerElement.BindProperty(this,
+            layerElement.BindProperty(LayeredBackgroundImage.IsVideoAutoplayProperty,
+                                      this,
                                       nameof(CurrentIsEnableBackgroundAutoPlay),
-                                      LayeredBackgroundImage.IsVideoAutoplayProperty,
-                                      BindingMode.OneWay,
-                                      MediaAutoplayWindowOverrideConverter);
+                                      bindingMode: BindingMode.OneWay,
+                                      sourceTrigger: UpdateSourceTrigger.PropertyChanged,
+                                      converter: StaticConverter<MediaAutoplayWindowOverrideConverter>.Shared);
         }
         else
         {
             layerElement.IsVideoAutoplay = WindowUtility.CurrentWindowIsVisible;
         }
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.ParallaxHoverSourceProperty,
+                                  this,
                                   nameof(GlobalParallaxHoverSource),
-                                  LayeredBackgroundImage.ParallaxHoverSourceProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.IsParallaxEnabledProperty,
+                                  this,
                                   nameof(GlobalIsBackgroundParallaxEffectEnabled),
-                                  LayeredBackgroundImage.IsParallaxEnabledProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.ParallaxHorizontalShiftProperty,
+                                  this,
                                   nameof(GlobalBackgroundParallaxPixelShift),
-                                  LayeredBackgroundImage.ParallaxHorizontalShiftProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.ParallaxVerticalShiftProperty,
+                                  this,
                                   nameof(GlobalBackgroundParallaxPixelShift),
-                                  LayeredBackgroundImage.ParallaxVerticalShiftProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this, 
+        layerElement.BindProperty(LayeredBackgroundImage.IsAudioEnabledProperty,
+                                  this,
                                   nameof(GlobalBackgroundAudioEnabled),
-                                  LayeredBackgroundImage.IsAudioEnabledProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.AudioVolumeProperty,
+                                  this,
                                   nameof(GlobalBackgroundAudioVolume),
-                                  LayeredBackgroundImage.AudioVolumeProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.IsBackgroundElevatedProperty,
+                                  this,
                                   nameof(IsBackgroundElevated),
-                                  LayeredBackgroundImage.IsBackgroundElevatedProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.ForegroundOpacityProperty,
+                                  this,
                                   nameof(ForegroundOpacity),
-                                  LayeredBackgroundImage.ForegroundOpacityProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(this,
+        layerElement.BindProperty(LayeredBackgroundImage.SmokeOpacityProperty,
+                                  this,
                                   nameof(SmokeOpacity),
-                                  LayeredBackgroundImage.SmokeOpacityProperty,
-                                  BindingMode.OneWay);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged);
 
-        layerElement.BindProperty(context,
+        layerElement.BindProperty(LayeredBackgroundImage.UseImageCacheProperty,
+                                  context,
                                   nameof(context.ForceReload),
-                                  LayeredBackgroundImage.UseImageCacheProperty,
-                                  BindingMode.OneWay,
-                                  BoolInvertConverter);
+                                  bindingMode: BindingMode.OneWay,
+                                  sourceTrigger: UpdateSourceTrigger.PropertyChanged,
+                                  converter: StaticConverter<InverseBooleanConverter>.Shared);
 
         layerElement.Transitions.Add(new PopupThemeTransition());
         layerElement.ImageLoaded += LayerElementOnLoaded;

CollapseLauncher/Classes/GameManagement/ImageBackground/ImageBackgroundManager.cs

@@ -69,8 +69,8 @@ public bool GlobalIsEnableCustomImage
         set
         {
             LauncherConfig.SetAndSaveConfigValue(GlobalIsEnableCustomImageConfigKey, value);
-            OnPropertyChanged();
             InitializeCore();
+            OnPropertyChanged();
         }
     }
 
@@ -212,8 +212,8 @@ public bool CurrentIsEnableCustomImage
         set
         {
             LauncherConfig.SetAndSaveConfigValue(CurrentIsEnableCustomImageConfigKey, value);
-            OnPropertyChanged();
             InitializeCore();
+            OnPropertyChanged();
         }
     }
 

CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml

@@ -102,6 +102,7 @@
             </MenuFlyoutSubItem>
             <MenuFlyoutSeparator Margin="16,8" />
             <ToggleMenuFlyoutItem DataContext="{x:Bind CurrentBackgroundManager, Mode=OneWay}"
+                                  IsChecked="{Binding GlobalBackgroundAudioEnabled, Mode=TwoWay}"
                                   Text="{x:Bind helper:Locale.Current.Lang._HomePage.BgContextMenu_EnableAudioText, Mode=OneWay}"
                                   ToolTipService.Placement="Left"
                                   ToolTipService.ToolTip="{x:Bind helper:Locale.Current.Lang._HomePage.BgContextMenu_EnableAudioTooltip, Mode=OneWay}">

CollapseLauncher/XAMLs/MainApp/Pages/OOBE/OOBEAgreementMenu.xaml.cs

@@ -17,13 +17,7 @@ internal AgreementProperty(string title, string filePath)
             Title = title;
         }
 
-        internal string Text
-        {
-            get
-            {
-                return !File.Exists(FilePath) ? $"### Failed to read the file\n**{FilePath}**" : File.ReadAllText(FilePath);
-            }
-        }
+        internal          string         Text     => !File.Exists(FilePath) ? $"### Failed to read the file\n**{FilePath}**" : File.ReadAllText(FilePath);
         internal          string         Title    { get; }
         private           string         FilePath { get; }
         internal readonly MarkdownConfig MarkdownConfig = new();

CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml

@@ -194,6 +194,7 @@
                             <ToggleSwitch x:Name="AppBGMode"
                                           Margin="0,4,0,8"
                                           Header="{x:Bind helper:Locale.Current.Lang._SettingsPage.AppBG_Checkbox, Mode=OneWay}"
+                                          DataContext="{x:Bind backgroundManager:ImageBackgroundManager.Shared}"
                                           IsOn="{Binding GlobalIsEnableCustomImage, Mode=TwoWay}"
                                           OffContent="{x:Bind helper:Locale.Current.Lang._Misc.Disabled, Mode=OneWay}"
                                           OnContent="{x:Bind helper:Locale.Current.Lang._Misc.Enabled, Mode=OneWay}" />

CollapseLauncher/XAMLs/MainApp/Pages/SettingsPage.xaml.cs

@@ -8,16 +8,16 @@
 using CollapseLauncher.Helper.Animation;
 using CollapseLauncher.Helper.Database;
 using CollapseLauncher.Helper.Image;
+#if ENABLEUSERFEEDBACK
+using CollapseLauncher.Helper.Loading;
+#endif
 using CollapseLauncher.Helper.Metadata;
 using CollapseLauncher.Helper.Update;
 using CollapseLauncher.Pages.OOBE;
 using CollapseLauncher.Pages.SettingsContext;
 using CollapseLauncher.Plugins;
 using CollapseLauncher.XAMLs.Theme.ContentDialog;
 using CollapseLauncher.XAMLs.Theme.CustomControls;
-#if ENABLEUSERFEEDBACK
-using CollapseLauncher.Helper.Loading;
-#endif
 using CommunityToolkit.WinUI;
 using Hi3Helper;
 using Hi3Helper.EncTool;