From 66a71fbfde9ba41f0f417068cbcfcec006266a41 Mon Sep 17 00:00:00 2001 From: Matt Bruce Date: Tue, 2 Aug 2022 11:04:51 -0500 Subject: [PATCH] moved to other file Signed-off-by: Matt Bruce --- .gitignore | 3 + .../JSONCreator.xcodeproj/project.pbxproj | 4 + .../JSONCreator/TestLabelToggle.swift | 100 ++++++++++++++++++ JSONCreator_iOS/JSONCreator/WifiWidget.swift | 89 ---------------- dependency.txt | 2 + 5 files changed, 109 insertions(+), 89 deletions(-) create mode 100644 JSONCreator_iOS/JSONCreator/TestLabelToggle.swift diff --git a/.gitignore b/.gitignore index ef6af7e..3bc7441 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ mvm_core mfprepayshop_ios mvm_core_ui mvmreactnative +vds +VDSSample # frameworks contentTransferFramework.framework @@ -37,6 +39,7 @@ __MACOSX ## Build generated build/ DerivedData/ +SharedFrameworks/ ## Various settings *.pbxuser diff --git a/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj b/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj index 2f12d6d..c6ffea1 100644 --- a/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj +++ b/JSONCreator_iOS/JSONCreator.xcodeproj/project.pbxproj @@ -87,6 +87,7 @@ EAA658162875FA5E00484A7D /* VDSFormControlsTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EAA658142875FA5E00484A7D /* VDSFormControlsTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; EACA5E5E2853DBC900CBA65B /* VDSColorTokens.xcframework in Frameworks */ = {isa = PBXBuildFile; fileRef = EACA5E5D2853DBC900CBA65B /* VDSColorTokens.xcframework */; }; EACA5E5F2853DBC900CBA65B /* VDSColorTokens.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = EACA5E5D2853DBC900CBA65B /* VDSColorTokens.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + EAF7F0912899825D00B287F5 /* TestLabelToggle.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAF7F0902899825D00B287F5 /* TestLabelToggle.swift */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -180,6 +181,7 @@ EAA54A91286A47ED00B9136B /* WifiViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WifiViewController.swift; sourceTree = ""; }; EAA658142875FA5E00484A7D /* VDSFormControlsTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSFormControlsTokens.xcframework; path = ../SharedFrameworks/VDSFormControlsTokens.xcframework; sourceTree = ""; }; EACA5E5D2853DBC900CBA65B /* VDSColorTokens.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = VDSColorTokens.xcframework; path = ../SharedFrameworks/VDSColorTokens.xcframework; sourceTree = ""; }; + EAF7F0902899825D00B287F5 /* TestLabelToggle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestLabelToggle.swift; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -246,6 +248,7 @@ EA3362332891F5AB0071C351 /* TestToggleModel.swift */, EA3361C0288B37FB0071C351 /* TestToggle.swift */, EA1B7BBC2893459E006AF0BC /* DecodableDefaults+VDS.swift */, + EAF7F0902899825D00B287F5 /* TestLabelToggle.swift */, ); path = JSONCreator; sourceTree = ""; @@ -480,6 +483,7 @@ EA09CDFD282C430400A7835F /* ServiceModel.swift in Sources */, EA09CE01282C43E800A7835F /* KeyedDecodingContainer+Decode.swift in Sources */, EA09CDDE282C40CC00A7835F /* GMFG5GSignalHandler.swift in Sources */, + EAF7F0912899825D00B287F5 /* TestLabelToggle.swift in Sources */, EA09CDD1282C40CC00A7835F /* MFFGHSBluetoothPair.swift in Sources */, EA09CDEB282C422900A7835F /* GMFGStorageManager.swift in Sources */, EA1B7BBD2893459E006AF0BC /* DecodableDefaults+VDS.swift in Sources */, diff --git a/JSONCreator_iOS/JSONCreator/TestLabelToggle.swift b/JSONCreator_iOS/JSONCreator/TestLabelToggle.swift new file mode 100644 index 0000000..e3d2a6d --- /dev/null +++ b/JSONCreator_iOS/JSONCreator/TestLabelToggle.swift @@ -0,0 +1,100 @@ +// +// TestLabelToggle.swift +// JSONCreator +// +// Created by Matt Bruce on 8/2/22. +// Copyright © 2022 Verizon Wireless. All rights reserved. +// + +import Foundation +import MVMCore +import MVMCoreUI + +@objcMembers open class TestLabelToggle: View { + //-------------------------------------------------- + // MARK: - Properties + //-------------------------------------------------- + + public let label = Label(fontStyle: .BoldBodySmall) + public let toggle = TestToggle() + + //-------------------------------------------------- + // MARK: - MVMCoreViewProtocol + //-------------------------------------------------- + + open override func updateView(_ size: CGFloat) { + super.updateView(size) + label.updateView(size) + toggle.updateView(size) + } + + open override func setupView() { + super.setupView() + + addSubview(label) + addSubview(toggle) + label.setContentHuggingPriority(.required, for: .vertical) + NSLayoutConstraint.pinViews(leftView: label, rightView: toggle, alignTop: false) + } + + open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { + guard let model = model as? TestLabelToggleModel, + let toggleHeight = Toggle.estimatedHeight(with: model.toggle, delegateObject), + let labelHeight = Label.estimatedHeight(with: model.label, delegateObject) + else { return nil } + + return max(toggleHeight, labelHeight) + } + + open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { + + guard let labelToggleModel = model as? TestLabelToggleModel else { return } + + label.set(with: labelToggleModel.label, delegateObject, additionalData) + toggle.set(with: labelToggleModel.toggle, delegateObject, additionalData) + } + + // MARK: - MoleculeViewProtocol + open override func reset() { + super.reset() + label.reset() + toggle.reset() + label.setFontStyle(.BoldBodySmall) + } +} + +public class TestLabelToggleModel: MoleculeModelProtocol { + public static var identifier: String = "testLabelToggle" + public var moleculeName: String = TestLabelToggleModel.identifier + public var backgroundColor: Color? + public var label: LabelModel + public var toggle: TestToggleModel + + public init(_ label: LabelModel, _ toggle: TestToggleModel) { + self.label = label + self.toggle = toggle + } + + private enum CodingKeys: String, CodingKey { + case moleculeName + case backgroundColor + case label + case toggle + } + + required public init(from decoder: Decoder) throws { + let typeContainer = try decoder.container(keyedBy: CodingKeys.self) + backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey:.backgroundColor) + label = try typeContainer.decode(LabelModel.self, forKey:.label) + toggle = try typeContainer.decode(TestToggleModel.self, forKey:.toggle) + } + + public func encode(to encoder: Encoder) throws { + var container = encoder.container(keyedBy: CodingKeys.self) + try container.encode(moleculeName, forKey: .moleculeName) + try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) + try container.encode(label, forKey: .label) + try container.encode(toggle, forKey: .toggle) + } +} + diff --git a/JSONCreator_iOS/JSONCreator/WifiWidget.swift b/JSONCreator_iOS/JSONCreator/WifiWidget.swift index 02a889e..bc9c9af 100644 --- a/JSONCreator_iOS/JSONCreator/WifiWidget.swift +++ b/JSONCreator_iOS/JSONCreator/WifiWidget.swift @@ -10,95 +10,6 @@ import UIKit import MVMCore import MVMCoreUI -@objcMembers open class TestLabelToggle: View { - //-------------------------------------------------- - // MARK: - Properties - //-------------------------------------------------- - - public let label = Label(fontStyle: .BoldBodySmall) - public let toggle = TestToggle() - - //-------------------------------------------------- - // MARK: - MVMCoreViewProtocol - //-------------------------------------------------- - - open override func updateView(_ size: CGFloat) { - super.updateView(size) - label.updateView(size) - toggle.updateView(size) - } - - open override func setupView() { - super.setupView() - - addSubview(label) - addSubview(toggle) - label.setContentHuggingPriority(.required, for: .vertical) - NSLayoutConstraint.pinViews(leftView: label, rightView: toggle, alignTop: false) - } - - open override class func estimatedHeight(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?) -> CGFloat? { - guard let model = model as? TestLabelToggleModel, - let toggleHeight = Toggle.estimatedHeight(with: model.toggle, delegateObject), - let labelHeight = Label.estimatedHeight(with: model.label, delegateObject) - else { return nil } - - return max(toggleHeight, labelHeight) - } - - open override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { - - guard let labelToggleModel = model as? TestLabelToggleModel else { return } - - label.set(with: labelToggleModel.label, delegateObject, additionalData) - toggle.set(with: labelToggleModel.toggle, delegateObject, additionalData) - } - - // MARK: - MoleculeViewProtocol - open override func reset() { - super.reset() - label.reset() - toggle.reset() - label.setFontStyle(.BoldBodySmall) - } -} - -public class TestLabelToggleModel: MoleculeModelProtocol { - public static var identifier: String = "testLabelToggle" - public var moleculeName: String = TestLabelToggleModel.identifier - public var backgroundColor: Color? - public var label: LabelModel - public var toggle: TestToggleModel - - public init(_ label: LabelModel, _ toggle: TestToggleModel) { - self.label = label - self.toggle = toggle - } - - private enum CodingKeys: String, CodingKey { - case moleculeName - case backgroundColor - case label - case toggle - } - - required public init(from decoder: Decoder) throws { - let typeContainer = try decoder.container(keyedBy: CodingKeys.self) - backgroundColor = try typeContainer.decodeIfPresent(Color.self, forKey:.backgroundColor) - label = try typeContainer.decode(LabelModel.self, forKey:.label) - toggle = try typeContainer.decode(TestToggleModel.self, forKey:.toggle) - } - - public func encode(to encoder: Encoder) throws { - var container = encoder.container(keyedBy: CodingKeys.self) - try container.encode(moleculeName, forKey: .moleculeName) - try container.encodeIfPresent(backgroundColor, forKey: .backgroundColor) - try container.encode(label, forKey: .label) - try container.encode(toggle, forKey: .toggle) - } -} - - public class WifiWidget: View { //-------------------------------------------------- // MARK: - Outlets diff --git a/dependency.txt b/dependency.txt index 45a8cd2..f9b54ac 100644 --- a/dependency.txt +++ b/dependency.txt @@ -2,3 +2,5 @@ mvm_core https://gitlab.verizon.com/BPHV_MIPS/mvm_core.git develop mvm_core_ui https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui.git develop + +vds https://gitlab.verizon.com/V520390/vds.git develop \ No newline at end of file