ProMotion 0.7.8 → 1.0.0

data/lib/ProMotion/table/table_screen.rb

@@ -0,0 +1,6 @@
+module ProMotion
+  class TableScreen < TableViewController
+    include ProMotion::ScreenModule
+    include ProMotion::Table
+  end
+end

data/lib/ProMotion/{screens/_compatibility → thirdparty}/formotion_screen.rb

@@ -2,7 +2,7 @@ module ProMotion
   if defined?(Formotion) && defined?(Formotion::FormController)
     class FormotionScreen < Formotion::FormController
       include ProMotion::ScreenModule
-
+      
       def self.new(args = {})
         s = self.alloc.initWithStyle(UITableViewStyleGrouped)
         s.on_create(args) if s.respond_to?(:on_create)
@@ -15,7 +15,9 @@ module ProMotion
           PM.logger.error "PM::FormotionScreen requires a `table_data` method or form: to be passed into `new`."
         end
 
+        t = s.title # Formotion kills the title when you request tableView.
         s.tableView.allowsSelectionDuringEditing = true
+        s.title = t
 
         s
       end
@@ -26,6 +28,15 @@ module ProMotion
         self.form.controller = self
         self.tableView.reloadData
       end
+      
+      def screen_setup
+        self.title = self.class.send(:get_title)
+      end
+    
+      def loadView
+        super
+        self.send(:on_load) if self.respond_to?(:on_load)
+      end
 
       def viewDidLoad
         super
@@ -34,21 +45,23 @@ module ProMotion
 
       def viewWillAppear(animated)
         super
-        self.view_will_appear(animated) if self.respond_to?(:view_will_appear)
+        self.view_will_appear(animated) if self.respond_to?("view_will_appear:")
       end
 
       def viewDidAppear(animated)
         super
-        self.view_did_appear(animated) if self.respond_to?(:view_did_appear)
+        self.view_did_appear(animated) if self.respond_to?("view_did_appear:")
       end
 
       def viewWillDisappear(animated)
-        self.view_will_disappear(animated) if self.respond_to?(:view_will_disappear)
+        self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
         super
       end
 
       def viewDidDisappear(animated)
-        self.view_did_disappear(animated) if self.respond_to?(:view_did_disappear)
+        if self.respond_to?("view_did_disappear:")
+          self.view_did_disappear(animated)
+        end
         super
       end
 

data/lib/ProMotion/version.rb

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

data/lib/ProMotion/view/styling.rb

