ProMotion 1.1.2 → 1.2.0

data/lib/ProMotion/extensions/conversions.rb

@@ -1,20 +1,20 @@
 module ProMotion
   module Conversions
-    
+
     # For converting, for example, from :contacts to UITabBarSystemItemContacts
     # Unfortunately, this only works if the symbol is defined in your code.
     # So, for now, we'll have to do it manually.
     def convert_symbol(symbol, prefix)
       Object.const_get("#{prefix}#{camel_case symbol}")
     end
-    
+
     def objective_c_method_name(str)
       str.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
     end
-    
+
     def camel_case(str)
       str.split('_').map(&:capitalize).join
     end
-    
+
   end
 end

data/lib/ProMotion/map/map_screen.rb

@@ -1,3 +1,7 @@
+motion_require '../cocoatouch/view_controller'
+motion_require '../screen/screen_module'
+motion_require 'map_screen_module'
+
 module ProMotion
   class MapScreen < ViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/map/map_screen_module.rb

@@ -9,7 +9,7 @@ module ProMotion
         resize: [ :width, :height ],
         delegate: self
       }
-      
+
       check_annotation_data
       @promotion_annotation_data = []
       set_up_start_position

data/lib/ProMotion/screen/screen.rb

@@ -1,3 +1,6 @@
+motion_require '../cocoatouch/view_controller'
+motion_require 'screen_module'
+
 module ProMotion
   class Screen < ViewController
     # You can inherit a screen from any UIViewController if you include the ScreenModule

data/lib/ProMotion/screen/screen_module.rb

@@ -1,3 +1,8 @@
+motion_require 'screen_navigation'
+motion_require '../view/styling'
+motion_require '../containers/tabs'
+motion_require '../containers/split_screen'
+
 module ProMotion
   module ScreenModule
     include ProMotion::ScreenNavigation
@@ -12,9 +17,11 @@ module ProMotion
         raise StandardError.new("ERROR: Screens must extend UIViewController or a subclass of UIViewController.")
       end
 
-      self.title = self.class.send(:get_title)
+      resolve_title
+
       self.tab_bar_item = self.class.send(:get_tab_bar_item)
       self.refresh_tab_bar_item if self.tab_bar_item
+      self.class.send(:get_title)
 
       args.each { |k, v| self.send("#{k}=", v) if self.respond_to?("#{k}=") }
 
@@ -48,6 +55,18 @@ module ProMotion
       @navigationController = nav
     end
 
+    def resolve_title
+      if self.class.send(:get_title).kind_of? String
+        self.title = self.class.send(:get_title)
+      elsif self.class.send(:get_title).kind_of? UIView
+        self.navigationItem.titleView = self.class.send(:get_title)
+      elsif self.class.send(:get_title).kind_of? UIImage
+        self.navigationItem.titleView = UIImageView.alloc.initWithImage(self.class.send(:get_title))
+      else
+        PM.logger.warn("title expects string, UIView, or UIImage, but #{self.class.send(:get_title).class.to_s} given.")
+      end
+    end
+
     def add_nav_bar(args = {})
       self.navigationController ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
@@ -120,6 +139,10 @@ module ProMotion
       end
     end
 
+    def parent_screen=(parent)
+      @parent_screen = WeakRef.new(parent)
+    end
+
     def first_screen?
       self.first_screen == true
     end
@@ -282,6 +305,7 @@ module ProMotion
       def title=(t)
         @title = t
       end
+      
       def get_title
         @title ||= self.to_s
       end

data/lib/ProMotion/screen/screen_navigation.rb

@@ -18,7 +18,7 @@ module ProMotion
         open_root_screen screen
 
       elsif args[:modal]
-        present_modal_view_controller screen, args[:animated]
+        present_modal_view_controller screen, args[:animated], args[:completion]
 
       elsif args[:in_tab] && self.tab_bar
         present_view_controller_in_tab_bar_controller screen, args[:in_tab]
@@ -117,8 +117,8 @@ module ProMotion
       end
     end
 
