Merge branch 'feature/oneApp_4156-LoggingHandlerSwiftMigration' into 'develop'

story: ONEAPP-4156 LoggingHandler Swift migration

### Summary
Swiftify logging handler

### JIRA Ticket
https://onejira.verizon.com/browse/ONEAPP-4156

Co-authored-by: Nandhini Rajendran <nandhini.rajendran@verizon.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/1015

MVMCoreUI.xcodeproj/project.pbxproj

@@ -168,8 +168,10 @@
 		526A265E240D200500B0D828 /* ListTwoColumnCompareChanges.swift in Sources */ = {isa = PBXBuildFile; fileRef = 526A265D240D200500B0D828 /* ListTwoColumnCompareChanges.swift */; };
 		52B201D224081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B201D024081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift */; };
 		52B201D324081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52B201D124081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift */; };
+		608211282AC6B57E00C3FC39 /* MVMCoreUILoggingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */; };
 		7199C8162A4F3A64001568B7 /* AccessibilityHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7199C8152A4F3A64001568B7 /* AccessibilityHandler.swift */; };
 		71BE969E2AD96BE6000B5DB7 /* RotorHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71BE969D2AD96BE6000B5DB7 /* RotorHandler.swift */; };
+		608211282AC6B57E00C3FC39 /* MVMCoreUILoggingHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */; };
 		8D070BB0241B56530099AC56 /* ListRightVariableTotalDataModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D070BAF241B56530099AC56 /* ListRightVariableTotalDataModel.swift */; };
 		8D070BB2241B56AD0099AC56 /* ListRightVariableTotalData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D070BB1241B56AD0099AC56 /* ListRightVariableTotalData.swift */; };
 		8D084AD02410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */; };
@@ -473,8 +475,6 @@
 		D29DF26D21E6AA0B003B2FB9 /* FLAnimatedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF26921E6AA0B003B2FB9 /* FLAnimatedImageView.m */; };
 		D29DF26E21E6AA0B003B2FB9 /* FLAnimatedImage.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF26A21E6AA0B003B2FB9 /* FLAnimatedImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF26F21E6AA0B003B2FB9 /* FLAnimatedImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF26B21E6AA0B003B2FB9 /* FLAnimatedImageView.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D29DF27521E79E81003B2FB9 /* MVMCoreUILoggingHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF27321E79E81003B2FB9 /* MVMCoreUILoggingHandler.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF27421E79E81003B2FB9 /* MVMCoreUILoggingHandler.m */; };
 		D29DF27921E7A533003B2FB9 /* MVMCoreUISession.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF27721E7A533003B2FB9 /* MVMCoreUISession.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		D29DF27A21E7A533003B2FB9 /* MVMCoreUISession.m in Sources */ = {isa = PBXBuildFile; fileRef = D29DF27821E7A533003B2FB9 /* MVMCoreUISession.m */; };
 		D29DF28021E7AA51003B2FB9 /* MVMCoreUIDetailViewProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = D29DF27F21E7AA50003B2FB9 /* MVMCoreUIDetailViewProtocol.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -760,8 +760,10 @@
 		526A265D240D200500B0D828 /* ListTwoColumnCompareChanges.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListTwoColumnCompareChanges.swift; sourceTree = "<group>"; };
 		52B201D024081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethod.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAndPaymentMethod.swift; sourceTree = "<group>"; };
 		52B201D124081CFB00D2011E /* ListLeftVariableRadioButtonAndPaymentMethodModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableRadioButtonAndPaymentMethodModel.swift; sourceTree = "<group>"; };
+		608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUILoggingHandler.swift; sourceTree = "<group>"; };
 		7199C8152A4F3A64001568B7 /* AccessibilityHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccessibilityHandler.swift; sourceTree = "<group>"; };
 		71BE969D2AD96BE6000B5DB7 /* RotorHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RotorHandler.swift; sourceTree = "<group>"; };
+		608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MVMCoreUILoggingHandler.swift; sourceTree = "<group>"; };
 		8D070BAF241B56530099AC56 /* ListRightVariableTotalDataModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalDataModel.swift; sourceTree = "<group>"; };
 		8D070BB1241B56AD0099AC56 /* ListRightVariableTotalData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListRightVariableTotalData.swift; sourceTree = "<group>"; };
 		8D084ACF2410BF4800951227 /* ListOneColumnFullWidthTextBodyTextModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextBodyTextModel.swift; sourceTree = "<group>"; };
@@ -1073,8 +1075,6 @@
 		D29DF26921E6AA0B003B2FB9 /* FLAnimatedImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FLAnimatedImageView.m; sourceTree = "<group>"; };
 		D29DF26A21E6AA0B003B2FB9 /* FLAnimatedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLAnimatedImage.h; sourceTree = "<group>"; };
 		D29DF26B21E6AA0B003B2FB9 /* FLAnimatedImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FLAnimatedImageView.h; sourceTree = "<group>"; };
-		D29DF27321E79E81003B2FB9 /* MVMCoreUILoggingHandler.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUILoggingHandler.h; sourceTree = "<group>"; };
-		D29DF27421E79E81003B2FB9 /* MVMCoreUILoggingHandler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUILoggingHandler.m; sourceTree = "<group>"; };
 		D29DF27721E7A533003B2FB9 /* MVMCoreUISession.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MVMCoreUISession.h; sourceTree = "<group>"; };
 		D29DF27821E7A533003B2FB9 /* MVMCoreUISession.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MVMCoreUISession.m; sourceTree = "<group>"; };
 		D29DF27F21E7AA50003B2FB9 /* MVMCoreUIDetailViewProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MVMCoreUIDetailViewProtocol.h; sourceTree = "<group>"; };
@@ -2291,8 +2291,7 @@
 				D2B18B912361E65A00A9AEDC /* CoreUIObject.swift */,
 				D29DF27721E7A533003B2FB9 /* MVMCoreUISession.h */,
 				D29DF27821E7A533003B2FB9 /* MVMCoreUISession.m */,
