Add notification handler.

sanyandreichuk · sanyandreichuk · commit 1c6b91ad472f · 2021-04-21T17:24:48.000+03:00
diff --git a/sample/Sample.Android/MainApplication.cs b/sample/Sample.Android/MainApplication.cs
@@ -33,9 +33,9 @@ public override void OnCreate()
             }
 
 #if DEBUG
-            NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), resetToken: true);
+            NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), new NotificationHandler(), resetToken: true);
 #else
-            NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), resetToken: false);
+            NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), new NotificationHandler(), resetToken: false);
 #endif
         }
     }
diff --git a/sample/Sample.Android/NotificationHandler.cs b/sample/Sample.Android/NotificationHandler.cs
@@ -0,0 +1,30 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Android.App;
+using Android.Content;
+using Android.OS;
+using Android.Support.V4.App;
+using Notifo.SDK;
+
+namespace Sample.Droid
+{
+    public class NotificationHandler : INotificationHandler
+    {
+        public void OnBuildNotification(NotificationCompat.Builder notificationBuilder, NotificationDto notification)
+        {
+            if (Build.VERSION.SdkInt >= BuildVersionCodes.O)
+            {
+                return;
+            }
+
+            var soundUri = Android.Net.Uri.Parse($"{ContentResolver.SchemeAndroidResource}://{Application.Context.PackageName}/raw/announcement");
+
+            notificationBuilder.SetSound(soundUri);
+        }
+    }
+}
diff --git a/sample/Sample.Android/Resources/Resource.designer.cs b/sample/Sample.Android/Resources/Resource.designer.cs
diff --git a/sample/Sample.Android/Resources/raw/announcement.mp3 b/sample/Sample.Android/Resources/raw/announcement.mp3
diff --git a/sample/Sample.Android/Sample.Android.csproj b/sample/Sample.Android/Sample.Android.csproj
@@ -93,6 +93,7 @@
   <ItemGroup>
     <Compile Include="MainActivity.cs" />
     <Compile Include="MainApplication.cs" />
+    <Compile Include="NotificationHandler.cs" />
     <Compile Include="Resources\Resource.designer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -137,6 +138,9 @@
       <Name>Sample</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <AndroidResource Include="Resources\raw\announcement.mp3" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
   <ProjectExtensions>
     <VisualStudio>
