Merge pull request #640 from OneSignal/user_model/debug_namespace

fhboswell · web-flow · commit e166e63ad622 · 2023-02-01T15:32:10.000-08:00
Adding Debug namespace
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -179,7 +179,6 @@
 				6BBCCF44B691DF76AC7D7376 /* Pods-Runner.debug.xcconfig */,
 				47FF2D2152AD7B79C3388A8D /* Pods-Runner.release.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -596,10 +595,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -625,10 +621,7 @@
 					"$(PROJECT_DIR)/Flutter",
 				);
 				INFOPLIST_FILE = Runner/Info.plist;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-				);
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(PROJECT_DIR)/Flutter",
@@ -657,12 +650,8 @@
 				ENABLE_BITCODE = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -690,12 +679,8 @@
 				ENABLE_BITCODE = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu11;
 				INFOPLIST_FILE = OneSignalNotificationServiceExtension/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
-				LD_RUNPATH_SEARCH_PATHS = (
-					"$(inherited)",
-					"@executable_path/Frameworks",
-					"@executable_path/../../Frameworks",
-				);
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @executable_path/../../Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.onesignal.example.OneSignalNotificationServiceExtensionA;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -26,10 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -39,14 +36,13 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -63,8 +59,6 @@
             ReferencedContainer = "container:Runner.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -32,7 +32,12 @@ class _MyAppState extends State<MyApp> {
   Future<void> initPlatformState() async {
     if (!mounted) return;
 
-    // OneSignal.shared.setLogLevel(OSLogLevel.verbose, OSLogLevel.none);
+    OneSignal.Debug.setLogLevel(OSLogLevel.verbose);
+
+    OneSignal.Debug.setVisualLevel(OSLogLevel.verbose);
+
+    // NOTE: Replace with your own app ID from https://www.onesignal.com
+    OneSignal.shared.initialize("9c59a2aa-315a-4bf9-9fef-f76d575d3202");
 
     // OneSignal.shared.setRequiresUserPrivacyConsent(_requireConsent);
 
@@ -100,10 +105,6 @@ class _MyAppState extends State<MyApp> {
     //   print("ON DID DISMISS IN APP MESSAGE ${message.messageId}");
     // });
 
-    // NOTE: Replace with your own app ID from https://www.onesignal.com
-    await OneSignal.shared
-        .setAppId("380dc082-5231-4cc2-ab51-a03da5a0e4c2");
-
     // iOS-only method to open launch URLs in Safari when set to false
     // OneSignal.shared.setLaunchURLsInApp(false);
 
diff --git a/ios/Classes/OSFlutterDebug.h b/ios/Classes/OSFlutterDebug.h
@@ -0,0 +1,36 @@
+/**
+ * Modified MIT License
+ *
+ * Copyright 2017 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 OSFlutterDebug : NSObject<FlutterPlugin>
+
+@property (strong, nonatomic) FlutterMethodChannel *channel;
+
+@end
diff --git a/ios/Classes/OSFlutterDebug.m b/ios/Classes/OSFlutterDebug.m
@@ -0,0 +1,60 @@
+/**
+ * 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 "OSFlutterDebug.h"
+#import <OneSignalFramework/OneSignalFramework.h>
+#import "OSFlutterCategories.h"
+
+@implementation OSFlutterDebug
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
+    OSFlutterDebug *instance = [OSFlutterDebug new];
+
+    instance.channel = [FlutterMethodChannel
+                        methodChannelWithName:@"OneSignal#debug"
+                        binaryMessenger:[registrar messenger]];
+
+    [registrar addMethodCallDelegate:instance channel:instance.channel];
+}
+
+- (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
+    if ([@"OneSignal#setLogLevel" isEqualToString:call.method])
+        [self setLogLevel:call];
+    else if ([@"OneSignal#setVisualLevel" isEqualToString:call.method])
+        [self setVisualLevel:call];
+    else 
+        result(FlutterMethodNotImplemented);
+}
+
+- (void)setLogLevel:(FlutterMethodCall *)call {
+    [OneSignal.Debug setLogLevel:call.arguments[@"logLevel"]];
+}
+
+- (void)setVisualLevel:(FlutterMethodCall *)call {
+    [OneSignal.Debug setVisualLevel:call.arguments[@"visualLevel"]];
+}
+
+@end
diff --git a/ios/Classes/OneSignalPlugin.h b/ios/Classes/OneSignalPlugin.h
@@ -28,7 +28,7 @@
 #import <Flutter/Flutter.h>
 #import <OneSignalFramework/OneSignalFramework.h>
 
-@interface OneSignalPlugin : NSObject<FlutterPlugin, OSPermissionObserver>
+@interface OneSignalPlugin : NSObject<FlutterPlugin>
 
 // Do NOT initialize instances of this class.
 // You must only reference the shared instance.
diff --git a/ios/Classes/OneSignalPlugin.m b/ios/Classes/OneSignalPlugin.m
@@ -27,6 +27,8 @@
 
 #import "OneSignalPlugin.h"
 #import "OSFlutterCategories.h"
+#import "OSFlutterDebug.h"
+
 
 @interface OneSignalPlugin ()
 
@@ -58,29 +60,24 @@ + (instancetype)sharedInstance {
 #pragma mark FlutterPlugin
 + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar>*)registrar {
 
-    [OneSignal initialize:nil withLaunchOptions:nil];
     [OneSignal setMSDKType:@"flutter"];
 
-    // Wrapper SDK's call init with no app ID early on in the
-    // app lifecycle. The developer will call init() later on
-    // from the Flutter plugin channel.
-
     OneSignalPlugin.sharedInstance.channel = [FlutterMethodChannel
                                      methodChannelWithName:@"OneSignal"
                                      binaryMessenger:[registrar messenger]];
 
     [registrar addMethodCallDelegate:OneSignalPlugin.sharedInstance channel:OneSignalPlugin.sharedInstance.channel];
-
+    [OSFlutterDebug registerWithRegistrar:registrar];
 }
 
 - (void)handleMethodCall:(FlutterMethodCall*)call result:(FlutterResult)result {
     if ([@"OneSignal#initialize" isEqualToString:call.method])
-        [self initialize:call withResult:result];
+        [self initialize:call];
     else 
         result(FlutterMethodNotImplemented);
 }
 
-- (void)initialize:(FlutterMethodCall *)call withResult:(FlutterResult)result {
+- (void)initialize:(FlutterMethodCall *)call {
 
     [OneSignal initialize:call.arguments[@"appId"] withLaunchOptions:nil];
     // If the user has required privacy consent, the SDK will not
@@ -91,8 +88,7 @@ - (void)initialize:(FlutterMethodCall *)call withResult:(FlutterResult)result {
     // } else {
     //     [self addObservers];
     // }
-    result(nil);
+   // result(nil);
 }
 
-
 @end
diff --git a/lib/onesignal_flutter.dart b/lib/onesignal_flutter.dart
@@ -4,9 +4,11 @@ import 'package:flutter/services.dart';
 import 'package:onesignal_flutter/src/permission.dart';
 import 'package:onesignal_flutter/src/defines.dart';
 import 'package:onesignal_flutter/src/utils.dart';
+import 'package:onesignal_flutter/src/onesignaldebug.dart';
 
 export 'src/permission.dart';
 export 'src/defines.dart';
+export 'src/onesignaldebug.dart';
 
 
 // Handlers for various events
@@ -19,30 +21,24 @@ class OneSignal {
   /// so if you create multiple instances of OneSignal, they will
   /// mostly share the same state.
   static OneSignal shared = new OneSignal();
+  static OneSignalDebug Debug = new OneSignalDebug();
   
 
   // private channels used to bridge to ObjC/Java
   MethodChannel _channel = const MethodChannel('OneSignal');
-  // MethodChannel _tagsChannel = const MethodChannel('OneSignal#tags');
-
-  // event handlers
-  PermissionChangeHandler? _onPermissionChangedHandler;
-
+ 
+  /// The initializer for OneSignal. 
+  ///
+  /// The initializer accepts an [appId] which the developer can get 
+  /// from the OneSignal consoleas well as a dictonary of [launchOptions]
+  void initialize(String appId) {
+    _channel.invokeMethod(
+        'OneSignal#initialize', {'appId': appId});
+  }
   // constructor method
   OneSignal() {
     this._channel.setMethodCallHandler(_handleMethod);
   }
-
-  /// The initializer for OneSignal. Note that this initializer
-  /// accepts an iOSSettings object, in Android you can pass null.
-  Future<void> setAppId(String appId) async {
-    // _onesignalLog(OSLogLevel.verbose,
-    //     "Initializing the OneSignal Flutter SDK ($sdkVersion)");
-
-    await _channel.invokeMethod(
-        'OneSignal#initialize', {'appId': appId});
-  }
-
    // Private function that gets called by ObjC/Java
   Future<Null> _handleMethod(MethodCall call) async {
     return null;
diff --git a/lib/src/onesignaldebug.dart b/lib/src/onesignaldebug.dart
@@ -0,0 +1,37 @@
+import 'dart:async';
+import 'dart:io' show Platform;
+import 'package:flutter/services.dart';
+import 'package:onesignal_flutter/src/defines.dart';
+
+class OneSignalDebug {
+
+  // private channels used to bridge to ObjC/Java
+  MethodChannel _channel = const MethodChannel('OneSignal#debug');
+
+  // constructor method
+  OneSignalDebug() {
+    this._channel.setMethodCallHandler(_handleMethod);
+  }
+   // Private function that gets called by ObjC/Java
+  Future<Null> _handleMethod(MethodCall call) async {
+    return null;
+  }
+
+  /// Sets the log level for the SDK. 
+  ///
+  /// The parameter [logLevel] controls
+  /// how verbose logs in the console/logcat are
+  void setLogLevel(OSLogLevel logLevel) {
+    _channel.invokeMethod("OneSignal#setLogLevel",
+        {'console': logLevel.index});
+  }
+
+  /// Sets the log level for the SDK. 
+  ///
+  /// The parameter [visualLevel] controls
+  /// if the SDK will show alerts for each logged message
+  void setVisualLevel( OSLogLevel visualLevel) {
+    _channel.invokeMethod("OneSignal#setVisualLevel",
+        {'visual': visualLevel.index});
+  }
+}