-				D29DF27321E79E81003B2FB9 /* MVMCoreUILoggingHandler.h */,
+				608211262AC6AF8200C3FC39 /* MVMCoreUILoggingHandler.swift */,
-				D29DF27421E79E81003B2FB9 /* MVMCoreUILoggingHandler.m */,
 				AFA4933E29E874F0001A9663 /* MVMCoreUILoggingDelegateProtocol.swift */,
 				D2C5001621F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.h */,
 				D2C5001721F8ECDD001DA659 /* MVMCoreUIViewControllerMappingObject.m */,
@@ -2530,7 +2529,6 @@
 				D29DF25921E6A22D003B2FB9 /* MFButtonProtocol.h in Headers */,
 				D29DF28421E7AB24003B2FB9 /* MVMCoreUICommonViewsUtility.h in Headers */,
 				D29DF2CE21E7C104003B2FB9 /* MFLoadingViewController.h in Headers */,
-				D29DF27521E79E81003B2FB9 /* MVMCoreUILoggingHandler.h in Headers */,
 				D29DF2B321E7B76D003B2FB9 /* MFLoadingSpinner.h in Headers */,
 				D20492A424329A2800A5EED6 /* MVMCoreUIPagingProtocol.h in Headers */,
 				D296E14722A5984C0051EBE7 /* MVMCoreUIViewConstrainingProtocol.h in Headers */,
@@ -2755,6 +2753,7 @@
 				D29DF2CF21E7C104003B2FB9 /* MFLoadingViewController.m in Sources */,
 				D28A837B23C928DA00DFE4FC /* MoleculeListCellProtocol.swift in Sources */,
 				D28BA74D248589C800B75CB8 /* TabPageModelProtocol.swift in Sources */,