diff --git a/sample/Sample.iOS/AppDelegate.cs b/sample/Sample.iOS/AppDelegate.cs
@@ -25,7 +25,7 @@ public override bool FinishedLaunching(UIApplication uiApplication, NSDictionary
             global::Xamarin.Forms.Forms.Init();
             LoadApplication(new App(new iOSInitializer()));
 
-            NotifoFirebasePlugin.Initialize(launchOptions, new NotifoStartup(), true);
+            NotifoFirebasePlugin.Initialize(launchOptions, new NotifoStartup(), new NotificationHandler(), true);
             UNUserNotificationCenter.Current.Delegate = this;
 
             return base.FinishedLaunching(uiApplication, launchOptions);
diff --git a/sample/Sample.iOS/NotificationHandler.cs b/sample/Sample.iOS/NotificationHandler.cs
@@ -0,0 +1,22 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Notifo.SDK;
+using UserNotifications;
+
+#pragma warning disable SA1300 // Element should begin with upper-case letter
+namespace Sample.iOS
+#pragma warning restore SA1300 // Element should begin with upper-case letter
+{
+    public class NotificationHandler : INotificationHandler
+    {
+        public void OnBuildNotification(UNMutableNotificationContent content, NotificationDto notification)
+        {
+            content.Sound = UNNotificationSound.GetSound("announcement.caf");
+        }
+    }
+}
diff --git a/sample/Sample.iOS/Resources/announcement.caf b/sample/Sample.iOS/Resources/announcement.caf
diff --git a/sample/Sample.iOS/Sample.iOS.csproj b/sample/Sample.iOS/Sample.iOS.csproj
@@ -52,7 +52,7 @@
     <MtouchLink>None</MtouchLink>
     <MtouchInterpreter>-all</MtouchInterpreter>
     <CodesignProvision>
-    </CodesignProvision>
+	</CodesignProvision>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhone' ">
     <DebugType>none</DebugType>
@@ -76,7 +76,9 @@
     <BundleResource Include="GoogleService-Info.plist" />
     <None Include="Info.plist" />
     <Compile Include="Application.cs" />
+    <Compile Include="NotificationHandler.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <BundleResource Include="Resources\announcement.caf" />
   </ItemGroup>
   <ItemGroup>
     <InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
diff --git a/sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.android.cs b/sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.android.cs
@@ -21,11 +21,14 @@ public class NotifoFirebasePlugin
         /// </summary>
         /// <param name="context">The current application context.</param>
         /// <param name="notifoStartup">The <see cref="INotifoStartup"/> implementation.</param>
+        /// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
         /// <param name="resetToken">Set to <see langword="true"/> while debugging.</param>
         /// <param name="autoRegistration">Automatically register for push notifications.</param>
-        public static void Initialize(Context context, INotifoStartup notifoStartup, bool resetToken, bool autoRegistration = true)
+        public static void Initialize(Context context, INotifoStartup notifoStartup, INotificationHandler? notificationHandler = null, bool resetToken = false, bool autoRegistration = true)
         {
             FirebasePushNotificationManager.Initialize(context, new NotifoPushNotificationHandler(), resetToken, createDefaultNotificationChannel: true, autoRegistration);
+
+            NotifoIO.Current.SetNotificationHandler(notificationHandler);
             notifoStartup.ConfigureService(NotifoIO.Current);
         }
 
diff --git a/sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.ios.cs b/sdk/Notifo.SDK.FirebasePlugin/NotifoFirebasePlugin.ios.cs
@@ -25,10 +25,13 @@ public class NotifoFirebasePlugin
         /// </summary>
         /// <param name="options">Application launch options.</param>
         /// <param name="notifoStartup">The <see cref="INotifoStartup"/> implementation.</param>
+        /// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
         /// <param name="autoRegistration">Automatically register for push notifications.</param>
-        public static void Initialize(NSDictionary options, INotifoStartup notifoStartup, bool autoRegistration = true)
+        public static void Initialize(NSDictionary options, INotifoStartup notifoStartup, INotificationHandler? notificationHandler = null, bool autoRegistration = true)
         {
             FirebasePushNotificationManager.Initialize(options, autoRegistration);
+
+            NotifoIO.Current.SetNotificationHandler(notificationHandler);
             notifoStartup.ConfigureService(NotifoIO.Current);
         }
 
diff --git a/sdk/Notifo.SDK.FirebasePlugin/NotifoPushNotificationHandler.android.cs b/sdk/Notifo.SDK.FirebasePlugin/NotifoPushNotificationHandler.android.cs
@@ -7,8 +7,6 @@
 
 using System;
 using System.Collections.Generic;
-using Android.App;
-using Android.Content;
 using Android.Support.V4.App;
 using Notifo.SDK.Extensions;
 using Notifo.SDK.NotifoMobilePush;
@@ -45,63 +43,7 @@ public override void OnBuildNotification(NotificationCompat.Builder notification
             var notification = new NotificationDto()
                 .FromDictionary(new Dictionary<string, object>(parameters));
 
-            if (!string.IsNullOrWhiteSpace(notification.Subject))
-            {
-                notificationBuilder.SetContentTitle(notification.Subject);
-            }
-
-            if (!string.IsNullOrWhiteSpace(notification.ImageSmall))
-            {
-                int width = GetDimension(Resource.Dimension.notification_large_icon_width);
-                int height = GetDimension(Resource.Dimension.notification_large_icon_height);
-
-                var largeIcon = notifoMobilePush.GetBitmap(notification.ImageSmall, width, height);
-                if (largeIcon != null)
-                {
-                    notificationBuilder.SetLargeIcon(largeIcon);
-                }
-            }
-
-            if (!string.IsNullOrWhiteSpace(notification.ImageLarge))
-            {
-                var bigPicture = notifoMobilePush.GetBitmap(notification.ImageLarge);
-                if (bigPicture != null)
-                {
-                    notificationBuilder.SetStyle(
-                        new NotificationCompat
-                            .BigPictureStyle()
-                            .BigPicture(bigPicture)
-                            .SetSummaryText(notification.Body)
-                    );
-                }
-            }
-
-            notificationBuilder.MActions.Clear();
-
-            if (!string.IsNullOrWhiteSpace(notification.ConfirmUrl) &&
-                !string.IsNullOrWhiteSpace(notification.ConfirmText) &&
-                !notification.IsConfirmed)
-            {
-                AddAction(notificationBuilder, notification.ConfirmText, notification.ConfirmUrl);
-            }
-
-            if (!string.IsNullOrWhiteSpace(notification.LinkUrl) &&
-                !string.IsNullOrWhiteSpace(notification.LinkText))
-            {
-                AddAction(notificationBuilder, notification.LinkText, notification.LinkUrl);
-            }
+            notifoMobilePush.OnBuildNotification(notificationBuilder, notification);
         }
-
-        private void AddAction(NotificationCompat.Builder notificationBuilder, string title, string url)
-        {
-            var notificationIntent = new Intent(Intent.ActionView);
-            notificationIntent.SetData(Android.Net.Uri.Parse(url));
-            var buttonIntent = PendingIntent.GetActivity(Application.Context, 0, notificationIntent, 0);
-
-            notificationBuilder.AddAction(0, title, buttonIntent);
-        }
-
-        private int GetDimension(int resourceId) =>
-            Application.Context?.Resources?.GetDimensionPixelSize(resourceId) ?? -1;
     }
 }