@@ -0,0 +1,137 @@
+module ProMotion
+  module Styling
+    include Conversions
+    
+    def set_attributes(element, args = {})
+      args.each { |k, v| set_attribute(element, k, v) }
+      element
+    end
+
+    def set_attribute(element, k, v)
+      return element unless element
+
+      if v.is_a?(Hash) && element.respond_to?(k)
+        sub_element = element.send(k)
+        set_attributes(sub_element, v) if sub_element
+      elsif element.respond_to?("#{k}=")
+        element.send("#{k}=", v)
+      elsif v.is_a?(Array) && element.respond_to?("#{k}") && element.method("#{k}").arity == v.length
+        element.send("#{k}", *v)
+      else
+        # Doesn't respond. Check if snake case.
+        if k.to_s.include?("_")
+          set_attribute(element, objective_c_method_name(k), v)
+        end
+      end
+      element
+    end
+
+    def set_easy_attributes(parent, element, args={})
+      attributes = {}
+
+      if args[:resize]
+        attributes[:autoresizingMask]  = UIViewAutoresizingNone
+        args[:resize].each { |r| attributes[:autoresizingMask] |= map_resize_symbol(r) }
+      end
+
+      if [:left, :top, :width, :height].select{ |a| args[a] && args[a] != :auto }.length == 4
+        attributes[:frame] = CGRectMake(args[:left], args[:top], args[:width], args[:height])
+      end
+
+      set_attributes element, attributes
+      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
+        end
+      end
+      height
+    end
+
+    def closest_parent(type, this_view = nil)
+      # iterate up the view hierarchy to find the parent element of "type" containing this view
+      this_view ||= view_or_self.superview
+      while this_view != nil do
+        return this_view if this_view.is_a? type
+        this_view = this_view.superview
+      end
+      nil
+    end
+    
+    def add(element, attrs = {})
+      add_to view_or_self, element, attrs
+    end
+    alias :add_element :add
+    alias :add_view :add
+
+    def remove(element)
+      element.removeFromSuperview
+      element = nil
+    end
+    alias :remove_element :remove
+    alias :remove_view :remove
+
+    def add_to(parent_element, element, attrs = {})
+      parent_element.addSubview element
+      if attrs && attrs.length > 0
+        set_attributes(element, attrs)
+        set_easy_attributes(parent_element, element, attrs)
+      end
+      element
+    end
+    
+    def view_or_self
+      self.respond_to?(:view) ? self.view : self
+    end
+    
+    # These three color methods are stolen from BubbleWrap.
+    def rgb_color(r,g,b)
+      rgba_color(r,g,b,1)
+    end
+
+    def rgba_color(r,g,b,a)
+      r,g,b = [r,g,b].map { |i| i / 255.0}
+      UIColor.colorWithRed(r, green: g, blue:b, alpha:a)
+    end
+
+    def hex_color(str)
+      hex_color = str.gsub("#", "")
+      case hex_color.size 
+      when 3
+        colors = hex_color.scan(%r{[0-9A-Fa-f]}).map{ |el| (el * 2).to_i(16) }
+      when 6
+        colors = hex_color.scan(%r<[0-9A-Fa-f]{2}>).map{ |el| el.to_i(16) }
+      else
+        raise ArgumentError
+      end
+      
+      if colors.size == 3
+        rgb_color(colors[0], colors[1], colors[2])
+      else
+        raise ArgumentError
+      end 
+    end
+    
+    protected
+    
+    def map_resize_symbol(symbol)
+      @_resize_symbols ||= {
+        left:     UIViewAutoresizingFlexibleLeftMargin,
+        right:    UIViewAutoresizingFlexibleRightMargin,
+        top:      UIViewAutoresizingFlexibleTopMargin,
+        bottom:   UIViewAutoresizingFlexibleBottomMargin,
+        width:    UIViewAutoresizingFlexibleWidth,
+        height:   UIViewAutoresizingFlexibleHeight     
+      }
+      @_resize_symbols[symbol] || symbol
+    end
+    
+  end
+end

data/lib/ProMotion/web/web_screen.rb

@@ -0,0 +1,6 @@
+module ProMotion
+  class WebScreen < ViewController
+    include ProMotion::ScreenModule
+    include ProMotion::WebScreenModule
+  end
+end

data/lib/ProMotion/web/web_screen_module.rb

