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

fixes

Browse Source
This commit is contained in:
Pfeil, Scott Robert 2020-03-16 19:41:50 -04:00
parent 2c6f9667a5
commit f4f5d8dc84
7 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atoms/Views/MFLoadImageView.swift
View File

@ -181,7 +181,7 @@ import UIKit
let widthWillChange = !MVMCoreGetterUtility.cgfequal(widthConstraint?.constant ?? 0, width ?? 0)
let heightWillChange = !MVMCoreGetterUtility.cgfequal(heightConstraint?.constant ?? 0, height ?? 0)
let sizeWillChange = (width == nil || height == nil) && !(size?.equalTo(imageView.image?.size ?? CGSize.zero) ?? false)
let heightChangeFromSpinner = ((height ?? size?.height) ?? 0) < loadingSpinnerHeightConstraint?.constant ?? CGFloat.leastNormalMagnitude
let heightChangeFromSpinner = (heightConstraint?.isActive ?? false) ? false : ((height ?? size?.height) ?? 0) < loadingSpinnerHeightConstraint?.constant ?? CGFloat.leastNormalMagnitude
return widthWillChange || heightWillChange || sizeWillChange || heightChangeFromSpinner
}

2
MVMCoreUI/BaseControllers/ThreeLayerTableViewController.swift
View File

@ -37,10 +37,10 @@ open class ThreeLayerTableViewController: ProgrammaticTableViewController {
}
open override func handleNewData() {
super.handleNewData()
createViewForTableHeader()
createViewForTableFooter()
tableView?.reloadData()
super.handleNewData()
}
override open func viewDidLoad() {

42
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -123,24 +123,6 @@ open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMC
}
open func parsePageJSON() throws {
// Convert legacy to navigation model.
if pageModel?.navigationItem == nil {
let navigationModel = NavigationItemModel()
if navigationModel.title == nil {
navigationModel.title = pageModel?.screenHeading
}
if navigationModel.showLeftPanelButton == nil {
navigationModel.showLeftPanelButton = isMasterInitiallyAccessible()
}
if navigationModel.showRightPanelButton == nil {
navigationModel.showRightPanelButton = isSupportInitiallyAccessible()
}
pageModel?.navigationItem = navigationModel
}
if self.formValidator == nil {
let rules = pageModel?.formRules
self.formValidator = FormValidator(rules)
}
}
open class func verifyRequiredModulesLoaded(for loadObject: MVMCoreLoadObject?, error: inout MVMCoreErrorObject?) -> Bool {
@ -173,7 +155,24 @@ open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMC
/// Processes any new data. Called after the page is loaded the first time and on response updates for this page,
open func handleNewData() {
formValidator?.validate()
// Convert legacy to navigation model.
if pageModel?.navigationItem == nil {
let navigationModel = NavigationItemModel()
if navigationModel.title == nil {
navigationModel.title = pageModel?.screenHeading
}
if navigationModel.showLeftPanelButton == nil {
navigationModel.showLeftPanelButton = isMasterInitiallyAccessible()
}
if navigationModel.showRightPanelButton == nil {
navigationModel.showRightPanelButton = isSupportInitiallyAccessible()
}
pageModel?.navigationItem = navigationModel
}
if self.formValidator == nil {
let rules = pageModel?.formRules
self.formValidator = FormValidator(rules)
}
}
// MARK: - Navigation Item (Move to model base)
@ -257,6 +256,7 @@ open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMC
}
open func updateViews() {
formValidator?.validate()
}
override open func viewDidLoad() {
@ -312,7 +312,7 @@ open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMC
if manager == nil {
MVMCoreUISession.sharedGlobal()?.currentPageType = pageType
MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
//MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
}
}
@ -341,7 +341,7 @@ open class ViewController: UIViewController, MVMCoreViewControllerProtocol, MVMC
set(navigationController: manager.navigationController)
}
MVMCoreUISession.sharedGlobal()?.currentPageType = pageType
MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
//MVMCoreUILoggingHandler.shared()?.defaultLogPageState(forController: self)
}
// MARK: - MVMCoreActionDelegateProtocol

2
MVMCoreUI/Templates/ListPageTemplateModel.swift
View File

@ -8,7 +8,7 @@
import Foundation
@objcMembers public class ListPageTemplateModel: TemplateModelProtocol {
@objcMembers public class ListPageTemplateModel: MVMControllerModelProtocol {
public var formRules: [FormGroupRule]?
public var formValidator: FormValidator?

2
MVMCoreUI/Templates/MoleculeListTemplate.swift
View File

@ -81,9 +81,9 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
}
open override func handleNewData() {
super.handleNewData()
setup()
registerWithTable()
super.handleNewData()
}
//--------------------------------------------------

2
MVMCoreUI/Templates/StackCenteredPageTemplateModel.swift
View File

@ -8,7 +8,7 @@
import Foundation
@objcMembers public class StackCenteredPageTemplateModel: TemplateModelProtocol {
@objcMembers public class StackCenteredPageTemplateModel: MVMControllerModelProtocol {
public var formRules: [FormGroupRule]?
public var formValidator: FormValidator?

2
MVMCoreUI/Templates/ThreeLayerPageTemplateModel.swift
View File

@ -8,7 +8,7 @@
import Foundation
@objcMembers public class ThreeLayerPageTemplateModel: TemplateModelProtocol {
@objcMembers public class ThreeLayerPageTemplateModel: MVMControllerModelProtocol {
public var formRules: [FormGroupRule]?
public var formValidator: FormValidator?