Removed all usages of deprecated code.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
EgorBo · May 11, 2018 · cd6538a · cd6538a
1 parent 19bcdb1
commit cd6538a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj b/Sample/Toasts.Forms.Plugin.Sample.iOS/Toasts.Forms.Plugin.Sample.iOS.csproj
@@ -28,7 +28,6 @@
     <MtouchArch>Default, i386, x86_64</MtouchArch>
     <MtouchLink>None</MtouchLink>
     <MtouchDebug>True</MtouchDebug>
-    <CodesignEntitlements>Entitlements.plist</CodesignEntitlements>
     <MtouchSdkVersion>
     </MtouchSdkVersion>
     <MtouchProfiling>False</MtouchProfiling>

diff --git a/Toasts.Forms.Plugin.Droid/AlarmHandler.cs b/Toasts.Forms.Plugin.Droid/AlarmHandler.cs
@@ -4,6 +4,7 @@
 using System.IO;
 using System.Xml.Serialization;
 using Android.Graphics;
+using Android.Support.V4.App;
 
 namespace Plugin.Toasts
 {
@@ -24,12 +25,12 @@ public override void OnReceive(Context context, Intent intent)
             }
 
             // Show Notification
-            Android.App.Notification.Builder builder = new Android.App.Notification.Builder(Application.Context)
+            var builder = new NotificationCompat.Builder(Application.Context, NotificationBuilder.DefaultChannelName)
                 .SetContentTitle(options.Title)
                 .SetContentText(options.Description)
                 .SetSmallIcon(options.AndroidOptions.SmallDrawableIcon.Value) // Must have small icon to display
                 .SetPriority((int)NotificationPriority.High) // Must be set to High to get Heads-up notification
-                .SetDefaults(NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
+                .SetDefaults((int) NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
                 .SetAutoCancel(true)
                 .SetColor(Color.ParseColor(options.AndroidOptions.HexColor));
 

diff --git a/Toasts.Forms.Plugin.Droid/NotificationBuilder.cs b/Toasts.Forms.Plugin.Droid/NotificationBuilder.cs
@@ -8,6 +8,7 @@
 using System.Xml.Serialization;
 using Plugin.Toasts.Interfaces;
 using System.Collections.Concurrent;
+using Android.Support.V4.App;
 
 namespace Plugin.Toasts
 {
@@ -211,12 +212,12 @@ public INotificationResult Notify(Activity activity, INotificationOptions option
                     options.AndroidOptions.HexColor = "#" + options.AndroidOptions.HexColor;
                 }
 
-                Android.App.Notification.Builder builder = new Android.App.Notification.Builder(Application.Context)
+                var builder = new NotificationCompat.Builder(Application.Context)
                     .SetContentTitle(options.Title)
                     .SetContentText(options.Description)
                     .SetSmallIcon(smallIcon) // Must have small icon to display
                     .SetPriority((int)NotificationPriority.High) // Must be set to High to get Heads-up notification
-                    .SetDefaults(NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
+                    .SetDefaults((int) NotificationDefaults.All) // Must also include vibrate to get Heads-up notification
                     .SetAutoCancel(true) // To allow click event to trigger delete Intent
                     .SetContentIntent(pendingClickIntent) // Must have Intent to accept the click                   
                     .SetDeleteIntent(pendingDismissIntent)

diff --git a/Toasts.Forms.Plugin.Droid/SnackbarNotification.cs b/Toasts.Forms.Plugin.Droid/SnackbarNotification.cs
@@ -36,12 +36,12 @@ public NotificationResult Notify(Activity activity, INotificationOptions options
 
             var snackbar = Snackbar.Make(view, builder, Snackbar.LengthLong);
             if (options.IsClickable)
-                snackbar.SetAction(options.AndroidOptions.ViewText, new EmptyOnClickListener(id, (toastId, result) => { ToastClosed(toastId, result); }, new NotificationResult() { Action = NotificationAction.Clicked }));
+                snackbar.SetAction(options.AndroidOptions.ViewText, new EmptyOnClickListener(id, ToastClosed, new NotificationResult() { Action = NotificationAction.Clicked }));
             else
-                snackbar.SetAction(options.AndroidOptions.DismissText, new EmptyOnClickListener(id, (toastId, result) => { ToastClosed(toastId, result); }, new NotificationResult() { Action = NotificationAction.Dismissed }));
+                snackbar.SetAction(options.AndroidOptions.DismissText, new EmptyOnClickListener(id, ToastClosed, new NotificationResult() { Action = NotificationAction.Dismissed }));
 
             // Monitor callbacks
-            snackbar.SetCallback(new ToastCallback(id, (toastId, result) => { ToastClosed(toastId, result); }));
+            snackbar.AddCallback(new ToastCallback(id, ToastClosed));
 
             // Setup reset events
             var resetEvent = new ManualResetEvent(false);