+				608211282AC6B57E00C3FC39 /* MVMCoreUILoggingHandler.swift in Sources */,
 				014AA72F23C5059B006F3E93 /* ThreeLayerPageTemplateModel.swift in Sources */,
 				0A21DB91235E0EDB00C160A2 /* DigitBox.swift in Sources */,
 				BBAA4F04243D8E3B005AAD5F /* RadioBoxModel.swift in Sources */,
@@ -2762,7 +2761,6 @@
 				D21B7F71243BAC1600051ABF /* CollectionViewCell.swift in Sources */,
 				AAA905E124D1759A00D1EFAB /* ListThreeColumnBillHistory.swift in Sources */,
 				C7F8012323E846C300396FBD /* ListRVWheelModel.swift in Sources */,
-				D29DF27621E79E81003B2FB9 /* MVMCoreUILoggingHandler.m in Sources */,
 				D2ED27EC254B0CE700A1C293 /* UIAlertControllerStyle+Extension.swift in Sources */,
 				C695A69623C990BC00BFB94E /* DoughnutChart.swift in Sources */,
 				014AA72D23C5059B006F3E93 /* StackPageTemplateModel.swift in Sources */,

MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift

@@ -231,7 +231,7 @@ public typealias ActionBlock = () -> ()
                                                            documentAttributes: nil)
         } catch {
             if let coreErrorObject = MVMCoreErrorObject.createErrorObject(for: error, location: "LabelHTMLParse") {
-                MVMCoreUILoggingHandler.addError(toLog: coreErrorObject)
+                MVMCoreUILoggingHandler.shared()?.addError(toLog: coreErrorObject)
             }
         }
     }
@@ -1013,17 +1013,13 @@ extension Label {
 
 func validateAttribute(range: NSRange, in string: NSAttributedString, type: String = "") -> NSRange? {
     guard range.location >= 0 && range.location <= string.length else {
-        if let loggingHandler = MVMCoreLoggingHandler.shared(), loggingHandler.responds(to: #selector(MVMCoreLoggingHandler.addError(toLog:))) {
+        MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, messageToLog: "Attribute starting location \(range.lowerBound) is out of bounds for '\(string.string)'. Attribute is discarded.", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: "\(#file): \(#function)")!)
-            loggingHandler.addError(toLog: MVMCoreErrorObject(title: nil, messageToLog: "Attribute starting location \(range.lowerBound) is out of bounds for '\(string.string)'. Attribute is discarded.", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: "\(#file): \(#function)")!)
-        }
         return nil
     }
     
     if type != "image" && range.upperBound > string.length {
         let newRange = NSRange(location: range.location, length: string.length - range.location)
-        if let loggingHandler = MVMCoreLoggingHandler.shared(), loggingHandler.responds(to: #selector(MVMCoreLoggingHandler.addError(toLog:))) {
+        MVMCoreLoggingHandler.shared()?.addError(toLog: MVMCoreErrorObject(title: nil, messageToLog: "Attribute ending location \(range.upperBound) is out of bounds for '\(string)'. Adjusting to \(newRange.upperBound).", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: "\(#file): \(#function)")!)
-            loggingHandler.addError(toLog: MVMCoreErrorObject(title: nil, messageToLog: "Attribute ending location \(range.upperBound) is out of bounds for '\(string)'. Adjusting to \(newRange.upperBound).", code: ErrorCode.default.rawValue, domain: ErrorDomainNative, location: "\(#file): \(#function)")!)
-        }
         return newRange
     }
     

MVMCoreUI/Atomic/Atoms/Views/Video/Video.swift

@@ -89,7 +89,7 @@ open class Video: View {
                 })
             case .failed:
                 if let errorObject = item.loadFailedError {
-                    MVMCoreLoggingHandler.addError(toLog: errorObject)
+                    MVMCoreLoggingHandler.shared()?.addError(toLog: errorObject)
                 }
             default:
                 break

MVMCoreUI/Atomic/Molecules/OtherContainers/ModuleMolecule.swift

