Merge pull request #50 from jamesmontemagno/windows-updates

Introduce ReviewStatus enum and update RequestReview method

README.md

@@ -1,4 +1,4 @@
-## Store Review Plugin for Xamarin
+## Store Review Plugin for .NET MAUI, Windows, & Xamarin
 
 **Platform Support**
 
@@ -57,9 +57,20 @@ Read for Android: [In-app reviews for your Android apps](https://devblogs.micros
 /// <summary>
 /// Requests the review.
 /// </summary>
-void RequestReview();
+Task<ReviewStatus> RequestReview(bool testMode)
 ```
 
+If you are on .NET 6 Windows you will need to set the Window handle before calling the method:
+
+```csharp
+#if WINDOWS
+        var windowObject = (MauiWinUIWindow)App.Current.Windows[0].Handler.PlatformView;
+        StoreReviewImplementation.Window = windowObject;
+#endif
+```
+
+Test mode is only used on Android.
+
 ### Android setup
 
 Ensure that you follow the [Xamarin.Essentials setup steps](https://docs.microsoft.com/xamarin/essentials/get-started?WT.mc_id=friends-0000-jamont). And follow the steps below if you linker behavior is not set to `Don't Link`.

src/StoreReview.Plugin/CrossStoreReview.shared.cs

@@ -3,6 +3,14 @@
 
 namespace Plugin.StoreReview
 {
+    public enum ReviewStatus
+    {
+        Succeeded,
+        Error,
+        CanceledByUser,
+        NetworkError,
+        Unknown
+    }
 	/// <summary>
 	/// Cross platform StoreReview implemenations
 	/// </summary>

src/StoreReview.Plugin/IStoreReview.shared.cs

@@ -22,6 +22,6 @@ public interface IStoreReview
         /// <summary>
         /// Requests an app review.
         /// </summary>
-        Task RequestReview(bool testMode);
+        Task<ReviewStatus> RequestReview(bool testMode);
     }
 }

src/StoreReview.Plugin/StoreReviewImplementation.android.cs

@@ -86,7 +86,7 @@ public void OpenStoreReviewPage(string appId)
 		/// <summary>
 		/// Requests an app review.
 		/// </summary>
-		public async Task RequestReview(bool testMode)
+		public async Task<ReviewStatus> RequestReview(bool testMode)
 		{
 			tcs?.TrySetCanceled();
 			tcs = new TaskCompletionSource<bool>();
@@ -99,9 +99,11 @@ public async Task RequestReview(bool testMode)
             forceReturn = false;
 			var request = manager.RequestReviewFlow();
 			request.AddOnCompleteListener(this);
-			await tcs.Task;
+			var status = await tcs.Task;
 			manager.Dispose();
             request.Dispose();
+
+            return status ? ReviewStatus.Succeeded : ReviewStatus.Error;
         }
 
 		Activity Activity =>

src/StoreReview.Plugin/StoreReviewImplementation.apple.cs

@@ -75,7 +75,7 @@ public void OpenStoreReviewPage(string appId)
         /// <summary>
         /// Requests an app review.
         /// </summary>
-        public Task RequestReview(bool testMode)
+        public Task<ReviewStatus> RequestReview(bool testMode)
 		{
 #if __IOS__
             if (IsiOS103)
@@ -86,7 +86,7 @@ public Task RequestReview(bool testMode)
 					if (windowScene != null)
 					{
 						SKStoreReviewController.RequestReview(windowScene);
-						return Task.CompletedTask;
+						return Task.FromResult(ReviewStatus.Unknown);
 					}
 				}
                 SKStoreReviewController.RequestReview();
@@ -99,8 +99,8 @@ public Task RequestReview(bool testMode)
 			}
 #endif
 
-			return Task.CompletedTask;
-		}
+            return Task.FromResult(ReviewStatus.Unknown);
+        }
 
 		internal static Version ParseVersion(string version)
 		{

src/StoreReview.Plugin/StoreReviewImplementation.uwp.cs

@@ -5,6 +5,9 @@
 using System.Threading.Tasks;
 using Windows.Foundation;
 using Windows.Services.Store;
+using Windows.ApplicationModel.Store;
+using System.Collections.Generic;
+using Windows.System;
 
 namespace Plugin.StoreReview
 {
@@ -27,10 +30,50 @@ public void OpenStoreListing(string appId) =>
         public void OpenStoreReviewPage(string appId) =>
             OpenUrl($"ms-windows-store://review/?ProductId={appId}");
 
-		/// <summary>
-		/// Requests an app review.
-		/// </summary>
-		public async Task RequestReview(bool testMode) => _ = await StoreRequestHelper.SendRequestAsync(StoreContext.GetDefault(), 16, string.Empty).AsTask();
+#if NET6_0_OR_GREATER
+        public static object Window { get; set; }
+#endif
+        /// <summary>
+        /// Requests an app review.
+        /// </summary>
+        public async Task<ReviewStatus> RequestReview(bool testMode)
+        {
+            try
+            {
+
+                var context = StoreContext.GetDefault();
+
+#if NET6_0_OR_GREATER
+                if(Window is null)
+                    throw new NullReferenceException("WindowObject is null. Please set the WindowObject property before calling RequestReview.");
+
+                var hwnd = WinRT.Interop.WindowNative.GetWindowHandle(Window);
+
+                WinRT.Interop.InitializeWithWindow.Initialize(context, hwnd);
+#endif
+
+                var result = await context.RequestRateAndReviewAppAsync();
+                return result.Status switch
+                {
+                    StoreRateAndReviewStatus.Succeeded => ReviewStatus.Succeeded,
+                    StoreRateAndReviewStatus.CanceledByUser => ReviewStatus.CanceledByUser,
+                    StoreRateAndReviewStatus.Error => ReviewStatus.Error,
+                    StoreRateAndReviewStatus.NetworkError => ReviewStatus.NetworkError,
+                    _ => ReviewStatus.Error,
+                };
+            }
+            catch(Exception ex)
+            {
+                Debug.WriteLine(ex);
+                return ReviewStatus.Error;
+            }
+            finally
+            {
+#if NET6_0_OR_GREATER
+                Window = null;
+#endif
+            }
+        }
 
 		void OpenUrl(string url)
         {