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

update based on scott's comments

Browse Source
This commit is contained in:
panxi 2019-10-17 16:52:05 -04:00
parent d94bbc1dae
commit 4e1a6ca479
4 changed files with 86 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MVMCoreUI/Atoms/TextFields/MFTextField.h
View File

@ -46,8 +46,8 @@
// To set the placeholder and text // To set the placeholder and text
@property (nullable, weak, nonatomic) NSString *text; @property (nullable, weak, nonatomic) NSString *text;
@property (nullable, weak, nonatomic) NSString *formText; @property (nullable, weak, nonatomic) NSString *formText;
@property (nullable, weak, nonatomic) NSString *fieldKey; @property (nullable, strong, nonatomic) NSString *fieldKey;
@property (nullable, weak, nonatomic) NSString *groupName; @property (nullable, strong, nonatomic) NSString *groupName;
@property (nullable, weak, nonatomic) NSString *placeholder; // will move out in Feb release @property (nullable, weak, nonatomic) NSString *placeholder; // will move out in Feb release

5
MVMCoreUI/SupportingFiles/Strings/es-MX.lproj/Localizable.strings
View File

@ -37,6 +37,11 @@
"checkbox_checked_state" = "Verificado"; "checkbox_checked_state" = "Verificado";
"checkbox_unchecked_state" = "Sin marcar"; "checkbox_unchecked_state" = "Sin marcar";
"checkbox_desc_state" = "%@ Casilla %@"; "checkbox_desc_state" = "%@ Casilla %@";
// Radio Button
"radio_action_hint" = "Toca dos veces para seleccionar.";
"radio_selected_state" = "Seleccionado";
"radio_not_selected_state" = "No Seleccionado";
"radio_desc_state" = "Opción";
// Switch // Switch
"mfswitch_buttonlabel" = "Botón Cambiar"; "mfswitch_buttonlabel" = "Botón Cambiar";
"AccOn" = "encendido"; "AccOn" = "encendido";

7
MVMCoreUI/SupportingFiles/Strings/es.lproj/Localizable.strings
View File

@ -37,6 +37,13 @@
"checkbox_checked_state" = "Verificado"; "checkbox_checked_state" = "Verificado";
"checkbox_unchecked_state" = "Sin marcar"; "checkbox_unchecked_state" = "Sin marcar";
"checkbox_desc_state" = "%@ Casilla %@"; "checkbox_desc_state" = "%@ Casilla %@";
// Radio Button
"radio_action_hint" = "Toca dos veces para seleccionar.";
"radio_selected_state" = "Seleccionado";
"radio_not_selected_state" = "No Seleccionado";
"radio_desc_state" = "Opción";
// Switch // Switch
"mfswitch_buttonlabel" = "Botón Cambiar"; "mfswitch_buttonlabel" = "Botón Cambiar";
"AccOn" = "encendido"; "AccOn" = "encendido";

144
MVMCoreUI/Templates/MoleculeStackTemplate.swift
View File

