0.10 Beta Bugfix (Win11 OSD & Lock keys) (#1205)

* Updated the toolkit

Microsoft deprecated the old toolkit and released the same thing under a new name.

* Update ModernFlyouts.Package.wapproj

* Update README.md

* Adds Windows 11 Support for hiding the volume OSD

Changes the class that is being searched for depending on the build number.

* Revert "Update README.md"

This reverts commit 381e623.

* Reverting the name back to normal

I changed it to avoid interfering with normal builds.

Author: manstheram

ModernFlyouts.Core/Display/BrightnessController.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Management;
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using ModernFlyouts.Core.Interop;
 
 namespace ModernFlyouts.Core.Display

ModernFlyouts.Core/Display/DisplayManager.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using ModernFlyouts.Core.Interop;
 using System;
 using System.Collections.Generic;

ModernFlyouts.Core/Display/DisplayMonitor.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Windows;
 

ModernFlyouts.Core/Interop/NativeFlyoutHandler.cs

@@ -1,6 +1,8 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Windows.Interop;
 using System.Windows.Threading;
 using static ModernFlyouts.Core.Interop.NativeMethods;
 
@@ -340,11 +342,31 @@ private static bool IsShellProcess(int id)
 
         private bool GetAllInfos()
         {
-            IntPtr hWndHost;
-            while ((hWndHost = FindWindowEx(IntPtr.Zero, IntPtr.Zero, "NativeHWNDHost", "")) != IntPtr.Zero)
+            IntPtr hWndHost = IntPtr.Zero;
+            IntPtr hWndDUI = IntPtr.Zero;
+
+            String build = RuntimeInformation.OSDescription.Substring(RuntimeInformation.OSDescription.LastIndexOf('.') + 1);
+            int buildNumber = int.Parse(build);
+
+            String outerClass = "";
+            String outerName = "";
+            String innerClass = "";
+            String innerName = "";
+            if (buildNumber >= 22000)
+            {
+                outerClass = "XamlExplorerHostIslandWindow";
+                innerClass = "Windows.UI.Composition.DesktopWindowContentBridge";
+                innerName = "DesktopWindowXamlSource";
+            }
+            else
+            {
+                outerClass = "NativeHWNDHost";
+                innerClass = "DirectUIHWND";
+            }
+
+            while ((hWndHost = FindWindowEx(IntPtr.Zero, hWndHost, outerClass, outerName)) != IntPtr.Zero)
             {
-                IntPtr hWndDUI;
-                if ((hWndDUI = FindWindowEx(hWndHost, IntPtr.Zero, "DirectUIHWND", "")) != IntPtr.Zero)
+                if ((hWndDUI = FindWindowEx(hWndHost, IntPtr.Zero, innerClass, innerName)) != IntPtr.Zero)
                 {
                     GetWindowThreadProcessId(hWndHost, out int pid);
                     if (Process.GetProcessById(pid).ProcessName.ToLower() == "explorer")

ModernFlyouts.Core/Media/Control/GSMTCMediaSession.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ModernFlyouts.Core.AppInformation;
 using ModernFlyouts.Core.Helpers;
 using System;

ModernFlyouts.Core/Media/Control/MediaSession.cs

@@ -1,5 +1,5 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Input;
 using System;
 using System.Windows;
 using System.Windows.Input;

ModernFlyouts.Core/Media/Control/MediaSessionManager.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.ComponentModel;
 using System;
 using System.Collections.ObjectModel;
 

ModernFlyouts.Core/Media/Control/NowPlayingMediaSession.cs

@@ -1,4 +1,4 @@
-using Microsoft.Toolkit.Mvvm.Input;
+using CommunityToolkit.Mvvm.Input;
 using ModernFlyouts.Core.AppInformation;
 using ModernFlyouts.Core.Helpers;
 using ModernFlyouts.Core.Threading;

ModernFlyouts.Core/ModernFlyouts.Core.csproj

@@ -9,7 +9,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.1.0" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.1" />
+    <PackageReference Include="CommunityToolkit.Mvvm" Version="7.1.0" />
     <PackageReference Include="NAudio" Version="2.0.1" />
     <PackageReference Include="NPSMLib" Version="0.9.14" />
     <PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.2.21480.5" />

ModernFlyouts.Package/ModernFlyouts.Package.wapproj

@@ -43,7 +43,7 @@
     <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
     <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
     <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <AppxBundlePlatforms>x64</AppxBundlePlatforms>
     <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
     <AppInstallerUri>https://ModernFlyouts-community.github.io/package.github.io/ModernFlyouts.Package/ModernFlyouts.Package.appinstaller</AppInstallerUri>
     <EntryPointProjectUniqueName>..\ModernFlyouts\ModernFlyouts.csproj</EntryPointProjectUniqueName>
@@ -110,7 +110,9 @@
     <Content Include="Images\Wide310x150Logo.scale-150.png" />
     <Content Include="Images\Wide310x150Logo.scale-200.png" />
     <Content Include="Images\Wide310x150Logo.scale-400.png" />
-    <PRIResource Include="Strings\en-us\Resources.resw" />
+    <PRIResource Include="Strings\en-us\Resources.resw">
+      <SubType>Designer</SubType>
+    </PRIResource>
     <None Include="ModernFlyouts.Package_TemporaryKey.pfx" />
     <Content Include="Package.appinstaller" />
     <Content Include="priconfig.default.xml" />
@@ -122,7 +124,6 @@
       <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
       <PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
     </ProjectReference>
-    <ProjectReference Include="..\ModernFlyoutsBridge\ModernFlyoutsBridge.vcxproj" />
   </ItemGroup>
   <Target Name="FlattenPackage" BeforeTargets="_ConvertItems">
     <ItemGroup>