From 7d9d6ff60ba34e8dbba07572fea1bd5293938286 Mon Sep 17 00:00:00 2001 From: Max Sokolov Date: Sat, 16 Apr 2016 22:48:46 +0300 Subject: [PATCH] remove useless code, add gitignore --- .gitignore | 39 ++++++++++++++++++ .../UserInterfaceState.xcuserstate | Bin 17148 -> 0 bytes Tablet/TableDirector.swift | 6 +-- Tablet/TableSectionBuilder.swift | 8 +--- Tests/TabletTests.swift | 2 +- 5 files changed, 44 insertions(+), 11 deletions(-) create mode 100755 .gitignore delete mode 100644 Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/.gitignore b/.gitignore new file mode 100755 index 0000000..222e8ec --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +# Mac OS X +.DS_Store + +# Xcode + +## Build generated +build/ +DerivedData + +## Various settings +*.pbxuser +!default.pbxuser +*.mode1v3 +!default.mode1v3 +*.mode2v3 +!default.mode2v3 +*.perspectivev3 +!default.perspectivev3 +xcuserdata + +## Other +*.xccheckout +*.moved-aside +*.xcuserstate +*.xcscmblueprint + +## Obj-C/Swift specific +*.hmap +*.ipa + +## Playgrounds +timeline.xctimeline +playground.xcworkspace + +# Swift Package Manager +.build/ + +# Carthage +Carthage/Build diff --git a/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet.xcworkspace/xcuserdata/maxsokolov.xcuserdatad/UserInterfaceState.xcuserstate deleted file mode 100644 index 0ab37795a72c0fc93aeaf39338dc35bab879a33f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17148 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 CGFloat { - return sections[section].headerHeight + return sections[section].headerView?.frame.size.height ?? UITableViewAutomaticDimension } - + func tableView(tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { - return sections[section].footerHeight + return sections[section].footerView?.frame.size.height ?? UITableViewAutomaticDimension } } diff --git a/Tablet/TableSectionBuilder.swift b/Tablet/TableSectionBuilder.swift index 30a532e..4bb0d68 100644 --- a/Tablet/TableSectionBuilder.swift +++ b/Tablet/TableSectionBuilder.swift @@ -34,10 +34,7 @@ public class TableSectionBuilder { public var footerTitle: String? public var headerView: UIView? - public var headerHeight: CGFloat = UITableViewAutomaticDimension - public var footerView: UIView? - public var footerHeight: CGFloat = UITableViewAutomaticDimension /// A total number of rows in section of each row builder. public var numberOfRowsInSection: Int { @@ -54,13 +51,10 @@ public class TableSectionBuilder { } } - public init(headerView: UIView? = nil, headerHeight: CGFloat = UITableViewAutomaticDimension, footerView: UIView? = nil, footerHeight: CGFloat = UITableViewAutomaticDimension) { + public init(headerView: UIView? = nil, footerView: UIView? = nil) { self.headerView = headerView - self.headerHeight = headerHeight - self.footerView = footerView - self.footerHeight = footerHeight } // MARK: Public diff --git a/Tests/TabletTests.swift b/Tests/TabletTests.swift index 2d9136e..0cbe395 100644 --- a/Tests/TabletTests.swift +++ b/Tests/TabletTests.swift @@ -157,7 +157,7 @@ class TabletTests: XCTestCase { let sectionHeaderView = UIView() let sectionFooterView = UIView() - let section = TableSectionBuilder(headerView: sectionHeaderView, headerHeight: 44, footerView: sectionFooterView, footerHeight: 44) + let section = TableSectionBuilder(headerView: sectionHeaderView, footerView: sectionFooterView) section += row testController.view.hidden = false