api surface refactoring

Author: mbi88

Example/Example/ViewController.swift

@@ -39,8 +39,8 @@ class ViewController: UserReportViewController {
         self.setupNavigationBar()
 
         // Setup base state for testMode switch
-        UserReport.shared?.testMode = true
-        self.testModeSwitch.isOn = (UserReport.shared?.testMode)!
+        UserReport.testMode = true
+        self.testModeSwitch.isOn = UserReport.testMode
 
 
         // Setup base state for Display mode buttons
@@ -85,7 +85,7 @@ class ViewController: UserReportViewController {
     @objc private func updateSessionInfo() {
 
         // Session information about the running time of the application and screen views
-        guard let session = UserReport.shared?.session else { return }
+        guard let session = UserReport.session else { return }
         self.totalScreensLabel.text = "\(session.totalScreenView) screens"
         self.sessionScreensLabel.text = "\(session.screenView) screens"
         self.totalTimeLabel.text = session.totalSecondsInApp.stringTime()
@@ -109,13 +109,13 @@ class ViewController: UserReportViewController {
     }
 
     @IBAction func changeTestMode(_ sender: Any) {
-        UserReport.shared?.testMode = self.testModeSwitch.isOn
+        UserReport.testMode = self.testModeSwitch.isOn
     }
 
     @IBAction func selectAlertDisplayMode(_ sender: Any) {
 
         // Change display mode survey in UserReport SDK
-        UserReport.shared?.displayMode = .alert
+        UserReport.setDisplayMode(.alert)
 
         // Update buttons
         self.alertDisplayModeButton.isSelected = true
@@ -125,7 +125,7 @@ class ViewController: UserReportViewController {
     @IBAction func selectFullscreenDisplayMode(_ sender: Any) {
 
         // Change display mode survey in UserReport SDK
-        UserReport.shared?.displayMode = .fullscreen
+        UserReport.setDisplayMode(.fullscreen)
 
         // Update buttons
         self.alertDisplayModeButton.isSelected = false

Example_Objective-C/Example_Objective-C/ViewController.m

@@ -20,8 +20,8 @@ - (void)viewDidLoad {
     [self setupNavigationBar];
 
     // Setup base state for testMode switch
-    UserReport.shared.testMode = YES;
-    self.testModeSwitch.on = UserReport.shared.testMode;
+    UserReport.testMode = YES;
+    self.testModeSwitch.on = UserReport.testMode;
 
 
     // Setup base state for Display mode buttons
@@ -66,7 +66,7 @@ - (void)updateSessionInfo {
     [dateFormatter setDateFormat:@"yyyy-MM-dd HH:mm:ss"];
 
     // Session information about the running time of the application and screen views
-    Session *session = [[UserReport shared] session];
+    Session *session = [UserReport session];
     if (session) {
         self.totalScreensLabel.text = [NSString stringWithFormat:@"%li screens", session.totalScreenView];
         self.sessionScreensLabel.text = [NSString stringWithFormat:@"%li screens", session.screenView];
@@ -94,14 +94,14 @@ - (IBAction)showUserReport:(id)sender {
 }
 
 - (IBAction)changeTestMode:(id)sender {
-    [UserReport shared].testMode = self.testModeSwitch.isOn;
+    UserReport.testMode = self.testModeSwitch.isOn;
 }
 
 - (IBAction)selectAlertDisplayMode:(id)sender {
     NSLog(@"[CLICK]");
 
     // Change display mode survey in UserReport SDK
-    UserReport.shared.displayMode = DisplayModeAlert;
+    UserReport.displayMode = DisplayModeAlert;
 
     // Update buttons
     self.alertDisplayModeButton.selected = YES;
@@ -111,7 +111,7 @@ - (IBAction)selectAlertDisplayMode:(id)sender {
 - (IBAction)selectFullscreenDisplayMode:(id)sender {
 
     // Change display mode survey in UserReport SDK
-    UserReport.shared.displayMode = DisplayModeFullscreen;
+    UserReport.displayMode = DisplayModeFullscreen;
 
     // Update buttons
     self.alertDisplayModeButton.selected = NO;

UserReport/UserReport/UserReport.swift

@@ -50,25 +50,30 @@ private var sharedInstance: UserReport?
     public static let sdkVersion = Bundle(for: UserReport.self).infoDictionary?["CFBundleShortVersionString"] as! String
 
     /// Survey view display style. Default `.alert`
-    @objc public var displayMode: DisplayMode = .alert
+    @objc public class func setDisplayMode(_ displayMode : DisplayMode) {
+        UserReport.shared?.displayMode = displayMode
+    }
+    @objc public private(set) var displayMode: DisplayMode = .alert
 
     /// Level of messages printing to the console. Default `.debug`
-    public var logLevel: LogLevel {
-        set { self.logger.level = newValue }
-        get { return self.logger.level }
+    public class var logLevel: LogLevel {
+        set { UserReport.shared?.logger.level = newValue }
+        get { return UserReport.shared?.logger.level ?? .debug }
     }
 
     /**
      * Flag for testing the display of the survey view.
      * The server will return data about the survey each time, otherwise they will set up the default settings.
      * Default `false`
      */
-   @objc public var testMode: Bool = false {
-        didSet {
-            self.network.testMode = self.testMode
-            self.logger.log("Test mode: \(self.testMode ? "On" : "Off")", level: .debug)
+    @objc public class var testMode: Bool {
+        set {
+            UserReport.shared?.network.testMode = newValue
+            UserReport.shared?.logger.log("Test mode: \(self.testMode ? "On" : "Off")", level: .debug)
         }
-    }
+        get { return UserReport.shared?.testMode ?? false }
+     }
+   @objc private var testMode: Bool = false
 
     /**
      * Mute display of the survey.
@@ -77,15 +82,23 @@ private var sharedInstance: UserReport?
      *
      * - Note: Don't forget to return back to `false`
      */
-    @objc public var mute: Bool = false
+    @objc public class var mute: Bool {
+        set { UserReport.shared?.mute = newValue }
+        get { return UserReport.shared?.mute ?? false }
+     }
+    @objc private var mute: Bool = false
 
     /// Returns whether the survey is displayed on the screen
-    @objc public var isSurveyShown: Bool {
-        get { return self.surveyStatus == .surveyShown }
+    @objc public class var isSurveyShown: Bool {
+        get { return UserReport.shared?.surveyStatus == .surveyShown }
     }
 
     /// Session data about count of screens viewed and the time the application is used
-    @objc public var session: Session!
+    @objc public class var session: Session? {
+        set { UserReport.shared?.session = newValue }
+        get { return UserReport.shared?.session }
+     }
+    @objc private var session: Session!
 
     // MARK: private
     private var logger: Logger!
@@ -159,7 +172,10 @@ private var sharedInstance: UserReport?
      *
      * - parameter user: User with new data
      */
-    @objc public func updateUser(_ user: User) {
+    @objc public class func updateUser(_ user: User) {
+        UserReport.shared?.updateUser(user)
+    }
+    @objc private func updateUser(_ user: User) {
         self.info.user = user
     }
 
@@ -168,7 +184,10 @@ private var sharedInstance: UserReport?
      *
      * - parameter settings: New settings
      */
-    @objc public func updateSettings(_ settings: Settings) {
+    @objc public class func updateSettings(_ settings: Settings) {
+        UserReport.shared?.session.updateSettings(settings)
+    }
+    @objc private func updateSettings(_ settings: Settings) {
         self.session.updateSettings(settings)
     }