From e267b7d59c4b4c82dac12c6dd84aeaa12cab88f3 Mon Sep 17 00:00:00 2001 From: Carlin Isaacson Date: Mon, 15 Jun 2015 11:50:25 -0700 Subject: [PATCH 1/4] Added Bright Phonics to the app page --- docs/ProMotion Apps.md | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/ProMotion Apps.md b/docs/ProMotion Apps.md index 1194c49e..7ebe1cfe 100644 --- a/docs/ProMotion Apps.md +++ b/docs/ProMotion Apps.md @@ -5,7 +5,7 @@ [![rm yelp](http://media.clearsightstudio.com/jamon/iOS_Simulator__iPhone_Retina_4inch__iOS_7.0.3_11B508_20140114_091423.jpg)](https://github.com/faizaanshamsi/rubymotion_yelp) > Simple Yelp search using Rubymotion. My First Rubymotion app! -> +> > Uses Yelp API v1.0 so search by location. Allows you to filter results in a table view. Clicking on a results will redirect you to the mobile yelp page. By [@faizaanshamsi](https://twitter.com/faizaanshamsi). @@ -136,7 +136,14 @@ Dropzones lists all current U.S. Parachute Association (USPA) member dropzones i This application is open source! [Check out the source code](https://github.com/OTGApps/Dropzones) +### Bright Phonics + +[![https://pbs.twimg.com/profile_images/593445791345192960/YZlXl_CE.png](https://pbs.twimg.com/profile_images/593445791345192960/YZlXl_CE.png)](https://itunes.apple.com/us/app/bright-phonics/id986665887) + +[App Store Link](https://itunes.apple.com/us/app/bright-phonics/id986665887) + +Bright Phonics (by [Zero41 Software](http://zero41.com/bright-phonics/)) is an educational app to help children learn to read. It is designed to be the most efficient way for children to learn and memorize English phonemes. Bright Phonics uses the scientifically supported Spaced Repetition learning technique to enable fast, efficient learning. ### Your app here -Tweet [@jamonholmgren](https://twitter.com/jamonholmgren) if you built an app in ProMotion and want it included here! \ No newline at end of file +Tweet [@jamonholmgren](https://twitter.com/jamonholmgren) if you built an app in ProMotion and want it included here! From bfe9f512a4c3335cff8ea609c0fdd65b43e0b5f0 Mon Sep 17 00:00:00 2001 From: Carlin Isaacson Date: Mon, 15 Jun 2015 11:55:09 -0700 Subject: [PATCH 2/4] more information link --- docs/ProMotion Apps.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/ProMotion Apps.md b/docs/ProMotion Apps.md index 7ebe1cfe..00d28541 100644 --- a/docs/ProMotion Apps.md +++ b/docs/ProMotion Apps.md @@ -142,7 +142,9 @@ This application is open source! [Check out the source code](https://github.com/ [App Store Link](https://itunes.apple.com/us/app/bright-phonics/id986665887) -Bright Phonics (by [Zero41 Software](http://zero41.com/bright-phonics/)) is an educational app to help children learn to read. It is designed to be the most efficient way for children to learn and memorize English phonemes. Bright Phonics uses the scientifically supported Spaced Repetition learning technique to enable fast, efficient learning. +Bright Phonics is an educational app to help children learn to read. It is designed to be the most efficient way for children to learn and memorize English phonemes. Bright Phonics uses the scientifically supported Spaced Repetition learning technique to enable fast, efficient learning. + +More information: [http://zero41.com/bright-phonics/](http://zero41.com/bright-phonics/) ### Your app here From c49c638a83aafbfb220aea1c1116bba79a4b53db Mon Sep 17 00:00:00 2001 From: Andrew Havens Date: Thu, 18 Jun 2015 09:35:38 -0700 Subject: [PATCH 3/4] Change behavior of screen title so that it will be nil by default --- app/test_screens/untitled_screen.rb | 2 ++ lib/ProMotion/screen/screen_module.rb | 2 +- spec/unit/screen_spec.rb | 10 ++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/test_screens/untitled_screen.rb diff --git a/app/test_screens/untitled_screen.rb b/app/test_screens/untitled_screen.rb new file mode 100644 index 00000000..5e1cb7bb --- /dev/null +++ b/app/test_screens/untitled_screen.rb @@ -0,0 +1,2 @@ +class UntitledScreen < PM::Screen +end diff --git a/lib/ProMotion/screen/screen_module.rb b/lib/ProMotion/screen/screen_module.rb index 45d228ab..ae084b20 100644 --- a/lib/ProMotion/screen/screen_module.rb +++ b/lib/ProMotion/screen/screen_module.rb @@ -218,7 +218,7 @@ def title(t=nil) end @title = t if t @title_type = :text if t - @title ||= self.to_s + @title end def title_type diff --git a/spec/unit/screen_spec.rb b/spec/unit/screen_spec.rb index 34945381..09fbe74d 100644 --- a/spec/unit/screen_spec.rb +++ b/spec/unit/screen_spec.rb @@ -6,6 +6,16 @@ @screen.on_load end + it "does not have a default title" do + screen = UntitledScreen.new + screen.title.should == nil + end + + it "does not display a default title in the nav bar" do + screen = UntitledScreen.new + screen.navigationItem.title.should == nil + end + it "should store title" do HomeScreen.title.should == "Home" end From 4906d85d179548a13f4be0d9bd604faa9a8168e3 Mon Sep 17 00:00:00 2001 From: Andrew Havens Date: Mon, 4 Apr 2016 12:59:57 -0700 Subject: [PATCH 4/4] Dont try updating search results table view if search display controller does not exist --- lib/ProMotion/table/table.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/ProMotion/table/table.rb b/lib/ProMotion/table/table.rb index 78cf6182..a9497451 100644 --- a/lib/ProMotion/table/table.rb +++ b/lib/ProMotion/table/table.rb @@ -117,7 +117,10 @@ def update_table_view_data(data, args = {}) else table_view.reloadData end - @table_search_display_controller.searchResultsTableView.reloadData if searching? + + if searching? && @table_search_display_controller.respond_to?(:searchResultsTableView) + @table_search_display_controller.searchResultsTableView.reloadData + end end def accessory_toggled_switch(switch)