Skip to content

Commit c7d2d1f

Browse files
[Housekeeping] Add [SupportedOSPlatform] to AppBuilderExtensions (#2488)
* Update AppBuilderExtensions.shared.cs * Update Android NavigationBar Minimum OS Support * Update all AppBuilderExtensions --------- Co-authored-by: Brandon Minnick <13558917+brminnick@users.noreply.github.com> Co-authored-by: Vladislav Antonyuk <vlad.antonyuk@gmail.com>
1 parent fa4004d commit c7d2d1f

File tree

6 files changed

+32
-5
lines changed

6 files changed

+32
-5
lines changed

src/CommunityToolkit.Maui.Core/AppBuilderExtensions.shared.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Diagnostics;
2+
using System.Runtime.Versioning;
23
using CommunityToolkit.Maui.Core.Services;
34
using Microsoft.Extensions.DependencyInjection;
45
using Microsoft.Maui.LifecycleEvents;
@@ -9,6 +10,11 @@ namespace CommunityToolkit.Maui.Core;
910
/// <summary>
1011
/// <see cref="MauiAppBuilder"/> Extensions
1112
/// </summary>
13+
[SupportedOSPlatform("iOS15.0")]
14+
[SupportedOSPlatform("MacCatalyst15.0")]
15+
[SupportedOSPlatform("Android21.0")]
16+
[SupportedOSPlatform("Windows10.0.17763")]
17+
[SupportedOSPlatform("Tizen6.5")]
1218
public static class AppBuilderExtensions
1319
{
1420
/// <summary>

src/CommunityToolkit.Maui.Maps/AppHostBuilderExtensions.shared.cs renamed to src/CommunityToolkit.Maui.Maps/AppBuilderExtensions.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
using System.Diagnostics.CodeAnalysis;
2+
using System.Runtime.Versioning;
23

34
namespace CommunityToolkit.Maui.Maps;
45

56
/// <summary>
67
/// Maps Extensions for <see cref="MauiAppBuilder"/>
78
/// </summary>
8-
public static class AppHostBuilderExtensions
9+
[SupportedOSPlatform("iOS15.0")]
10+
[SupportedOSPlatform("MacCatalyst15.0")]
11+
[SupportedOSPlatform("Android21.0")]
12+
[SupportedOSPlatform("Windows10.0.17763")]
13+
[SupportedOSPlatform("Tizen6.5")]
14+
public static class AppBuilderExtensions
915
{
1016
/// <summary>
1117
/// Initializes the .NET MAUI Community Toolkit Maps Library

src/CommunityToolkit.Maui.MediaElement/AppBuilderExtensions.shared.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
using CommunityToolkit.Maui.Core.Handlers;
1+
using System.Runtime.Versioning;
2+
using CommunityToolkit.Maui.Core.Handlers;
23
using CommunityToolkit.Maui.Views;
34

45
namespace CommunityToolkit.Maui;
56

67
/// <summary>
78
/// This class contains MediaElement's <see cref="MauiAppBuilder"/> extensions.
89
/// </summary>
10+
[SupportedOSPlatform("iOS15.0")]
11+
[SupportedOSPlatform("MacCatalyst15.0")]
12+
[SupportedOSPlatform("Android26.0")]
13+
[SupportedOSPlatform("Windows10.0.17763")]
14+
[SupportedOSPlatform("Tizen6.5")]
915
public static class AppBuilderExtensions
1016
{
1117
/// <summary>

src/CommunityToolkit.Maui/AppBuilderExtensions.shared.cs

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CommunityToolkit.Maui.Core;
1+
using System.Runtime.Versioning;
2+
using CommunityToolkit.Maui.Core;
23
using CommunityToolkit.Maui.Core.Handlers;
34
using CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific;
45
using CommunityToolkit.Maui.Views;
@@ -8,6 +9,11 @@ namespace CommunityToolkit.Maui;
89
/// <summary>
910
/// Extensions for MauiAppBuilder
1011
/// </summary>
12+
[SupportedOSPlatform("iOS15.0")]
13+
[SupportedOSPlatform("MacCatalyst15.0")]
14+
[SupportedOSPlatform("Android21.0")]
15+
[SupportedOSPlatform("Windows10.0.17763")]
16+
[SupportedOSPlatform("Tizen6.5")]
1117
public static class AppBuilderExtensions
1218
{
1319
/// <summary>
@@ -34,7 +40,10 @@ public static MauiAppBuilder UseMauiCommunityToolkit(this MauiAppBuilder builder
3440
});
3541

3642
Popup.RemapForControls();
43+
44+
#if ANDROID
3745
NavigationBar.RemapForControls();
46+
#endif
3847
return builder;
3948
}
4049
}

src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.android.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public static void MapNavigationColorProperty(IPageHandler handler, IContentView
9393

9494
var color = GetColor(page).ToPlatform();
9595

96-
if (OperatingSystem.IsAndroidVersionAtLeast(21))
96+
if (OperatingSystem.IsAndroidVersionAtLeast(23))
9797
{
9898
window.SetNavigationBarColor(color);
9999
}

src/CommunityToolkit.Maui/PlatformConfiguration/AndroidSpecific/NavigationBar.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace CommunityToolkit.Maui.PlatformConfiguration.AndroidSpecific;
88
/// <summary>
99
/// Provides platform-specific configuration properties for the Android navigation bar.
1010
/// </summary>
11-
[SupportedOSPlatform("Android21.0")]
11+
[SupportedOSPlatform("Android23.0")]
1212
public static partial class NavigationBar
1313
{
1414
/// <summary>

0 commit comments

Comments
 (0)