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

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>

Browse Source
This commit is contained in:
Matt Bruce 2022-10-20 15:58:40 -05:00
parent 627a1eddac
commit 9c5f30b886
4 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
JSONCreator_iOS/JSONCreator/JSON/Samples/FormContactInfo.json
View File

@ -22,18 +22,19 @@
{ {
"moleculeName": "stackItem", "moleculeName": "stackItem",
"molecule": { "molecule": {
"moleculeName": "testToggle3" "moleculeName": "toggle"
} }
}, },
{ {
"moleculeName": "stackItem", "moleculeName": "stackItem",
"molecule": { "molecule": {
"moleculeName": "testLabelToggle", "moleculeName": "labelToggle",
"label": { "label": {
"moleculeName": "label",
"text": "isActive" "text": "isActive"
}, },
"toggle": { "toggle": {
"moleculeName": "testToggle1", "moleculeName": "toggle",
"fieldKey": "isActive" "fieldKey": "isActive"
} }
} }

21
JSONCreator_iOS/JSONCreator/TestToggle.swift
View File

@ -11,26 +11,6 @@ import MVMCoreUI
import UIKit import UIKit
import VDS import VDS
///-----------------------------------------------------------------------------
///MARK: -- VDSMoleculeViewProtocol (Contract between VDS -> Atomic)
///-----------------------------------------------------------------------------
public protocol VDSMoleculeViewProtocol: MoleculeViewProtocol, MVMCoreViewProtocol {
associatedtype ViewModel: MoleculeModelProtocol
var viewModel: ViewModel! { get set }
var delegateObject: MVMCoreUIDelegateObject? { get set }
var additionalData: [AnyHashable: Any]? { get set }
func viewModelDidUpdate()
}
extension VDSMoleculeViewProtocol {
public func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
guard let castedModel = model as? ViewModel else { return }
self.delegateObject = delegateObject
viewModel = castedModel
viewModelDidUpdate()
}
}
///----------------------------------------------------------------------------- ///-----------------------------------------------------------------------------
///MARK: -- TestToggleModel Extension ///MARK: -- TestToggleModel Extension
///----------------------------------------------------------------------------- ///-----------------------------------------------------------------------------
@ -96,7 +76,6 @@ open class TestToggle: ToggleBase<DefaultToggleModel>, VDSMoleculeViewProtocol {
open func viewModelDidUpdate() { open func viewModelDidUpdate() {
guard let viewModel else { return } guard let viewModel else { return }
FormValidator.setupValidation(for: viewModel, delegate: delegateObject?.formHolderDelegate)
additionalData = additionalData.dictionaryAdding(key: KeySourceModel, value: viewModel) additionalData = additionalData.dictionaryAdding(key: KeySourceModel, value: viewModel)
set(with: viewModel.getVDSModel()) set(with: viewModel.getVDSModel())
} }

1
JSONCreator_iOS/JSONCreator/TestToggleVM.swift
View File

@ -198,7 +198,6 @@ open class TestToggle3: ToggleViewModelHandlerBase<ToggleViewModelBase<TestToggl
open func updateView(_ size: CGFloat) {} open func updateView(_ size: CGFloat) {}
open func viewModelDidSet() { open func viewModelDidSet() {
FormValidator.setupValidation(for: viewModel.model, delegate: delegateObject?.formHolderDelegate)
additionalData = additionalData.dictionaryAdding(key: KeySourceModel, value: viewModel) additionalData = additionalData.dictionaryAdding(key: KeySourceModel, value: viewModel)
} }

6
JSONCreator_iOS/JSONCreator/VDSToggleVM.swift
View File

@ -80,7 +80,7 @@ extension ViewModelHandler {
///----------------------------------------------------------------------------- ///-----------------------------------------------------------------------------
public protocol ViewModel<ModelType>: AnyObject, Surfaceable, Disabling { public protocol ViewModel<ModelType>: AnyObject, Surfaceable, Disabling {
associatedtype ModelType: Modelable associatedtype ModelType: Modelable
var model: ModelType { get set } var model: ModelType { get }
var modelSubject: CurrentValueSubject<ModelType, Never> { get set } var modelSubject: CurrentValueSubject<ModelType, Never> { get set }
var publisher: AnyPublisher<ModelType, Never> { get } var publisher: AnyPublisher<ModelType, Never> { get }
init(with model: ModelType) init(with model: ModelType)
@ -92,7 +92,7 @@ public protocol ViewModel<ModelType>: AnyObject, Surfaceable, Disabling {
///----------------------------------------------------------------------------- ///-----------------------------------------------------------------------------
///MARK: -- ViewModel Generic Base Class ///MARK: -- ViewModel Generic Base Class
///----------------------------------------------------------------------------- ///-----------------------------------------------------------------------------
public class ViewModelBase<ModelType: Modelable>: NSObject, ViewModel, ObservableObject { public class ViewModelBase<ModelType: Modelable>: NSObject, ViewModel {
public var model: ModelType public var model: ModelType
public var modelSubject = CurrentValueSubject<ModelType, Never>(ModelType()) public var modelSubject = CurrentValueSubject<ModelType, Never>(ModelType())
public var publisher: AnyPublisher<ModelType, Never> { modelSubject.eraseToAnyPublisher() } public var publisher: AnyPublisher<ModelType, Never> { modelSubject.eraseToAnyPublisher() }
@ -519,5 +519,7 @@ open class ToggleViewModelHandlerBase<ViewModelType: ToggleViewModel>: ControlVi
backgroundColor = viewModel.surface.color backgroundColor = viewModel.surface.color
setNeedsLayout() setNeedsLayout()
layoutIfNeeded() layoutIfNeeded()
//viewModel.model = DefaultToggleModel()
//viewModel.model.disabled = true
} }
} }