fix: ScaleBarVisibility for Android

Author: tuyen-vuduc

src/libs/Mapbox.Maui/Mapbox.Maui.csproj

@@ -61,7 +61,7 @@
 		<RepositoryUrl>https://github.com/tuyen-vuduc/mapbox-maui</RepositoryUrl>
 		<PackageProjectUrl>https://mapbox.tuyen-vuduc.tech</PackageProjectUrl>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-		<PackageVersion>11.6.0-alpha01</PackageVersion>
+		<PackageVersion>11.6.0-alpha02</PackageVersion>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageIcon>tv-mapbox.png</PackageIcon>

src/libs/Mapbox.Maui/MapboxView.cs

@@ -101,7 +101,7 @@ public DebugOption[] DebugOptions
        nameof(ScaleBarVisibility),
        typeof(OrnamentVisibility),
        typeof(MapboxView),
-       OrnamentVisibility.Hidden
+       OrnamentVisibility.Visible
     );
     public OrnamentVisibility ScaleBarVisibility
     {

src/libs/Mapbox.Maui/Platforms/Android/AdditionalExtensions.cs

@@ -16,6 +16,7 @@
 using Com.Mapbox.Maps.Plugins.Animation;
 using Com.Mapbox.Functions;
 using Com.Mapbox.Maps.Plugins;
+using System.ComponentModel;
 
 static class AdditionalExtensions
 {
@@ -313,13 +314,10 @@ internal static PlatformValue GetVolatileProperties(this MapboxSource source)
     }
 
     internal static MapView GetMapView(this MapboxViewHandler handler)
-        => handler.PlatformView.GetMapView();
-
-    internal static MapView GetMapView(this FragmentContainerView container)
     {
-        var mainActivity = (MauiAppCompatActivity)container.Context.GetActivity();
-        var tag = $"mapbox-maui-{container.Id}";
-        var fragnent = mainActivity.SupportFragmentManager.FindFragmentByTag(tag);
+        var fragmentManager = handler.MauiContext.Services.GetService<FragmentManager>();
+        var tag = $"mapbox-maui-{handler.PlatformView.Id}";
+        var fragnent = fragmentManager.FindFragmentByTag(tag);
         return (fragnent as MapboxFragment)?.MapView;
     }
 

src/libs/Mapbox.Maui/Platforms/Android/MapboxFragment.cs

@@ -59,15 +59,15 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
         }
 
         MapView = new MapView(Context);
-
-        MapReady?.Invoke(MapView);
         return MapView;
     }
 
     public override void OnViewCreated(View view, Bundle savedInstanceState)
     {
         base.OnViewCreated(view, savedInstanceState);
 
+        MapReady?.Invoke(MapView);
+
         cancelables.Add(
             MapView.MapboxMap.SubscribeCameraChanged(this)
         );

src/libs/Mapbox.Maui/Platforms/Android/MapboxViewHandler.Location.cs

@@ -7,7 +7,7 @@ public partial class MapboxViewHandler : Locations.ILocationComponentPlugin
 {
     private ILocationComponentPlugin GetPlugin()
     {
-        var mapView = PlatformView.GetMapView();
+        var mapView = this.GetMapView();
         if (mapView is null) return null;
 
         return LocationComponentUtils.GetLocationComponent(mapView);

src/libs/Mapbox.Maui/Platforms/Android/MapboxViewHandler.Query.cs

@@ -9,7 +9,7 @@ partial class MapboxViewHandler : IMapFeatureQueryable
 {
     public Task<IEnumerable<XQueriedFeature>> QueryRenderedFeaturesWith(ScreenPosition point, XRenderedQueryOptions options)
     {
-        var mapView = PlatformView.GetMapView();
+        var mapView = this.GetMapView();
         if (mapView == null) return Task.FromResult(
             Array.Empty<XQueriedFeature>() as IEnumerable<XQueriedFeature>
         );

src/libs/Mapbox.Maui/Platforms/Android/MapboxViewHandler.cs

@@ -212,8 +212,6 @@ private static void HandleScaleBarVisibilityChanged(MapboxViewHandler handler, I
         var mapView = handler.GetMapView();
         if (mapView is null) return;
 
-        if (mapView.MapboxMap.Style?.IsStyleLoaded != true) return;
-
         var scaleBarPlugin = ScaleBarUtils.GetScaleBar(mapView);
 
         scaleBarPlugin.Enabled = view.ScaleBarVisibility != OrnamentVisibility.Hidden;