diff --git a/sdk/Notifo.SDK/INotificationHandler.android.cs b/sdk/Notifo.SDK/INotificationHandler.android.cs
@@ -0,0 +1,24 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Android.Support.V4.App;
+
+namespace Notifo.SDK
+{
+    /// <summary>
+    /// Notification handler interface.
+    /// </summary>
+    public interface INotificationHandler
+    {
+        /// <summary>
+        /// Provides a place for notification customization.
+        /// </summary>
+        /// <param name="notificationBuilder">The notification builder.</param>
+        /// <param name="notification">The notification.</param>
+        void OnBuildNotification(NotificationCompat.Builder notificationBuilder, NotificationDto notification);
+    }
+}
diff --git a/sdk/Notifo.SDK/INotificationHandler.ios.cs b/sdk/Notifo.SDK/INotificationHandler.ios.cs
@@ -0,0 +1,24 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using UserNotifications;
+
+namespace Notifo.SDK
+{
+    /// <summary>
+    /// Notification handler interface.
+    /// </summary>
+    public interface INotificationHandler
+    {
+        /// <summary>
+        /// Provides a place for notification customization.
+        /// </summary>
+        /// <param name="content">The notification content.</param>
+        /// <param name="notification">The notification.</param>
+        void OnBuildNotification(UNMutableNotificationContent content, NotificationDto notification);
+    }
+}
diff --git a/sdk/Notifo.SDK/Notifo.SDK.csproj b/sdk/Notifo.SDK/Notifo.SDK.csproj
@@ -68,6 +68,9 @@
     <PackageReference Include="Serilog.Sinks.Xamarin">
       <Version>0.2.0.64</Version>
     </PackageReference>
+    <PackageReference Include="Xamarin.Android.Support.v4">
+      <Version>28.0.0.3</Version>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/INotifoMobilePush.android.cs b/sdk/Notifo.SDK/NotifoMobilePush/INotifoMobilePush.android.cs
@@ -0,0 +1,19 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+namespace Notifo.SDK.NotifoMobilePush
+{
+    public partial interface INotifoMobilePush
+    {
+        /// <summary>
+        /// Sets the notification handler.
+        /// </summary>
+        /// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
+        /// <returns>The current instance.</returns>
+        public INotifoMobilePush SetNotificationHandler(INotificationHandler? notificationHandler);
+    }
+}
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/INotifoMobilePush.cs b/sdk/Notifo.SDK/NotifoMobilePush/INotifoMobilePush.cs
@@ -13,7 +13,7 @@ namespace Notifo.SDK.NotifoMobilePush
     /// <summary>
     /// Notifo mobile push service interface.
     /// </summary>
-    public interface INotifoMobilePush : INotifoClient
+    public partial interface INotifoMobilePush : INotifoClient
     {
         /// <summary>
         /// Event triggered when a notification is received.
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/INotifoMobilePush.ios.cs b/sdk/Notifo.SDK/NotifoMobilePush/INotifoMobilePush.ios.cs
@@ -0,0 +1,19 @@
+﻿// ==========================================================================
+//  Notifo.io
+// ==========================================================================
+//  Copyright (c) Sebastian Stehle
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+namespace Notifo.SDK.NotifoMobilePush
+{
+    public partial interface INotifoMobilePush
+    {
+        /// <summary>
+        /// Sets the notification handler.
+        /// </summary>
+        /// <param name="notificationHandler">The <see cref="INotificationHandler"/> implementation.</param>
+        /// <returns>The current instance.</returns>
+        public INotifoMobilePush SetNotificationHandler(INotificationHandler? notificationHandler);
+    }
+}
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.android.cs b/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.android.cs
diff --git a/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.ios.cs b/sdk/Notifo.SDK/NotifoMobilePush/NotifoMobilePushImplementation.ios.cs

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ public override void OnCreate()`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`#if DEBUG`
`36`		`- NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), resetToken: true);`
	`36`	`+ NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), new NotificationHandler(), resetToken: true);`
`37`	`37`	`#else`
`38`		`- NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), resetToken: false);`
	`38`	`+ NotifoFirebasePlugin.Initialize(this, new NotifoStartup(), new NotificationHandler(), resetToken: false);`
`39`	`39`	`#endif`
`40`	`40`	`}`
`41`	`41`	`}`