Merge branch 'develop' into feature/vds_batch_one

MVMCoreUI.xcodeproj/xcshareddata/xcschemes/MVMCoreUI.xcscheme

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1500"
+   version = "1.7">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "D29DF0CB21E404D4003B2FB9"
+               BuildableName = "MVMCoreUI.framework"
+               BlueprintName = "MVMCoreUI"
+               ReferencedContainer = "container:MVMCoreUI.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldAutocreateTestPlan = "YES">
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "D29DF0CB21E404D4003B2FB9"
+            BuildableName = "MVMCoreUI.framework"
+            BlueprintName = "MVMCoreUI"
+            ReferencedContainer = "container:MVMCoreUI.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

MVMCoreUI/Alerts/AlertOperation.swift

@@ -73,7 +73,7 @@ public class AlertOperation: MVMCoreOperation {
             if await !self.properties.getIsDisplayed() {
                 self.markAsFinished()
             } else {
-                (CoreUIObject.sharedInstance()?.loggingDelegate as? MVMCoreUILoggingDelegateProtocol)?.logAlert(with: self.alertObject)
+                (MVMCoreObject.sharedInstance()?.loggingDelegate as? MVMCoreUILoggingDelegateProtocol)?.logAlert(with: self.alertObject)
                 if self.isCancelled {
                     await self.dismissAlertView()
                 }

MVMCoreUI/OtherHandlers/CoreUIObject.swift

@@ -9,19 +9,22 @@
 import UIKit
 import MVMCore
 
-@objcMembers open class CoreUIObject: MVMCoreObject {
+@objcMembers 
+public class CoreUIObject: NSObject {
+    private static var singleton = CoreUIObject()
+    public static func sharedInstance() -> CoreUIObject? { singleton }
+    private override init() {}
+
     public var alertHandler: AlertHandler?
     public var topNotificationHandler: NotificationHandler?
 
-    open override func defaultInitialSetup() {
+    public func defaultInitialSetup() {
+        MVMCoreObject.sharedInstance()?.defaultInitialSetup()
         CoreUIModelMapping.registerObjects()
-        loadHandler = MVMCoreLoadHandler()
-        cache = MVMCoreCache()
-        session = MVMCoreUISession()
-        sessionHandler = MVMCoreSessionTimeHandler()
-        actionHandler = MVMCoreUIActionHandler()
-        viewControllerMapping = MVMCoreUIViewControllerMappingObject()
-        loggingDelegate = MVMCoreUILoggingHandler()
+        MVMCoreObject.sharedInstance()?.session = MVMCoreUISession()
+        MVMCoreObject.sharedInstance()?.actionHandler = MVMCoreUIActionHandler()
+        MVMCoreObject.sharedInstance()?.viewControllerMapping = MVMCoreUIViewControllerMappingObject()
+        MVMCoreObject.sharedInstance()?.loggingDelegate = MVMCoreUILoggingHandler()
         alertHandler = AlertHandler()
     }
 }

MVMCoreUI/OtherHandlers/MVMCoreUISession.m

@@ -9,7 +9,8 @@
 #import "MVMCoreUISession.h"
 #import "MFLoadingViewController.h"
 #import "NSLayoutConstraint+MFConvenience.h"
-@import MVMCore.MVMCoreObject;
+@import MVMCore.MVMCoreLoadingOverlayDelegateProtocol;
+@import MVMCore.Swift;
 
 @interface MVMCoreUISession () <MVMCoreLoadingOverlayDelegateProtocol>