From 8f473234b0a04fed2662d2c1859358b23c10e085 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+TheCodeTraveler@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:28:50 -0800 Subject: [PATCH 1/3] Update AppBuilderExtensions.shared.cs --- src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs index 5e45d440ee..c7210d5185 100644 --- a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs +++ b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs @@ -1,4 +1,5 @@ -using CommunityToolkit.Maui.Core; +using System.Runtime.Versioning; +using CommunityToolkit.Maui.Core; using CommunityToolkit.Maui.Core.Handlers; using CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific; using CommunityToolkit.Maui.Views; @@ -16,6 +17,11 @@ public static class AppBuilderExtensions /// generated by /// /// initialized for + [SupportedOSPlatform("iOS15.0")] + [SupportedOSPlatform("MacCatalyst15.0")] + [SupportedOSPlatform("Android21.0")] + [SupportedOSPlatform("Windows10.0.17763")] + [SupportedOSPlatform("Tizen6.5")] public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder, Action? options = null) { // Pass `null` because `options?.Invoke()` will set options on both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core` From 5454509e0e5cb2bac36b6fa80e1f09da931f3627 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:38:42 -0800 Subject: [PATCH 2/3] Update Android NavigationBar Minimum OS Support --- .../AppBuilderExtensions.shared.cs | 13 ++++++++----- .../AndroidSpecific/NavigationBar.android.cs | 2 +- .../AndroidSpecific/NavigationBar.cs | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs index c7210d5185..0b38801ce5 100644 --- a/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs +++ b/src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs @@ -9,6 +9,11 @@ namespace CommunityToolkit.Maui; /// /// Extensions for MauiAppBuilder /// +[SupportedOSPlatform("iOS15.0")] +[SupportedOSPlatform("MacCatalyst15.0")] +[SupportedOSPlatform("Android21.0")] +[SupportedOSPlatform("Windows10.0.17763")] +[SupportedOSPlatform("Tizen6.5")] public static class AppBuilderExtensions { /// @@ -17,11 +22,6 @@ public static class AppBuilderExtensions /// generated by /// /// initialized for - [SupportedOSPlatform("iOS15.0")] - [SupportedOSPlatform("MacCatalyst15.0")] - [SupportedOSPlatform("Android21.0")] - [SupportedOSPlatform("Windows10.0.17763")] - [SupportedOSPlatform("Tizen6.5")] public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder, Action? options = null) { // Pass `null` because `options?.Invoke()` will set options on both `CommunityToolkit.Maui` and `CommunityToolkit.Maui.Core` @@ -40,7 +40,10 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder }); Popup.RemapForControls(); + +#if ANDROID NavigationBar.RemapForControls(); +#endif return builder; } } \ No newline at end of file diff --git a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs index c3a569c430..74272b6494 100644 --- a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs +++ b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs @@ -93,7 +93,7 @@ public static void MapNavigationColorProperty(IPageHandler handler, IContentView var color = GetColor(page).ToPlatform(); - if (OperatingSystem.IsAndroidVersionAtLeast(21)) + if (OperatingSystem.IsAndroidVersionAtLeast(23)) { window.SetNavigationBarColor(color); } diff --git a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs index db95defbc6..017c3d3704 100644 --- a/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs +++ b/src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs @@ -8,7 +8,7 @@ namespace CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific; /// /// Provides platform-specific configuration properties for the Android navigation bar. /// -[SupportedOSPlatform("Android21.0")] +[SupportedOSPlatform("Android23.0")] public static partial class NavigationBar { /// From 3db7819590ff0273c98c1718d86eef32e067a2c1 Mon Sep 17 00:00:00 2001 From: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Date: Mon, 3 Feb 2025 11:40:16 -0800 Subject: [PATCH 3/3] Update all AppBuilderExtensions --- .../AppBuilderExtensions.shared.cs | 6 ++++++ ...uilderExtensions.shared.cs => AppBuilderExtensions.cs} | 8 +++++++- .../AppBuilderExtensions.shared.cs | 8 +++++++- 3 files changed, 20 insertions(+), 2 deletions(-) rename src/CommunityToolkit.Maui.Maps/{AppHostBuilderExtensions.shared.cs => AppBuilderExtensions.cs} (86%) diff --git a/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs index 8b9c3464e3..be5b66415c 100644 --- a/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs +++ b/src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs @@ -1,4 +1,5 @@ using System.Diagnostics; +using System.Runtime.Versioning; using CommunityToolkit.Maui.Core.Services; using Microsoft.Extensions.DependencyInjection; using Microsoft.Maui.LifecycleEvents; @@ -9,6 +10,11 @@ namespace CommunityToolkit.Maui.Core; /// /// Extensions /// +[SupportedOSPlatform("iOS15.0")] +[SupportedOSPlatform("MacCatalyst15.0")] +[SupportedOSPlatform("Android21.0")] +[SupportedOSPlatform("Windows10.0.17763")] +[SupportedOSPlatform("Tizen6.5")] public static class AppBuilderExtensions { /// diff --git a/src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs similarity index 86% rename from src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs rename to src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs index 865d23d379..dcba35adc2 100644 --- a/src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs +++ b/src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs @@ -1,11 +1,17 @@ using System.Diagnostics.CodeAnalysis; +using System.Runtime.Versioning; namespace CommunityToolkit.Maui.Maps; /// /// Maps Extensions for /// -public static class AppHostBuilderExtensions +[SupportedOSPlatform("iOS15.0")] +[SupportedOSPlatform("MacCatalyst15.0")] +[SupportedOSPlatform("Android21.0")] +[SupportedOSPlatform("Windows10.0.17763")] +[SupportedOSPlatform("Tizen6.5")] +public static class AppBuilderExtensions { /// /// Initializes the .NET MAUI Community Toolkit Maps Library diff --git a/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs b/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs index 6d1cd023ac..f2ee5d594b 100644 --- a/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs +++ b/src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs @@ -1,4 +1,5 @@ -using CommunityToolkit.Maui.Core.Handlers; +using System.Runtime.Versioning; +using CommunityToolkit.Maui.Core.Handlers; using CommunityToolkit.Maui.Views; namespace CommunityToolkit.Maui; @@ -6,6 +7,11 @@ namespace CommunityToolkit.Maui; /// /// This class contains MediaElement's extensions. /// +[SupportedOSPlatform("iOS15.0")] +[SupportedOSPlatform("MacCatalyst15.0")] +[SupportedOSPlatform("Android26.0")] +[SupportedOSPlatform("Windows10.0.17763")] +[SupportedOSPlatform("Tizen6.5")] public static class AppBuilderExtensions { ///