@@ -75,7 +75,7 @@ open class ModuleMolecule: Container {
             let _ = delegateObject?.moleculeDelegate?.getModuleWithName(moduleName) else {
             if let errorObject = MVMCoreErrorObject(title: nil, message: MVMCoreGetterUtility.hardcodedString(withKey: HardcodedErrorUnableToProcess), code: CoreUIErrorCode.ErrorCodeModuleMolecule.rawValue, domain: ErrorDomainNative, location: String(describing: self)) {
                 error?.pointee = errorObject
-                MVMCoreUILoggingHandler.addError(toLog: errorObject)
+                MVMCoreUILoggingHandler.shared()?.addError(toLog: errorObject)
             }
             return nil
         }

MVMCoreUI/Atomic/Protocols/MoleculeViewProtocol.swift

@@ -77,7 +77,7 @@ public extension ModelRegistry {
             return type
         } catch {
             if let errorObject = MVMCoreErrorObject.createErrorObject(for: error, location: #function) {
-                MVMCoreLoggingHandler.addError(toLog: errorObject)
+                MVMCoreLoggingHandler.shared()?.addError(toLog: errorObject)
             }
             return nil
         }

MVMCoreUI/BaseControllers/ViewController.swift

@@ -115,7 +115,7 @@ import MVMCore
             })
         } catch {
             if let coreError = MVMCoreErrorObject.createErrorObject(for: error, location: "updateJSON for pageType: \(String(describing: pageType))") {
-                MVMCoreLoggingHandler.addError(toLog: coreError)
+                MVMCoreLoggingHandler.shared()?.addError(toLog: coreError)
             }
         }
     }

MVMCoreUI/Behaviors/Protocols/PageBehaviorHandlerProtocol.swift

@@ -33,7 +33,7 @@ public extension PageBehaviorHandlerProtocol {
                 behaviors.append(behavior)
             } catch {
                 if let errorObject = MVMCoreErrorObject.createErrorObject(for: error, location: #function) {
-                    MVMCoreLoggingHandler.addError(toLog: errorObject)
+                    MVMCoreLoggingHandler.shared()?.addError(toLog: errorObject)
                 }
             }
         }

MVMCoreUI/FormUIHelpers/FormValidator.swift

@@ -95,7 +95,7 @@ import MVMCore
                 groupValid = try validateGroup(group)
             } catch {
                 if let err = MVMCoreErrorObject.createErrorObject(for: error, location: "FormValidator"){
-                    MVMCoreLoggingHandler.addError(toLog: err)
+                    MVMCoreLoggingHandler.shared()?.addError(toLog: err)
                     fatalError(err.description)
                 }
             }

MVMCoreUI/MVMCoreUI.h

@@ -17,7 +17,6 @@ FOUNDATION_EXPORT const unsigned char MVMCoreUIVersionString[];
 // In this header, you should import all the public headers of your framework using statements like #import <MVMCoreUI/PublicHeader.h>
 #pragma mark - OtherHandlers
 #import <MVMCoreUI/MVMCoreUISession.h>
-#import <MVMCoreUI/MVMCoreUILoggingHandler.h>
 #import <MVMCoreUI/MVMCoreUIViewControllerMappingObject.h>
 #import <MVMCoreUI/MVMCoreUIViewConstrainingProtocol.h>
 

MVMCoreUI/Notification/NotificationHandler.swift

@@ -399,7 +399,7 @@ open class NotificationHandler {
                 try await showNotification(for: json, delegateObject: delegateObject)
             } catch {
                 if let errorObject = MVMCoreErrorObject.createErrorObject(for: error, location: "\(self)") {
-                    MVMCoreUILoggingHandler.addError(toLog: errorObject)
+                    MVMCoreUILoggingHandler.shared()?.addError(toLog: errorObject)
                 }
             }
         }

MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.h