@@ -0,0 +1,155 @@
+module ProMotion
+  module WebScreenModule
+
+    attr_accessor :webview, :external_links, :detector_types
+
+    def screen_setup
+      check_content_data
+      self.external_links ||= false
+    end
+
+    def on_init
+
+      self.detector_types ||= UIDataDetectorTypeNone
+      if self.detector_types.is_a? Array
+        detectors = UIDataDetectorTypeNone
+        self.detector_types.each { |dt| detectors |= map_detector_symbol(dt) }
+        self.detector_types = detectors
+      end
+
+      self.webview ||= add UIWebView.new, {
+        frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
+        resize: [ :width, :height ],
+        delegate: self,
+        data_detector_types: self.detector_types
+      }
+
+      set_initial_content
+    end
+
+    def web
+      self.webview
+    end
+
+    def set_initial_content
+      return unless self.respond_to?(:content)
+      content.is_a?(NSURL) ? open_url(content) : set_content(content)
+    end
+
+    def set_content(content)
+      content_path = File.join(NSBundle.mainBundle.resourcePath, content)
+
+      if File.exists? content_path
+        content_string = File.read content_path
+        content_base_url = NSURL.fileURLWithPath NSBundle.mainBundle.resourcePath
+
+        self.web.loadHTMLString(convert_retina_images(content_string), baseURL:content_base_url)
+      else
+        # We assume the user wants to load an arbitrary string into the web view
+        self.web.loadHTMLString(content, baseURL:nil)
+      end
+    end
+
+    def open_url(url)
+      request = NSURLRequest.requestWithURL(
+        url.is_a?(NSURL) ? url : NSURL.URLWithString(url)
+      )
+      web.loadRequest request
+    end
+
+    def convert_retina_images(content)
+      #Convert images over to retina if the images exist.
+      if UIScreen.mainScreen.bounds.respondsToSelector('displayLinkWithTarget:selector:') && UIScreen.mainScreen.bounds.scale == 2.0 # Thanks BubbleWrap! https://github.com/rubymotion/BubbleWrap/blob/master/motion/core/device/ios/screen.rb#L9
+        content.gsub!(/src=['"](.*?)\.(jpg|gif|png)['"]/) do |img|
+          if File.exists?(File.join(NSBundle.mainBundle.resourcePath, "#{$1}@2x.#{$2}"))
+            # Create a UIImage to get the width and height of hte @2x image
+            tmp_image = UIImage.imageNamed("/#{$1}@2x.#{$2}")
+            new_width = tmp_image.size.width / 2
+            new_height = tmp_image.size.height / 2
+
+            img = "src=\"#{$1}@2x.#{$2}\" width=\"#{new_width}\" height=\"#{new_height}\""
+          end
+        end
+      end
+      content
+    end
+
+    def check_content_data
+      PM.logger.error "Missing #content method in WebScreen #{self.class.to_s}." unless self.respond_to?(:content)
+    end
+
+    def html
+      self.webview.stringByEvaluatingJavaScriptFromString("document.documentElement.outerHTML")
+    end
+
+    def evaluate(js)
+      self.webview.stringByEvaluatingJavaScriptFromString(js)
+    end
+
+    def current_url
+      evaluate('document.URL')
+    end
+
+    # Navigation
+    def can_go_back; web.canGoBack; end
+    def can_go_forward; web.canGoForward; end
+    def back; web.goBack if can_go_back; end
+    def forward; web.goForward if can_go_forward; end
+    def refresh; web.reload; end
+    def stop; web.stopLoading; end
+    alias :reload :refresh
+
+    def open_in_chrome(inRequest)
+      # Add pod 'OpenInChrome' to your Rakefile if you want links to open in chrom for users.
+      chrome_controller = OpenInChromeController.sharedInstance
+      return open_in_safari(inRequest) unless chrome_controller.isChromeInstalled
+      chrome_controller.open_in_chrome(inRequest.URL)
+    end
+
+    def open_in_safari(inRequest)
+      #Open UIWebView delegate links in Safari.
+      UIApplication.sharedApplication.openURL(inRequest.URL)
+    end
+
+    #UIWebViewDelegate Methods - Camelcase
+    def webView(inWeb, shouldStartLoadWithRequest:inRequest, navigationType:inType)
+      if self.external_links == true && inType == UIWebViewNavigationTypeLinkClicked
+        if defined?(OpenInChromeController)
+          open_in_chrome inRequest
+        else
+          open_in_safari inRequest
+        end
+        return false #don't allow the web view to load the link.
+      end
+
+      load_request_enable = true #return true on default for local file loading.
+      load_request_enable = !!on_request(inRequest, inType) if self.respond_to?(:on_request)
+      load_request_enable
+    end
+
+    def webViewDidStartLoad(webView)
+      load_started if self.respond_to?(:load_started)
+    end
+
+    def webViewDidFinishLoad(webView)
+      load_finished if self.respond_to?(:load_finished)
+    end
+
+    def webView(webView, didFailLoadWithError:error)
+      load_failed(error) if self.respond_to?("load_failed:")
+    end
+
+    protected
+
+    def map_detector_symbol(symbol)
+      {
+        phone:    UIDataDetectorTypePhoneNumber,
+        link:     UIDataDetectorTypeLink,
+        address:  UIDataDetectorTypeAddress,
+        event:    UIDataDetectorTypeCalendarEvent,
+        all:      UIDataDetectorTypeAll
+      }[symbol] || UIDataDetectorTypeNone
+    end
+
+  end
+end

data/resources/WebScreen.html

@@ -0,0 +1,6 @@
+<html>
+<head></head>
+<body>
+<h1>Test</h1>
+</body>
+</html>

data/spec/functional/func_map_screen_spec.rb

@@ -0,0 +1,105 @@
+describe "ProMotion::TestMapScreen functionality" do
+  tests PM::TestMapScreen
+
+  # Override controller to properly instantiate
+  def controller
+    rotate_device to: :portrait, button: :bottom
+    @map ||= TestMapScreen.new(nav_bar: true)
+    @map.will_appear
+    @map.navigation_controller
+  end
+
+  after do
+    @map = nil
+  end
+
+  it "should have a navigation bar" do
+    @map.navigationController.should.be.kind_of(UINavigationController)
+  end
+
+  it "should have the map properly centered" do
+    center_coordinate = @map.center
+    center_coordinate.latitude.should.be.close 35.090648651123, 0.001
+    center_coordinate.longitude.should.be.close -82.965972900391, 0.001
+  end
+
+  it "should move the map center" do
+    @map.center = {latitude: 35.07496, longitude: -82.95916, animated: true}
+
+    wait 0.75 do
+      center_coordinate = @map.center
+      center_coordinate.latitude.should.be.close 35.07496, 0.001
+      center_coordinate.longitude.should.be.close -82.95916, 0.001
+    end
+  end
+
+  it "should select an annotation" do
+    @map.selected_annotations.should == nil
+    @map.select_annotation @map.annotations.first
+    wait 0.75 do
+      @map.selected_annotations.count.should == 1
+    end
+  end
+
+  it "should select an annotation by index" do
+    @map.selected_annotations.should == nil
+    @map.select_annotation_at 2
+    wait 0.75 do
+      @map.selected_annotations.count.should == 1
+      @map.selected_annotations[0].should == @map.promotion_annotation_data[2]
+    end
+  end
+
+  it "should select another annotation and check that the title is correct" do
+    @map.selected_annotations.should == nil
+    @map.select_annotation @map.annotations[1]
+    wait 0.75 do
+      @map.selected_annotations.count.should == 1
+    end
+
+    @map.selected_annotations.first.title.should == "Turtleback Falls"
+    @map.selected_annotations.first.subtitle.should == "Nantahala National Forest"
+
+  end
+
+  it "should deselect selected annotations" do
+    @map.select_annotation @map.annotations.last
+    wait 0.75 do
+      # @map.selected_annotations.count.should == 1
+    end
+
+    @map.deselect_annotations
+    wait 0.75 do
+      @map.selected_annotations.should == nil
+    end
+  end
+
+  it "should add an annotation and be able to zoom immediately" do
+    ann = {
+      longitude: -82.966093558105,
+      latitude: 35.092520895652,
+      title: "Something Else"
+    }
+    @map.annotations.count.should == 5
+    @map.add_annotation ann
+    @map.annotations.count.should == 6
+    @map.set_region @map.region(coordinate: @map.annotations.last.coordinate, span: [0.05, 0.05])
+    @map.select_annotation @map.annotations.last
+  end
+
+  it "should be able to overwrite all annotations" do
+    anns = [{
+      longitude: -122.029620,
+      latitude: 37.331789,
+      title: "My Cool Pin"
+    },{
+      longitude: -80.8498118 ,
+      latitude: 35.2187218,
+      title: "My Cool Pin"
+    }]
+    @map.annotations.count.should == 5
+    @map.add_annotations anns
+    @map.annotations.count.should == 2
+  end
+
+end