mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 'release/10_8_0'

Browse Source 
updated logic for change in VDS TitleLockup/Tilelet

### Summary
merge develop

Co-authored-by: Scott Pfeil <Scott.Pfeil3@verizonwireless.com>
Co-authored-by: Matt Bruce <matt.bruce@verizon.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui/-/merge_requests/976
This commit is contained in:
Pfeil, Scott Robert 2023-06-30 18:01:46 +00:00
commit b49c03fa7f
4 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
MVMCoreUI/Atomic/Atoms/Views/TileletModel.swift
View File

@ -65,9 +65,9 @@ open class TileletModel: MoleculeModelProtocol {
public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? { public func titleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.TitleModel? {
guard let title else { return nil } guard let title else { return nil }
let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData) let attrs = title.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
let style: Tilelet.TitleModel.TextStyle? = title.fontStyle?.vdsSubsetStyle() let style: TextStyle? = title.fontStyle?.vdsTextStyle()
if let style { if let style, let standardStyle = Tilelet.TitleModel.StandardStyle(rawValue: style.toStandardStyle().rawValue) {
return .init(text: title.text, textAttributes: attrs, textStyle: style) return .init(text: title.text, textAttributes: attrs, standardStyle: standardStyle)
} else { } else {
return .init(text: title.text, textAttributes: attrs) return .init(text: title.text, textAttributes: attrs)
} }
@ -75,11 +75,12 @@ open class TileletModel: MoleculeModelProtocol {
public func subTitleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.SubTitleModel? { public func subTitleModel(delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) -> Tilelet.SubTitleModel? {
guard let subTitle else { return nil } guard let subTitle else { return nil }
let style: Tilelet.SubTitleModel.TextStyle? = subTitle.fontStyle?.vdsSubsetStyle() let attrs = subTitle.attributes?.toVDSLabelAttributeModel(delegateObject: delegateObject, additionalData: additionalData)
if let style { let style: TextStyle? = subTitle.fontStyle?.vdsTextStyle()
return .init(text: subTitle.text, textStyle: style) if let style, let standardStyle = Tilelet.SubTitleModel.StandardStyle(rawValue: style.toStandardStyle().rawValue) {
return .init(text: subTitle.text, textAttributes: attrs, standardStyle: standardStyle)
} else { } else {
return .init(text: subTitle.text) return .init(text: subTitle.text, textAttributes: attrs)
} }
} }

13
MVMCoreUI/Notification/NotificationContainerView.swift
View File

@ -12,7 +12,6 @@ import MVMCore
/// A simple container view that shows and hides a notification. /// A simple container view that shows and hides a notification.
public class NotificationContainerView: UIView { public class NotificationContainerView: UIView {
public var currentModel: NotificationModel?
public var currentNotificationView: UIView? public var currentNotificationView: UIView?
lazy private var height = heightAnchor.constraint(equalToConstant: 0) lazy private var height = heightAnchor.constraint(equalToConstant: 0)
@ -82,17 +81,7 @@ extension NotificationContainerView: NotificationTransitionDelegateProtocol {
@MainActor @MainActor
public func update(with model: NotificationModel, delegateObject: MVMCoreUIDelegateObject?) { public func update(with model: NotificationModel, delegateObject: MVMCoreUIDelegateObject?) {
guard let currentModel = currentModel, guard let molecule = currentNotificationView as? MoleculeViewProtocol else { return }
currentModel.type == model.type else { return }
guard let molecule = currentNotificationView as? MoleculeViewProtocol,
currentModel.molecule.moleculeName == model.molecule.moleculeName else {
// Log that we couldn't update.
if let errorObject = MVMCoreErrorObject(title: nil, message: nil, messageToLog: nil, code: ErrorCode.parsingJSON.rawValue, domain: ErrorDomainNative, location: "TopNotification update \(String(describing: model.type))") {
MVMCoreUILoggingHandler.addError(toLog: errorObject)
}
return
}
// Update molecule // Update molecule
molecule.reset() molecule.reset()
molecule.set(with: model.molecule, delegateObject, nil) molecule.set(with: model.molecule, delegateObject, nil)

5
MVMCoreUI/Notification/NotificationHandler.swift
View File

@ -563,8 +563,9 @@ extension NotificationOperation {
!isCancelled else { return } !isCancelled else { return }
self.log(message: "Operation Updated") self.log(message: "Operation Updated")
updateStopTimer() updateStopTimer()
Task { @MainActor in Task {
transitionDelegate.update(with: notificationModel, delegateObject: delegateObject) await transitionDelegate.update(with: notificationModel, delegateObject: delegateObject)
NotificationHandler.shared()?.onNotificationUpdated.send((notification, notificationModel))
} }
} }

4
MVMCoreUI/OtherHandlers/CoreUIObject.swift
View File

@ -18,9 +18,7 @@ import MVMCore
loadHandler = MVMCoreLoadHandler() loadHandler = MVMCoreLoadHandler()
cache = MVMCoreCache() cache = MVMCoreCache()
session = MVMCoreUISession() session = MVMCoreUISession()
Task { @MainActor in sessionHandler = MVMCoreSessionTimeHandler()
self.sessionHandler = MVMCoreSessionTimeHandler()
}
actionHandler = MVMCoreUIActionHandler() actionHandler = MVMCoreUIActionHandler()
viewControllerMapping = MVMCoreUIViewControllerMappingObject() viewControllerMapping = MVMCoreUIViewControllerMappingObject()
loggingDelegate = MVMCoreUILoggingHandler() loggingDelegate = MVMCoreUILoggingHandler()