Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Create DeclarativeSection and override header/footer methods in TableViewController for when the section is DeclarativeSection #68

Merged
merged 2 commits into from
Jun 4, 2021
Merged

Create DeclarativeSection and override header/footer methods in TableViewController for when the section is DeclarativeSection #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
659d43e
Create `DeclarativeSection` and override header/footer methods in `Ta…
Feb 1, 2021
4f14fcb
Re-add `DeclarativeSection`
Mar 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions ThunderTable.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
B1EC81031FDE86BF00C8EE72 /* SubtitleTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1EC81011FDE86BF00C8EE72 /* SubtitleTableViewCell.xib */; };
B1EC81061FDE873700C8EE72 /* Value1TableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1EC81041FDE873700C8EE72 /* Value1TableViewCell.swift */; };
B1EC81071FDE873700C8EE72 /* Value1TableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B1EC81051FDE873700C8EE72 /* Value1TableViewCell.xib */; };
B8B37A6425F1AA05002B866A /* DeclarativeSection.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8D95CF425C8729F004F32DD /* DeclarativeSection.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -161,6 +162,7 @@
B1EC81011FDE86BF00C8EE72 /* SubtitleTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubtitleTableViewCell.xib; sourceTree = "<group>"; };
B1EC81041FDE873700C8EE72 /* Value1TableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Value1TableViewCell.swift; sourceTree = "<group>"; };
B1EC81051FDE873700C8EE72 /* Value1TableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Value1TableViewCell.xib; sourceTree = "<group>"; };
B8D95CF425C8729F004F32DD /* DeclarativeSection.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DeclarativeSection.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -286,6 +288,7 @@
B17BAA551D8963BB00844421 /* TableViewController.swift */,
B185A58B2398129D00B87BC7 /* TableViewController+Collection.swift */,
B17BAA571D89643800844421 /* TableSection.swift */,
B8D95CF425C8729F004F32DD /* DeclarativeSection.swift */,
B17BAA591D89645000844421 /* TableRow.swift */,
B114F0C220359F76005D52F2 /* TableRow+Actions.swift */,
B11CB8CE1F320DA600E58116 /* Extensions.swift */,
Expand Down Expand Up @@ -564,6 +567,7 @@
B108319D1F068FDF008B565D /* TableImageViewCell.swift in Sources */,
B11264F41D8A9AE800224FB2 /* InputTableRow.swift in Sources */,
B114F0C320359F76005D52F2 /* TableRow+Actions.swift in Sources */,
B8B37A6425F1AA05002B866A /* DeclarativeSection.swift in Sources */,
B11CB8CF1F320DA600E58116 /* Extensions.swift in Sources */,
B114F10E2035CA75005D52F2 /* InputPickerRow.swift in Sources */,
B1EC81061FDE873700C8EE72 /* Value1TableViewCell.swift in Sources */,
Expand Down
49 changes: 49 additions & 0 deletions ThunderTable/DeclarativeSection.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
//
// DeclarativeSection.swift
// ThunderTable
//
// Created by Ben Shutt on 01/02/2021.
// Copyright © 2021 3SidedCube. All rights reserved.
//

import Foundation
import UIKit

/// A `TableSection` with a header and footer specified
open class DeclarativeSection: TableSection {

/// `CGFloat` height of the header for `Section`
open var headerHeight: CGFloat

/// `UIView` view of the header for `Section`
open var headerView: UIView

/// `CGFloat` height of the footer for `Section`
open var footerHeight: CGFloat

/// `UIView` view of the footer for `Section`
open var footerView: UIView

/// Default memberwise initializer
///
/// - Parameters:
/// - rows: `[Row]`
/// - headerHeight: `CGFloat`
/// - headerView: `UIView`
/// - footerHeight: `CGFloat`
/// - footerView: `UIView`
public init(
rows: [Row],
headerHeight: CGFloat = 0,
headerView: UIView = UIView(),
footerHeight: CGFloat = 0,
footerView: UIView = UIView()
) {
self.headerHeight = headerHeight
self.headerView = headerView
self.footerHeight = footerHeight
self.footerView = footerView

super.init(rows: rows)
}
}
41 changes: 41 additions & 0 deletions ThunderTable/TableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -577,6 +577,47 @@ open class TableViewController: UITableViewController, UIContentSizeCategoryAdju
set(indexPath: indexPath, selected: false)
}
}

override open func tableView(
_ tableView: UITableView,
heightForHeaderInSection section: Int
) -> CGFloat {
guard let tableSection = data[section] as? DeclarativeSection else {
return super.tableView(tableView, heightForHeaderInSection: section)
simonmitchell marked this conversation as resolved.
Show resolved Hide resolved
}
return tableSection.headerHeight
}

override open func tableView(
_ tableView: UITableView,
viewForHeaderInSection section: Int
) -> UIView? {
guard let tableSection = data[section] as? DeclarativeSection else {
return super.tableView(tableView, viewForHeaderInSection: section)
}
return tableSection.headerView
}

override open func tableView(
_ tableView: UITableView,
heightForFooterInSection section: Int
) -> CGFloat {
guard let tableSection = data[section] as? DeclarativeSection else {
return super.tableView(tableView, heightForFooterInSection: section)
}
return tableSection.footerHeight
}

override open func tableView(
_ tableView: UITableView,
viewForFooterInSection section: Int
) -> UIView? {
guard let tableSection = data[section] as? DeclarativeSection else {
return super.tableView(tableView, viewForFooterInSection: section)
}
return tableSection.footerView
}


//MARK: -
//MARK: Scroll Offset Management
Expand Down