kylefang/ProMotion
1
0
Fork 0
mirror of https://github.com/zhigang1992/ProMotion.git synced 2026-05-24 17:22:49 +08:00
Code Issues Packages Projects Releases Wiki Activity
895 Commits 19 Branches 26 Tags
aabb6fd3d65bbb19c2b04aea0ab2b9ed288d4fbb
Commit Graph

527 Commits

Author SHA1 Message Date
Jamon Holmgren
da14f38165 Merge pull request #271 from clearsightstudio/stopped_searching 
Searching callbacks
 2013-08-15 14:24:56 -07:00
Mark Rickert
80f51245ec Changed on_ to will_ 2013-08-15 17:07:39 -04:00
Jamon Holmgren
96629acdde Merge pull request #269 from AmoebaConsulting/back_button_support 
Back button support
 2013-08-15 13:03:54 -07:00
Mark Rickert
b1e4ef754e Updated end search callback name and added on_begin_search callback. Also updated tests to pass. 2013-08-15 15:42:21 -04:00
Jamon Holmgren
d827f732ed Merge pull request #267 from AmoebaConsulting/add_flat_tabs 
Add flat tabs
 2013-08-15 11:37:16 -07:00
Jamon Holmgren
b13d54df30 Revert "Merge branch 'edge' of github.com:clearsightstudio/ProMotion into edge" 
This reverts commit 62fd1c1970, reversing
changes made to a139d36879.
 2013-08-15 10:47:56 -07:00
Daniel Jabbour
beb7a8af48 Adding support for back button 2013-08-14 18:52:26 -07:00
Mark Rickert
23eba38466 Add a callback to the tablescreen class that is called when the user stops searching (hits the cancel button) 2013-08-14 20:20:31 -04:00
Daniel Jabbour
819553af82 Tab icons support selected & unselected state 2013-08-14 16:48:59 -07:00
Jamon Holmgren
62fd1c1970 Merge branch 'edge' of github.com:clearsightstudio/ProMotion into edge 2013-08-14 16:17:00 -07:00
Jamon Holmgren
a139d36879 Merge branch 'master' into edge 2013-08-14 16:16:44 -07:00
Daniel Jabbour
ce96dc05bd Updating Tabs :icon attribute to accept UIImage 2013-08-13 19:18:34 -07:00
Jamon Holmgren
d07e035840 Merge pull request #262 from rheoli/accessibility 
Add accessibilityLabel for easier testing with Calabash
 2013-08-09 11:35:20 -07:00
Stephan Toggweiler
7905c4b914 small fix 2013-08-09 16:59:54 +02:00
Stephan Toggweiler
ca207753f6 more generalized version 2013-08-09 16:57:59 +02:00
Jamon Holmgren
23d53a2ca0 Added ability to specify a string OR UIImage for map screen annotation image 2013-08-06 11:31:22 -07:00
Jamon Holmgren
883af37402 Merge pull request #258 from thebeansgroup/feature/map_annotation_image 
Allow MapScreen annotations to be images
 2013-08-06 11:13:41 -07:00
Ad Taylor
b68891aa43 Fixes repeated line in image annotation IF 2013-08-06 12:36:29 +01:00
Tiago Bastos
e911c1c2a2 Add support to application:openURL:sourceApplication:annotation 
Now you can use `on_open_url` instead.

http://developer.apple.com/library/ios/documentation/uikit/reference/UIApplicationDelegate_Protocol/Reference/Reference.html#//apple_ref/occ/intfm/UIApplicationDelegate/application:openURL:sourceApplication:annotation:
 2013-08-05 15:37:26 -03:00
Jamon Holmgren
976cc6dd7f Fixing conflicts. 2013-08-05 11:33:57 -07:00
Ad Taylor
7011955485 Ensures MK Annotation is of correct type for image. Updates identifier when image is set 2013-08-02 16:21:02 +01:00
Ad Taylor
da058d5043 Adds image param to MapScreen annotation data 2013-08-02 14:45:03 +01:00
Jamon Holmgren
9a83b6060c Version 1.0.3 2013-08-01 14:15:35 -07:00
Stephan Toggweiler
7ae1b8315d add accessibilityLabel for easier testing with Calabash 2013-08-01 10:18:27 +02:00
Stephan Toggweiler
be351709f9 fix typo (:badge to :badge_number) 2013-08-01 10:17:07 +02:00
Jamon Holmgren
1306b249f9 Merge pull request #242 from forrestgrant/attributed 
Allow use of attributed strings in table cell titles/subtitles
 2013-07-30 13:54:18 -07:00
