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

code review cleanup, removing testing details

Browse Source
This commit is contained in:
Scott Pfeil 2023-06-27 13:27:23 -04:00
parent 7eee7d51d5
commit 4920977c7f
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
View File

@ -131,7 +131,6 @@ open class Carousel: View {
inset.right = carouselModel?.rightPadding ?? Padding.Component.horizontalPaddingForSize(size) inset.right = carouselModel?.rightPadding ?? Padding.Component.horizontalPaddingForSize(size)
} }
collectionView.contentInset = inset collectionView.contentInset = inset
//(collectionView.collectionViewLayout as? UICollectionViewFlowLayout)?.sectionInset = inset
// Update cells and re-layout. // Update cells and re-layout.
for cell in collectionView.visibleCells { for cell in collectionView.visibleCells {

1
MVMCoreUI/Atomic/Templates/CollectionTemplate.swift
View File

@ -100,6 +100,7 @@
let columns = templateModel?.columns, columns > 0, let columns = templateModel?.columns, columns > 0,
let cell = cell as? CollectionTemplateItemProtocol { let cell = cell as? CollectionTemplateItemProtocol {
let width = (size - collectionView.adjustedContentInset.left - collectionView.adjustedContentInset.right) / CGFloat(columns) let width = (size - collectionView.adjustedContentInset.left - collectionView.adjustedContentInset.right) / CGFloat(columns)
// Makes the width slightly less to avoid rounding errors and the column being a little too big.
cell.set(width: width - 0.1) cell.set(width: width - 0.1)
} }
} }

2
MVMCoreUI/Atomic/Templates/MoleculeListTemplate.swift
View File

@ -74,7 +74,7 @@ open class MoleculeListTemplate: ThreeLayerTableViewController, TemplateProtocol
let molecule = generateMoleculeView(from: footerModel) let molecule = generateMoleculeView(from: footerModel)
else { else {
let view = super.viewForBottom() let view = super.viewForBottom()
view.backgroundColor = templateModel?.footerColor?.uiColor ?? .clear view.backgroundColor = templateModel?.backgroundColor?.uiColor ?? .clear
return view return view
} }

6
MVMCoreUI/Atomic/Templates/ThreeLayerModelBase.swift
View File

@ -16,7 +16,6 @@
public var header: MoleculeModelProtocol? public var header: MoleculeModelProtocol?
public var anchorFooter: Bool = false public var anchorFooter: Bool = false
public var footer: MoleculeModelProtocol? public var footer: MoleculeModelProtocol?
public var footerColor = Color(name: "white")
public override var rootMolecules: [MoleculeModelProtocol] { public override var rootMolecules: [MoleculeModelProtocol] {
[navigationBar, header, footer].compactMap { $0 } [navigationBar, header, footer].compactMap { $0 }
@ -39,7 +38,6 @@
case header case header
case anchorFooter case anchorFooter
case footer case footer
case footerColor
} }
//-------------------------------------------------- //--------------------------------------------------
@ -56,9 +54,6 @@
anchorFooter = anchor anchorFooter = anchor
} }
footer = try typeContainer.decodeModelIfPresent(codingKey: .footer) footer = try typeContainer.decodeModelIfPresent(codingKey: .footer)
if let footerColor = try typeContainer.decodeIfPresent(Color.self, forKey: .footerColor) {
self.footerColor = footerColor
}
try super.init(from: decoder) try super.init(from: decoder)
} }
@ -69,6 +64,5 @@
try container.encodeModelIfPresent(header, forKey: .header) try container.encodeModelIfPresent(header, forKey: .header)
try container.encodeIfPresent(anchorFooter, forKey: .anchorFooter) try container.encodeIfPresent(anchorFooter, forKey: .anchorFooter)
try container.encodeModelIfPresent(footer, forKey: .footer) try container.encodeModelIfPresent(footer, forKey: .footer)
try container.encodeIfPresent(footerColor, forKey: .footerColor)
} }
} }