-    def present_modal_view_controller(screen, animated)
-      self.presentModalViewController((screen.navigationController || screen), animated:animated)
+    def present_modal_view_controller(screen, animated, completion)
+      self.presentViewController((screen.navigationController || screen), animated:animated, completion:completion)
     end
 
     def present_view_controller_in_tab_bar_controller(screen, tab_name)

data/lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -1,3 +1,5 @@
+motion_require '../../view/styling'
+
 module ProMotion
   module TableViewCellModule
     include Styling
@@ -63,18 +65,22 @@ module ProMotion
 
     def set_remote_image
       if data_cell[:remote_image]
-        if self.imageView.respond_to?("setImageWithURL:placeholderImage:")
+        if self.imageView.respond_to?("setImageWithURL:placeholder:")
           url = data_cell[:remote_image][:url]
           url = NSURL.URLWithString(url) unless url.is_a?(NSURL)
           placeholder = data_cell[:remote_image][:placeholder]
           placeholder = UIImage.imageNamed(placeholder) if placeholder.is_a?(String)
 
           self.image_size = data_cell[:remote_image][:size] if data_cell[:remote_image][:size] && self.respond_to?("image_size=")
-          self.imageView.setImageWithURL(url, placeholderImage: placeholder)
+          self.imageView.setImageWithURL(url, placeholder: placeholder)
           self.imageView.layer.masksToBounds = true
           self.imageView.layer.cornerRadius = data_cell[:remote_image][:radius] if data_cell[:remote_image].has_key?(:radius)
+          self.imageView.contentMode = map_content_mode_symbol(data_cell[:remote_image][:content_mode]) if data_cell[:remote_image].has_key?(:content_mode)
+        elsif self.imageView.respond_to?("setImageWithURL:placeholderImage:")
+          # TODO - Remove this in next major release
+          PM.logger.deprecated "The SDWebImage cocoapod is deprecated. Please replace it with 'JMImageCache'."
         else
-          PM.logger.error "ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'SDWebImage'."
+          PM.logger.error "ProMotion Warning: to use remote_image with TableScreen you need to include the CocoaPod 'JMImageCache'."
         end
       end
       self
@@ -152,5 +158,15 @@ module ProMotion
     def set_selection_style
       self.selectionStyle = UITableViewCellSelectionStyleNone if data_cell[:no_select]
     end
+
+    def map_content_mode_symbol(symbol)
+      content_mode = {
+        scale_to_fill:     UIViewContentModeScaleToFill,
+        scale_aspect_fit:  UIViewContentModeScaleAspectFit,
+        scale_aspect_fill: UIViewContentModeScaleAspectFill,
+        mode_redraw:       UIViewContentModeRedraw
+      }[symbol] if symbol.is_a?(Symbol)
+      content_mode || symbol
+    end
   end
 end

data/lib/ProMotion/table/grouped_table_screen.rb

@@ -1,3 +1,8 @@
+motion_require '../cocoatouch/table_view_controller'
+motion_require '../screen/screen_module'
+motion_require 'table'
+motion_require 'grouped_table'
+
 module ProMotion
   class GroupedTableScreen < TableViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/table/table.rb

@@ -1,3 +1,8 @@
+motion_require '../view/styling'
+motion_require 'extensions/searchable'
+motion_require 'extensions/refreshable'
+motion_require 'extensions/indexable'
+
 module ProMotion
   module Table
 

data/lib/ProMotion/table/table_screen.rb

@@ -1,3 +1,7 @@
+motion_require '../cocoatouch/table_view_controller'
+motion_require '../screen/screen_module'
+motion_require 'table'
+
 module ProMotion
   class TableScreen < TableViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/version.rb

@@ -1,3 +1,3 @@
 module ProMotion
-  VERSION = "1.1.2" unless defined?(ProMotion::VERSION)
+  VERSION = "1.2.0" unless defined?(ProMotion::VERSION)
 end

data/lib/ProMotion/view/styling.rb

@@ -1,3 +1,5 @@
+motion_require '../extensions/conversions'
+
 module ProMotion
   module Styling
     include Conversions
