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

merge

Browse Source
This commit is contained in:
Scott Pfeil 2024-05-02 11:53:00 -04:00
commit 55050bf084
7 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/Dropdown Fields/Item Dropdown/BaseItemPickerEntryField.swift
View File

@ -74,7 +74,7 @@ extension BaseItemPickerEntryField {
@objc open override func setAccessibilityString(_ accessibilityString: String?) { @objc open override func setAccessibilityString(_ accessibilityString: String?) {
var accessibilityString = accessibilityString ?? "" let accessibilityString = accessibilityString ?? ""
textField.accessibilityTraits = .staticText textField.accessibilityTraits = .staticText
textField.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "textfield_picker_item") textField.accessibilityHint = MVMCoreUIUtility.hardcodedString(withKey: "textfield_picker_item")
textField.accessibilityLabel = "\(accessibilityString) \(textField.isEnabled ? "" : MVMCoreUIUtility.hardcodedString(withKey: "textfield_disabled_state") ?? "")" textField.accessibilityLabel = "\(accessibilityString) \(textField.isEnabled ? "" : MVMCoreUIUtility.hardcodedString(withKey: "textfield_disabled_state") ?? "")"

2
MVMCoreUI/Atomic/Atoms/FormFields/TextFields/TextEntryField.swift
View File

@ -397,7 +397,7 @@ extension TextEntryField {
@objc open override func setAccessibilityString(_ accessibilityString: String?) { @objc open override func setAccessibilityString(_ accessibilityString: String?) {
var accessibilityString = accessibilityString ?? "" let accessibilityString = accessibilityString ?? ""
textField.accessibilityLabel = "\(accessibilityString) \(textField.isEnabled ? "" : MVMCoreUIUtility.hardcodedString(withKey: "textfield_disabled_state") ?? "")" textField.accessibilityLabel = "\(accessibilityString) \(textField.isEnabled ? "" : MVMCoreUIUtility.hardcodedString(withKey: "textfield_disabled_state") ?? "")"
} }

4
MVMCoreUI/Atomic/Molecules/VerticalCombinationViews/HeadlineBodyModel.swift
View File

@ -94,7 +94,7 @@ open class HeadlineBodyModel: ParentMoleculeModelProtocol {
public extension HeadlineBodyModel { public extension HeadlineBodyModel {
func createHeaderTitleLockupModel(defaultStyle: Style = .header) throws -> TitleLockupModel { func createHeaderTitleLockupModel(defaultStyle: Style = .header) throws -> TitleLockupModel {
guard let headline = headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") } guard let headline = headline else { throw ModelRegistry.Error.decoderOther(message: "headline is required for this use case.") }
var body = self.body let body = self.body
switch style ?? defaultStyle { switch style ?? defaultStyle {
case .landingHeader: case .landingHeader:
headline.fontStyle = Styler.Font.RegularTitle2XLarge headline.fontStyle = Styler.Font.RegularTitle2XLarge
@ -106,7 +106,7 @@ public extension HeadlineBodyModel {
headline.fontStyle = Styler.Font.RegularTitleXLarge headline.fontStyle = Styler.Font.RegularTitleXLarge
body?.fontStyle = Styler.Font.RegularTitleMedium body?.fontStyle = Styler.Font.RegularTitleMedium
} }
let model = try TitleLockupModel(title: headline, subTitle: body) let model = TitleLockupModel(title: headline, subTitle: body)
model.id = id model.id = id
return model return model
} }

8
MVMCoreUI/Behaviors/GetContactBehavior.swift
View File

@ -35,16 +35,16 @@ public class PageGetContactBehavior: PageVisibilityBehavior {
CNContactStore().requestAccess(for: .contacts) { [weak self] (access, error) in CNContactStore().requestAccess(for: .contacts) { [weak self] (access, error) in
guard access, guard access,
error == nil, error == nil,
let rootMolecules = self?.delegate?.moleculeDelegate?.getRootMolecules() else { return } let rootMolecules = delegateObject?.moleculeDelegate?.getRootMolecules() else { return }
// Iterate models and provide contact // Iterate models and provide contact
self?.getContacts(for: rootMolecules) self?.getContacts(for: rootMolecules)
// Tell template to update // Tell template to update
MVMCoreDispatchUtility.performBlock(onMainThread: { Task { @MainActor in
// TODO: move to protocol function instead // TODO: move to protocol function instead
guard let controller = self?.delegate?.moleculeDelegate as? ViewController else { return } guard let controller = delegateObject?.moleculeDelegate as? ViewController else { return }
controller.handleNewData() controller.handleNewData()
}) }
} }
} }

1
MVMCoreUI/Categories/UIColor+Extension.swift
View File

@ -256,6 +256,7 @@ extension UIColor {
return UIColor(named: name, in: MVMCoreUIUtility.bundleForMVMCoreUI(), compatibleWith: nil)! return UIColor(named: name, in: MVMCoreUIUtility.bundleForMVMCoreUI(), compatibleWith: nil)!
} }
/// Returns a color corresponding to the passed in color name.
@objc @objc
public static func mvmCoreUIColor(with name: String) -> UIColor? { public static func mvmCoreUIColor(with name: String) -> UIColor? {
return UIColor.names[name]?.uiColor return UIColor.names[name]?.uiColor

3
MVMCoreUI/Categories/UIStackView+Extension.swift
View File

@ -7,6 +7,7 @@
// //
import Foundation import Foundation
import MVMCore
extension UIStackView: MVMCoreViewProtocol { extension UIStackView: MVMCoreViewProtocol {
public func updateView(_ size: CGFloat) { public func updateView(_ size: CGFloat) {
@ -16,7 +17,7 @@ extension UIStackView: MVMCoreViewProtocol {
} }
/// A convenience function for updating molecules. If model is nil, view is hidden. /// A convenience function for updating molecules. If model is nil, view is hidden.
open func updateContainedMolecules(with models: [MoleculeModelProtocol?], _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) { public func updateContainedMolecules(with models: [MoleculeModelProtocol?], _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {
for (index, item) in arrangedSubviews.enumerated() { for (index, item) in arrangedSubviews.enumerated() {
if let model = models[index] { if let model = models[index] {
(item as? MoleculeViewProtocol)?.set(with: model, delegateObject, additionalData) (item as? MoleculeViewProtocol)?.set(with: model, delegateObject, additionalData)

2
MVMCoreUI/Managers/SubNav/SubNavManagerController.swift
View File

@ -404,7 +404,7 @@ open class SubNavManagerController: ViewController, MVMCoreViewManagerProtocol,
public func update(percentage: CGFloat) { public func update(percentage: CGFloat) {
guard customInteractor?.interactive == true, guard customInteractor?.interactive == true,
let index = index else { return } let _ = index else { return }
// tabs.progress(from: tabs.selectedIndex, toIndex: index, percentage: percentage) // tabs.progress(from: tabs.selectedIndex, toIndex: index, percentage: percentage)
} }
} }