Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui.git into feature/atomic_vds_badgeIndicator_buttonIcon_tileContainer

MVMCoreUI.xcodeproj/project.pbxproj

@@ -126,7 +126,6 @@
 		0AE98BB523FF18D2004C5109 /* Arrow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BB423FF18D2004C5109 /* Arrow.swift */; };
 		0AE98BB723FF18E9004C5109 /* ArrowModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AE98BB623FF18E9004C5109 /* ArrowModel.swift */; };
 		0AF60F0926B3316E00AC3DB4 /* MVMCoreUIUtility+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0AF60F0826B3316E00AC3DB4 /* MVMCoreUIUtility+Extension.swift */; };
-		187FEB2A2844D2A600BF29C2 /* VDSFormControlsTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = 187FEB292844D2A600BF29C2 /* VDSFormControlsTokens.xcframework */; };
 		1D6D258826899B0C00DEBB08 /* ImageButtonModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6D258626899B0B00DEBB08 /* ImageButtonModel.swift */; };
 		1D6D258926899B0C00DEBB08 /* ImageButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1D6D258726899B0B00DEBB08 /* ImageButton.swift */; };
 		22B678F929E7944E00CF4196 /* GetNotificationAuthStatusBehavior.swift in Sources */ = {isa = PBXBuildFile; fileRef = 22B678F829E7944E00CF4196 /* GetNotificationAuthStatusBehavior.swift */; };
@@ -300,7 +299,6 @@
 		AFA4932229E5EF2E001A9663 /* NotificationHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA4932129E5EF2E001A9663 /* NotificationHandler.swift */; };
 		AFA4933F29E874F0001A9663 /* MVMCoreUILoggingDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA4933E29E874F0001A9663 /* MVMCoreUILoggingDelegateProtocol.swift */; };
 		AFA4935729EE3DCC001A9663 /* AlertDelegateProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFA4935629EE3DCC001A9663 /* AlertDelegateProtocol.swift */; };
-		AFE4A1D127DFB5EE00C458D0 /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = AFE4A1D027DFB5EE00C458D0 /* VDSColorTokens.xcframework */; };
 		AFE4A1D627DFBB6F00C458D0 /* UINavigationController+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = AFE4A1D527DFBB6F00C458D0 /* UINavigationController+Extension.swift */; };
 		B4CC8FBD29DF34680005D28B /* Badge.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CC8FBC29DF34680005D28B /* Badge.swift */; };
 		B4CC8FBF29DF34730005D28B /* BadgeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B4CC8FBE29DF34730005D28B /* BadgeModel.swift */; };
@@ -591,7 +589,6 @@
 		EA985C3E2970938F00F2FF2E /* Tilelet.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3D2970938F00F2FF2E /* Tilelet.swift */; };
 		EA985C402970939A00F2FF2E /* TileletModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C3F2970939A00F2FF2E /* TileletModel.swift */; };
 		EA985C602970A3F000F2FF2E /* VDS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA985C5F2970A3F000F2FF2E /* VDS.framework */; };
-		EA985C642970A40E00F2FF2E /* VDSTypographyTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EA985C632970A40E00F2FF2E /* VDSTypographyTokens.xcframework */; };
 		EA985C852981AA9C00F2FF2E /* VDS-Enums+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C842981AA9C00F2FF2E /* VDS-Enums+Codable.swift */; };
 		EA985C872981AB0F00F2FF2E /* VDS-Tilelet+Codable.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C862981AB0F00F2FF2E /* VDS-Tilelet+Codable.swift */; };
 		EA985C892981AB7100F2FF2E /* VDS-TextStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA985C882981AB7100F2FF2E /* VDS-TextStyle.swift */; };
@@ -606,6 +603,7 @@
 		EABFC1412763BB8D00E78B40 /* FormLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABFC1402763BB8D00E78B40 /* FormLabel.swift */; };
 		EABFC152276913E800E78B40 /* FormLabelModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = EABFC151276913E800E78B40 /* FormLabelModel.swift */; };
 		EACCF38C2ABB346700E0F104 /* VDS-Interpreters.swift in Sources */ = {isa = PBXBuildFile; fileRef = EACCF38B2ABB346700E0F104 /* VDS-Interpreters.swift */; };
