fixed no permission crash + fix ios init

amay077 · May 6, 2023 · a8db42b · jahmai-ca · Jun 21, 2023 · a8db42b
1 parent ed495a8
commit a8db42b
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 76 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) themronion 2016-2022
+Copyright (c) themronion 2022-2023
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/lib/Maui.GoogleMaps/Handlers/MapHandler.Standard.cs b/lib/Maui.GoogleMaps/Handlers/MapHandler.Standard.cs
diff --git a/lib/Maui.GoogleMaps/Hosting/AppHostBuilderExtensions.cs b/lib/Maui.GoogleMaps/Hosting/AppHostBuilderExtensions.cs
@@ -5,13 +5,12 @@ namespace Maui.GoogleMaps.Hosting
 {
     public static class AppHostBuilderExtensions
     {
-        public static MauiAppBuilder UseGoogleMaps(this MauiAppBuilder appBuilder
+        public static MauiAppBuilder UseGoogleMaps(this MauiAppBuilder appBuilder,
 #if ANDROID
-        , Android.PlatformConfig config = null
+            Android.PlatformConfig config = null)
 #elif IOS
-        , string iosApiKey, iOS.PlatformConfig config = null
+            string iosApiKey, iOS.PlatformConfig config = null)
 #endif
-        )
         {
             appBuilder.ConfigureMauiHandlers(handlers => handlers.AddTransient(typeof(Map), h => new MapHandler()))
             .ConfigureLifecycleEvents(events =>
@@ -21,7 +20,7 @@ public static MauiAppBuilder UseGoogleMaps(this MauiAppBuilder appBuilder
                 .OnCreate((activity, bundle) => MauiGoogleMaps.Init(activity, bundle, config)));
 #elif IOS
                 events.AddiOS(ios => ios
-                .FinishedLaunching((app, options) =>
+                .WillFinishLaunching((app, options) =>
                 { 
                     MauiGoogleMaps.Init(iosApiKey, config);
                     return true;

diff --git a/lib/Maui.GoogleMaps/Maui.GoogleMaps.csproj b/lib/Maui.GoogleMaps/Maui.GoogleMaps.csproj
@@ -1,57 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net7.0-android;net7.0-ios</TargetFrameworks>
+		<TargetFrameworks>net7.0-android;net7.0-ios</TargetFrameworks>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios'">14.2</SupportedOSPlatformVersion>
 		<SupportedOSPlatformVersion Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'android'">21.0</SupportedOSPlatformVersion>
-
-	</PropertyGroup>
-
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-ios')) != true ">
-		<Compile Remove="Platforms\iOS\*.cs" />
-		<None Include="Platforms\iOS\*.cs" />
-	</ItemGroup>
-
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-android')) != true ">
-		<Compile Remove="Platforms\Android\*.cs" />
-		<None Include="Platforms\Android\*.cs" />
-	</ItemGroup>
-
-	<ItemGroup Condition="$(TargetFramework.StartsWith('net7.0-ios')) == true OR $(TargetFramework.StartsWith('net7.0-android')) == true">
-		<Compile Remove="**\*.Standard.cs" />
-		<None Include="**\*.Standard.cs" />
-		<Compile Remove="**\Standard\**\*.cs" />
-		<None Include="**\Standard\**\*.cs" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<Compile Remove="bin\**;obj\**" />
-		<None Remove="bin\**;obj\**" />
-	</ItemGroup>
-
-	<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
-		<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-	</PropertyGroup>
-
-	<PropertyGroup Condition="$(TargetFramework.StartsWith('net7.0-android'))">
-		<DefineConstants>$(DefineConstants);MONOANDROID</DefineConstants>
-	</PropertyGroup>
-
-	<PropertyGroup Condition=" '$(TargetFramework)' == 'net7.0-ios' ">
-		<DefineConstants>$(DefineConstants);IOS</DefineConstants>
 	</PropertyGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
-	  <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0" />
+	  <PackageReference Include="Xamarin.GooglePlayServices.Maps" Version="118.1.0.1" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-ios'">
 	  <PackageReference Include="Xamarin.Google.iOS.Maps" Version="6.0.1.1" />
 	  <PackageReference Include="Xamarin.Build.Download" Version="0.11.4" />
 	</ItemGroup>
 
-
 </Project>
diff --git a/lib/Xamarin.Forms.GoogleMaps.nuspec b/lib/Xamarin.Forms.GoogleMaps.nuspec
@@ -3,27 +3,25 @@
 	<metadata minClientVersion="2.8.3">
 		<id>Onion.Maui.GoogleMaps</id>
 		<title>Maui.GoogleMaps</title>
-		<version>5.0.0</version>
+		<version>5.0.1</version>
 		<releaseNotes>
-# 5.0.0
+# 5.0.1
 
-- Built with net7.0
-- Removed Xamarin Forms support
+- Removed net7.0 target (only android and ios left)
+- Reconfigure map initialization to be able to use it on the first page
 - Dependencies update
 		</releaseNotes>
 		<authors>themronion</authors>
-		<copyright>Copyright 2016-2022</copyright>
+		<copyright>Copyright 2022-2023</copyright>
 		<license type="file">LICENSE.txt</license>
     <projectUrl>https://github.com/themronion/Maui.GoogleMaps/tree/maui</projectUrl>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
 		<description>Maps library for MAUI that is optimized for Google maps.</description>
 		<summary>Maps library for MAUI that is optimized for Google maps</summary>
 		<tags>maui maps mauimaps maui.maps mauigooglemaps maui.googlemaps google googlemap</tags>
 	<dependencies>
-		<group targetFramework="net7.0">
-		</group>
 	  <group targetFramework="net7.0-android">
-		<dependency id="Xamarin.GooglePlayServices.Maps" version="118.1.0"/>
+		<dependency id="Xamarin.GooglePlayServices.Maps" version="118.1.0.1"/>
 	  </group>
 	  <group targetFramework="net7.0-ios">
         <dependency id="Xamarin.Google.iOS.Maps" version="6.0.1.1"/>
@@ -36,7 +34,6 @@
 		<file src="..\LICENSE.txt" target="" />
 
 		<!--Maui-->
-		<file src="Maui.GoogleMaps\bin\Release\net7.0\Maui.GoogleMaps.dll" target="lib\net7.0" />
 		<file src="Maui.GoogleMaps\bin\Release\net7.0-android\Maui.GoogleMaps.dll" target="lib\net7.0-android" />
 		<file src="Maui.GoogleMaps\bin\Release\net7.0-ios\Maui.GoogleMaps.dll" target="lib\net7.0-ios" />
 	</files>

diff --git a/lib/build.bat b/lib/build.bat
diff --git a/sample/MauiGoogleMapSample/BasicMapPage.xaml.cs b/sample/MauiGoogleMapSample/BasicMapPage.xaml.cs
@@ -23,9 +23,26 @@ public BasicMapPage()
             pickerMapType.SelectedIndex = 0;
 
             // MyLocationEnabled
-            switchMyLocationEnabled.Toggled += (sender, e) =>
+            switchMyLocationEnabled.Toggled += async (sender, e) =>
             {
-                map.MyLocationEnabled = e.Value;
+                if (e.Value)
+                {
+                    var status = await CheckAndRequestLocationPermission();
+                    if (status == PermissionStatus.Granted)
+                    {
+                        map.MyLocationEnabled = e.Value;
+                        await DisplayAlert("Location", "Please be aware, that GEO needs to be on to make this work", "OK");
+                    }
+                    else
+                    {
+                        await DisplayAlert("Permission", "Failed due to permission error", "OK");
+                        switchMyLocationEnabled.IsToggled = false;
+                    }
+                }
+                else
+                {
+                    map.MyLocationEnabled = e.Value;
+                }
             };
             switchMyLocationEnabled.IsToggled = map.MyLocationEnabled;
 
@@ -164,6 +181,29 @@ public BasicMapPage()
                 imageSnapshot.Source = ImageSource.FromStream(() => stream);
             };
         }
+
+        public async Task<PermissionStatus> CheckAndRequestLocationPermission()
+        {
+            PermissionStatus status = await Permissions.CheckStatusAsync<Permissions.LocationWhenInUse>();
+
+            if (status == PermissionStatus.Granted)
+                return status;
+
+            if (status == PermissionStatus.Denied && DeviceInfo.Platform == DevicePlatform.iOS)
+            {
+                await DisplayAlert("Permission", "Please give location permission in settings", "OK");
+                return status;
+            }
+
+            if (Permissions.ShouldShowRationale<Permissions.LocationWhenInUse>())
+            {
+                await DisplayAlert("Permission", "Permission needed to turn on geo", "OK");
+            }
+
+            status = await Permissions.RequestAsync<Permissions.LocationWhenInUse>();
+
+            return status;
+        }
     }
 }