Mark Rickert
42b6b34c61 Merge branch 'master' of github.com:clearsightstudio/ProMotion into expose-tableview-search-string 
# By Mark Rickert (2) and toshiwo (1)
# Via Jamon Holmgren (2) and Mark Rickert (1)
* 'master' of github.com:clearsightstudio/ProMotion:
  Add a note in the OpenInChrome about fallback.
  Fixes open in chrome functionality
  fix a timing to create table_view and call on_load
 2013-07-30 15:16:50 -04:00
Mark Rickert
116439ed3d Expose original search string 2013-07-30 15:16:28 -04:00
Mark Rickert
6531669d03 Expose search_string to the table_view 2013-07-30 15:05:54 -04:00
Forrest Grant
bf47236f8a Swapping regex case statement for if/then is_a? 2013-07-30 08:04:08 -04:00
Jamon Holmgren
d2d827844e Merge pull request #246 from toshiwo/fix_timing_to_create_table_view_and_call_on_load 
Fix a timing to create table_view and call on_load
 2013-07-29 16:01:28 -07:00
Mark Rickert
fd5fadf790 Add a note in the OpenInChrome about fallback. 2013-07-29 09:54:00 -04:00
Mark Rickert
45ab44007d Fixes open in chrome functionality 
Apparently, the OpenInChrome doesn't auto-translate to camelcase for their method signatures :P
 2013-07-29 09:51:47 -04:00
toshiwo
a114a7bb25 fix a timing to create table_view and call on_load 2013-07-28 23:23:38 +09:00
Forrest Grant
648c61c886 Rolling back version, cleaning up spec formatting. 2013-07-26 19:29:18 -04:00
Forrest Grant
64510afdf6 Allow use of attributed strings in table cell titles/subtitles 2013-07-26 13:51:21 -04:00
toshiwo
0478630bd7 Revert "fix section size from numberOfSectionsInTableView" 
This reverts commit 6bd97fb343.
 2013-07-23 22:19:33 -07:00
Jesper Christiansen
37dcc2c161 You can now specify title_view for custom views for your section titles 
def table_data
  [{
    title: "My section title",
    title_view: MyCustomSectionView,
    title_height: 50,
    cells: []
  }]
end

If you specify a title accessor on the custom view, this will be set to the
title

class MyCustomSectionView < UITableViewCell
  attr_accessor :title
end
 2013-07-23 22:19:33 -07:00
Jamon Holmgren
82690114c5 Version 1.0.2 2013-07-23 22:08:51 -07:00
ainame
abc6e5f201 bug fix: update_table_data raise error at on_load 2013-07-24 11:12:17 +09:00
Michal Jirku
7f0f8439ad Fix issue #233 2013-07-17 21:53:22 +02:00
Jamon Holmgren
a7999477d0 Fixing issue #231 2013-07-16 16:07:12 -07:00
Jamon Holmgren
e05b55f15a Version 1.0.1 2013-07-16 12:08:22 -07:00
AndrewGertig
abf8ef63fa table_view_controller was missing a loadView implementation 2013-07-16 14:40:05 -04:00
AndrewGertig
6ace545f50 Add a check to see if the table class responds to get_indexable 2013-07-15 23:10:54 -04:00
Mark Rickert
24e0a35627 Fix webscreen html method and tests. 2013-07-15 13:49:27 -04:00
Jamon Holmgren
8138d0f9d2 tab_bar_item class method 
I know I said that we were in a feature freeze, but this is necessary
due to the on_load changes we made.

Plus:

* Moved module class method inclusions, made possible by loading
ScreenModule in every Screen type. This is cleaner for class method
inclusion, although there's still some room for improvement.
* Added unit tests for the tab bar and tab bar items
* Moved `on_init` after `screen_setup` which makes more sense.
 2013-07-14 18:22:17 -07:00
Jamon Holmgren
89c76c5bfe Remove indexable per @ainame 2013-07-12 21:16:10 -07:00
Jamon Holmgren
fa14ca247b Fixed issue #74 reported by @jeanmartin 2013-07-12 17:55:02 -07:00
Jamon Holmgren
857fb3b20a Removed _tables 2013-07-12 17:16:42 -07:00