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

navigation item update to fix crash

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-03-23 15:01:31 -04:00
parent 71fdc43b86
commit 7b36f466fa
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Models/ModelProtocols/PageModelProtocol.swift
View File

@ -13,5 +13,5 @@ public protocol PageModelProtocol {
var pageType: String { get set } var pageType: String { get set }
var screenHeading: String? { get set } var screenHeading: String? { get set }
var isAtomicTabs: Bool? { get set } var isAtomicTabs: Bool? { get set }
var navigationItem: NavigationItemModelProtocol? { get set } var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)? { get set }
} }

4
MVMCoreUI/Molecules/NavigationItemModelProtocol.swift
View File

@ -8,7 +8,7 @@
import Foundation import Foundation
public protocol NavigationItemModelProtocol: MoleculeModelProtocol { public protocol NavigationItemModelProtocol {
var title: String? { get set } var title: String? { get set }
var titleView: MoleculeModelProtocol? { get set } var titleView: MoleculeModelProtocol? { get set }
var hidden: Bool { get set } var hidden: Bool { get set }
@ -50,7 +50,7 @@ public class NavigationItemButtonModel: Codable {
} }
} }
public class NavigationItemModel: NavigationItemModelProtocol { public class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtocol {
public class var identifier: String { public class var identifier: String {
return "navigationItem" return "navigationItem"
} }

2
MVMCoreUI/Templates/ListPageTemplateModel.swift
View File

@ -22,7 +22,7 @@ import Foundation
public var pageType: String public var pageType: String
public var screenHeading: String? public var screenHeading: String?
public var isAtomicTabs: Bool? public var isAtomicTabs: Bool?
public var navigationItem: NavigationItemModelProtocol? public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
public var header: MoleculeModelProtocol? public var header: MoleculeModelProtocol?
public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]? public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]?

2
MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift
View File

@ -17,7 +17,7 @@ import Foundation
public var pageType: String public var pageType: String
public var screenHeading: String? public var screenHeading: String?
public var isAtomicTabs: Bool? public var isAtomicTabs: Bool?
public var navigationItem: NavigationItemModelProtocol? public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
public init(pageType: String) { public init(pageType: String) {
self.pageType = pageType self.pageType = pageType

2
MVMCoreUI/Templates/TemplateModel.swift
View File

@ -15,7 +15,7 @@ import Foundation
public var pageType: String public var pageType: String
public var screenHeading: String? public var screenHeading: String?
public var isAtomicTabs: Bool? public var isAtomicTabs: Bool?
public var navigationItem: NavigationItemModelProtocol? public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
public var formRules: [FormGroupRule]? public var formRules: [FormGroupRule]?
public init(pageType: String) { public init(pageType: String) {

2
MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift
View File

@ -18,7 +18,7 @@ import Foundation
public var pageType: String public var pageType: String
public var screenHeading: String? public var screenHeading: String?
public var isAtomicTabs: Bool? public var isAtomicTabs: Bool?
public var navigationItem: NavigationItemModelProtocol? public var navigationItem: (NavigationItemModelProtocol & MoleculeModelProtocol)?
public var header: MoleculeModelProtocol? public var header: MoleculeModelProtocol?
public var middle: MoleculeModelProtocol? public var middle: MoleculeModelProtocol?