Move live activities to its own namespace

emawby · emawby · commit 1735f6479fa3 · 2023-05-04T17:46:28.000-07:00
diff --git a/ios/Classes/OSFlutterLiveActivities.h b/ios/Classes/OSFlutterLiveActivities.h
@@ -0,0 +1,35 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2023 OneSignal
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import <Foundation/Foundation.h>
+#import <Flutter/Flutter.h>
+
+@interface OSFlutterLiveActivities : NSObject<FlutterPlugin>
+
+@property (strong, nonatomic) FlutterMethodChannel *channel;
+
+@end
diff --git a/ios/Classes/OSFlutterLiveActivities.m b/ios/Classes/OSFlutterLiveActivities.m
@@ -0,0 +1,73 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2023 OneSignal
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * 1. The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * 2. All copies of substantial portions of the Software may only be used in connection
+ * with services provided by OneSignal.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#import "OSFlutterLiveActivities.h"
+#import <OneSignalFramework/OneSignalFramework.h>
+#import "OSFlutterCategories.h"
+
+@implementation OSFlutterLiveActivities
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
+    OSFlutterLiveActivities *instance = [OSFlutterLiveActivities new];
+
+    instance.channel = [FlutterMethodChannel
+                        methodChannelWithName:@"OneSignal#liveactivities"
+                        binaryMessenger:[registrar messenger]];
+
+    [registrar addMethodCallDelegate:instance channel:instance.channel];
+}
+
+- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
+    if ([@"OneSignal#enterLiveActivity" isEqualToString:call.method])
+        [self enterLiveActivity:call withResult:result];
+    else if ([@"OneSignal#exitLiveActivity" isEqualToString:call.method])
+        [self exitLiveActivity:call withResult:result];
+    else 
+        result(FlutterMethodNotImplemented);
+}
+
+- (void)enterLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+    NSString *activityId = call.arguments[@"activityId"];
+    NSString *token = call.arguments[@"token"];
+
+    [OneSignal enterLiveActivity:activityId withToken:token withSuccess:^(NSDictionary *results) {
+        result(results);
+    } withFailure:^(NSError *error) {
+        result(error.flutterError);
+    }];
+}
+
+- (void)exitLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+    NSString *activityId = call.arguments[@"activityId"];
+
+    [OneSignal exitLiveActivity:activityId withSuccess:^(NSDictionary *results) {
+        result(results);
+    } withFailure:^(NSError *error) {
+        result(error.flutterError);
+    }];
+}
+
+@end
diff --git a/ios/Classes/OneSignalPlugin.m b/ios/Classes/OneSignalPlugin.m
@@ -85,10 +85,6 @@ - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
         [self setConsentGiven:call withResult:result];
     else if ([@"OneSignal#setLaunchURLsInApp" isEqualToString:call.method])
         [self setLaunchURLsInApp:call withResult:result];
-     else if ([@"OneSignal#enterLiveActivity" isEqualToString:call.method])
-        [self enterLiveActivity:call withResult:result];
-    else if ([@"OneSignal#exitLiveActivity" isEqualToString:call.method])
-        [self exitLiveActivity:call withResult:result];
     else
         result(FlutterMethodNotImplemented);
 }
@@ -134,27 +130,4 @@ - (void)setLaunchURLsInApp:(FlutterMethodCall *)call withResult:(FlutterResult)r
     result(nil);
 }
 
-#pragma mark Live Activity
-
-- (void)enterLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    NSString *activityId = call.arguments[@"activityId"];
-    NSString *token = call.arguments[@"token"];
-
-    [OneSignal enterLiveActivity:activityId withToken:token withSuccess:^(NSDictionary *results) {
-        result(results);
-    } withFailure:^(NSError *error) {
-        result(error.flutterError);
-    }];
-}
-
-- (void)exitLiveActivity:(FlutterMethodCall *)call withResult:(FlutterResult)result {
-    NSString *activityId = call.arguments[@"activityId"];
-
-    [OneSignal exitLiveActivity:activityId withSuccess:^(NSDictionary *results) {
-        result(results);
-    } withFailure:^(NSError *error) {
-        result(error.flutterError);
-    }];
-}
-
 @end
diff --git a/lib/onesignal_flutter.dart b/lib/onesignal_flutter.dart
@@ -7,13 +7,15 @@ import 'package:onesignal_flutter/src/notifications.dart';
 import 'package:onesignal_flutter/src/session.dart';
 import 'package:onesignal_flutter/src/location.dart';
 import 'package:onesignal_flutter/src/inappmessages.dart';
+import 'package:onesignal_flutter/src/liveactivities.dart';
 
 export 'src/defines.dart';
 export 'src/pushsubscription.dart';
 export 'src/subscription.dart';
 export 'src/notification.dart';
 export 'src/notifications.dart';
 export 'src/inappmessage.dart';
+export 'src/liveactivities.dart';
 
 class OneSignal {
   /// A singleton representing the OneSignal SDK.
@@ -27,6 +29,7 @@ class OneSignal {
   static OneSignalSession Session = new OneSignalSession();
   static OneSignalLocation Location = new OneSignalLocation();
   static OneSignalInAppMessages InAppMessages = new OneSignalInAppMessages();
+  static OneSignalLiveActivities LiveActivities = new OneSignalLiveActivities();
 
   // private channels used to bridge to ObjC/Java
   MethodChannel _channel = const MethodChannel('OneSignal');
@@ -98,22 +101,4 @@ class OneSignal {
           'OneSignal#setLaunchURLsInApp', {'launchUrlsInApp': launchUrlsInApp});
     }
   }
-
-  /// Only applies to iOS
-  /// Associates a temporary push token with an Activity ID on the OneSignal server.
-  Future<void> enterLiveActivity(String activityId, String token) async {
-    if (Platform.isIOS) {
-      return await _channel.invokeMethod("OneSignal#enterLiveActivity",
-          {'activityId': activityId, 'token': token});
-    }
-  }
-
-  /// Only applies to iOS
-  /// Deletes activityId associated temporary push token on the OneSignal server.
-  Future<void> exitLiveActivity(String activityId) async {
-    if (Platform.isIOS) {
-      return await _channel.invokeMethod(
-          "OneSignal#exitLiveActivity", {'activityId': activityId});
-    }
-  }
 }
diff --git a/lib/src/liveactivities.dart b/lib/src/liveactivities.dart
@@ -0,0 +1,26 @@
+import 'dart:async';
+import 'dart:io';
+import 'package:flutter/services.dart';
+
+class OneSignalLiveActivities {
+  // private channels used to bridge to ObjC/Java
+  MethodChannel _channel = const MethodChannel('OneSignal#liveactivities');
+
+  /// Only applies to iOS
+  /// Associates a temporary push token with an Activity ID on the OneSignal server.
+  Future<void> enterLiveActivity(String activityId, String token) async {
+    if (Platform.isIOS) {
+      return await _channel.invokeMethod("OneSignal#enterLiveActivity",
+          {'activityId': activityId, 'token': token});
+    }
+  }
+
+  /// Only applies to iOS
+  /// Deletes activityId associated temporary push token on the OneSignal server.
+  Future<void> exitLiveActivity(String activityId) async {
+    if (Platform.isIOS) {
+      return await _channel.invokeMethod(
+          "OneSignal#exitLiveActivity", {'activityId': activityId});
+    }
+  }
+}
