From 9c909b84715469d97ff4db6a77bc6e5ec585fa01 Mon Sep 17 00:00:00 2001 From: Max Sokolov Date: Wed, 13 Apr 2016 20:51:23 +0300 Subject: [PATCH] methods improvements --- Tablet.podspec | 2 +- .../UserInterfaceState.xcuserstate | Bin 0 -> 10802 bytes Tablet/TableDirector.swift | 16 +++++++-------- Tablet/TableRowBuilder.swift | 6 +++--- Tablet/TableSectionBuilder.swift | 14 ++++++------- .../xcschemes/xcschememanagement.plist | 19 ++++++++++++++++++ 6 files changed, 38 insertions(+), 19 deletions(-) create mode 100644 Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 Tablet/Tablet.xcodeproj/xcuserdata/max.xcuserdatad/xcschemes/xcschememanagement.plist diff --git a/Tablet.podspec b/Tablet.podspec index 943a497..66dd4d3 100644 --- a/Tablet.podspec +++ b/Tablet.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'Tablet' - s.version = '0.4.0' + s.version = '0.4.1' s.homepage = 'https://github.com/maxsokolov/tablet' s.summary = 'Powerful type-safe tool for UITableView. Swift 2.0 is required.' diff --git a/Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate b/Tablet.xcworkspace/xcuserdata/max.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..87b462673907f2820a85dec730732ebdebebac16 GIT binary patch literal 10802 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 literal 0 HcmV?d00001 diff --git a/Tablet/TableDirector.swift b/Tablet/TableDirector.swift index e5985ab..7d075d8 100644 --- a/Tablet/TableDirector.swift +++ b/Tablet/TableDirector.swift @@ -192,33 +192,33 @@ public extension TableDirector { // MARK: Sections manipulation - public func appendSection(section: TableSectionBuilder) { - appendSections([section]) + public func append(section section: TableSectionBuilder) { + append(sections: [section]) } - public func appendSections(sections: [TableSectionBuilder]) { + public func append(sections sections: [TableSectionBuilder]) { sections.forEach { $0.willMoveToDirector(tableView) } self.sections.appendContentsOf(sections) } - public func clearSections() { + public func clear() { sections.removeAll() } } public func +=(left: TableDirector, right: RowBuilder) { - left.appendSection(TableSectionBuilder(rows: [right])) + left.append(section: TableSectionBuilder(rows: [right])) } public func +=(left: TableDirector, right: [RowBuilder]) { - left.appendSection(TableSectionBuilder(rows: right)) + left.append(section: TableSectionBuilder(rows: right)) } public func +=(left: TableDirector, right: TableSectionBuilder) { - left.appendSection(right) + left.append(section: right) } public func +=(left: TableDirector, right: [TableSectionBuilder]) { - left.appendSections(right) + left.append(sections: right) } \ No newline at end of file diff --git a/Tablet/TableRowBuilder.swift b/Tablet/TableRowBuilder.swift index 2c6cd52..e5a438d 100644 --- a/Tablet/TableRowBuilder.swift +++ b/Tablet/TableRowBuilder.swift @@ -173,7 +173,7 @@ public extension TableRowBuilder { // MARK: Items manipulation - public func appendItems(items: [I]) { + public func append(items items: [I]) { self.items.appendContentsOf(items) } @@ -183,9 +183,9 @@ public extension TableRowBuilder { } public func +=(left: TableRowBuilder, right: I) { - left.appendItems([right]) + left.append(items: [right]) } public func +=(left: TableRowBuilder, right: [I]) { - left.appendItems(right) + left.append(items: right) } \ No newline at end of file diff --git a/Tablet/TableSectionBuilder.swift b/Tablet/TableSectionBuilder.swift index e93a137..30a532e 100644 --- a/Tablet/TableSectionBuilder.swift +++ b/Tablet/TableSectionBuilder.swift @@ -69,14 +69,14 @@ public class TableSectionBuilder { builders.removeAll() } - public func appendRow(row: RowBuilder) { - appendRows([row]) + public func append(row row: RowBuilder) { + append(rows: [row]) } - public func appendRows(rowBuilders: [RowBuilder]) { + public func append(rows rows: [RowBuilder]) { - if let tableView = tableView { rowBuilders.forEach { $0.registerCell(inTableView: tableView) } } - builders.appendContentsOf(rowBuilders) + if let tableView = tableView { rows.forEach { $0.registerCell(inTableView: tableView) } } + builders.appendContentsOf(rows) } // MARK: Internal @@ -102,9 +102,9 @@ public class TableSectionBuilder { } public func +=(left: TableSectionBuilder, right: RowBuilder) { - left.appendRow(right) + left.append(row: right) } public func +=(left: TableSectionBuilder, right: [RowBuilder]) { - left.appendRows(right) + left.append(rows: right) } \ No newline at end of file diff --git a/Tablet/Tablet.xcodeproj/xcuserdata/max.xcuserdatad/xcschemes/xcschememanagement.plist b/Tablet/Tablet.xcodeproj/xcuserdata/max.xcuserdatad/xcschemes/xcschememanagement.plist new file mode 100644 index 0000000..d54e643 --- /dev/null +++ b/Tablet/Tablet.xcodeproj/xcuserdata/max.xcuserdatad/xcschemes/xcschememanagement.plist @@ -0,0 +1,19 @@ + + + + + SuppressBuildableAutocreation + + DAC2D6681C9D743D009E9C19 + + primary + + + DAC2D6721C9D743D009E9C19 + + primary + + + + +