kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-04-27 19:25:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

No longer initialize our own UITableView unnecessarily, other cleanup

Browse Source
This commit is contained in:
Jamon Holmgren
2013-11-21 00:12:08 -08:00
parent f89e5b2076
commit 5ae4f9c60d
7 changed files with 43 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -47,7 +47,7 @@ end
|Table Screens|Grouped Tables|Searchable|Refreshable|
|---|---|---|---|
|![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)|*Screenshot coming soon!*|![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)|![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)|
|![ProMotion TableScreen](https://f.cloud.github.com/assets/1479215/1534137/ed71e864-4c90-11e3-98aa-ed96049f5407.png)|![Grouped Table Screen](https://f.cloud.github.com/assets/1479215/1589973/61a48610-5281-11e3-85ac-abee99bf73ad.png)|![Searchable](https://f.cloud.github.com/assets/1479215/1534299/20cc05c6-4c93-11e3-92ca-9ee39c044457.png)|![Refreshable](https://f.cloud.github.com/assets/1479215/1534317/5a14ef28-4c93-11e3-8e9e-f8c08d8464f8.png)|
|iPad SplitScreens|Map Screens|Web Screens|

4
lib/ProMotion/cocoatouch/table_view_controller.rb
View File

@@ -1,7 +1,7 @@
module ProMotion
class TableViewController < UITableViewController
def self.new(args = {})
s = self.alloc.initWithNibName(nil, bundle:nil)
s = self.alloc.initWithStyle(table_style)
s.on_create(args) if s.respond_to?(:on_create)
s
end
@@ -52,4 +52,4 @@ module ProMotion
self.on_rotate
end
end
end
end

4
lib/ProMotion/table/extensions/indexable.rb
View File

@@ -2,9 +2,9 @@ module ProMotion
module Table
module Indexable
def table_data_index
return nil if @promotion_table_data.filtered || !self.class.get_indexable
return nil if self.promotion_table_data.filtered || !self.class.get_indexable
index = @promotion_table_data.sections.collect{ |section| section[:title][0] }
index = self.promotion_table_data.sections.collect{ |section| section[:title][0] }
index.unshift("{search}") if self.class.get_searchable
index
end

5
lib/ProMotion/table/extensions/searchable.rb
View File

@@ -42,13 +42,12 @@ module ProMotion
######### iOS methods, headless camel case #######
def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
@promotion_table_data.search(search_string)
self.promotion_table_data.search(search_string)
true
end
def searchDisplayControllerWillEndSearch(controller)
@promotion_table_data.stop_searching
@promotion_table_data_data = nil
self.promotion_table_data.stop_searching
self.table_view.setScrollEnabled true
self.table_view.reloadData
@table_search_display_controller.delegate.will_end_search if @table_search_display_controller.delegate.respond_to? "will_end_search"

9
lib/ProMotion/table/grouped_table.rb
View File

@@ -1,7 +1,12 @@
module ProMotion
module GroupedTable
def table_style
UITableViewStyleGrouped
module GroupedTableClassMethods
def table_style
UITableViewStyleGrouped
end
end
def self.included(base)
base.extend(GroupedTableClassMethods)
end
end
end

75
lib/ProMotion/table/table.rb
View File

@@ -6,22 +6,14 @@ module ProMotion
include ProMotion::Table::Refreshable
include ProMotion::Table::Indexable
def table_view
@table_view ||= begin
t = UITableView.alloc.initWithFrame(self.view.frame, style: table_style)
t.dataSource = self
t.delegate = self
t
end
end
attr_reader :promotion_table_data
def table_style
UITableViewStylePlain
def table_view
self.view
end
def screen_setup
check_table_data
set_up_table_view
set_up_searchable
set_up_refreshable
end
@@ -30,11 +22,8 @@ module ProMotion
PM.logger.error "Missing #table_data method in TableScreen #{self.class.to_s}." unless self.respond_to?(:table_data)
end
def set_up_table_view
# before access self.table_data, create UITableView and call on_load
table_view
self.view = self.create_table_view_from_data(self.table_data)
def promotion_table_data
@promotion_table_data ||= TableData.new(table_data, table_view)
end
def set_up_searchable
@@ -53,37 +42,31 @@ module ProMotion
end
end
def create_table_view_from_data(data)
@promotion_table_data = TableData.new(data, table_view)
table_view
end
def searching?
@promotion_table_data.filtered
self.promotion_table_data.filtered
end
def original_search_string
@promotion_table_data.original_search_string
self.promotion_table_data.original_search_string
end
def search_string
@promotion_table_data.search_string
self.promotion_table_data.search_string
end
def update_table_view_data(data)
create_table_view_from_data(data) unless @promotion_table_data
@promotion_table_data.data = data
self.promotion_table_data.data = data
table_view.reloadData
end
# Methods to retrieve data
def section_at_index(index)
@promotion_table_data.section(index)
self.promotion_table_data.section(index)
end
def cell_at_section_and_index(section, index)
@promotion_table_data.cell(section: section, index: index)
self.promotion_table_data.cell(section: section, index: index)
end
def trigger_action(action, arguments)
@@ -121,9 +104,9 @@ module ProMotion
index_paths.each do |index_path|
delete_cell = false
delete_cell = send(:on_cell_deleted, @promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
delete_cell = send(:on_cell_deleted, self.promotion_table_data.cell(index_path: index_path)) if self.respond_to?("on_cell_deleted:")
unless delete_cell == false
@promotion_table_data.delete_cell(index_path: index_path)
self.promotion_table_data.delete_cell(index_path: index_path)
deletable_index_paths << index_path
end
end
@@ -136,7 +119,7 @@ module ProMotion
params[:index] = params[:index_path].row
end
data_cell = @promotion_table_data.cell(section: params[:section], index: params[:index])
data_cell = self.promotion_table_data.cell(section: params[:section], index: params[:index])
return UITableViewCell.alloc.init unless data_cell # No data?
table_cell = create_table_cell(data_cell)
@@ -165,28 +148,24 @@ module ProMotion
########## Cocoa touch methods #################
def numberOfSectionsInTableView(table_view)
return Array(@promotion_table_data.data).length
Array(self.promotion_table_data.data).length
end
# Number of cells
def tableView(table_view, numberOfRowsInSection:section)
return @promotion_table_data.section_length(section)
0
self.promotion_table_data.section_length(section)
end
def tableView(table_view, titleForHeaderInSection:section)
return section_at_index(section)[:title] if section_at_index(section) && section_at_index(section)[:title]
section = section_at_index(section) || return
section[:title]
end
# Set table_data_index if you want the right hand index column (jumplist)
def sectionIndexTitlesForTableView(table_view)
return nil if @promotion_table_data.filtered
if self.respond_to?(:table_data_index)
self.table_data_index
else
nil
end
return if self.promotion_table_data.filtered
return self.table_data_index if self.respond_to?(:table_data_index)
nil
end
def tableView(table_view, cellForRowAtIndexPath:index_path)
@@ -194,17 +173,17 @@ module ProMotion
end
def tableView(table_view, willDisplayCell: table_cell, forRowAtIndexPath: index_path)
data_cell = @promotion_table_data.cell(index_path: index_path)
data_cell = self.promotion_table_data.cell(index_path: index_path)
table_cell.backgroundColor = data_cell[:background_color] || UIColor.whiteColor
table_cell.send(:restyle!) if table_cell.respond_to?(:restyle!)
end
def tableView(table_view, heightForRowAtIndexPath:index_path)
(@promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
(self.promotion_table_data.cell(index_path: index_path)[:height] || table_view.rowHeight).to_f
end
def tableView(table_view, didSelectRowAtIndexPath:index_path)
data_cell = @promotion_table_data.cell(index_path: index_path)
data_cell = self.promotion_table_data.cell(index_path: index_path)
table_view.deselectRowAtIndexPath(index_path, animated: true) unless data_cell[:keep_selection] == true
data_cell[:arguments] ||= {}
@@ -214,7 +193,7 @@ module ProMotion
end
def tableView(table_view, editingStyleForRowAtIndexPath: index_path)
data_cell = @promotion_table_data.cell(index_path: index_path)
data_cell = self.promotion_table_data.cell(index_path: index_path)
case data_cell[:editing_style]
when nil, :none
@@ -292,6 +271,10 @@ module ProMotion
end
module TableClassMethods
def table_style
UITableViewStylePlain
end
# Searchable
def searchable(params={})
@searchable_params = params

4
spec/helpers/table_screen.rb
View File

@@ -2,10 +2,6 @@ class TestTableScreen < ProMotion::TableScreen
attr_accessor :tap_counter, :cell_was_deleted
def promotion_table_data
@promotion_table_data
end
def on_load
self.tap_counter = 0
set_attributes self.view, { backgroundView: nil, backgroundColor: UIColor.whiteColor }