From fd05406e860274783579d3751940bfcb04d16bd2 Mon Sep 17 00:00:00 2001
From: HavenDV <havendv@gmail.com>
Date: Wed, 3 Jan 2024 01:50:19 +0400
Subject: [PATCH] feat: To Snackbar UI instead Alert.

---
 Maui.Android.InAppUpdates.sln.DotSettings     |  2 +
 README.md                                     |  2 +-
 sample/MainPage.xaml                          |  1 +
 sample/MainPage.xaml.cs                       | 18 +++++-
 src/libs/Directory.Build.props                |  2 +-
 .../AndroidInAppUpdatesOptions.cs             | 32 +++-------
 .../Android/AppUpdateSuccessListener.cs       |  4 +-
 .../Platforms/Android/DefaultUserInterface.cs | 63 ++++++++++---------
 .../Platforms/Android/Handler.cs              |  6 +-
 .../Android/InstallStateUpdatedListener.cs    | 12 ++--
 10 files changed, 70 insertions(+), 72 deletions(-)
 create mode 100644 Maui.Android.InAppUpdates.sln.DotSettings

diff --git a/Maui.Android.InAppUpdates.sln.DotSettings b/Maui.Android.InAppUpdates.sln.DotSettings
new file mode 100644
index 0000000..1b6cb1a
--- /dev/null
+++ b/Maui.Android.InAppUpdates.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Snackbar/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/README.md b/README.md
index 18d3230..65672f3 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@ NuGet package that implementing Android In-App Updates for MAUI with debugging c
 # Usage
 - Add NuGet package to your project:
 ```xml
-<PackageReference Include="Oscore.Maui.Android.InAppUpdates" Version="0.9.1" />
+<PackageReference Include="Oscore.Maui.Android.InAppUpdates" Version="1.0.0" />
 ```
 - Add the following to your `MauiProgram.cs` `CreateMauiApp` method:
 ```diff
diff --git a/sample/MainPage.xaml b/sample/MainPage.xaml
index 4d2b957..8ff79f2 100644
--- a/sample/MainPage.xaml
+++ b/sample/MainPage.xaml
@@ -18,6 +18,7 @@
             <Button Command="{Binding InstallFailsCommand}" Text="InstallFails" />
             <Label Text="Test UI:" />
             <Button Command="{Binding CompleteUpdateCommand}" Text="CompleteUpdate" />
+            <Button Command="{Binding DownloadingCommand}" Text="Downloading" />
         </VerticalStackLayout>
     </ScrollView>
 
diff --git a/sample/MainPage.xaml.cs b/sample/MainPage.xaml.cs
index 54cfe95..e09ee91 100644
--- a/sample/MainPage.xaml.cs
+++ b/sample/MainPage.xaml.cs
@@ -84,9 +84,21 @@ private void InstallFails()
 	private void CompleteUpdate()
 	{
 #if ANDROID
-		Internal.Handler.Options.CompleteUpdateAction(
-			Platform.CurrentActivity!,
-			Internal.Handler.AppUpdateManager!);
+		Internal.Handler.Options.CompleteUpdateAction();
+#endif
+	}
+	
+	[RelayCommand]
+	private async Task Downloading()
+	{
+#if ANDROID
+		for (var i = 0; i < 100; i += 10)
+		{
+			Internal.Handler.Options.DownloadingAction(i);
+			await Task.Delay(TimeSpan.FromMilliseconds(250));
+		}
+#else
+		await Task.Delay(TimeSpan.FromMilliseconds(250));
 #endif
 	}
 	
diff --git a/src/libs/Directory.Build.props b/src/libs/Directory.Build.props
index 0c8ee6d..4f8df2a 100755
--- a/src/libs/Directory.Build.props
+++ b/src/libs/Directory.Build.props
@@ -9,7 +9,7 @@
   </ItemGroup>
   
   <PropertyGroup Label="Nuget">
-    <Version>0.9.1</Version>
+    <Version>1.0.0</Version>
     <GeneratePackageOnBuild Condition=" '$(Configuration)' == 'Release' ">true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <Authors>Oscore</Authors>
diff --git a/src/libs/Maui.Android.InAppUpdates/AndroidInAppUpdatesOptions.cs b/src/libs/Maui.Android.InAppUpdates/AndroidInAppUpdatesOptions.cs
index 910847a..ca433fc 100644
--- a/src/libs/Maui.Android.InAppUpdates/AndroidInAppUpdatesOptions.cs
+++ b/src/libs/Maui.Android.InAppUpdates/AndroidInAppUpdatesOptions.cs
@@ -1,8 +1,3 @@
-#if ANDROID
-using Android.Content;
-using Xamarin.Google.Android.Play.Core.AppUpdate;
-#endif
-
 namespace Maui.Android.InAppUpdates;
 
 /// <summary>
@@ -32,36 +27,32 @@ public class AndroidInAppUpdatesOptions
     /// This action will be triggered when the app is updated. <br/>
     /// Default action will show the toast with english text. <br/>
     /// </summary>
-    public Action<Context> AppUpdatedAction { get; set; } = static context =>
+    public Action AppUpdatedAction { get; set; } = static () =>
         Internal.DefaultUserInterface.ShowShortToast(
-            context: context,
             text: "App updated");
     
     /// <summary>
     /// This action will be triggered when the update is cancelled. <br/>
     /// Default action will show the toast with english text. <br/>
     /// </summary>
-    public Action<Context> UpdateCancelledAction { get; set; } = static context =>
+    public Action UpdateCancelledAction { get; set; } = static () =>
         Internal.DefaultUserInterface.ShowShortToast(
-            context: context,
             text: "In app update cancelled");
     
     /// <summary>
     /// This action will be triggered when the update is failed. <br/>
     /// Default action will show the toast with english text. <br/>
     /// </summary>
-    public Action<Context> UpdateFailedAction { get; set; } = static context =>
+    public Action UpdateFailedAction { get; set; } = static () =>
         Internal.DefaultUserInterface.ShowShortToast(
-            context: context,
             text: "In app update failed");
     
     /// <summary>
     /// This action will be triggered when the download is failed. <br/>
     /// Default action will show the toast with english text. <br/>
     /// </summary>
-    public Action<Context> DownloadFailedAction { get; set; } = static context =>
+    public Action DownloadFailedAction { get; set; } = static () =>
         Internal.DefaultUserInterface.ShowShortToast(
-            context: context,
             text: "Update download failed.");
     
     /// <summary>
@@ -69,22 +60,19 @@ public class AndroidInAppUpdatesOptions
     /// Second value is the percentage of the download. <br/>
     /// Default action will show the toast with english text. <br/>
     /// </summary>
-    public Action<Context, double> DownloadingAction { get; set; } = static (context, percents) =>
+    public Action<double> DownloadingAction { get; set; } = static percents =>
         Internal.DefaultUserInterface.ShowShortToast(
-            context: context,
             text: $"Downloaded {percents}%");
     
     /// <summary>
     /// This action will be triggered when the update is completed. <br/>
     /// Default action will show the alert dialog to complete the update. <br/>
     /// </summary>
-    public Action<Context, IAppUpdateManager> CompleteUpdateAction { get; set; } = static (context, appUpdateManager) =>
-        Internal.DefaultUserInterface.ShowAlertToCompleteUpdate(
-            context: context,
-            appUpdateManager: appUpdateManager,
-            title: "Download completed",
-            message: "Update is ready to be installed.", // "Application successfully updated! You need to restart the app in order to use this new features"
-            positiveButton: "Perform update"); // "Restart"
+    public Action CompleteUpdateAction { get; set; } = static () =>
+        Internal.DefaultUserInterface.ShowSnackbar(
+            text: "An update has just been downloaded.",
+            actionText: "RESTART",
+            clickHandler: static _ => Internal.Handler.AppUpdateManager?.CompleteUpdate());
 #endif
     
     /// <summary>
diff --git a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/AppUpdateSuccessListener.cs b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/AppUpdateSuccessListener.cs
index 230eefc..a50bdfc 100644
--- a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/AppUpdateSuccessListener.cs
+++ b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/AppUpdateSuccessListener.cs
@@ -45,9 +45,7 @@ public void OnSuccess(Java.Lang.Object p0)
             case UpdateAvailability.UpdateAvailable or UpdateAvailability.DeveloperTriggeredUpdateInProgress when
                 isFlexibleUpdatesAllowed:
             {
-                InstallStateUpdatedListener ??= new InstallStateUpdatedListener(
-                    context: activity,
-                    appUpdateManager: appUpdateManager);
+                InstallStateUpdatedListener ??= new InstallStateUpdatedListener();
                 appUpdateManager.RegisterListener(InstallStateUpdatedListener);
                 
                 _ = appUpdateManager.StartUpdateFlowForResult(
diff --git a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/DefaultUserInterface.cs b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/DefaultUserInterface.cs
index 3f02d1b..ff9ead8 100644
--- a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/DefaultUserInterface.cs
+++ b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/DefaultUserInterface.cs
@@ -1,46 +1,47 @@
-using Android.App;
-using Android.Content;
+using Android.Views;
 using Android.Widget;
-using Xamarin.Google.Android.Play.Core.AppUpdate;
+using Google.Android.Material.Snackbar;
 
 namespace Maui.Android.InAppUpdates.Internal;
 
 public static class DefaultUserInterface
 {
     /// <summary>
-    /// This method will show the alert dialog to complete the update.
+    /// Displays a short duration toast message at the center of the screen.
     /// </summary>
-    /// <param name="context"></param>
-    /// <param name="appUpdateManager"></param>
-    public static void ShowAlertToCompleteUpdate(
-        Context context,
-        IAppUpdateManager appUpdateManager,
-        string title,
-        string message,
-        string positiveButton)
+    /// <param name="text">The text to be displayed in the toast message.</param>
+    public static void ShowShortToast(
+        string text)
     {
-        if (new AlertDialog.Builder(context).Create() is not {} alert)
+        Toast.MakeText(
+            context: Platform.AppContext,
+            text: text,
+            duration: ToastLength.Short)?.Show();
+    }
+
+    /// <summary>
+    /// Displays a snackbar with an action to complete the app update process.
+    /// </summary>
+    /// <param name="text">The text to display on the snackbar.</param>
+    /// <param name="actionText">The text for the action button.</param>
+    /// <param name="clickHandler">The handler for the action button.</param>
+    public static void ShowSnackbar(
+        string text,
+        string actionText,
+        Action<global::Android.Views.View> clickHandler)
+    {
+        if (Platform.CurrentActivity?.Window?.DecorView is not {} view ||
+            Snackbar.Make(
+                text: text,
+                duration: BaseTransientBottomBar.LengthIndefinite,
+                view: view) is not {} snackbar)
         {
             return;
         }
         
-        alert.SetTitle(title);
-        alert.SetMessage(message);
-        alert.SetButton((int) DialogButtonType.Positive, positiveButton, (_, _) =>
-        {
-            appUpdateManager.CompleteUpdate();
-            // You can start your activityonresult method when update is not available when using immediate update when testing with fakeappupdate manager
-            //activity.StartActivityForResult(intent, 400);
-        });
-        alert.SetCancelable(false);
-        alert.Show();
-    }
-
-    public static void ShowShortToast(Context context, string text)
-    {
-        Toast.MakeText(
-            context: context,
-            text: text,
-            duration: ToastLength.Short)?.Show();
+        snackbar.SetAction(
+            text: actionText,
+            clickHandler: clickHandler);
+        snackbar.Show();
     }
 }
\ No newline at end of file
diff --git a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/Handler.cs b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/Handler.cs
index 1df9507..f5fa188 100644
--- a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/Handler.cs
+++ b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/Handler.cs
@@ -89,15 +89,15 @@ public static void HandleActivityResult(
         switch (resultCode)
         {
             case Result.Ok:
-                Options.AppUpdatedAction(activity);
+                Options.AppUpdatedAction();
                 break;
             
             case Result.Canceled:
-                Options.UpdateCancelledAction(activity);
+                Options.UpdateCancelledAction();
                 break;
             
             case (Result)ActivityResult.ResultInAppUpdateFailed:
-                Options.UpdateFailedAction(activity);
+                Options.UpdateFailedAction();
                 break;
         }
     }
diff --git a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/InstallStateUpdatedListener.cs b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/InstallStateUpdatedListener.cs
index 105dde8..16aaa14 100644
--- a/src/libs/Maui.Android.InAppUpdates/Platforms/Android/InstallStateUpdatedListener.cs
+++ b/src/libs/Maui.Android.InAppUpdates/Platforms/Android/InstallStateUpdatedListener.cs
@@ -1,5 +1,3 @@
-using Android.Content;
-using Xamarin.Google.Android.Play.Core.AppUpdate;
 using Xamarin.Google.Android.Play.Core.Install;
 using Xamarin.Google.Android.Play.Core.Install.Model;
 using Object = Java.Lang.Object;
@@ -9,9 +7,7 @@ namespace Maui.Android.InAppUpdates.Internal;
 /// <summary>
 /// Listener to track request state updates.
 /// </summary>
-public class InstallStateUpdatedListener(
-    Context context,
-    IAppUpdateManager appUpdateManager)
+public class InstallStateUpdatedListener
     : Object, IInstallStateUpdatedListener
 {
     /// <summary>
@@ -43,16 +39,16 @@ public void OnStateUpdate(InstallState state)
                     var percents = Math.Round(
                         100.0 * bytesDownloaded / totalBytesToDownload);
                     
-                    Handler.Options.DownloadingAction(context, percents);
+                    Handler.Options.DownloadingAction(percents);
                     break;
                 }
             
                 case InstallStatus.Downloaded:
-                    Handler.Options.CompleteUpdateAction(context, appUpdateManager);
+                    Handler.Options.CompleteUpdateAction();
                     break;
                 
                 case InstallStatus.Failed:
-                    Handler.Options.DownloadFailedAction(context);
+                    Handler.Options.DownloadFailedAction();
                     break;
             }
         }