@@ -45,17 +47,28 @@ module ProMotion
       element
     end
 
-    def content_height(view)
-      height = 0
-      view.subviews.each do |sub_view|
-        next if sub_view.isHidden
-        y = sub_view.frame.origin.y
-        h = sub_view.frame.size.height
-        if (y + h) > height
-          height = y + h
+    def content_max(view, mode = :height)
+      return 0 if view.subviews.empty?
+
+      sizes = view.subviews.map do |sub_view|
+        if sub_view.isHidden
+          0
+        elsif mode == :height
+          sub_view.frame.origin.y + sub_view.frame.size.height
+        else
+          sub_view.frame.origin.x + sub_view.frame.size.width
         end
       end
-      height
+
+      sizes.max
+    end
+
+    def content_height(view)
+      content_max(view, :height)
+    end
+
+    def content_width(view)
+      content_max(view, :width)
     end
 
     def closest_parent(type, this_view = nil)

data/lib/ProMotion/web/web_screen.rb

@@ -1,3 +1,7 @@
+motion_require '../cocoatouch/view_controller'
+motion_require '../screen/screen_module'
+motion_require 'web_screen_module'
+
 module ProMotion
   class WebScreen < ViewController
     include ProMotion::ScreenModule

data/lib/ProMotion/web/web_screen_module.rb

@@ -79,7 +79,7 @@ module ProMotion
     end
 
     def html
-      self.webview.stringByEvaluatingJavaScriptFromString("document.documentElement.outerHTML")
+      evaluate("document.documentElement.outerHTML")
     end
 
     def evaluate(js)

data/spec/functional/func_image_title_screen.rb

@@ -0,0 +1,20 @@
+describe "ProMotion::Screen UIImage title functionality" do
+  tests PM::Screen
+
+  # Override controller to properly instantiate
+  def controller
+    rotate_device to: :portrait, button: :bottom
+    @image_title_screen ||= ImageTitleScreen.new(nav_bar: true)
+    @root_screen = @image_title_screen
+    @image_title_screen.navigationController
+  end
+
+  after do
+    @controller = nil
+    @root_screen = nil
+  end
+
+  it "should allow an image title" do
+    @root_screen.navigationItem.titleView.should.be.kind_of UIImageView
+  end
+end

data/spec/functional/func_image_view_title_screen.rb

@@ -0,0 +1,20 @@
+describe "ProMotion::Screen UIImageView title functionality" do
+  tests PM::Screen
+
+  # Override controller to properly instantiate
+  def controller
+    rotate_device to: :portrait, button: :bottom
+    @image_title_screen ||= ImageViewTitleScreen.new(nav_bar: true)
+    @root_screen = @image_title_screen
+    @image_title_screen.navigationController
+  end
+
+  after do
+    @controller = nil
+    @root_screen = nil
+  end
+
+  it "should allow an image title" do
+    @root_screen.navigationItem.titleView.should.be.kind_of UIImageView
+  end
+end

data/spec/functional/func_screen_spec.rb

@@ -18,6 +18,10 @@ describe "ProMotion::Screen functional" do
     view("Functional").should.be.kind_of UINavigationItemView
   end
 
+  it "should allow a string title" do
+    views(UINavigationItemView).include?(UIImageView).should.not.be.true
+  end
+
   it "should allow setting a left nav bar button" do
     @root_screen.set_nav_bar_button :left, title: "Cool", action: :triggered_button
     tap("Cool")

data/spec/functional/func_split_screen_spec.rb

@@ -71,4 +71,11 @@ describe "Split screen functional" do
     @detail.navigationItem.leftBarButtonItem.title.should == test_title
   end
 
+  it "should override the default swipe action, that reveals the menu" do
+    rotate_device to: :portrait, button: :bottom
+
+    @controller = @app.open_split_screen @master, @detail, swipe: false
+    @app.home_screen.presentsWithGesture.should == false
+  end
+
 end

data/spec/functional/func_view_title_screen.rb

