From 525f0f8f0abbb84d8184dac91f616181edd827f6 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Fri, 28 Jun 2024 09:13:49 -0400 Subject: [PATCH 01/24] Digital PCT265 defect CXTDT-579049: Add indexing safety to track action call. --- MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index 3ef117da..fc79b5bd 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -361,7 +361,7 @@ open class Carousel: View { } func trackSwipeActionAnalyticsforIndex(_ index : Int){ - guard let itemModel = molecules?[index], + guard let itemModel = molecules?[safe:index], let viewControllerObject = delegateObject?.moleculeDelegate as? MVMCoreViewControllerProtocol else { return } MVMCoreUILoggingHandler.shared()?.defaultLogAction(forController: viewControllerObject, actionInformation: itemModel.toJSON(), additionalData: nil) } From 080f77581f6d48a4cc21a646cd481bc7e7c5ff64 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Fri, 28 Jun 2024 09:18:13 -0400 Subject: [PATCH 02/24] Digital PCT265 defect CXTDT-579049: Fix indexing safety to mocules to add. (Another crash in App Store reports.) --- MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift b/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift index 943f53ad..22ec9bcd 100644 --- a/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift +++ b/MVMCoreUI/Atomic/Molecules/Items/TabsListItemModel.swift @@ -108,8 +108,7 @@ extension TabsListItemModel: AddMolecules { public func moleculesToAdd() -> AddMolecules.AddParameters? { guard addedMolecules == nil else { return nil } let index = tabs.selectedIndex - guard molecules.count >= index else { return nil } - let addedMolecules = molecules[index] + guard let addedMolecules = molecules[safe: index] else { return nil } self.addedMolecules = addedMolecules return (addedMolecules, .below) } From 91eb4fa87a793c141c22563a9540e541460f37e9 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Fri, 28 Jun 2024 15:23:17 -0400 Subject: [PATCH 03/24] Digital PCT265 defect CXTDT-579050: Prevent updateViews from triggering tableView(_:cellForRowAt:) through visibleCells. --- .../ThreeLayerTableViewController.swift | 4 ++-- MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift index 4bd889bd..c85e7b85 100644 --- a/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift +++ b/MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift @@ -52,8 +52,8 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController, Rotor bottomView.updateView(width) showFooter(width) } - tableView.visibleCells.forEach { cell in - (cell as? MVMCoreViewProtocol)?.updateView(width) + MVMCoreUIUtility.findParentViews(by: (UITableViewCell & MVMCoreViewProtocol).self, views: tableView.subviews).forEach { view in + view.updateView(width) } } diff --git a/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift b/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift index ea91f62b..5b70412e 100644 --- a/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift +++ b/MVMCoreUI/Utility/MVMCoreUIUtility+Extension.swift @@ -60,6 +60,16 @@ public extension MVMCoreUIUtility { return findViews(by: type, views: queue, excludedViews: excludedViews) + matching } + static func findParentViews(by type: T.Type, views: [UIView]) -> [T] { + return views.reduce(into: [T]()) { matchingViews, view in + if let view = view as? T { + return matchingViews.append(view) // If this view is the type stop here and return, ignoring its children. + } + // Otherwise check downstream. + matchingViews += findParentViews(by: type, views: view.subviews) + } + } + @MainActor static func visibleNavigationBarStlye() -> NavigationItemStyle? { if let navController = NavigationController.navigationController(), From d8d4b37d1d423d2f4b7bf011d095183f2f788e02 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Tue, 2 Jul 2024 19:05:53 -0400 Subject: [PATCH 04/24] Digital PCT265 defect CXTDT-579050: Rewire asynchronous response JSON parsing to filter, queue, and delay drop UI changes. --- .../BaseControllers/ViewController.swift | 97 ++++++++++--------- 1 file changed, 53 insertions(+), 44 deletions(-) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index 78191da5..e67188a0 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -8,6 +8,7 @@ import UIKit import MVMCore +import Combine @objc open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMCoreViewManagerViewControllerProtocol, MoleculeDelegateProtocol, FormHolderProtocol, MVMCoreActionDelegateProtocol, ActionDelegateProtocol, MVMCoreLoadDelegateProtocol, UITextFieldDelegate, UITextViewDelegate, ObservingTextFieldDelegate, MVMCoreUIDetailViewProtocol, PageProtocol, PageBehaviorHandlerProtocol { @@ -38,7 +39,7 @@ import MVMCore public var behaviors: [PageBehaviorProtocol]? public var needsUpdateUI = false - private var observingForResponses: NSObjectProtocol? + private var observingForResponses: AnyCancellable? private var initialLoadFinished = false public var isFirstRender = true public var previousScreenSize = CGSize.zero @@ -66,9 +67,46 @@ import MVMCore (pagesToListenFor()?.count ?? 0 > 0 || modulesToListenFor()?.count ?? 0 > 0) else { return } - observingForResponses = NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: NotificationResponseLoaded), object: nil, queue: pageUpdateQueue) { [weak self] notification in - self?.responseJSONUpdated(notification: notification) - } + observingForResponses = NotificationCenter.default.publisher(for: NSNotification.Name(rawValue: NotificationResponseLoaded)) + .receive(on: self.pageUpdateQueue) // Background serial queue. + .map { [weak self] notification in + guard let self = self else { return (nil, nil, nil) } + // Get the page data. + let pageUpdates = self.extractInterestedPageType(from: notification.userInfo?.optionalDictionaryForKey(KeyPageMap) ?? [:]) + // Convert the page data into a new model. + var pageModel: PageModelProtocol? = nil + if let pageUpdates { + do { + // TODO: Rewiring to parse from plain JSON rather than this protocol indirection. + pageModel = try (self as? any TemplateProtocol & PageBehaviorHandlerProtocol & MVMCoreViewControllerProtocol)?.parseTemplate(pageJSON: pageUpdates) + } catch { + if let coreError = MVMCoreErrorObject.createErrorObject(for: error, location: "updateJSON for pageType: \(String(describing: self.pageType))") { + MVMCoreLoggingHandler.shared()?.addError(toLog: coreError) + } + } + } + // Get the module data. + let moduleUpdates = self.extractInterestedModules(from: notification.userInfo?.optionalDictionaryForKey(KeyModuleMap) ?? [:]) + // Bundle the transformations. + return (pageUpdates, pageModel, moduleUpdates) + } + .filter { (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in + // Skip any non-updates. + (pageUpdates != nil && pageModel != nil) || (moduleUpdates != nil && moduleUpdates!.count > 0) + } + // Opportunity: Merge all module only updates into one event. + // Delay allowing the previous model update to settle before triggering a re-render. + .buffer(size: 100, prefetch: .byRequest, whenFull: .dropOldest) + .flatMap(maxPublishers: .max(1)) { Just($0).delay(for: .seconds(0.1), scheduler: RunLoop.main) } + .sink { [weak self] (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in + guard let self = self else { return } + if let pageUpdates, let pageModel { + self.loadObject?.pageJSON = pageUpdates + } + var mergedModuleUpdates = (loadObject?.modulesJSON ?? [:]).mergingLeft(moduleUpdates ?? [:]) + self.loadObject?.modulesJSON = mergedModuleUpdates + self.handleNewData(pageModel) + } } open func stopObservingForResponseJSONUpdates() { @@ -88,51 +126,22 @@ import MVMCore return requestModules + behaviorModules } - @objc open func responseJSONUpdated(notification: Notification) { - // Checks for a page we are listening for. - var hasDataUpdate = false - var pageModel: PageModelProtocol? = nil - if let pagesLoaded = notification.userInfo?.optionalDictionaryForKey(KeyPageMap), - let loadObject, - let pageType = pagesToListenFor()?.first(where: { (pageTypeListened) -> Bool in - guard let page = pagesLoaded.optionalDictionaryForKey(pageTypeListened), + private func extractInterestedPageType(from pageMap: [String: Any]) -> [String: Any]? { + guard let pageType = pagesToListenFor()?.first(where: { pageTypeListened -> Bool in + guard let page = pageMap.optionalDictionaryForKey(pageTypeListened), let pageType = page.optionalStringForKey(KeyPageType), pageType == pageTypeListened else { return false } - return true - }) { - hasDataUpdate = true - loadObject.pageJSON = pagesLoaded.optionalDictionaryForKey(pageType) - - // Separate page updates from the module updates to avoid unecessary resets to behaviors and full re-renders. - do { - pageModel = try parsePageJSON(loadObject: loadObject) - } catch { - if let coreError = MVMCoreErrorObject.createErrorObject(for: error, location: "updateJSON for pageType: \(String(describing: pageType))") { - MVMCoreLoggingHandler.shared()?.addError(toLog: coreError) - } - } + }) else { return nil } + return pageMap.optionalDictionaryForKey(pageType) + } + + private func extractInterestedModules(from moduleMap: [String: Any]) -> [String: Any]? { + guard let modulesListened = modulesToListenFor() else { return nil } + return moduleMap.filter { (key: String, value: Any) in + modulesListened.contains { $0 == key } } - - // Checks for modules we are listening for. - if let modulesLoaded = notification.userInfo?.optionalDictionaryForKey(KeyModuleMap), - let modulesListened = modulesToListenFor() { - for moduleName in modulesListened { - if let module = modulesLoaded.optionalDictionaryForKey(moduleName) { - hasDataUpdate = true - var currentModules = loadObject?.modulesJSON ?? [:] - currentModules.updateValue(module, forKey: moduleName) - loadObject?.modulesJSON = currentModules - } - } - } - - guard hasDataUpdate else { return } - - MVMCoreDispatchUtility.performBlock(onMainThread: { - self.handleNewData(pageModel) - }) } open func shouldFinishProcessingLoad(_ loadObject: MVMCoreLoadObject, error: AutoreleasingUnsafeMutablePointer) -> Bool { From 4cbf15a3a75e250c033e7abcd7150da276f8fa86 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Wed, 3 Jul 2024 15:42:12 -0400 Subject: [PATCH 05/24] Digital PCT265 defect CXTDT-579050: Change batching to the UI. --- .../BaseControllers/ViewController.swift | 63 ++++++++++++------- 1 file changed, 39 insertions(+), 24 deletions(-) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index e67188a0..950b330e 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -70,41 +70,34 @@ import Combine observingForResponses = NotificationCenter.default.publisher(for: NSNotification.Name(rawValue: NotificationResponseLoaded)) .receive(on: self.pageUpdateQueue) // Background serial queue. .map { [weak self] notification in - guard let self = self else { return (nil, nil, nil) } - // Get the page data. - let pageUpdates = self.extractInterestedPageType(from: notification.userInfo?.optionalDictionaryForKey(KeyPageMap) ?? [:]) - // Convert the page data into a new model. - var pageModel: PageModelProtocol? = nil - if let pageUpdates { - do { - // TODO: Rewiring to parse from plain JSON rather than this protocol indirection. - pageModel = try (self as? any TemplateProtocol & PageBehaviorHandlerProtocol & MVMCoreViewControllerProtocol)?.parseTemplate(pageJSON: pageUpdates) - } catch { - if let coreError = MVMCoreErrorObject.createErrorObject(for: error, location: "updateJSON for pageType: \(String(describing: self.pageType))") { - MVMCoreLoggingHandler.shared()?.addError(toLog: coreError) - } - } - } - // Get the module data. - let moduleUpdates = self.extractInterestedModules(from: notification.userInfo?.optionalDictionaryForKey(KeyModuleMap) ?? [:]) - // Bundle the transformations. - return (pageUpdates, pageModel, moduleUpdates) + self?.pullUpdates(from: notification) ?? (nil, nil, nil) } .filter { (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in // Skip any non-updates. (pageUpdates != nil && pageModel != nil) || (moduleUpdates != nil && moduleUpdates!.count > 0) } - // Opportunity: Merge all module only updates into one event. + // Merge all page and module updates into one update event. + //.print("[Update pipe] merging") + .scan((nil, nil, nil)) { accumulator, next in + // Always take the latest page and the latest modules with same key. + return (next.0, next.1, next.2?.mergingRight(accumulator.2 ?? [:])) + } + //.print("[Update pipe] into buffer") + // Hold onto the latest merged state until UI is ready for an update. Keep only the latest from scan. + .buffer(size: 1, prefetch: .byRequest, whenFull: .dropOldest) + //.print("[Update pipe] out of buffer") // Delay allowing the previous model update to settle before triggering a re-render. - .buffer(size: 100, prefetch: .byRequest, whenFull: .dropOldest) - .flatMap(maxPublishers: .max(1)) { Just($0).delay(for: .seconds(0.1), scheduler: RunLoop.main) } + .flatMap(maxPublishers: .max(1)) { buffer in + Just(buffer).delay(for: .seconds(0.1), scheduler: RunLoop.main) + } .sink { [weak self] (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in guard let self = self else { return } - if let pageUpdates, let pageModel { + if let pageUpdates, pageModel != nil { self.loadObject?.pageJSON = pageUpdates } - var mergedModuleUpdates = (loadObject?.modulesJSON ?? [:]).mergingLeft(moduleUpdates ?? [:]) + let mergedModuleUpdates = (loadObject?.modulesJSON ?? [:]).mergingLeft(moduleUpdates ?? [:]) self.loadObject?.modulesJSON = mergedModuleUpdates + self.debugLog("Applying async update page model \(pageModel.debugDescription) and modules \(mergedModuleUpdates.keys) to page.") self.handleNewData(pageModel) } } @@ -115,6 +108,28 @@ import Combine self.observingForResponses = nil } + func pullUpdates(from notification: Notification) -> (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) { + // Get the page data. + let pageUpdates = extractInterestedPageType(from: notification.userInfo?.optionalDictionaryForKey(KeyPageMap) ?? [:]) + // Convert the page data into a new model. + var pageModel: PageModelProtocol? = nil + if let pageUpdates { + do { + // TODO: Rewiring to parse from plain JSON rather than this protocol indirection. + pageModel = try (self as? any TemplateProtocol & PageBehaviorHandlerProtocol & MVMCoreViewControllerProtocol)?.parseTemplate(pageJSON: pageUpdates) + } catch { + if let coreError = MVMCoreErrorObject.createErrorObject(for: error, location: "updateJSON for pageType: \(String(describing: self.pageType))") { + MVMCoreLoggingHandler.shared()?.addError(toLog: coreError) + } + } + } + // Get the module data. + let moduleUpdates = extractInterestedModules(from: notification.userInfo?.optionalDictionaryForKey(KeyModuleMap) ?? [:]) + debugLog("Receiving page \(pageModel?.pageType ?? "none") & \(moduleUpdates?.keys.description ?? "none") modules from \((notification.userInfo?["MVMCoreLoadObject"] as? MVMCoreLoadObject)?.requestParameters?.url?.absoluteString ?? "")") + // Bundle the transformations. + return (pageUpdates, pageModel, moduleUpdates) + } + open func pagesToListenFor() -> [String]? { guard let pageType = loadObject?.pageType else { return nil } return [pageType] From 90f9a0bcf57cd7508d5971dbbbecaf761ee29d71 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Wed, 3 Jul 2024 18:39:28 -0400 Subject: [PATCH 06/24] Digital PCT265 defect CXTDT-579050: Code simplification and fixes of combine pipeline for page updates. --- .../Atomic/Organisms/Carousel/Carousel.swift | 11 ++++++++ .../BaseControllers/ViewController.swift | 26 +++++++------------ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index fc79b5bd..84124880 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -285,6 +285,17 @@ open class Carousel: View { /// Registers the cells with the collection view func registerCells(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) { + for molecule in carouselModel.molecules { + if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { + collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier) + } + } + let moleculeInfo = carouselModel.molecules.map { + getMoleculeInfo(with: $0, delegateObject: delegateObject) + } + // For each molecule with info, register it. + moleculeInfo.compactMap({ $0 }).forEach { collectionView.register($0.class, forCellWithReuseIdentifier: $0.identifier) } + for molecule in carouselModel.molecules { if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index 950b330e..a6c43b2d 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -69,27 +69,16 @@ import Combine observingForResponses = NotificationCenter.default.publisher(for: NSNotification.Name(rawValue: NotificationResponseLoaded)) .receive(on: self.pageUpdateQueue) // Background serial queue. - .map { [weak self] notification in - self?.pullUpdates(from: notification) ?? (nil, nil, nil) - } - .filter { (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in - // Skip any non-updates. - (pageUpdates != nil && pageModel != nil) || (moduleUpdates != nil && moduleUpdates!.count > 0) + .compactMap { [weak self] notification in + self?.pullUpdates(from: notification) ?? nil } // Merge all page and module updates into one update event. - //.print("[Update pipe] merging") .scan((nil, nil, nil)) { accumulator, next in // Always take the latest page and the latest modules with same key. - return (next.0, next.1, next.2?.mergingRight(accumulator.2 ?? [:])) + return (next.0 ?? accumulator.0, next.1 ?? accumulator.1, next.2?.mergingRight(accumulator.2 ?? [:])) } - //.print("[Update pipe] into buffer") - // Hold onto the latest merged state until UI is ready for an update. Keep only the latest from scan. - .buffer(size: 1, prefetch: .byRequest, whenFull: .dropOldest) - //.print("[Update pipe] out of buffer") // Delay allowing the previous model update to settle before triggering a re-render. - .flatMap(maxPublishers: .max(1)) { buffer in - Just(buffer).delay(for: .seconds(0.1), scheduler: RunLoop.main) - } + .throttle(for: .seconds(0.05), scheduler: RunLoop.main, latest: true) .sink { [weak self] (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in guard let self = self else { return } if let pageUpdates, pageModel != nil { @@ -108,7 +97,7 @@ import Combine self.observingForResponses = nil } - func pullUpdates(from notification: Notification) -> (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) { + func pullUpdates(from notification: Notification) -> (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?)? { // Get the page data. let pageUpdates = extractInterestedPageType(from: notification.userInfo?.optionalDictionaryForKey(KeyPageMap) ?? [:]) // Convert the page data into a new model. @@ -125,7 +114,10 @@ import Combine } // Get the module data. let moduleUpdates = extractInterestedModules(from: notification.userInfo?.optionalDictionaryForKey(KeyModuleMap) ?? [:]) - debugLog("Receiving page \(pageModel?.pageType ?? "none") & \(moduleUpdates?.keys.description ?? "none") modules from \((notification.userInfo?["MVMCoreLoadObject"] as? MVMCoreLoadObject)?.requestParameters?.url?.absoluteString ?? "")") + debugLog("Receiving page \(pageModel?.pageType ?? "none") & \(moduleUpdates?.keys.description ?? "none") modules from \((notification.userInfo?["MVMCoreLoadObject"] as? MVMCoreLoadObject)?.requestParameters?.url?.absoluteString ?? "")") + + guard (pageUpdates != nil && pageModel != nil) || (moduleUpdates != nil && moduleUpdates!.count > 0) else { return nil } + // Bundle the transformations. return (pageUpdates, pageModel, moduleUpdates) } From b2ad684f0081838c258af082fe0f7b0540f5e98c Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Wed, 3 Jul 2024 18:40:43 -0400 Subject: [PATCH 07/24] Digital PCT265 defect CXTDT-579050: Carousel cell registration check. --- .../Atomic/Organisms/Carousel/Carousel.swift | 29 +++++++++++-------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index 84124880..6df0f7c2 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -43,6 +43,9 @@ open class Carousel: View { /// The models for the molecules. public var molecules: [MoleculeModelProtocol & CarouselItemModelProtocol]? + /// A list of currently registered cells. + public var registeredMoleculeIds: [String]? + /// The horizontal alignment of the cell in the collection view. Only noticeable if the itemWidthPercent is less than 100%. public var itemAlignment = UICollectionView.ScrollPosition.left @@ -174,9 +177,7 @@ open class Carousel: View { MVMCoreLoggingHandler.shared()?.handleDebugMessage("[\(Self.self)] [\(ObjectIdentifier(self).hashValue)]\noriginal model: \(originalModel?.debugDescription ?? "none")\nnew model: \(model)") if #available(iOS 15.0, *) { - if let originalModel, carouselModel.isDeeplyVisuallyEquivalent(to: originalModel), - originalModel.visibleMolecules.isVisuallyEquivalent(to: molecules ?? []) // Since the carousel model's children are in place replaced and we do not have a deep copy of this model tree, add in this hack to check if the prior captured carousel items match the newly visible ones. - { + if hasSameCellRegistration(with: carouselModel, delegateObject: delegateObject) { // Prevents a carousel reset while still updating the cell backing data through reconfigureItems. MVMCoreLoggingHandler.shared()?.handleDebugMessage("[\(Self.self)] Model is visually equivalent. Skipping rebuild...") prepareMolecules(with: carouselModel) @@ -284,23 +285,27 @@ open class Carousel: View { /// Registers the cells with the collection view func registerCells(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) { - + var registeredIds = [String]() for molecule in carouselModel.molecules { if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier) + registeredIds.append(info.identifier) + } else { + registeredIds.append(molecule.moleculeName) } } - let moleculeInfo = carouselModel.molecules.map { - getMoleculeInfo(with: $0, delegateObject: delegateObject) - } - // For each molecule with info, register it. - moleculeInfo.compactMap({ $0 }).forEach { collectionView.register($0.class, forCellWithReuseIdentifier: $0.identifier) } - - for molecule in carouselModel.molecules { + registeredMoleculeIds = registeredIds + } + + func hasSameCellRegistration(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) -> Bool { + let incomingIds = carouselModel.molecules.map { molecule in if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { - collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier) + return info.identifier + } else { + return molecule.moleculeName } } + return incomingIds == registeredMoleculeIds } //-------------------------------------------------- From cae92360a254a8a31975b4f7e3f9eb5f6959c7c7 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Wed, 3 Jul 2024 18:45:29 -0400 Subject: [PATCH 08/24] Digital PCT265 defect CXTDT-579050: Carousel cell registration check break early. --- MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index 6df0f7c2..ad627d35 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -298,6 +298,8 @@ open class Carousel: View { } func hasSameCellRegistration(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) -> Bool { + guard let registeredMoleculeIds else { return false } + let incomingIds = carouselModel.molecules.map { molecule in if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { return info.identifier From 7fec6f540e944e02ce3a30714c8a9b0c1752e11c Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Fri, 5 Jul 2024 15:10:34 -0400 Subject: [PATCH 09/24] Add support for circular progress bar. --- MVMCoreUI.xcodeproj/project.pbxproj | 8 ++ .../Atoms/Views/CircularProgressBar.swift | 75 ++++++++++++++ .../Views/CircularProgressBarModel.swift | 99 +++++++++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift create mode 100644 MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 3433e17b..0a1ea43d 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -153,6 +153,8 @@ 444FB7C32821B76B00DFE692 /* TitleLockupModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 444FB7C22821B76B00DFE692 /* TitleLockupModel.swift */; }; 4457904E27ECE989002B1E1E /* UIImageRenderingMode+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4457904D27ECE989002B1E1E /* UIImageRenderingMode+Extension.swift */; }; 4B002ACA2BD855EC009BC9C1 /* DateDropdownEntryFieldModel+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B002AC92BD855EC009BC9C1 /* DateDropdownEntryFieldModel+Extension.swift */; }; + 4B3408A22C3873B0003BFABF /* CircularProgressBarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3408A12C3873B0003BFABF /* CircularProgressBarModel.swift */; }; + 4B3408A42C3873E8003BFABF /* CircularProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3408A32C3873E8003BFABF /* CircularProgressBar.swift */; }; 522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */; }; 522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */; }; 52267A0723FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */; }; @@ -770,6 +772,8 @@ 444FB7C22821B76B00DFE692 /* TitleLockupModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleLockupModel.swift; sourceTree = ""; }; 4457904D27ECE989002B1E1E /* UIImageRenderingMode+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIImageRenderingMode+Extension.swift"; sourceTree = ""; }; 4B002AC92BD855EC009BC9C1 /* DateDropdownEntryFieldModel+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateDropdownEntryFieldModel+Extension.swift"; sourceTree = ""; }; + 4B3408A12C3873B0003BFABF /* CircularProgressBarModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgressBarModel.swift; sourceTree = ""; }; + 4B3408A32C3873E8003BFABF /* CircularProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgressBar.swift; sourceTree = ""; }; 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinks.swift; sourceTree = ""; }; 522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinksModel.swift; sourceTree = ""; }; 52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinks.swift; sourceTree = ""; }; @@ -2311,6 +2315,8 @@ 0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */, D28A838223CCBD3F00DFE4FC /* WheelModel.swift */, 943784F3236B77BB006A1E82 /* Wheel.swift */, + 4B3408A12C3873B0003BFABF /* CircularProgressBarModel.swift */, + 4B3408A32C3873E8003BFABF /* CircularProgressBar.swift */, 943784F4236B77BB006A1E82 /* WheelAnimationHandler.swift */, 0AE98BB623FF18E9004C5109 /* ArrowModel.swift */, 0AE98BB423FF18D2004C5109 /* Arrow.swift */, @@ -3005,6 +3011,7 @@ D29DF2EF21ECEAE1003B2FB9 /* MFFonts.m in Sources */, D22479942316AE5E003FCCF9 /* NSLayoutConstraintExtension.swift in Sources */, D2B18B94236214AD00A9AEDC /* NavigationController.swift in Sources */, + 4B3408A42C3873E8003BFABF /* CircularProgressBar.swift in Sources */, 0A9D09222433796500D2E6C0 /* CarouselIndicator.swift in Sources */, EA17584E2BC9895A00A5C0D9 /* ButtonIcon.swift in Sources */, D29E28DA23D21AFA00ACEA85 /* StringAndMoleculeModel.swift in Sources */, @@ -3025,6 +3032,7 @@ AA1EC59924373994003D6F50 /* ListThreeColumnSpeedTestDivider.swift in Sources */, AA37CBD52519072F0027344C /* Stars.swift in Sources */, 942C378E2412F5B60066E45E /* ModalMoleculeStackTemplate.swift in Sources */, + 4B3408A22C3873B0003BFABF /* CircularProgressBarModel.swift in Sources */, 8D8067D32444473A00203BE8 /* ListRightVariablePriceChangeAllTextAndLinks.swift in Sources */, 8D4687E4242E2DF300802879 /* ListFourColumnDataUsageListItem.swift in Sources */, D2874024249BA6F300BE950A /* MVMCoreUISplitViewController+Extension.swift in Sources */, diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift new file mode 100644 index 00000000..9383425a --- /dev/null +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -0,0 +1,75 @@ +// +// CircularProgressBar.swift +// MVMCoreUI +// +// Created by Xi Zhang on 7/5/24. +// Copyright © 2024 Verizon Wireless. All rights reserved. +// + +import UIKit + +@objcMembers open class CircularProgressBar: View, MVMCoreUIViewConstrainingProtocol { + + var heightConstraint: NSLayoutConstraint? + weak var gradientLayer: CALayer? + var graphModel: CircularProgressBarModel? { + return model as? CircularProgressBarModel + } + +// MARK: setup + open override func setupView() { + super.setupView() + heightConstraint = heightAnchor.constraint(equalToConstant: 0) + heightConstraint?.isActive = true + widthAnchor.constraint(equalTo: heightAnchor).isActive = true + } + + override open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + super.set(with: model, delegateObject, additionalData) + guard let model = model as? CircularProgressBarModel else { return } + createGraphCircle(model) + } + + class func getAngle(_ piValue: Double) -> Double { + return piValue / (2.0 * Double.pi) * 360.0 + } + + class func getPiValue(_ angle: Double) -> Double { + return angle / 360.0 * 2.0 * Double.pi + } + +// MARK: circle + open func createGraphCircle(_ graphObject: CircularProgressBarModel) { + if let sublayers = layer.sublayers { + for sublayer in sublayers { + sublayer.removeAllAnimations() + sublayer.removeFromSuperlayer() + } + } + heightConstraint?.constant = graphObject.diameter + + let gradient = CAGradientLayer() + gradient.type = .conic + gradient.startPoint = CGPoint(x: 0.5, y: 0.5) + gradient.endPoint = CGPoint(x: 0.5, y: 0.0) + gradient.frame = CGRect(x: 0, y: 0, width: graphObject.diameter, height: graphObject.diameter) + gradientLayer = gradient + layer.addSublayer(gradient) + + let center = CGPoint(x: gradient.bounds.midX, y: gradient.bounds.midY) + let radius = (graphObject.diameter - graphObject.lineWidth) / 2.0 + let path = UIBezierPath(arcCenter: center, radius: radius, startAngle: (3 / 2 * .pi), endAngle: -(1 / 2 * .pi), clockwise: false) + let mask = CAShapeLayer() + mask.fillColor = UIColor.clear.cgColor + mask.strokeColor = UIColor.white.cgColor + mask.lineWidth = graphObject.lineWidth + mask.path = path.cgPath + gradient.mask = mask + } + +//MARK: MVMCoreUIViewConstrainingProtocol + public func needsToBeConstrained() -> Bool { + return true + } +} + diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift new file mode 100644 index 00000000..671607b1 --- /dev/null +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -0,0 +1,99 @@ +// +// CircularProgressBarModel.swift +// MVMCoreUI +// +// Created by Xi Zhang on 7/5/24. +// Copyright © 2024 Verizon Wireless. All rights reserved. +// + +import Foundation + + +public class CircularProgressBarModel: MoleculeModelProtocol { + + public static var identifier: String = "circularProgress" + public var id: String = UUID().uuidString + + public var size: GraphSize = .small { + didSet { + updateSize() + } + } + public var diameter: CGFloat = 84 + public var lineWidth: CGFloat = 5 + public var color: Color? + public var backgroundColor: Color? + public var percent: Int? + + public init() { + updateSize() + } + + private enum CodingKeys: String, CodingKey { + case id + case size + case diameter + case lineWidth + case color + case backgroundColor + case percent + case moleculeName + } + + required public init(from decoder: Decoder) throws { + let typeContainer = try decoder.container(keyedBy: CodingKeys.self) + id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString + + if let size = try typeContainer.decodeIfPresent(GraphSize.self, forKey: .size) { + self.size = size + } + updateSize() + + if let diameter = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .diameter) { + self.diameter = diameter + } + + if let lineWidth = try typeContainer.decodeIfPresent(CGFloat.self, forKey: .lineWidth) { + self.lineWidth = lineWidth + } + + color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) + backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) + percent = try typeContainer.decodeIfPresent(Int.self, forKey: .percent) + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(id, forKey: .id) + try container.encode(moleculeName, forKey: .moleculeName) + try container.encode(size, forKey: .size) + try container.encode(diameter, forKey: .diameter) + try container.encode(lineWidth, forKey: .lineWidth) + try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) + try container.encodeIfPresent(color, forKey: .color) + try container.encodeIfPresent(percent, forKey: .percent) + } + + func getCGColorsFromArray(_ colorArray: [String]) -> [Color] { + return colorArray.map { (colorString) -> Color in + return Color(uiColor: UIColor.mfGet(forHex: colorString)) + } + } + + func updateSize() { + switch size { + case .small: + diameter = MFSizeObject(standardSize: 20)?.getValueBasedOnApplicationWidth() ?? 20 + lineWidth = MFSizeObject(standardSize: 4)?.getValueBasedOnApplicationWidth() ?? 4 + break + case .medium: + diameter = MFSizeObject(standardSize: 100)?.getValueBasedOnApplicationWidth() ?? 100 + lineWidth = MFSizeObject(standardSize: 8)?.getValueBasedOnApplicationWidth() ?? 8 + break + case .large: + diameter = MFSizeObject(standardSize: 180)?.getValueBasedOnApplicationWidth() ?? 180 + lineWidth = MFSizeObject(standardSize: 12)?.getValueBasedOnApplicationWidth() ?? 12 + break + } + } +} From 1b0197ed2c180a4584e11ef6cd80fed3edb67c75 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Tue, 9 Jul 2024 18:49:10 -0400 Subject: [PATCH 10/24] Add support for circular progress bar part 2 --- .../Atoms/Views/CircularProgressBar.swift | 120 ++++++++++++------ .../Views/CircularProgressBarModel.swift | 12 +- .../OtherHandlers/CoreUIModelMapping.swift | 1 + 3 files changed, 90 insertions(+), 43 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index 9383425a..df5fe946 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -11,11 +11,82 @@ import UIKit @objcMembers open class CircularProgressBar: View, MVMCoreUIViewConstrainingProtocol { var heightConstraint: NSLayoutConstraint? - weak var gradientLayer: CALayer? var graphModel: CircularProgressBarModel? { return model as? CircularProgressBarModel } + private var progressLayer = CAShapeLayer() + private var tracklayer = CAShapeLayer() + private var labelLayer = CATextLayer() + + var setProgressColor: UIColor = UIColor.red { + didSet { + progressLayer.strokeColor = setProgressColor.cgColor + } + } + + var setTrackColor: UIColor = UIColor.white { + didSet { + tracklayer.strokeColor = setTrackColor.cgColor + } + } + /** + A path that consists of straight and curved line segments that you can render in your custom views. + Meaning our CAShapeLayer will now be drawn on the screen with the path we have specified here + */ + private var viewCGPath: CGPath? { + + let width = graphModel?.diameter ?? 84 + let height = width + + return UIBezierPath(arcCenter: CGPoint(x: width / 2.0, y: height / 2.0), + radius: (width - 1.5)/2, + startAngle: CGFloat(-0.5 * Double.pi), + endAngle: CGFloat(1.5 * Double.pi), clockwise: true).cgPath + } + + private func configureProgressViewToBeCircular() { + let lineWidth = graphModel?.lineWidth ?? 2.0 + self.backgroundColor = UIColor.clear + + self.drawShape(using: tracklayer, lineWidth: lineWidth) + self.drawShape(using: progressLayer, lineWidth: lineWidth) + } + + private func drawShape(using shape: CAShapeLayer, lineWidth: CGFloat) { + shape.path = self.viewCGPath + shape.fillColor = UIColor.clear.cgColor + shape.lineWidth = lineWidth + self.layer.addSublayer(shape) + } + + func setProgressWithAnimation(duration: TimeInterval, value: Float) { + let animation = CABasicAnimation(keyPath: "strokeEnd") + animation.duration = duration + + animation.fromValue = 0 //start animation at point 0 + animation.toValue = value //end animation at point specified + animation.timingFunction = CAMediaTimingFunction(name: CAMediaTimingFunctionName.linear) + progressLayer.strokeEnd = CGFloat(value) + progressLayer.add(animation, forKey: "animateCircle") + } + + func drawLabel() { + + let percent = graphModel?.percent ?? 0 + let percentLen = percent > 9 ? 2 : 1 + let attributedString = NSMutableAttributedString(string: String(percent) + "%") + attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldTitleLarge()], range: NSMakeRange(0, percentLen)) + attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldBodyLarge()], range: NSMakeRange(percentLen, 1)) + + // Text layer + let width = graphModel?.diameter ?? 84 + let height = width + labelLayer.string = attributedString + labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 30)/2, 60, 30) + self.layer.addSublayer(labelLayer) + } + // MARK: setup open override func setupView() { super.setupView() @@ -27,46 +98,21 @@ import UIKit override open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { super.set(with: model, delegateObject, additionalData) guard let model = model as? CircularProgressBarModel else { return } - createGraphCircle(model) - } - - class func getAngle(_ piValue: Double) -> Double { - return piValue / (2.0 * Double.pi) * 360.0 - } - - class func getPiValue(_ angle: Double) -> Double { - return angle / 360.0 * 2.0 * Double.pi - } - -// MARK: circle - open func createGraphCircle(_ graphObject: CircularProgressBarModel) { - if let sublayers = layer.sublayers { - for sublayer in sublayers { - sublayer.removeAllAnimations() - sublayer.removeFromSuperlayer() - } + + configureProgressViewToBeCircular() + + if let color = model.color { + setProgressColor = color.uiColor } - heightConstraint?.constant = graphObject.diameter - let gradient = CAGradientLayer() - gradient.type = .conic - gradient.startPoint = CGPoint(x: 0.5, y: 0.5) - gradient.endPoint = CGPoint(x: 0.5, y: 0.0) - gradient.frame = CGRect(x: 0, y: 0, width: graphObject.diameter, height: graphObject.diameter) - gradientLayer = gradient - layer.addSublayer(gradient) + if let backgroundColor = model.backgroundColor { + setTrackColor = backgroundColor.uiColor + } - let center = CGPoint(x: gradient.bounds.midX, y: gradient.bounds.midY) - let radius = (graphObject.diameter - graphObject.lineWidth) / 2.0 - let path = UIBezierPath(arcCenter: center, radius: radius, startAngle: (3 / 2 * .pi), endAngle: -(1 / 2 * .pi), clockwise: false) - let mask = CAShapeLayer() - mask.fillColor = UIColor.clear.cgColor - mask.strokeColor = UIColor.white.cgColor - mask.lineWidth = graphObject.lineWidth - mask.path = path.cgPath - gradient.mask = mask + setProgressWithAnimation(duration: 0.5, value: Float(graphModel?.percent ?? 0) / 100) + drawLabel() } - + //MARK: MVMCoreUIViewConstrainingProtocol public func needsToBeConstrained() -> Bool { return true diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index 671607b1..3a865b62 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -83,16 +83,16 @@ public class CircularProgressBarModel: MoleculeModelProtocol { func updateSize() { switch size { case .small: - diameter = MFSizeObject(standardSize: 20)?.getValueBasedOnApplicationWidth() ?? 20 - lineWidth = MFSizeObject(standardSize: 4)?.getValueBasedOnApplicationWidth() ?? 4 + diameter = MFSizeObject(standardSize: 64)?.getValueBasedOnApplicationWidth() ?? 64 + lineWidth = MFSizeObject(standardSize: 5)?.getValueBasedOnApplicationWidth() ?? 5 break case .medium: - diameter = MFSizeObject(standardSize: 100)?.getValueBasedOnApplicationWidth() ?? 100 - lineWidth = MFSizeObject(standardSize: 8)?.getValueBasedOnApplicationWidth() ?? 8 + diameter = MFSizeObject(standardSize: 84)?.getValueBasedOnApplicationWidth() ?? 84 + lineWidth = MFSizeObject(standardSize: 5)?.getValueBasedOnApplicationWidth() ?? 5 break case .large: - diameter = MFSizeObject(standardSize: 180)?.getValueBasedOnApplicationWidth() ?? 180 - lineWidth = MFSizeObject(standardSize: 12)?.getValueBasedOnApplicationWidth() ?? 12 + diameter = MFSizeObject(standardSize: 124)?.getValueBasedOnApplicationWidth() ?? 124 + lineWidth = MFSizeObject(standardSize: 5)?.getValueBasedOnApplicationWidth() ?? 5 break } } diff --git a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift index 22f65ade..d310a126 100644 --- a/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift +++ b/MVMCoreUI/OtherHandlers/CoreUIModelMapping.swift @@ -67,6 +67,7 @@ open class CoreUIModelMapping: ModelMapping { ModelRegistry.register(handler: LoadImageView.self, for: ImageViewModel.self) ModelRegistry.register(handler: Line.self, for: LineModel.self) ModelRegistry.register(handler: Wheel.self, for: WheelModel.self) + ModelRegistry.register(handler: CircularProgressBar.self, for: CircularProgressBarModel.self) ModelRegistry.register(handler: Toggle.self, for: ToggleModel.self) ModelRegistry.register(handler: CheckboxLabel.self, for: CheckboxLabelModel.self) ModelRegistry.register(handler: Arrow.self, for: ArrowModel.self) From 20d818b2c2df472e465bb563e89fdf7c6cbb91d7 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Thu, 11 Jul 2024 13:12:29 -0400 Subject: [PATCH 11/24] Refactor codes for circular progress UI. --- .../Atoms/Views/CircularProgressBar.swift | 98 ++++++++++++------- .../Views/CircularProgressBarModel.swift | 15 ++- 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index df5fe946..011359c8 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -15,6 +15,10 @@ import UIKit return model as? CircularProgressBarModel } + var viewWidth: CGFloat { + graphModel?.diameter ?? CGFloat(84) + } + private var progressLayer = CAShapeLayer() private var tracklayer = CAShapeLayer() private var labelLayer = CATextLayer() @@ -25,18 +29,16 @@ import UIKit } } - var setTrackColor: UIColor = UIColor.white { + var setTrackColor: UIColor = UIColor.lightGray { didSet { tracklayer.strokeColor = setTrackColor.cgColor } } - /** - A path that consists of straight and curved line segments that you can render in your custom views. - Meaning our CAShapeLayer will now be drawn on the screen with the path we have specified here - */ + + // A path with which CAShapeLayer will be drawn on the screen private var viewCGPath: CGPath? { - let width = graphModel?.diameter ?? 84 + let width = viewWidth let height = width return UIBezierPath(arcCenter: CGPoint(x: width / 2.0, y: height / 2.0), @@ -45,9 +47,51 @@ import UIKit endAngle: CGFloat(1.5 * Double.pi), clockwise: true).cgPath } +// MARK: setup + override open func setupView() { + super.setupView() + heightConstraint = heightAnchor.constraint(equalToConstant: 0) + heightConstraint?.isActive = true + widthAnchor.constraint(equalTo: heightAnchor).isActive = true + } + + override open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + + super.set(with: model, delegateObject, additionalData) + guard let model = model as? CircularProgressBarModel else { return } + + // set background color + if let backgroundColor = model.backgroundColor { + self.backgroundColor = backgroundColor.uiColor + } else { + self.backgroundColor = UIColor.clear + } + + configureProgressViewToBeCircular() + + // set progress color + if let color = model.color { + setProgressColor = color.uiColor + } else { + setProgressColor = UIColor.red + } + + // set track color + if let trackColor = model.trackColor { + setTrackColor = trackColor.uiColor + } else { + setProgressColor = UIColor.lightGray + } + + // show circular progress view with animation. + showProgressWithAnimation(duration: 0.5, value: Float(graphModel?.percent ?? 0) / 100) + + // show progress percentage label. + showProgressPercentage() + } + private func configureProgressViewToBeCircular() { - let lineWidth = graphModel?.lineWidth ?? 2.0 - self.backgroundColor = UIColor.clear + let lineWidth = graphModel?.lineWidth ?? 5.0 self.drawShape(using: tracklayer, lineWidth: lineWidth) self.drawShape(using: progressLayer, lineWidth: lineWidth) @@ -60,7 +104,8 @@ import UIKit self.layer.addSublayer(shape) } - func setProgressWithAnimation(duration: TimeInterval, value: Float) { + // value range is [0,1] + private func showProgressWithAnimation(duration: TimeInterval, value: Float) { let animation = CABasicAnimation(keyPath: "strokeEnd") animation.duration = duration @@ -71,47 +116,26 @@ import UIKit progressLayer.add(animation, forKey: "animateCircle") } - func drawLabel() { + private func showProgressPercentage() { let percent = graphModel?.percent ?? 0 let percentLen = percent > 9 ? 2 : 1 + + // configure attributed string for progress percentage. let attributedString = NSMutableAttributedString(string: String(percent) + "%") + // percent value attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldTitleLarge()], range: NSMakeRange(0, percentLen)) + // % symbol attributedString.setAttributes([NSAttributedString.Key.font: MFStyler.fontBoldBodyLarge()], range: NSMakeRange(percentLen, 1)) - // Text layer - let width = graphModel?.diameter ?? 84 + // show progress percentage in a text layer + let width = viewWidth let height = width labelLayer.string = attributedString labelLayer.frame = CGRectMake((width - CGFloat(percentLen * 20))/2, (height - 30)/2, 60, 30) self.layer.addSublayer(labelLayer) } -// MARK: setup - open override func setupView() { - super.setupView() - heightConstraint = heightAnchor.constraint(equalToConstant: 0) - heightConstraint?.isActive = true - widthAnchor.constraint(equalTo: heightAnchor).isActive = true - } - - override open func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { - super.set(with: model, delegateObject, additionalData) - guard let model = model as? CircularProgressBarModel else { return } - - configureProgressViewToBeCircular() - - if let color = model.color { - setProgressColor = color.uiColor - } - - if let backgroundColor = model.backgroundColor { - setTrackColor = backgroundColor.uiColor - } - - setProgressWithAnimation(duration: 0.5, value: Float(graphModel?.percent ?? 0) / 100) - drawLabel() - } //MARK: MVMCoreUIViewConstrainingProtocol public func needsToBeConstrained() -> Bool { diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index 3a865b62..6c58be43 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -22,9 +22,10 @@ public class CircularProgressBarModel: MoleculeModelProtocol { public var diameter: CGFloat = 84 public var lineWidth: CGFloat = 5 public var color: Color? - public var backgroundColor: Color? + public var trackColor: Color? public var percent: Int? - + public var backgroundColor: Color? = Color(uiColor: UIColor.clear) + public init() { updateSize() } @@ -35,8 +36,9 @@ public class CircularProgressBarModel: MoleculeModelProtocol { case diameter case lineWidth case color - case backgroundColor + case trackColor case percent + case backgroundColor case moleculeName } @@ -58,8 +60,10 @@ public class CircularProgressBarModel: MoleculeModelProtocol { } color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) - backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) + trackColor = try typeContainer.decodeIfPresent(Color.self, forKey: .trackColor) percent = try typeContainer.decodeIfPresent(Int.self, forKey: .percent) + + backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) } public func encode(to encoder: Encoder) throws { @@ -69,9 +73,10 @@ public class CircularProgressBarModel: MoleculeModelProtocol { try container.encode(size, forKey: .size) try container.encode(diameter, forKey: .diameter) try container.encode(lineWidth, forKey: .lineWidth) - try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) + try container.encodeIfPresent(trackColor, forKey: .trackColor) try container.encodeIfPresent(color, forKey: .color) try container.encodeIfPresent(percent, forKey: .percent) + try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) } func getCGColorsFromArray(_ colorArray: [String]) -> [Color] { From de60fdfaf93085a185b343f05299c41fba5cdb83 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Thu, 11 Jul 2024 17:22:11 -0400 Subject: [PATCH 12/24] Make animation duration configurable. --- MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift | 2 +- .../Atomic/Atoms/Views/CircularProgressBarModel.swift | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index 011359c8..651b7f65 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -84,7 +84,7 @@ import UIKit } // show circular progress view with animation. - showProgressWithAnimation(duration: 0.5, value: Float(graphModel?.percent ?? 0) / 100) + showProgressWithAnimation(duration: graphModel?.duration ?? 1.0, value: Float(graphModel?.percent ?? 0) / 100) // show progress percentage label. showProgressPercentage() diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index 6c58be43..252f4893 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -21,6 +21,7 @@ public class CircularProgressBarModel: MoleculeModelProtocol { } public var diameter: CGFloat = 84 public var lineWidth: CGFloat = 5 + public var duration : Double = 1.0 public var color: Color? public var trackColor: Color? public var percent: Int? @@ -35,6 +36,7 @@ public class CircularProgressBarModel: MoleculeModelProtocol { case size case diameter case lineWidth + case duration case color case trackColor case percent @@ -59,6 +61,10 @@ public class CircularProgressBarModel: MoleculeModelProtocol { self.lineWidth = lineWidth } + if let duration = try typeContainer.decodeIfPresent(Double.self, forKey: .duration) { + self.duration = duration + } + color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) trackColor = try typeContainer.decodeIfPresent(Color.self, forKey: .trackColor) percent = try typeContainer.decodeIfPresent(Int.self, forKey: .percent) @@ -73,6 +79,7 @@ public class CircularProgressBarModel: MoleculeModelProtocol { try container.encode(size, forKey: .size) try container.encode(diameter, forKey: .diameter) try container.encode(lineWidth, forKey: .lineWidth) + try container.encode(duration, forKey: .duration) try container.encodeIfPresent(trackColor, forKey: .trackColor) try container.encodeIfPresent(color, forKey: .color) try container.encodeIfPresent(percent, forKey: .percent) From 53c4bd6c466529fd8191089924d499ebcaeece32 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Fri, 12 Jul 2024 16:12:54 -0400 Subject: [PATCH 13/24] Revise codes following MR comments --- .../Atoms/Views/CircularProgressBar.swift | 41 ++++------- .../Views/CircularProgressBarModel.swift | 68 +++++++++++-------- 2 files changed, 52 insertions(+), 57 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index 651b7f65..bc9083d0 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -23,17 +23,8 @@ import UIKit private var tracklayer = CAShapeLayer() private var labelLayer = CATextLayer() - var setProgressColor: UIColor = UIColor.red { - didSet { - progressLayer.strokeColor = setProgressColor.cgColor - } - } - - var setTrackColor: UIColor = UIColor.lightGray { - didSet { - tracklayer.strokeColor = setTrackColor.cgColor - } - } + var progressColor: UIColor = UIColor.red + var trackColor: UIColor = UIColor.lightGray // A path with which CAShapeLayer will be drawn on the screen private var viewCGPath: CGPath? { @@ -61,37 +52,29 @@ import UIKit guard let model = model as? CircularProgressBarModel else { return } // set background color - if let backgroundColor = model.backgroundColor { - self.backgroundColor = backgroundColor.uiColor - } else { - self.backgroundColor = UIColor.clear - } + backgroundColor = model.backgroundColor?.uiColor ?? UIColor.clear configureProgressViewToBeCircular() // set progress color - if let color = model.color { - setProgressColor = color.uiColor - } else { - setProgressColor = UIColor.red - } - + progressColor = model.color?.uiColor ?? .red + progressLayer.strokeColor = progressColor.cgColor + // set track color - if let trackColor = model.trackColor { - setTrackColor = trackColor.uiColor - } else { - setProgressColor = UIColor.lightGray - } + trackColor = model.trackColor?.uiColor ?? .lightGray + tracklayer.strokeColor = trackColor.cgColor // show circular progress view with animation. showProgressWithAnimation(duration: graphModel?.duration ?? 1.0, value: Float(graphModel?.percent ?? 0) / 100) // show progress percentage label. - showProgressPercentage() + if let drawText = model.drawText, drawText { + showProgressPercentage() + } } private func configureProgressViewToBeCircular() { - let lineWidth = graphModel?.lineWidth ?? 5.0 + let lineWidth = graphModel?.lineWidth ?? 4.0 self.drawShape(using: tracklayer, lineWidth: lineWidth) self.drawShape(using: progressLayer, lineWidth: lineWidth) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index 252f4893..7e2f4cbd 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -2,29 +2,31 @@ // CircularProgressBarModel.swift // MVMCoreUI // +// https://oneconfluence.verizon.com/display/MFD/Circular+Progress+Tracker +// // Created by Xi Zhang on 7/5/24. // Copyright © 2024 Verizon Wireless. All rights reserved. // import Foundation - public class CircularProgressBarModel: MoleculeModelProtocol { public static var identifier: String = "circularProgress" public var id: String = UUID().uuidString - public var size: GraphSize = .small { + public var percent: Int = 0 + public var size: GraphSize? = .small { didSet { updateSize() } } - public var diameter: CGFloat = 84 - public var lineWidth: CGFloat = 5 - public var duration : Double = 1.0 - public var color: Color? - public var trackColor: Color? - public var percent: Int? + public var diameter: CGFloat? = 84 + public var lineWidth: CGFloat? = 4 + public var duration : Double? = 1.0 + public var color: Color? = Color(uiColor: UIColor.mfGet(forHex: "#007AB8")) + public var trackColor: Color? = Color(uiColor: .mvmCoolGray3) + public var drawText: Bool? = true public var backgroundColor: Color? = Color(uiColor: UIColor.clear) public init() { @@ -33,21 +35,24 @@ public class CircularProgressBarModel: MoleculeModelProtocol { private enum CodingKeys: String, CodingKey { case id + case moleculeName + case percent case size case diameter case lineWidth case duration case color case trackColor - case percent + case drawText case backgroundColor - case moleculeName } required public init(from decoder: Decoder) throws { let typeContainer = try decoder.container(keyedBy: CodingKeys.self) id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString + percent = try typeContainer.decode(Int.self, forKey: .percent) + if let size = try typeContainer.decodeIfPresent(GraphSize.self, forKey: .size) { self.size = size } @@ -65,46 +70,53 @@ public class CircularProgressBarModel: MoleculeModelProtocol { self.duration = duration } - color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) - trackColor = try typeContainer.decodeIfPresent(Color.self, forKey: .trackColor) - percent = try typeContainer.decodeIfPresent(Int.self, forKey: .percent) + if let drawText = try typeContainer.decodeIfPresent(Bool.self, forKey: .drawText) { + self.drawText = drawText + } - backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) + if let color = try typeContainer.decodeIfPresent(Color.self, forKey: .color) { + self.color = color + } + + if let trackColor = try typeContainer.decodeIfPresent(Color.self, forKey: .trackColor) { + self.trackColor = trackColor + } + + if let backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey: .backgroundColor) { + self.backgroundColor = backgroundColor + } } public func encode(to encoder: Encoder) throws { var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(id, forKey: .id) try container.encode(moleculeName, forKey: .moleculeName) - try container.encode(size, forKey: .size) - try container.encode(diameter, forKey: .diameter) - try container.encode(lineWidth, forKey: .lineWidth) - try container.encode(duration, forKey: .duration) + try container.encode(percent, forKey: .percent) + try container.encodeIfPresent(size, forKey: .size) + try container.encodeIfPresent(diameter, forKey: .diameter) + try container.encodeIfPresent(lineWidth, forKey: .lineWidth) + try container.encodeIfPresent(duration, forKey: .duration) + try container.encodeIfPresent(drawText, forKey: .drawText) try container.encodeIfPresent(trackColor, forKey: .trackColor) try container.encodeIfPresent(color, forKey: .color) - try container.encodeIfPresent(percent, forKey: .percent) try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) } - func getCGColorsFromArray(_ colorArray: [String]) -> [Color] { - return colorArray.map { (colorString) -> Color in - return Color(uiColor: UIColor.mfGet(forHex: colorString)) - } - } - func updateSize() { switch size { case .small: diameter = MFSizeObject(standardSize: 64)?.getValueBasedOnApplicationWidth() ?? 64 - lineWidth = MFSizeObject(standardSize: 5)?.getValueBasedOnApplicationWidth() ?? 5 + lineWidth = MFSizeObject(standardSize: 4)?.getValueBasedOnApplicationWidth() ?? 4 break case .medium: diameter = MFSizeObject(standardSize: 84)?.getValueBasedOnApplicationWidth() ?? 84 - lineWidth = MFSizeObject(standardSize: 5)?.getValueBasedOnApplicationWidth() ?? 5 + lineWidth = MFSizeObject(standardSize: 4)?.getValueBasedOnApplicationWidth() ?? 4 break case .large: diameter = MFSizeObject(standardSize: 124)?.getValueBasedOnApplicationWidth() ?? 124 - lineWidth = MFSizeObject(standardSize: 5)?.getValueBasedOnApplicationWidth() ?? 5 + lineWidth = MFSizeObject(standardSize: 4)?.getValueBasedOnApplicationWidth() ?? 4 + break + case .none: break } } From 5cbd472a2da34508e6ccd0a25ab83c42d0d809a4 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Mon, 15 Jul 2024 16:04:34 -0400 Subject: [PATCH 14/24] Make diameter default value to 64 consistent with the default small size diameter value. --- MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift | 2 +- MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index bc9083d0..f55e85c8 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -16,7 +16,7 @@ import UIKit } var viewWidth: CGFloat { - graphModel?.diameter ?? CGFloat(84) + graphModel?.diameter ?? CGFloat(64) } private var progressLayer = CAShapeLayer() diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index 7e2f4cbd..e92dddbf 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -21,7 +21,7 @@ public class CircularProgressBarModel: MoleculeModelProtocol { updateSize() } } - public var diameter: CGFloat? = 84 + public var diameter: CGFloat? = 64 public var lineWidth: CGFloat? = 4 public var duration : Double? = 1.0 public var color: Color? = Color(uiColor: UIColor.mfGet(forHex: "#007AB8")) From 29466e4e336aab101c29be67114d6939fbb879f0 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Mon, 15 Jul 2024 17:02:28 -0400 Subject: [PATCH 15/24] Move GraphSize to a higher level for common use. --- MVMCoreUI.xcodeproj/project.pbxproj | 4 +++ .../Views/CircularProgressBarModel.swift | 16 ++++------ .../Atoms/Views/GraphSizeProtocol.swift | 29 +++++++++++++++++++ MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift | 17 ++++------- 4 files changed, 44 insertions(+), 22 deletions(-) create mode 100644 MVMCoreUI/Atomic/Atoms/Views/GraphSizeProtocol.swift diff --git a/MVMCoreUI.xcodeproj/project.pbxproj b/MVMCoreUI.xcodeproj/project.pbxproj index 0a1ea43d..12d16ced 100644 --- a/MVMCoreUI.xcodeproj/project.pbxproj +++ b/MVMCoreUI.xcodeproj/project.pbxproj @@ -155,6 +155,7 @@ 4B002ACA2BD855EC009BC9C1 /* DateDropdownEntryFieldModel+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B002AC92BD855EC009BC9C1 /* DateDropdownEntryFieldModel+Extension.swift */; }; 4B3408A22C3873B0003BFABF /* CircularProgressBarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3408A12C3873B0003BFABF /* CircularProgressBarModel.swift */; }; 4B3408A42C3873E8003BFABF /* CircularProgressBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3408A32C3873E8003BFABF /* CircularProgressBar.swift */; }; + 4B53AF7B2C45BBBA00274685 /* GraphSizeProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B53AF7A2C45BBBA00274685 /* GraphSizeProtocol.swift */; }; 522679C123FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */; }; 522679C223FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */; }; 52267A0723FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift in Sources */ = {isa = PBXBuildFile; fileRef = 52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */; }; @@ -774,6 +775,7 @@ 4B002AC92BD855EC009BC9C1 /* DateDropdownEntryFieldModel+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DateDropdownEntryFieldModel+Extension.swift"; sourceTree = ""; }; 4B3408A12C3873B0003BFABF /* CircularProgressBarModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgressBarModel.swift; sourceTree = ""; }; 4B3408A32C3873E8003BFABF /* CircularProgressBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CircularProgressBar.swift; sourceTree = ""; }; + 4B53AF7A2C45BBBA00274685 /* GraphSizeProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GraphSizeProtocol.swift; sourceTree = ""; }; 522679BF23FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinks.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinks.swift; sourceTree = ""; }; 522679C023FE886900906CBA /* ListLeftVariableCheckboxAllTextAndLinksModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListLeftVariableCheckboxAllTextAndLinksModel.swift; sourceTree = ""; }; 52267A0623FFE25000906CBA /* ListOneColumnFullWidthTextAllTextAndLinks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ListOneColumnFullWidthTextAllTextAndLinks.swift; sourceTree = ""; }; @@ -2313,6 +2315,7 @@ 94C2D9822386F3E30006CF46 /* Label */, 31BE15C923D8924C00452370 /* CheckboxLabelModel.swift */, 0A7BAFA2232BE63400FB8E22 /* CheckboxLabel.swift */, + 4B53AF7A2C45BBBA00274685 /* GraphSizeProtocol.swift */, D28A838223CCBD3F00DFE4FC /* WheelModel.swift */, 943784F3236B77BB006A1E82 /* Wheel.swift */, 4B3408A12C3873B0003BFABF /* CircularProgressBarModel.swift */, @@ -3109,6 +3112,7 @@ D2A6390522CBCE160052ED1F /* MoleculeCollectionViewCell.swift in Sources */, D2A6390122CBB1820052ED1F /* Carousel.swift in Sources */, C7F8012123E8303200396FBD /* ListRVWheel.swift in Sources */, + 4B53AF7B2C45BBBA00274685 /* GraphSizeProtocol.swift in Sources */, BB2C968F24330EA7006FF80C /* ListRightVariableTextLinkAllTextAndLinksModel.swift in Sources */, D2FB151B23A2B65B00C20E10 /* MoleculeContainer.swift in Sources */, EA7D81622B2B6E7F00D29F9E /* IconModel.swift in Sources */, diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index e92dddbf..61c503f6 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -10,17 +10,12 @@ import Foundation -public class CircularProgressBarModel: MoleculeModelProtocol { +public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol { public static var identifier: String = "circularProgress" public var id: String = UUID().uuidString public var percent: Int = 0 - public var size: GraphSize? = .small { - didSet { - updateSize() - } - } public var diameter: CGFloat? = 64 public var lineWidth: CGFloat? = 4 public var duration : Double? = 1.0 @@ -29,7 +24,8 @@ public class CircularProgressBarModel: MoleculeModelProtocol { public var drawText: Bool? = true public var backgroundColor: Color? = Color(uiColor: UIColor.clear) - public init() { + public override init() { + super.init() updateSize() } @@ -48,6 +44,8 @@ public class CircularProgressBarModel: MoleculeModelProtocol { } required public init(from decoder: Decoder) throws { + + super.init() let typeContainer = try decoder.container(keyedBy: CodingKeys.self) id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString @@ -102,7 +100,7 @@ public class CircularProgressBarModel: MoleculeModelProtocol { try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) } - func updateSize() { + public override func updateSize() { switch size { case .small: diameter = MFSizeObject(standardSize: 64)?.getValueBasedOnApplicationWidth() ?? 64 @@ -116,8 +114,6 @@ public class CircularProgressBarModel: MoleculeModelProtocol { diameter = MFSizeObject(standardSize: 124)?.getValueBasedOnApplicationWidth() ?? 124 lineWidth = MFSizeObject(standardSize: 4)?.getValueBasedOnApplicationWidth() ?? 4 break - case .none: - break } } } diff --git a/MVMCoreUI/Atomic/Atoms/Views/GraphSizeProtocol.swift b/MVMCoreUI/Atomic/Atoms/Views/GraphSizeProtocol.swift new file mode 100644 index 00000000..13000706 --- /dev/null +++ b/MVMCoreUI/Atomic/Atoms/Views/GraphSizeProtocol.swift @@ -0,0 +1,29 @@ +// +// GraphSizeProtocol.swift +// MVMCoreUI +// +// Created by Xi Zhang on 7/15/24. +// Copyright © 2024 Verizon Wireless. All rights reserved. +// + +import Foundation + +public enum GraphSize: String, Codable { + case small, medium, large +} + +public protocol GraphSizeProtocol { + var size: GraphSize { get set } + func updateSize() +} + +public class GraphSizeBase: GraphSizeProtocol { + public var size: GraphSize = .small { + didSet { + updateSize() + } + } + + public func updateSize() { + } +} diff --git a/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift b/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift index 4fed14cb..416a1ac2 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/WheelModel.swift @@ -8,15 +8,11 @@ import UIKit -public enum GraphSize: String, Codable { - case small, medium, large -} - public enum GraphStyle: String, Codable { case unlimited, safetyMode } -public class WheelModel: MoleculeModelProtocol { +public class WheelModel: GraphSizeBase, MoleculeModelProtocol { public static var identifier: String = "wheel" public var id: String = UUID().uuidString @@ -27,11 +23,6 @@ public class WheelModel: MoleculeModelProtocol { } } - public var size: GraphSize = .small { - didSet { - updateSize() - } - } public var diameter: CGFloat = 24 public var lineWidth: CGFloat = 5 public var clockwise: Bool = true @@ -39,7 +30,8 @@ public class WheelModel: MoleculeModelProtocol { public var colors = [Color]() public var backgroundColor: Color? - public init() { + public override init() { + super.init() updateStyle() updateSize() } @@ -58,6 +50,7 @@ public class WheelModel: MoleculeModelProtocol { } required public init(from decoder: Decoder) throws { + super.init() let typeContainer = try decoder.container(keyedBy: CodingKeys.self) id = try typeContainer.decodeIfPresent(String.self, forKey: .id) ?? UUID().uuidString @@ -123,7 +116,7 @@ public class WheelModel: MoleculeModelProtocol { } } - func updateSize() { + public override func updateSize() { switch size { case .small: diameter = MFSizeObject(standardSize: 20)?.getValueBasedOnApplicationWidth() ?? 20 From f001f98d3a09557172b0152b4d7372e22c79e3ed Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Tue, 16 Jul 2024 14:20:37 -0400 Subject: [PATCH 16/24] Digital PCT265 story DE307-834: Add missing BadgeModel isEqual(to:). --- MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift b/MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift index b739baf7..e04cc47e 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/BadgeModel.swift @@ -53,4 +53,15 @@ open class BadgeModel: MoleculeModelProtocol { try container.encode(numberOfLines, forKey: .numberOfLines) try container.encodeIfPresent(maxWidth, forKey: .maxWidth) } + + public func isEqual(to model: any ModelComparisonProtocol) -> Bool { + guard let model = model as? BadgeModel else { return false } + return self.backgroundColor == model.backgroundColor + && self.fillColor == model.fillColor + && self.numberOfLines == model.numberOfLines + && self.text == model.text + && self.surface == model.surface + && self.accessibilityText == model.accessibilityText + && self.maxWidth == model.maxWidth + } } From 46d57733e4618104af8a1cf07210987e46179a75 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Tue, 16 Jul 2024 14:32:48 -0400 Subject: [PATCH 17/24] Digital PCT265 story DE307-834: Increase throttle time for collision safety. As a throttle this is to space the updates at regular intervals. This should also help reduce some of the page stuttering as there will be bigger update batches. --- MVMCoreUI/BaseControllers/ViewController.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/BaseControllers/ViewController.swift b/MVMCoreUI/BaseControllers/ViewController.swift index a6c43b2d..043627e6 100644 --- a/MVMCoreUI/BaseControllers/ViewController.swift +++ b/MVMCoreUI/BaseControllers/ViewController.swift @@ -78,7 +78,7 @@ import Combine return (next.0 ?? accumulator.0, next.1 ?? accumulator.1, next.2?.mergingRight(accumulator.2 ?? [:])) } // Delay allowing the previous model update to settle before triggering a re-render. - .throttle(for: .seconds(0.05), scheduler: RunLoop.main, latest: true) + .throttle(for: .seconds(0.25), scheduler: RunLoop.main, latest: true) .sink { [weak self] (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in guard let self = self else { return } if let pageUpdates, pageModel != nil { From bc72d81396cb2b3192e21f9674925bb597fb287e Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Tue, 16 Jul 2024 15:16:56 -0400 Subject: [PATCH 18/24] Digital PCT265 story DE307-834: Prevent scroll reset on reconfigure. --- MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index ad627d35..fb333772 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -210,6 +210,7 @@ open class Carousel: View { registerCells(with: carouselModel, delegateObject: delegateObject) prepareMolecules(with: carouselModel) + pageIndex = 0 FormValidator.setupValidation(for: carouselModel, delegate: delegateObject?.formHolderDelegate) setupPagingMolecule(carouselModel.pagingMolecule, delegateObject: delegateObject) @@ -250,8 +251,6 @@ open class Carousel: View { } else { loop = false } - - pageIndex = 0 } open override func reset() { From 16c20507ce19f11df7326c5761df432843c5c164 Mon Sep 17 00:00:00 2001 From: "Hedden, Kyle Matthew" Date: Tue, 16 Jul 2024 19:58:26 -0400 Subject: [PATCH 19/24] Digital PCT265 story DE307-834: Crash prevention on registered cells check for gone change. --- MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift index fb333772..f84bdfc5 100644 --- a/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift +++ b/MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift @@ -285,7 +285,7 @@ open class Carousel: View { /// Registers the cells with the collection view func registerCells(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) { var registeredIds = [String]() - for molecule in carouselModel.molecules { + for molecule in carouselModel.visibleMolecules { if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier) registeredIds.append(info.identifier) @@ -299,7 +299,7 @@ open class Carousel: View { func hasSameCellRegistration(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) -> Bool { guard let registeredMoleculeIds else { return false } - let incomingIds = carouselModel.molecules.map { molecule in + let incomingIds = carouselModel.visibleMolecules.map { molecule in if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) { return info.identifier } else { From 3b5b03a3689f7185e1811b9525afee1ead5ec086 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Wed, 17 Jul 2024 10:23:50 -0400 Subject: [PATCH 20/24] Fix the showing issue when percent is 100%. --- MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index f55e85c8..09009a57 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -102,7 +102,7 @@ import UIKit private func showProgressPercentage() { let percent = graphModel?.percent ?? 0 - let percentLen = percent > 9 ? 2 : 1 + let percentLen = String(percent).count // configure attributed string for progress percentage. let attributedString = NSMutableAttributedString(string: String(percent) + "%") From 0f4a97b49cbb2b1160a736b23d230193a1e25961 Mon Sep 17 00:00:00 2001 From: Xi Zhang Date: Wed, 17 Jul 2024 14:35:55 -0400 Subject: [PATCH 21/24] Set the default value of duration to 0 to disable the animation by default following confluence page. --- MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift | 2 +- MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift index 09009a57..835a1def 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBar.swift @@ -65,7 +65,7 @@ import UIKit tracklayer.strokeColor = trackColor.cgColor // show circular progress view with animation. - showProgressWithAnimation(duration: graphModel?.duration ?? 1.0, value: Float(graphModel?.percent ?? 0) / 100) + showProgressWithAnimation(duration: graphModel?.duration ?? 0, value: Float(graphModel?.percent ?? 0) / 100) // show progress percentage label. if let drawText = model.drawText, drawText { diff --git a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift index 61c503f6..b2f37e68 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CircularProgressBarModel.swift @@ -18,7 +18,7 @@ public class CircularProgressBarModel: GraphSizeBase, MoleculeModelProtocol { public var percent: Int = 0 public var diameter: CGFloat? = 64 public var lineWidth: CGFloat? = 4 - public var duration : Double? = 1.0 + public var duration : Double? = 0 public var color: Color? = Color(uiColor: UIColor.mfGet(forHex: "#007AB8")) public var trackColor: Color? = Color(uiColor: .mvmCoolGray3) public var drawText: Bool? = true From efd98cc887a0adc4d5ce0ec6de14e4ff36ad6018 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 19 Jul 2024 16:00:43 -0500 Subject: [PATCH 22/24] removed un-needed properties Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift | 9 --------- 1 file changed, 9 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift index 7c3d3ee0..00554c2e 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/CheckboxModel.swift @@ -22,11 +22,8 @@ import VDS public static override var identifier: String { "checkbox" } public var selected: Bool = false public var animated: Bool = true - public var inverted: Bool = false public var action: ActionModelProtocol? public var offAction: ActionModelProtocol? - - public var surface: Surface { inverted ? .dark : .light } //-------------------------------------------------- // MARK: - Keys @@ -34,7 +31,6 @@ import VDS private enum CodingKeys: String, CodingKey { case checked - case inverted case animated case action case offAction @@ -85,10 +81,6 @@ import VDS self.animated = animated } - if let inverted = try typeContainer.decodeIfPresent(Bool.self, forKey: .inverted) { - self.inverted = inverted - } - action = try typeContainer.decodeModelIfPresent(codingKey: .action) offAction = try typeContainer.decodeModelIfPresent(codingKey: .offAction) @@ -98,7 +90,6 @@ import VDS try super.encode(to: encoder) var container = encoder.container(keyedBy: CodingKeys.self) try container.encode(selected, forKey: .checked) - try container.encode(inverted, forKey: .inverted) try container.encodeIfPresent(animated, forKey: .animated) try container.encodeModelIfPresent(action, forKey: .action) try container.encodeModelIfPresent(offAction, forKey: .offAction) From f82ef2e51c3063a498204a0ccacf81b2b8aea792 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 19 Jul 2024 16:12:12 -0500 Subject: [PATCH 23/24] add open Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift index 473e56df..99dc419e 100644 --- a/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift +++ b/MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift @@ -26,10 +26,10 @@ import VDS var groupName: String? /// Disables all selection logic when setting the value of isSelected, reducing it to a stored property. - public var updateSelectionOnly: Bool = false + open var updateSelectionOnly: Bool = false /// Action Block called when the switch is selected. - public var actionBlock: ActionBlock? { + open var actionBlock: ActionBlock? { get { nil } set { if let action = newValue { @@ -110,7 +110,7 @@ import VDS //-------------------------------------------------- /// This will toggle the state of the Checkbox and execute the actionBlock if provided. - public func toggleAndAction() { + open func toggleAndAction() { toggle() } @@ -120,7 +120,7 @@ import VDS /// Programmatic means to check/uncheck the box. /// - parameter selected: state of the check box: true = checked OR false = unchecked. /// - parameter animated: allows the state of the checkbox to change with or without animation. - public func updateSelection(to selected: Bool, animated: Bool) { + open func updateSelection(to selected: Bool, animated: Bool) { DispatchQueue.main.async { self.isAnimated = animated @@ -131,7 +131,7 @@ import VDS /// updates the visuals of the check mark and background. /// - parameter isSelected: the check state of the checkbox. /// - parameter isAnimated: determines of the changes should animate or immediately refelect. - public func updateCheckboxUI(isSelected: Bool, isAnimated: Bool) { + open func updateCheckboxUI(isSelected: Bool, isAnimated: Bool) { DispatchQueue.main.async { self.isAnimated = isAnimated @@ -145,9 +145,9 @@ import VDS open func needsToBeConstrained() -> Bool { true } - public func horizontalAlignment() -> UIStackView.Alignment { .leading } + open func horizontalAlignment() -> UIStackView.Alignment { .leading } - public func updateView(_ size: CGFloat) {} + open func updateView(_ size: CGFloat) {} private func performCheckboxAction(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) { MVMCoreUIActionHandler.performActionUnstructured(with: actionModel, sourceModel: viewModel, additionalData: additionalData, delegateObject: delegateObject) From c47d21bdf1c50e2006c2be45b11d519ba5c50122 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Fri, 19 Jul 2024 16:32:46 -0500 Subject: [PATCH 24/24] updated with open Signed-off-by: Matt Bruce --- MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift index b1454a97..9473a324 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/CheckboxLabel.swift @@ -38,7 +38,7 @@ import VDS //-------------------------------------------------- // MARK: - Atomic //-------------------------------------------------- - public func viewModelDidUpdate() { + open func viewModelDidUpdate() { surface = viewModel.surface updateCheckbox() @@ -62,7 +62,7 @@ import VDS MVMCoreUIActionHandler.performActionUnstructured(with: actionModel, sourceModel: viewModel.checkbox, additionalData: additionalData, delegateObject: delegateObject) } - public func updateCheckbox() { + open func updateCheckbox() { //forms FormValidator.setupValidation(for: viewModel.checkbox, delegate: delegateObject?.formHolderDelegate) groupName = viewModel.checkbox.groupName