@ -9,76 +9,76 @@
import UIKit import UIKit
open class MoleculeStackTemplate: ThreeLayerViewController { open class MoleculeStackTemplate: ThreeLayerViewController {
var observer: NSKeyValueObservation? var observer: NSKeyValueObservation?
open override var loadObject: MVMCoreLoadObject? { open override var loadObject: MVMCoreLoadObject? {
didSet { didSet {
if loadObject != oldValue { if loadObject != oldValue {
updateRequiredModules() updateRequiredModules()
observer?.invalidate() observer?.invalidate()
if let newObject = loadObject { if let newObject = loadObject {
observer = newObject.observe(\MVMCoreLoadObject.pageJSON, options: [.old, .new]) { [weak self] (object, change) in observer = newObject.observe(\MVMCoreLoadObject.pageJSON, options: [.old, .new]) { [weak self] (object, change) in
self?.updateRequiredModules() self?.updateRequiredModules()
} }
} }
} }
} }
} }
open override func spaceBetweenTopAndMiddle() -> CGFloat? { open override func spaceBetweenTopAndMiddle() -> CGFloat? {
return 0 return 0
} }
open override func viewForTop() -> UIView? { open override func viewForTop() -> UIView? {
guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else { guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("header"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
return nil return nil
} }
return molecule return molecule
} }
open override func viewForMiddle() -> UIView? { open override func viewForMiddle() -> UIView? {
guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack") else { guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack") else {
return nil return nil
} }
let stack = MoleculeStackView(frame: .zero) let stack = MoleculeStackView(frame: .zero)
stack.useStackSpacingBeforeFirstItem = true stack.useStackSpacingBeforeFirstItem = true
stack.setWithJSON(moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, additionalData: nil) stack.setWithJSON(moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, additionalData: nil)
return stack return stack
} }
override open func viewForBottom() -> UIView? { override open func viewForBottom() -> UIView? {
guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else { guard let moleculeJSON = loadObject?.pageJSON?.optionalDictionaryForKey("footer"), let molecule = MVMCoreUIMoleculeMappingObject.shared()?.createMolecule(forJSON: moleculeJSON, delegateObject: delegateObject() as? MVMCoreUIDelegateObject, constrainIfNeeded: true) else {
return nil return nil
} }
return molecule return molecule
} }
// MARK: - cache handling // MARK: - cache handling
open override func pageTypesToListenFor() -> [Any]? { open override func pageTypesToListenFor() -> [Any]? {
guard let pageType = self.pageType else { guard let pageType = self.pageType else {
return super.pageTypesToListenFor() return super.pageTypesToListenFor()
} }
return [pageType] return [pageType]
} }
open override func modulesToListenFor() -> [Any]? { open override func modulesToListenFor() -> [Any]? {
return loadObject?.requestParameters?.modules return loadObject?.requestParameters?.modules
} }
/// Adds modules from requiredModules() to the MVMCoreViewControllerMapping.requiredModules map. /// Adds modules from requiredModules() to the MVMCoreViewControllerMapping.requiredModules map.
open func updateRequiredModules() { open func updateRequiredModules() {
if let requiredModules = requiredModules(), let pageType = pageType { if let requiredModules = requiredModules(), let pageType = pageType {
MVMCoreViewControllerMappingObject.shared()?.addRequiredModules(toMapping: requiredModules, forPageType: pageType) MVMCoreViewControllerMappingObject.shared()?.addRequiredModules(toMapping: requiredModules, forPageType: pageType)
} }
} }
/// Gets modules required by the loadObject.pageJSON. /// Gets modules required by the loadObject.pageJSON.
open func requiredModules() -> [Any]? { open func requiredModules() -> [Any]? {
let modules: NSMutableArray = [] let modules: NSMutableArray = []
let delegate = delegateObject() as? MVMCoreUIDelegateObject let delegate = delegateObject() as? MVMCoreUIDelegateObject
MVMCoreUIMoleculeMappingObject.addRequiredModules(forJSON: loadObject?.pageJSON?.optionalDictionaryForKey("header"), delegateObject: delegate, moduleList: modules, errorList: nil) MVMCoreUIMoleculeMappingObject.addRequiredModules(forJSON: loadObject?.pageJSON?.optionalDictionaryForKey("header"), delegateObject: delegate, moduleList: modules, errorList: nil)
MVMCoreUIMoleculeMappingObject.addRequiredModules(forJSON: loadObject?.pageJSON?.optionalDictionaryForKey("footer"), delegateObject: delegate, moduleList: modules, errorList: nil) MVMCoreUIMoleculeMappingObject.addRequiredModules(forJSON: loadObject?.pageJSON?.optionalDictionaryForKey("footer"), delegateObject: delegate, moduleList: modules, errorList: nil)
MVMCoreUIMoleculeMappingObject.addRequiredModules(forJSON: loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack"), delegateObject: delegate, moduleList: modules, errorList: nil) MVMCoreUIMoleculeMappingObject.addRequiredModules(forJSON: loadObject?.pageJSON?.optionalDictionaryForKey("moleculeStack"), delegateObject: delegate, moduleList: modules, errorList: nil)
return modules as? [Any] return modules as? [Any]
} }
} }