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

review changes

Browse Source
This commit is contained in:
Scott Pfeil 2023-04-18 11:16:55 -04:00
parent 67cd073173
commit 800cc7671a
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/Alerts/AlertController.swift
View File

@ -7,6 +7,7 @@
// //
import Foundation import Foundation
import MVMCore
public class AlertController: UIAlertController { public class AlertController: UIAlertController {
@objc dynamic public var visible = false @objc dynamic public var visible = false

2
MVMCoreUI/Alerts/AlertHandler.swift
View File

@ -10,7 +10,7 @@ import MVMCore
public class AlertHandler { public class AlertHandler {
/// Returns the action handler stored in the CoreUIObject /// Returns the handler stored in the CoreUIObject
public static func shared() -> Self { public static func shared() -> Self {
return MVMCoreActionUtility.fatalClassCheck(object: CoreUIObject.sharedInstance()?.alertHandler) return MVMCoreActionUtility.fatalClassCheck(object: CoreUIObject.sharedInstance()?.alertHandler)
} }

4
MVMCoreUI/Alerts/TopNotificationHandler.swift
View File

@ -10,10 +10,10 @@ import MVMCore
public class TopNotificationHandler { public class TopNotificationHandler {
/// The operation queue of alert operations. /// The operation queue of top notification operations.
private var queue = OperationQueue() private var queue = OperationQueue()
/// Returns the action handler stored in the CoreUIObject /// Returns the handler stored in the CoreUIObject
public static func shared() -> Self { public static func shared() -> Self {
return MVMCoreActionUtility.fatalClassCheck(object: CoreUIObject.sharedInstance()?.topNotificationHandler) return MVMCoreActionUtility.fatalClassCheck(object: CoreUIObject.sharedInstance()?.topNotificationHandler)
} }

8
MVMCoreUI/Atomic/Actions/AlertModel.swift
View File

@ -69,7 +69,7 @@ public struct AlertModel: Codable, Identifiable {
public var message: String public var message: String
public var style: UIAlertController.Style = .alert public var style: UIAlertController.Style = .alert
public var actions: [UIAlertAction] public var actions: [UIAlertAction]
public var alertActions: [AlertButtonModel]? public var buttonModels: [AlertButtonModel]?
public var analyticsData: JSONValueDictionary? public var analyticsData: JSONValueDictionary?
public var id: String public var id: String
@ -117,8 +117,8 @@ public struct AlertModel: Codable, Identifiable {
let delegateObject = try decoder.get() let delegateObject = try decoder.get()
title = try typeContainer.decode(String.self, forKey: .title) title = try typeContainer.decode(String.self, forKey: .title)
message = try typeContainer.decode(String.self, forKey: .message) message = try typeContainer.decode(String.self, forKey: .message)
alertActions = try typeContainer.decode([AlertButtonModel].self, forKey: .alertActions) buttonModels = try typeContainer.decode([AlertButtonModel].self, forKey: .alertActions)
actions = alertActions!.map({ alertButtonModel in actions = buttonModels!.map({ alertButtonModel in
return alertButtonModel.generateAction(delegateObject: delegateObject) return alertButtonModel.generateAction(delegateObject: delegateObject)
}) })
analyticsData = try typeContainer.decodeIfPresent(JSONValueDictionary.self, forKey: .analyticsData) analyticsData = try typeContainer.decodeIfPresent(JSONValueDictionary.self, forKey: .analyticsData)
@ -133,7 +133,7 @@ public struct AlertModel: Codable, Identifiable {
var container = encoder.container(keyedBy: CodingKeys.self) var container = encoder.container(keyedBy: CodingKeys.self)
try container.encode(title, forKey: .title) try container.encode(title, forKey: .title)
try container.encode(message, forKey: .message) try container.encode(message, forKey: .message)
try container.encodeIfPresent(alertActions, forKey: .alertActions) try container.encodeIfPresent(buttonModels, forKey: .alertActions)
try container.encode(style.rawValueString, forKey: .style) try container.encode(style.rawValueString, forKey: .style)
try container.encodeIfPresent(analyticsData, forKey: .analyticsData) try container.encodeIfPresent(analyticsData, forKey: .analyticsData)
try container.encode(id, forKey: .id) try container.encode(id, forKey: .id)