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

Merge branch 'bugfix/accordion_layout_fix' into 'develop'

Browse Source 
getting the accordion accessory to work

See merge request BPHV_MIPS/mvm_core_ui!585
This commit is contained in:
Pfeil, Scott Robert 2020-09-10 18:52:11 -04:00
commit dc8e580f87
3 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
MVMCoreUI/Atomic/Molecules/Items/AccordionListItemModel.swift
View File

@ -9,12 +9,21 @@
import UIKit import UIKit
class AccordionListItemModel: MoleculeListItemModel { class AccordionListItemModel: MoleculeListItemModel {
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
override public class var identifier: String { override public class var identifier: String {
return "accordionListItem" return "accordionListItem"
} }
public var molecules: [ListItemModelProtocol & MoleculeModelProtocol] public var molecules: [ListItemModelProtocol & MoleculeModelProtocol]
public var hideLineWhenExpanded: Bool = false public var hideLineWhenExpanded: Bool = false
//--------------------------------------------------
// MARK: - Keys
//--------------------------------------------------
private enum CodingKeys: String, CodingKey { private enum CodingKeys: String, CodingKey {
case moleculeName case moleculeName
case molecules case molecules
@ -22,11 +31,19 @@ class AccordionListItemModel: MoleculeListItemModel {
case hideLineWhenExpanded case hideLineWhenExpanded
} }
//--------------------------------------------------
// MARK: - Methods
//--------------------------------------------------
public override func setDefaults() { public override func setDefaults() {
super.setDefaults() super.setDefaults()
hideArrow = true hideArrow = true
} }
//--------------------------------------------------
// MARK: - Codec
//--------------------------------------------------
required public init(from decoder: Decoder) throws { required public init(from decoder: Decoder) throws {
let typeContainer = try decoder.container(keyedBy: CodingKeys.self) let typeContainer = try decoder.container(keyedBy: CodingKeys.self)
molecules = try typeContainer.decodeModels(codingKey: .molecules) molecules = try typeContainer.decodeModels(codingKey: .molecules)

21
MVMCoreUI/Atomic/Molecules/Items/AccordionMoleculeTableViewCell.swift
View File

@ -8,20 +8,29 @@
import UIKit import UIKit
@objcMembers public class AccordionMoleculeTableViewCell: MoleculeTableViewCell { @objcMembers public class AccordionMoleculeTableViewCell: MoleculeTableViewCell {
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
var accordionListItemModel: AccordionListItemModel? { var accordionListItemModel: AccordionListItemModel? {
return listItemModel as? AccordionListItemModel return listItemModel as? AccordionListItemModel
} }
let accordionButton = createAccordionButton()
static func createAccordionButton() -> Button { let accordionButton: Button = {
let accordionButton = Button(type: .custom) let accordionButton = Button(type: .custom)
accordionButton.setTitle("+", for: .normal) accordionButton.setTitle("+", for: .normal)
accordionButton.setTitleColor(.black, for: .normal) accordionButton.setTitleColor(.black, for: .normal)
accordionButton.titleLabel?.font = UIFont.systemFont(ofSize: 40, weight: .ultraLight) accordionButton.titleLabel?.font = UIFont.systemFont(ofSize: 40, weight: .ultraLight)
accordionButton.frame = CGRect(x: 0, y: 0, width: 20, height: 20) accordionButton.frame = CGRect(x: 0, y: 0, width: 20, height: 20)
accordionButton.translatesAutoresizingMaskIntoConstraints = true
return accordionButton return accordionButton
} }()
//--------------------------------------------------
// MARK: - Setup
//--------------------------------------------------
override public func setupView() { override public func setupView() {
customAccessoryView = true customAccessoryView = true
@ -29,9 +38,11 @@ import UIKit
accessoryView = accordionButton accessoryView = accordionButton
} }
override public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable : Any]?) { override public func didSelectCell(at index: IndexPath, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
accordionButton.isSelected = !accordionButton.isSelected
accordionButton.isSelected.toggle()
accordionButton.setTitle(accordionButton.isSelected ? "-" : "+", for: .normal) accordionButton.setTitle(accordionButton.isSelected ? "-" : "+", for: .normal)
guard let model = accordionListItemModel else { return } guard let model = accordionListItemModel else { return }
if accordionButton.isSelected { if accordionButton.isSelected {

7
MVMCoreUI/BaseClasses/TableViewCell.swift
View File

@ -8,7 +8,11 @@
import UIKit import UIKit
@objcMembers open class TableViewCell: UITableViewCell, MoleculeViewProtocol, MoleculeListCellProtocol, MVMCoreViewProtocol, MFButtonProtocol { @objcMembers open class TableViewCell: UITableViewCell, MoleculeViewProtocol, MoleculeListCellProtocol, MVMCoreViewProtocol, MFButtonProtocol {
//--------------------------------------------------
// MARK: - Properties
//--------------------------------------------------
open var molecule: MoleculeViewProtocol? open var molecule: MoleculeViewProtocol?
open var listItemModel: ListItemModelProtocol? open var listItemModel: ListItemModelProtocol?
@ -30,7 +34,10 @@ import UIKit
private var initialSetupPerformed = false private var initialSetupPerformed = false
//--------------------------------------------------
// MARK: - Styling // MARK: - Styling
//--------------------------------------------------
open func styleLine(with style: ListItemStyle?) { open func styleLine(with style: ListItemStyle?) {
switch style { switch style {
case .standard?: case .standard?: