Merge branch 'main' into gh-1355

xamarin · Jan 18, 2022 · 1a77144 · 1a77144
2 parents 521db2c + 7f07d01
commit 1a77144
Show file tree

Hide file tree

Showing 19 changed files with 201 additions and 114 deletions.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -6,22 +6,4 @@ labels: feature-request
 assignees: ''
 
 ---
-
-## Summary
-Please provide a brief summary of your proposal. Two to three sentences is best here.
-
-## API Changes
-
-Include a list of all API changes, additions, subtractions as would be required by your proposal. These APIs should be considered placeholders, so the naming is not as important as getting the concepts correct. If possible you should include some "example" code of usage of your new API.  You should also provide details of the level of availability for the feature on each of the supported platforms.
-
-e.g.
-
-In order to facilitate the new Shiny Button api, a bool is added to the Button class. This is done as a bool because it is simpler to data bind and other reasons...
-
-    var button = new Button ();
-    button.MakeShiny = true; // new API
-
-The MakeShiny API works even if the button is already visible.
-
-## Intended Use Case
-Provide a detailed example of where your proposal would be used and for what purpose.
+We are no longer accepting new feature request for Xamarin.Essentials. Please make your new feature requests in the .NET MAUI repo which contains .NET MAUI Essentials. 
diff --git a/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj b/DeviceTests/DeviceTests.Android/DeviceTests.Android.csproj
@@ -9,7 +9,6 @@
     <RootNamespace>DeviceTests.Droid</RootNamespace>
     <AssemblyName>XamarinEssentialsDeviceTestsAndroid</AssemblyName>
     <TargetFrameworkVersion>v10.0</TargetFrameworkVersion>
-    <AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
     <AndroidApplication>True</AndroidApplication>
     <AndroidUseIntermediateDesignerFile>true</AndroidUseIntermediateDesignerFile>
     <AndroidResgenClass>Resource</AndroidResgenClass>
@@ -19,6 +18,7 @@
     <AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
     <AndroidUseAapt2>true</AndroidUseAapt2>
     <AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
+    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,7 +29,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AndroidLinkMode>None</AndroidLinkMode>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
     <AotAssemblies>false</AotAssemblies>
     <EnableLLVM>false</EnableLLVM>
@@ -47,7 +46,6 @@
     <WarningLevel>4</WarningLevel>
     <AndroidManagedSymbols>true</AndroidManagedSymbols>
     <AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
-    <AndroidSupportedAbis>armeabi-v7a;x86;x86_64;arm64-v8a</AndroidSupportedAbis>
     <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
     <JavaMaximumHeapSize>1G</JavaMaximumHeapSize>
   </PropertyGroup>
@@ -63,7 +61,7 @@
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.devices" Version="2.5.25" />
-    <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20602.1" />
+    <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21620.1" />
     <PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.0.1" />
     <PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.6" />
   </ItemGroup>

diff --git a/DeviceTests/DeviceTests.Android/Properties/AndroidManifest.xml b/DeviceTests/DeviceTests.Android/Properties/AndroidManifest.xml
@@ -12,5 +12,36 @@
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.READ_CONTACTS" />
+	<queries>
+		<!-- Email -->
+		<intent>
+			<action android:name="android.intent.action.SENDTO" />
+			<data android:scheme="mailto" />
+		</intent>
+		<!-- Browser -->
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="http" />
+		</intent>
+		<!-- Browser -->
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="https" />
+		</intent>
+		<!-- Sms -->
+		<intent>
+			<action android:name="android.intent.action.VIEW" />
+			<data android:scheme="smsto" />
+		</intent>
+		<!-- PhoneDialer -->
+		<intent>
+			<action android:name="android.intent.action.DIAL" />
+			<data android:scheme="tel" />
+		</intent>
+		<!-- MediaPicker -->
+		<intent>
+			<action android:name="android.media.action.IMAGE_CAPTURE" />
+		</intent>
+	</queries>
 	<application android:label="@string/app_name" android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round" android:theme="@style/MainTheme"></application>
 </manifest>
diff --git a/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj b/DeviceTests/DeviceTests.iOS/DeviceTests.iOS.csproj
@@ -80,7 +80,7 @@
     <PackageReference Include="Xamarin.Forms" Version="5.0.0.2083" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.devices" Version="2.5.25" />
-    <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.20602.1" />
+    <PackageReference Include="Microsoft.DotNet.XHarness.TestRunners.Xunit" Version="1.0.0-prerelease.21620.1" />
     <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>

