From b75f25764f866607decfb608ecd23fa5049bac77 Mon Sep 17 00:00:00 2001 From: "Pfeil, Scott Robert" Date: Fri, 16 Jul 2021 17:59:19 -0400 Subject: [PATCH] cleanup --- .../Molecules/LeftRightViews/CornerLabelsModel.swift | 2 +- .../Molecules/NavigationBar/NavigationItemModel.swift | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift b/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift index 58b661c6..5c910298 100644 --- a/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift +++ b/MVMCoreUI/Atomic/Molecules/LeftRightViews/CornerLabelsModel.swift @@ -17,7 +17,7 @@ public class CornerLabelsModel: ParentMoleculeModelProtocol { public var bottomRightLabel: LabelModel? public var molecule: MoleculeModelProtocol? public var children: [MoleculeModelProtocol] { - return [topLeftLabel, topRightLabel, bottomLeftLabel, bottomRightLabel].compactMap { (molecule: MoleculeModelProtocol?) in molecule } + [molecule, topLeftLabel, topRightLabel, bottomLeftLabel, bottomRightLabel].compactMap { $0 } } init(with molecule: MoleculeModelProtocol?) { diff --git a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift index 5f3db6be..6a75718b 100644 --- a/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift +++ b/MVMCoreUI/Atomic/Molecules/NavigationBar/NavigationItemModel.swift @@ -94,16 +94,7 @@ open class NavigationItemModel: NavigationItemModelProtocol, MoleculeModelProtoc extension NavigationItemModel: ParentMoleculeModelProtocol { public var children: [MoleculeModelProtocol] { - var children: [MoleculeModelProtocol] = [] - if let line = line { - children.append(line) - } - if let titleView = titleView { - children.append(titleView) - } - if let backButton = backButton { - children.append(backButton) - } + var children: [MoleculeModelProtocol] = [line, titleView, backButton].compactMap { $0 } if let leftButtons = additionalLeftButtons { children.append(contentsOf: leftButtons) }