+		EAD715AA2BBC8FAF00DEDA6A /* VDSTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EAD715A92BBC8FAF00DEDA6A /* VDSTokens.xcframework */; };
 		FD99130028E21E4900542CC3 /* RuleNotEqualsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD9912FF28E21E4900542CC3 /* RuleNotEqualsModel.swift */; };
 /* End PBXBuildFile section */
 
@@ -1212,6 +1210,7 @@
 		EABFC1402763BB8D00E78B40 /* FormLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormLabel.swift; sourceTree = "<group>"; };
 		EABFC151276913E800E78B40 /* FormLabelModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormLabelModel.swift; sourceTree = "<group>"; };
 		EACCF38B2ABB346700E0F104 /* VDS-Interpreters.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "VDS-Interpreters.swift"; sourceTree = "<group>"; };
+		EAD715A92BBC8FAF00DEDA6A /* VDSTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSTokens.xcframework; path = ../SharedFrameworks/VDSTokens.xcframework; sourceTree = "<group>"; };
 		FD9912FF28E21E4900542CC3 /* RuleNotEqualsModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RuleNotEqualsModel.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -1221,10 +1220,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				D29DF0E621E4F3C7003B2FB9 /* MVMCore.framework in Frameworks */,
-				AFE4A1D127DFB5EE00C458D0 /* VDSColorTokens.xcframework in Frameworks */,
 				EA985C602970A3F000F2FF2E /* VDS.framework in Frameworks */,
-				187FEB2A2844D2A600BF29C2 /* VDSFormControlsTokens.xcframework in Frameworks */,
+				EAD715AA2BBC8FAF00DEDA6A /* VDSTokens.xcframework in Frameworks */,
-				EA985C642970A40E00F2FF2E /* VDSTypographyTokens.xcframework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2085,6 +2082,7 @@
 		D29DF0E421E4F3C7003B2FB9 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				EAD715A92BBC8FAF00DEDA6A /* VDSTokens.xcframework */,
 				EA985C632970A40E00F2FF2E /* VDSTypographyTokens.xcframework */,
 				EA985C5F2970A3F000F2FF2E /* VDS.framework */,
 				187FEB292844D2A600BF29C2 /* VDSFormControlsTokens.xcframework */,

MVMCoreUI/Atomic/Atoms/Buttons/ButtonModel.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
 import VDS
 import MVMCore
 