diff --git a/DeviceTests/DeviceTests.iOS/Main.cs b/DeviceTests/DeviceTests.iOS/Main.cs
@@ -1,15 +1,16 @@
-using UIKit;
+using System;
+using UIKit;
 
 namespace DeviceTests.iOS
 {
     public class Application
     {
         static void Main(string[] args)
         {
-            if (args?.Length > 0) // usually means this is from xharness
-                UIApplication.Main(args, null, nameof(TestApplicationDelegate));
+            if (!string.IsNullOrWhiteSpace(Environment.GetEnvironmentVariable("ci-run")))
+                UIApplication.Main(args, null, typeof(TestApplicationDelegate));
             else
-                UIApplication.Main(args, null, nameof(AppDelegate));
+                UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/DeviceTests/build.cake b/DeviceTests/build.cake
@@ -118,11 +118,12 @@ Task("test-ios-emu")
     CleanDirectories(IOS_TEST_RESULTS_PATH.FullPath);
 
     // Run the tests
-    var resultCode = StartProcess("xharness", "ios test " +
+    var resultCode = StartProcess("xharness", "apple test " +
         $"--app=\"{IOS_IPA_PATH}\" " +
         $"--targets=\"ios-simulator-64\" " +
         $"--output-directory=\"{IOS_TEST_RESULTS_PATH}\" " +
-        $"--verbosity=\"Debug\" ");
+        $"--verbosity=\"Debug\" " +
+        $"--set-env=ci-run=true ");
 
     // Rename test result files
     var resultFiles = GetFiles($"{IOS_TEST_RESULTS_PATH}/*.xml");

diff --git a/README.md b/README.md
@@ -77,3 +77,5 @@ Here are some frequently asked questions about Xamarin.Essentials, but be sure t
 
 Please see the [License](LICENSE).
 
+## Stats
+<img src="https://repobeats.axiom.co/api/embed/f917a77cbbdeee19b87fa1f2f932895d1df18b31.svg" />
diff --git a/Samples/Samples.iOS/Main.cs b/Samples/Samples.iOS/Main.cs
@@ -6,7 +6,7 @@ public class Application
     {
         static void Main(string[] args)
         {
-            UIApplication.Main(args, null, nameof(AppDelegate));
+            UIApplication.Main(args, null, typeof(AppDelegate));
         }
     }
 }
diff --git a/Xamarin.Essentials/Contacts/Contacts.ios.macos.cs b/Xamarin.Essentials/Contacts/Contacts.ios.macos.cs
@@ -39,6 +39,14 @@ static Task<Contact> PlatformPickContactAsync()
                 })
             };
 
+            if (picker.PresentationController != null)
+            {
+                picker.PresentationController.Delegate = new Platform.UIPresentationControllerDelegate
+                {
+                    DismissHandler = () => source?.TrySetResult(null)
+                };
+            }
+
             uiView.PresentViewController(picker, true, null);
 
             return source.Task;

diff --git a/Xamarin.Essentials/Email/Email.ios.cs b/Xamarin.Essentials/Email/Email.ios.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Threading.Tasks;
 using Foundation;
 using MessageUI;
@@ -50,13 +51,21 @@ static Task ComposeWithMailCompose(EmailMessage message)
                 }
             }
 
-            // show the controller
             var tcs = new TaskCompletionSource<bool>();
             controller.Finished += (sender, e) =>
             {
                 controller.DismissViewController(true, null);
                 tcs.TrySetResult(e.Result == MFMailComposeResult.Sent);
             };
+
+            if (controller.PresentationController != null)
+            {
+                controller.PresentationController.Delegate = new Platform.UIPresentationControllerDelegate
+                {
+                    DismissHandler = () => tcs.TrySetResult(false)
+                };
+            }
+
             parentController.PresentViewController(controller, true, null);
 
             return tcs.Task;

diff --git a/Xamarin.Essentials/FilePicker/FilePicker.ios.cs b/Xamarin.Essentials/FilePicker/FilePicker.ios.cs
@@ -34,9 +34,9 @@ static async Task<IEnumerable<FileResult>> PlatformPickAsync(PickOptions options
 
             if (documentPicker.PresentationController != null)
             {
-                documentPicker.PresentationController.Delegate = new PickerPresentationControllerDelegate
+                documentPicker.PresentationController.Delegate = new Platform.UIPresentationControllerDelegate
                 {
-                    PickHandler = urls => GetFileResults(urls, tcs)
+                    DismissHandler = () => GetFileResults(null, tcs)
                 };
             }
 
@@ -74,14 +74,6 @@ public override void DidPickDocument(UIDocumentPickerViewController controller,
             public override void DidPickDocument(UIDocumentPickerViewController controller, NSUrl url)
                 => PickHandler?.Invoke(new NSUrl[] { url });
         }
-
-        class PickerPresentationControllerDelegate : UIAdaptivePresentationControllerDelegate
-        {
-            public Action<NSUrl[]> PickHandler { get; set; }
-
-            public override void DidDismiss(UIPresentationController presentationController) =>
-                PickHandler?.Invoke(null);
-        }
     }
 
     public partial class FilePickerFileType

diff --git a/Xamarin.Essentials/MediaPicker/MediaPicker.ios.cs b/Xamarin.Essentials/MediaPicker/MediaPicker.ios.cs
@@ -75,9 +75,9 @@ static async Task<FileResult> PhotoAsync(MediaPickerOptions options, bool photo,
 
             if (picker.PresentationController != null)
             {
-                picker.PresentationController.Delegate = new PhotoPickerPresentationControllerDelegate
+                picker.PresentationController.Delegate = new Platform.UIPresentationControllerDelegate
                 {
-                    CompletedHandler = info => GetFileResult(info, tcs)
+                    DismissHandler = () => GetFileResult(null, tcs)
                 };
             }
 
@@ -167,13 +167,5 @@ public override void FinishedPickingMedia(UIImagePickerController picker, NSDict
             public override void Canceled(UIImagePickerController picker) =>
                 CompletedHandler?.Invoke(null);
         }
-
-        class PhotoPickerPresentationControllerDelegate : UIAdaptivePresentationControllerDelegate
-        {
-            public Action<NSDictionary> CompletedHandler { get; set; }
-
-            public override void DidDismiss(UIPresentationController presentationController) =>
-                CompletedHandler?.Invoke(null);
-        }
     }
 }