@@ -1,24 +0,0 @@
-//
-//  MVMCoreUILoggingHandler.h
-//  MVMCoreUI
-//
-//  Created by Scott Pfeil on 1/10/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-@import MVMCore.MVMCoreLoggingHandler;
-
-NS_ASSUME_NONNULL_BEGIN
-
-@interface MVMCoreUILoggingHandler : MVMCoreLoggingHandler
-
-// Page State Logging
-- (void)defaultLogPageStateForController:(nonnull id <MVMCoreViewControllerProtocol>)controller;
-
-// Action Logging
-- (void)defaultLogActionForController:(nullable id <MVMCoreViewControllerProtocol>)controller actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData;
-- (nullable NSDictionary *)defaultGetActionTrackDataDictionaryForController:(nullable id <MVMCoreViewControllerProtocol>)controller actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData;
-
-@end
-
-NS_ASSUME_NONNULL_END

MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.m

@@ -1,23 +0,0 @@
-//
-//  MVMCoreUILoggingHandler.m
-//  MVMCoreUI
-//
-//  Created by Scott Pfeil on 1/10/19.
-//  Copyright © 2019 Verizon Wireless. All rights reserved.
-//
-
-#import "MVMCoreUILoggingHandler.h"
-
-@implementation MVMCoreUILoggingHandler
-
-- (void)defaultLogPageStateForController:(nonnull id <MVMCoreViewControllerProtocol>)controller {
-}
-
-- (void)defaultLogActionForController:(nullable id <MVMCoreViewControllerProtocol>)controller actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {
-}
-
-- (nullable NSDictionary *)defaultGetActionTrackDataDictionaryForController:(nullable id <MVMCoreViewControllerProtocol>)controller actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData {
-    return nil;
-}
-
-@end

MVMCoreUI/OtherHandlers/MVMCoreUILoggingHandler.swift

@@ -0,0 +1,21 @@
+//
+//  MVMCoreUILoggingHandler.swift
+//  MVMCoreUI
+//
+//  Created by Nandhini Rajendran on 29/09/23.
+//  Copyright © 2023 Verizon Wireless. All rights reserved.
+//
+
+@objc open class MVMCoreUILoggingHandler: MVMCoreLoggingHandler {
+
+    // Page State Logging
+    @objc open func defaultLogPageState(forController controller: MVMCoreViewControllerProtocol) { }
+
+    // Action Logging
+    @objc open func defaultLogAction(forController controller: MVMCoreViewControllerProtocol?, actionInformation: [AnyHashable : Any]?, additionalData: [AnyHashable : Any]?) { }
+
+    @objc open func defaultGetActionTrackDataDictionary(forController controller: MVMCoreViewControllerProtocol?, actionInformation: NSDictionary?, additionalData: NSDictionary?) -> NSDictionary? {
+        return nil
+    }
+}
+

MVMCoreUI/Utility/MFFonts.m

@@ -9,8 +9,11 @@
 #import "MFFonts.h"
 #import <CoreText/CoreText.h>
 #import "MVMCoreUIUtility.h"
-@import MVMCore.MVMCoreLoggingHandler;
+#import <MVMCore/MVMCoreLoggingHandlerHelper.h>
+@import MVMCore.Swift;
 @import MVMCore.MVMCoreErrorConstants;
+@import MVMCore.MVMCoreLoadHandler;
+@import MVMCore.MVMCoreErrorObject;
 
 NSString * const DSBold = @"VerizonNHGeDS-Bold";
 NSString * const DSRegular = @"VerizonNHGeDS-Regular";
@@ -108,7 +111,7 @@ NSString * const TXRegular = @"VerizonNHGeTX-Regular";
 + (void)validFont:(UIFont *)font fontName:(NSString *)fontName {
     if (font == nil) {
         MVMCoreErrorObject *errorObject = [[MVMCoreErrorObject alloc] initWithTitle:@"font can not load" message:[NSString stringWithFormat:@"missing font name is %@", fontName] code:ErrorCodeFontNotFound domain:ErrorDomainNative location:@"MFStyler"];
-        [MVMCoreLoggingHandler addErrorToLog:errorObject];
+        [[MVMCoreLoggingHandler sharedLoggingHandler]addErrorToLog:errorObject];
     }
 }
 @end