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

merging

Browse Source
This commit is contained in:
Kevin G Christiano 2020-06-09 09:17:12 -04:00
commit 15e8f45293
5 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/Atomic/Atoms/FormFields/Tags/Tag.swift
View File

@ -19,6 +19,7 @@ import Foundation
//-------------------------------------------------- //--------------------------------------------------
// MARK: - MVMCoreViewProtocol // MARK: - MVMCoreViewProtocol
//-------------------------------------------------- //--------------------------------------------------
open override func setupView() { open override func setupView() {
super.setupView() super.setupView()
layer.borderColor = UIColor.mvmCoolGray6.cgColor layer.borderColor = UIColor.mvmCoolGray6.cgColor

5
MVMCoreUI/Atomic/Atoms/Views/ImageViewModel.swift
View File

@ -21,8 +21,11 @@ import Foundation
public var contentMode: UIView.ContentMode? public var contentMode: UIView.ContentMode?
public var localBundle: Bundle? public var localBundle: Bundle?
public init(image: String) { public init(image: String, imageFormat: String? = nil, width: CGFloat? = nil, height: CGFloat? = nil) {
self.image = image self.image = image
self.imageFormat = imageFormat
self.width = width
self.height = height
} }
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String, CodingKey {

6
MVMCoreUI/Atomic/Atoms/Views/LineModel.swift
View File

@ -71,6 +71,12 @@ import UIKit
self.useVerticalLine = false self.useVerticalLine = false
} }
public init(verticalLineOf type: Style, backgroundColor: Color? = nil) {
self.type = type
self.backgroundColor = backgroundColor
self.useVerticalLine = true
}
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Keys // MARK: - Keys
//-------------------------------------------------- //--------------------------------------------------

2
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -263,7 +263,7 @@ import UIKit
// MARK: - TabBar // MARK: - TabBar
open func updateTabBar() { open func updateTabBar() {
guard MVMCoreUISplitViewController.main()?.getCurrentDetailViewController() == self, guard MVMCoreUISplitViewController.main()?.getCurrentDetailViewController() == self,
var tabModel = pageModel as? TabPageModelProtocol else { return } let tabModel = pageModel as? TabPageModelProtocol else { return }
if let index = tabModel.tabBarIndex { if let index = tabModel.tabBarIndex {
MVMCoreUISplitViewController.main()?.tabBar?.highlightTab(at: index) MVMCoreUISplitViewController.main()?.tabBar?.highlightTab(at: index)
} }

12
MVMCoreUI/FormUIHelpers/FormValidator.swift
View File

@ -15,12 +15,12 @@ import MVMCore
// MARK: - Properties // MARK: - Properties
//-------------------------------------------------- //--------------------------------------------------
static var defaultGroupName: String = "default" public static var defaultGroupName: String = "default"
var formRules: [FormGroupRule]? public var formRules: [FormGroupRule]?
weak var delegate: FormHolderProtocol? public weak var delegate: FormHolderProtocol?
var fields: [String: FormFieldProtocol] = [:] public var fields: [String: FormFieldProtocol] = [:]
var groupWatchers: [FormGroupWatcherFieldProtocol] = [] public var groupWatchers: [FormGroupWatcherFieldProtocol] = []
var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:] public var radioButtonsModelByGroup: [String: RadioButtonSelectionHelper] = [:]
//-------------------------------------------------- //--------------------------------------------------
// MARK: - Initializer // MARK: - Initializer