@@ -0,0 +1,21 @@
+describe "ProMotion::Screen UIView title functionality" do
+  tests PM::Screen
+
+  # Override controller to properly instantiate
+  def controller
+    rotate_device to: :portrait, button: :bottom
+    @image_title_screen ||= ViewTitleScreen.new(nav_bar: true)
+    @root_screen = @image_title_screen
+    @image_title_screen.navigationController
+  end
+
+  after do
+    @controller = nil
+    @root_screen = nil
+  end
+
+  it "should allow an image title" do
+    @root_screen.navigationItem.titleView.should.not.be.kind_of UIImageView
+    @root_screen.navigationItem.titleView.should.be.kind_of UIView
+  end
+end

data/spec/functional/func_web_screen_spec.rb

@@ -23,7 +23,7 @@ describe "ProMotion::TestWebScreen functionality" do
     @webscreen.set_content(file_name)
 
     @loaded_file = File.read(File.join(NSBundle.mainBundle.resourcePath, file_name))
-    wait_for_change @webscreen, 'load_finished' do
+    wait_for_change @webscreen, 'is_load_finished' do
       @webscreen.html.delete("\n").should == @loaded_file.delete("\n")
     end
   end
@@ -33,7 +33,7 @@ describe "ProMotion::TestWebScreen functionality" do
       to_return(body: %q{Google! <form action="/search">%}, content_type: "text/html")
 
     @webscreen.open_url(NSURL.URLWithString("https://www.google.com/"))
-    wait_for_change @webscreen, 'load_finished' do
+    wait_for_change @webscreen, 'is_load_finished' do
       @webscreen.html.include?('<form action="/search"').should == true
     end
   end
@@ -41,7 +41,7 @@ describe "ProMotion::TestWebScreen functionality" do
   it "should manipulate the webscreen contents with javascript" do
     @webscreen.set_content('<h1 id="cool">Something Cool</h1>')
 
-    wait_for_change @webscreen, 'load_finished' do
+    wait_for_change @webscreen, 'is_load_finished' do
       @webscreen.evaluate('document.getElementById("cool").innerHTML = "Changed"')
       @webscreen.html.should =~ /<h1 id="cool">Changed<\/h1>/
     end

data/spec/helpers/image_title_screen.rb

@@ -0,0 +1,15 @@
+class ImageTitleScreen < PM::Screen
+  attr_accessor :button_was_triggered
+
+  title UIImage.imageNamed('test.png')
+
+  def will_appear
+    self.button_was_triggered = false
+    add UILabel.alloc.initWithFrame([[ 10, 10 ], [ 300, 40 ]]),
+      text: "Label Here"
+  end
+
+  def triggered_button
+    self.button_was_triggered = true
+  end
+end

data/spec/helpers/image_view_title_screen.rb

@@ -0,0 +1,15 @@
+class ImageViewTitleScreen < PM::Screen
+  attr_accessor :button_was_triggered
+
+  title UIImageView.alloc.initWithImage(UIImage.imageNamed('test.png'))
+
+  def will_appear
+    self.button_was_triggered = false
+    add UILabel.alloc.initWithFrame([[ 10, 10 ], [ 300, 40 ]]),
+      text: "Label Here"
+  end
+
+  def triggered_button
+    self.button_was_triggered = true
+  end
+end

data/spec/helpers/map_screen.rb

@@ -1,6 +1,6 @@
 class TestMapScreen < PM::MapScreen
 
-  attr_accessor :infinite_loop_points
+  attr_accessor :infinite_loop_points, :request_complete
 
   start_position latitude: 35.090648651123, longitude: -82.965972900391, radius: 4
   title "Gorges State Park, NC"
@@ -43,7 +43,9 @@ class TestMapScreen < PM::MapScreen
   end
 
   def lookup_infinite_loop
-    look_up_address address: "1 Infinite Loop" do |points, error|
+    self.request_complete = false
+    self.look_up_address address: "1 Infinite Loop" do |points, error|
+      self.request_complete = true
       self.infinite_loop_points = points
     end
   end