MVMCoreUI/Atomic/Atoms/Buttons/Link/Link.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
 import VDS
 
 open class Link: VDS.TextLink, VDSMoleculeViewProtocol {

MVMCoreUI/Atomic/Atoms/Buttons/PillButton.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
 import VDS
 import MVMCore
 import Combine

MVMCoreUI/Atomic/Atoms/Selectors/RadioButton.swift

@@ -7,8 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
-import VDSFormControlsTokens
 
 @objcMembers open class RadioButton: Control, MFButtonProtocol {
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicator.swift

@@ -5,7 +5,7 @@
 //  Created by Kevin Christiano on 1/30/20.
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
-import VDSColorTokens
+import VDSTokens
 
 open class CarouselIndicator: Control, CarouselPageControlProtocol {
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Views/CarouselIndicator/CarouselIndicatorModel.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import VDSColorTokens
+import VDSTokens
 
 open class CarouselIndicatorModel: CarouselPagingModelProtocol, MoleculeModelProtocol, EnableableModelProtocol {
     //--------------------------------------------------

MVMCoreUI/Atomic/Atoms/Views/IconModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 open class IconModel: MoleculeModelProtocol {
     

MVMCoreUI/Atomic/Atoms/Views/LineModel.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
 import VDS
 
 public class LineModel: MoleculeModelProtocol, Invertable {

MVMCoreUI/Atomic/Atoms/Views/TooltipModel.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import VDS
-import VDSColorTokens
+import VDSTokens
 import MVMCore
 
 open class TooltipModel: MoleculeModelProtocol {

MVMCoreUI/Atomic/Extensions/VDS-Enums+Codable.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import VDS
-import VDSColorTokens
+import VDSTokens
 
 //--------------------------------------------------
 // MARK: - Codable Extensions

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2ButtonsModel.swift

@@ -74,7 +74,7 @@ public class HeadersH2ButtonsModel: HeaderModel, MoleculeModelProtocol, ParentMo
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         buttons = try typeContainer.decode(TwoButtonViewModel.self, forKey: .buttons)
         try super.init(from: decoder)
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2CaretLinkModel.swift

@@ -67,7 +67,7 @@ public class HeadersH2CaretLinkModel: HeaderModel, MoleculeModelProtocol, Parent
     //--------------------------------------------------
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         caretLink = try typeContainer.decode(CaretLinkModel.self, forKey: .caretLink)
         try super.init(from: decoder)
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2LinkModel.swift

@@ -73,7 +73,7 @@ public class HeadersH2LinkModel: HeaderModel, MoleculeModelProtocol, ParentMolec
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         link = try typeContainer.decode(LinkModel.self, forKey: .link)
         try super.init(from: decoder)
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/Headers/H2/HeadersH2TinyButtonModel.swift

@@ -76,7 +76,7 @@ public class HeadersH2TinyButtonModel: HeaderModel, MoleculeModelProtocol, Paren
     
     required public init(from decoder: Decoder) throws {
         let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
-        titleLockup = try typeContainer.decodeMolecule(codingKey: .titleLockup)
+        titleLockup = try helper.deprecatedCreate(from: decoder) ?? typeContainer.decodeMolecule(codingKey: .titleLockup)
         button = try typeContainer.decode(ButtonModel.self, forKey: .button)
         try super.init(from: decoder)
     }

MVMCoreUI/Atomic/Molecules/DesignedComponents/LockUps/TitleLockupModel.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2022 Verizon Wireless. All rights reserved.
 //
 
-import VDSColorTokens
+import VDSTokens
 import VDS
 
 public class TitleLockupModel: MoleculeModelProtocol, ParentMoleculeModelProtocol {

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBar.swift

@@ -5,7 +5,7 @@
 //  Created by Scott Pfeil on 5/28/20.
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
-import VDSColorTokens
+import VDSTokens
 
 @objcMembers open class TabBar: UITabBar, MoleculeViewProtocol, TabBarProtocol, UITabBarDelegate {
     

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabBarModel.swift

@@ -7,7 +7,7 @@
 //
 
 import Foundation
-import VDSColorTokens
+import VDSTokens
 
 open class TabBarModel: MoleculeModelProtocol {
     public static var identifier: String = "tabBar"

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/Tabs.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
 import VDS
 
 @objc public protocol TabsDelegate {

MVMCoreUI/Atomic/Molecules/HorizontalCombinationViews/TabsModel.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import VDSColorTokens
+import VDSTokens
 import VDS
 open class TabsModel: MoleculeModelProtocol {
     

MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift

@@ -6,7 +6,7 @@
 //  Copyright © 2020 Verizon Wireless. All rights reserved.
 //
 
-import VDSColorTokens
+import VDSTokens
 
 public enum NavigationItemStyle: String, Codable {
     case light

MVMCoreUI/Containers/NavigationController/NavigationController.swift

@@ -34,6 +34,7 @@ import Combine
     public static func setupNavigationControllerAsMainController() -> Self? {
         guard let navigationController = setupNavigationController() else { return nil }
         MVMCoreUISession.sharedGlobal()?.setup(asStandardLoadViewDelegate: navigationController)
+        MVMCoreObject.sharedInstance()?.viewControllerManager = navigationController
         return navigationController
     }
     
@@ -136,6 +137,31 @@ extension NavigationController: MVMCoreViewManagerProtocol {
     public func displayedViewController(_ viewController: UIViewController) {
         manager?.displayedViewController?(viewController)
     }
+    
+    private func go(to index: Int) async {
+        guard index != viewControllers.count - 1 else { return }
+        await NavigationHandler.shared().set(viewControllers: Array(viewControllers[0...index]), navigationController: self)
+    }
+    
+    public func navigate(toViewControllerOfPageType pageType: String, controllerType: AnyClass?) async -> UIViewController? {
+        for (index, controller) in viewControllers.enumerated() {
+            if let manager = controller as? MVMCoreViewManagerProtocol,
+               let viewController = await manager.navigate(toViewControllerOfPageType: pageType, controllerType: controllerType) {
+                await go(to: index)
+                return viewController
+            } else if let controller = controller as? MVMCoreViewControllerProtocol & UIViewController,
+                      controller.pageType == pageType {
+                guard let controllerType = controllerType else {
+                    await go(to: index)
+                    return controller
+                }
+                guard (type(of: controller) == controllerType) else { continue }
+                await go(to: index)
+                return controller
+            }
+        }
+        return nil
+    }
 }
 
 extension UIColor {

MVMCoreUI/Containers/NavigationController/UINavigationController+Extension.swift

@@ -102,7 +102,7 @@ public extension UINavigationController {
         navigationBar.standardAppearance = appearance
         navigationBar.scrollEdgeAppearance = appearance
         
-        setNavigationBarHidden(model.hidden, animated: true)
+        setNavigationBarHidden(model.hidden, animated: false)
     }
     
     @objc @MainActor

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController+Extension.swift

@@ -269,6 +269,10 @@ extension MVMCoreUISplitViewController: MVMCoreViewManagerProtocol {
     public func newDataReceived(in viewController: UIViewController) {
         updateState(with: viewController)
     }
+    
+    public func navigate(toViewControllerOfPageType pageType: String, controllerType: AnyClass?) async -> UIViewController? {
+        return await navigationController?.navigate(toViewControllerOfPageType: pageType, controllerType: controllerType)
+    }
 }
 
 @objc public extension MVMCoreUISplitViewController {

MVMCoreUI/Containers/SplitViewController/MVMCoreUISplitViewController.m

@@ -95,6 +95,7 @@ CGFloat const PanelAnimationDuration = 0.2;
     if (topAlertView) {
         [splitViewController subscribeForNotifications];
     }
+    [MVMCoreObject sharedInstance].viewControllerManager = splitViewController;
     return splitViewController;
 }
 

MVMCoreUI/Managers/SubNav/SubNavManagerController.swift

@@ -8,7 +8,7 @@
 
 import Foundation
 import MVMCore
-import VDSColorTokens
+import VDSTokens
 
 open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol, TabsDelegate, MVMCorePresentationDelegateProtocol, SubNavSwipeNavigationProtocol {
     /// The number of tabs count or less that will turn on the fillContainer
@@ -362,6 +362,35 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
         manager?.displayedViewController?(viewController)
     }
     
+    private func go(to index: Int) async {
+        // Load controller from the cache
+        guard index != self.index,
+              let controller = viewControllers[index] else { return }
+        needToTrackTabSelect = true
+        self.index = index
+        await NavigationHandler.shared().replace(viewController: controller, navigationController:subNavigationController, delegateObject:delegateObject(), tryToReplace: false, animated: true)
+    }
+    
+    public func navigate(toViewControllerOfPageType pageType: String, controllerType: AnyClass?) async -> UIViewController?  {
+        for (index, controller) in viewControllers.enumerated() {
+            if let manager = controller as? MVMCoreViewManagerProtocol,
+               let viewController = await manager.navigate(toViewControllerOfPageType: pageType, controllerType: controllerType) {
+                await go(to: index)
+                return viewController
+            } else if let controller = controller as? MVMCoreViewControllerProtocol & UIViewController,
+                      controller.pageType == pageType {
+                guard let controllerType = controllerType else {
+                    await go(to: index)
+                    return controller
+                }
+                guard (type(of: controller) == controllerType) else { continue }
+                await go(to: index)
+                return controller
+            }
+        }
+        return nil
+    }
+    
     // MARK: - MVMCoreUISwipeNavigationProtocol
     
     public func swipeLeft() {

MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift

@@ -73,6 +73,7 @@ public extension MVMCoreUIUtility {
 
 @objc
 public extension MVMCoreUIUtility {
+    /// Returns the current visible viewcontroller.
     @objc @MainActor
     static func getVisibleViewController() -> UIViewController? {
         var viewController = NavigationHandler.shared().getViewControllerToPresentOn()