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

warning fix

Browse Source
This commit is contained in:
Scott Pfeil 2024-06-03 14:25:06 -04:00
parent 32d3a20232
commit 5e9f33efa8
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MVMCoreUI/Atomic/Molecules/TopNotification/NotificationMoleculeView.swift
View File

@ -46,7 +46,7 @@ import VDS
self.accessibilityIdentifier = accessibilityIdentifier self.accessibilityIdentifier = accessibilityIdentifier
} }
if var closeButton = viewModel.closeButton { if let closeButton = viewModel.closeButton {
onCloseClick = { [weak self] _ in onCloseClick = { [weak self] _ in
guard let self else { return } guard let self else { return }
if closeButton.action.actionType == ActionNoopModel.identifier { if closeButton.action.actionType == ActionNoopModel.identifier {

4
MVMCoreUI/Atomic/Templates/StackPageTemplateModel.swift
View File

@ -20,8 +20,10 @@
} }
public override func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> MoleculeModelProtocol? { public override func replaceChildMolecule(with molecule: MoleculeModelProtocol) throws -> MoleculeModelProtocol? {
if let replacedMolecule = try super.replaceChildMolecule(with: molecule) {
return replacedMolecule
}
var replacedMolecule: MoleculeModelProtocol? var replacedMolecule: MoleculeModelProtocol?
return try super.replaceChildMolecule(with: molecule)
if try replaceChildMolecule(at: &navigationBar, with: molecule, replaced: &replacedMolecule) if try replaceChildMolecule(at: &navigationBar, with: molecule, replaced: &replacedMolecule)
|| replaceChildMolecule(at: &moleculeStack, with: molecule, replaced: &replacedMolecule) { || replaceChildMolecule(at: &moleculeStack, with: molecule, replaced: &replacedMolecule) {
return replacedMolecule return replacedMolecule

2
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -315,7 +315,7 @@ import MVMCore
if let updatedMolecules = behavior.onPageNew(rootMolecules: newTemplateModel.rootMolecules, delegateObjectIVar, changes: &changes) { if let updatedMolecules = behavior.onPageNew(rootMolecules: newTemplateModel.rootMolecules, delegateObjectIVar, changes: &changes) {
updatedMolecules.forEach { molecule in updatedMolecules.forEach { molecule in
// Replace again in case there is a template level child. // Replace again in case there is a template level child.
if let replaced = try? newTemplateModel.replaceChildMolecule(with: molecule) { if let _ = try? newTemplateModel.replaceChildMolecule(with: molecule) {
// Only recognize the molecules that actually changed. // Only recognize the molecules that actually changed.
if changes.count > 0 { if changes.count > 0 {
debugLog("\(behavior) updated \(changes) in template model.") debugLog("\(behavior) updated \(changes) in template model.")