ProMotion 0.7.8 → 1.0.0

data/lib/ProMotion/map/map_screen.rb

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

data/lib/ProMotion/map/map_screen_annotation.rb

@@ -0,0 +1,56 @@
+module ProMotion
+  class MapScreenAnnotation
+
+    #Creates the new crime object
+    def initialize(params = {})
+      @params = params
+      set_defaults
+
+      unless @params[:latitude] && @params[:longitude]
+        PM.logger.error("You are required to specify :latitude and :longitude for annotations.")
+        return nil
+      end
+      @coordinate = CLLocationCoordinate2D.new(@params[:latitude], @params[:longitude])
+    end
+
+    def set_defaults
+      @params = {
+        title: "Title",
+        pin_color: MKPinAnnotationColorRed,
+        identifier: "Annotation-#{@params[:pin_color]}",
+        show_callout: true,
+        animates_drop: false
+      }.merge(@params)
+    end
+
+    def title
+      @params[:title]
+    end
+
+    def subtitle
+      @params[:subtitle] ||= nil
+    end
+
+    def coordinate
+      @coordinate
+    end
+
+    def cllocation
+      CLLocation.alloc.initWithLatitude(@params[:latitude], longitude:@params[:longitude])
+    end
+
+    def setCoordinate(new_coordinate);
+      if new_coordinate.is_a? Hash
+        @coordinate = CLLocationCoordinate2D.new(new_coordinate[:latitude], new_coordinate[:longitude])
+      else
+        @coordinate = new_coordinate
+      end
+    end
+
+    # Allows for retrieving your own custom values on the annotation
+    def annotation_params
+      @params
+    end
+
+  end
+end

data/lib/ProMotion/map/map_screen_module.rb

@@ -0,0 +1,207 @@
+module ProMotion
+  module MapScreenModule
+    attr_accessor :mapview
+
+    def screen_setup
+      check_mapkit_included
+      self.mapview ||= add MKMapView.new, {
+        frame: CGRectMake(0, 0, self.view.frame.size.width, self.view.frame.size.height),
+        resize: [ :width, :height ],
+        delegate: self
+      }
+      
+      check_annotation_data
+      @promotion_annotation_data = []
+      set_up_start_position
+    end
+
+    def view_will_appear(animated)
+      super
+      update_annotation_data
+    end
+
+    def check_mapkit_included
+      PM.logger.error "You must add MapKit and CoreLocation to your project's frameworks in the Rakefile." unless defined?(CLLocationCoordinate2D)
+    end
+
+    def check_annotation_data
+      PM.logger.error "Missing #annotation_data method in MapScreen #{self.class.to_s}." unless self.respond_to?(:annotation_data)
+    end
+
+    def update_annotation_data
+      clear_annotations
+      add_annotations annotation_data
+    end
+
+    def map
+      self.mapview
+    end
+
+    def center
+      self.mapview.centerCoordinate
+    end
+
+    def center=(params={})
+      PM.logger.error "Missing #:latitude property in call to #center=." unless params[:latitude]
+      PM.logger.error "Missing #:longitude property in call to #center=." unless params[:longitude]
+      params[:animated] = true
+
+      # Set the new region
+      self.mapview.setCenterCoordinate(
+        CLLocationCoordinate2D.new(params[:latitude], params[:longitude]),
+        animated:params[:animated]
+      )
+    end
+
+    def annotations
+      @promotion_annotation_data
+    end
+
+    def select_annotation(annotation, animated=true)
+      self.mapview.selectAnnotation(annotation, animated:animated)
+    end
+
+    def select_annotation_at(annotation_index, animated=true)
+      select_annotation(annotations[annotation_index], animated:animated)
+    end
+
+    def selected_annotations
+      self.mapview.selectedAnnotations
+    end
+
+    def deselect_annotations(animated=false)
+      unless selected_annotations.nil?
+        selected_annotations.each do |annotation|
+          self.mapview.deselectAnnotation(annotation, animated:animated)
+        end
+      end
+    end
+
+    def add_annotation(annotation)
+      @promotion_annotation_data << MapScreenAnnotation.new(annotation)
+      self.mapview.addAnnotation @promotion_annotation_data.last
+    end
+
+    def add_annotations(annotations)
+      @promotion_annotation_data = Array(annotations).map{|a| MapScreenAnnotation.new(a)}
+      self.mapview.addAnnotations @promotion_annotation_data
+    end
+
+    def clear_annotations
+      @promotion_annotation_data.each do |a|
+        self.mapview.removeAnnotation(a)
+      end
+      @promotion_annotation_data = []
+    end
+
+    def mapView(mapView, viewForAnnotation:annotation)
+      identifier = annotation.annotation_params[:identifier]
+      if view = mapView.dequeueReusableAnnotationViewWithIdentifier(identifier)
+        view.annotation = annotation
+      else
+        #Set the pin properties
+        view = MKPinAnnotationView.alloc.initWithAnnotation(annotation, reuseIdentifier:identifier)
+        view.canShowCallout = annotation.annotation_params[:show_callout]
+        view.animatesDrop = annotation.annotation_params[:animates_drop]
+        view.pinColor = annotation.annotation_params[:pin_color]
+      end
+      view
+    end
+
+    def set_start_position(params={})
+      params[:latitude] ||= 37.331789
+      params[:longitude] ||= -122.029620
+      params[:radius] ||= 10
+
+      meters_per_mile = 1609.344
+
+      initialLocation = CLLocationCoordinate2D.new(params[:latitude], params[:longitude])
+      region = MKCoordinateRegionMakeWithDistance(initialLocation, params[:radius] * meters_per_mile, params[:radius] * meters_per_mile)
+      self.mapview.setRegion(region, animated:false)
+    end
+
+    def set_up_start_position
+      if self.class.respond_to?(:get_start_position) && self.class.get_start_position
+        self.set_start_position self.class.get_start_position_params
+      end
+    end
+
+    # TODO: Why is this so complex?
+    def zoom_to_fit_annotations(animated=true)
+      #Don't attempt the rezoom of there are no pins
+      return if annotations.count == 0
+
+      #Set some crazy boundaries
+      topLeft = CLLocationCoordinate2D.new(-90, 180)
+      bottomRight = CLLocationCoordinate2D.new(90, -180)
+
+      #Find the bounds of the pins
+      annotations.each do |a|
+        topLeft.longitude = [topLeft.longitude, a.coordinate.longitude].min
+        topLeft.latitude = [topLeft.latitude, a.coordinate.latitude].max
+        bottomRight.longitude = [bottomRight.longitude, a.coordinate.longitude].max
+        bottomRight.latitude = [bottomRight.latitude, a.coordinate.latitude].min
+      end
+
+      #Find the bounds of all the pins and set the mapView
+      coord = CLLocationCoordinate2D.new(
+        topLeft.latitude - (topLeft.latitude - bottomRight.latitude) * 0.5,
+        topLeft.longitude + (bottomRight.longitude - topLeft.longitude) * 0.5
+      )
+
+      # Add some padding to the edges
+      span = MKCoordinateSpanMake(
+        ((topLeft.latitude - bottomRight.latitude) * 1.075).abs,
+        ((bottomRight.longitude - topLeft.longitude) * 1.075).abs
+      )
+
+      region = MKCoordinateRegionMake(coord, span)
+      fits = self.mapview.regionThatFits(region);
+
+      self.mapview.setRegion(fits, animated:animated)
+    end
+
+    def set_region(region, animated=true)
+      self.mapview.setRegion(region, animated:animated)
+    end
+
+    def region(params)
+      return nil unless params.is_a? Hash
+
+      params[:coordinate] = CLLocationCoordinate2D.new(params[:coordinate][:latitude], params[:coordinate][:longitude]) if params[:coordinate].is_a? Hash
+      params[:span] = MKCoordinateSpanMake(params[:span][0], params[:span][1]) if params[:span].is_a? Array
+
+      if params[:coordinate] && params[:span]
+        MKCoordinateRegionMake( params[:coordinate], params[:span] )
+      end
+    end
+
+    def look_up_address(args={}, &callback)
+      args[:address] = args if args.is_a? String # Assume if a string is passed that they want an address
+
+      geocoder = CLGeocoder.new
+      return geocoder.geocodeAddressDictionary(args[:address], completionHandler: callback) if args[:address].is_a?(Hash)
+      return geocoder.geocodeAddressString(args[:address].to_s, completionHandler: callback) unless args[:region]
+      return geocoder.geocodeAddressString(args[:address].to_s, inRegion:args[:region].to_s, completionHandler: callback) if args[:region]
+    end
+
+    module MapClassMethods
+      def start_position(params={})
+        @start_position_params = params
+        @start_position = true
+      end
+
+      def get_start_position_params
+        @start_position_params ||= nil
+      end
+
+      def get_start_position
+        @start_position ||= false
+      end
+    end
+    def self.included(base)
+      base.extend(MapClassMethods)
+    end
+
+  end
+end

data/lib/ProMotion/{push_notifications → push_notification}/push_notification.rb

@@ -31,20 +31,27 @@ module ProMotion
       aps["sound"] if aps
     end
 
+    def method_missing(meth, *args, &block)
+      aps[meth.to_s] || aps[meth.to_sym] || self.notification[meth.to_s] || self.notification[meth.to_sym] || super
+    end
+
     # For testing from the REPL
     # > PM::PushNotification.simulate alert: "My test message", badge: 4
     def self.simulate(args = {})
-      UIApplication.sharedApplication.delegate.on_push_notification self.fake_notification(args)
+      UIApplication.sharedApplication.delegate.on_push_notification self.fake_notification(args), args[:launched]
     end
 
     def self.fake_notification(args = {})
       self.new({
         "aps" => {
-          "alert" => args[:alert] || "Test Push Notification",
-          "badge" => args[:badge] || 2,
-          "sound" => args[:sound] || "default"
-        }
-      })
+          "alert" => args.delete(:alert) || "Test Push Notification",
+          "badge" => args.delete(:badge) || 2,
+          "sound" => args.delete(:sound) || "default"
+        },
+        "channels" => args.delete(:channels) || [
+          "channel_name"
+        ]
+      }.merge(args))
     end
 
   end

data/lib/ProMotion/{screens → screen}/screen.rb

@@ -1,7 +1,7 @@
 module ProMotion
   class Screen < ViewController
     # You can inherit a screen from any UIViewController if you include the ScreenModule
-    # Just make sure to implement the Obj-C methods in cocoatouch/ViewController.rb.
+    # Just make sure to implement the Obj-C methods in cocoatouch/view_controller.rb.
     include ProMotion::ScreenModule
   end
 end

data/lib/ProMotion/{screens/_screen_module.rb → screen/screen_module.rb}

@@ -1,12 +1,11 @@
 module ProMotion
   module ScreenModule
     include ProMotion::ScreenNavigation
-    include ProMotion::ScreenElements
-    include ProMotion::SystemHelper
-    include ProMotion::ScreenTabs
+    include ProMotion::Styling
+    include ProMotion::Tabs
     include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2")
 
-    attr_accessor :parent_screen, :first_screen, :tab_bar_item, :tab_bar, :modal, :split_screen
+    attr_accessor :parent_screen, :first_screen, :modal, :split_screen
 
     def on_create(args = {})
       unless self.is_a?(UIViewController)
@@ -14,32 +13,25 @@ module ProMotion
       end
 
       self.title = self.class.send(:get_title)
+      self.tab_bar_item = self.class.send(:get_tab_bar_item)
+      self.refresh_tab_bar_item if self.tab_bar_item
 
-      args.each do |k, v|
-        self.send("#{k}=", v) if self.respond_to?("#{k}=")
-      end
+      args.each { |k, v| self.send("#{k}=", v) if self.respond_to?("#{k}=") }
 
       self.add_nav_bar(args) if args[:nav_bar]
       self.navigationController.toolbarHidden = !args[:toolbar] unless args[:toolbar].nil?
+      self.screen_setup
       self.on_init if self.respond_to?(:on_init)
-      self.table_setup if self.respond_to?(:table_setup)
       self
     end
 
-    def is_modal?
-      PM.logger.deprecated "`is_modal?` is deprecated. Use `modal?`."
-      modal?
+    def screen_setup
     end
 
     def modal?
       self.modal == true
     end
 
-    def has_nav_bar?
-      PM.logger.deprecated "`has_nav_bar? is deprecated. Use `nav_bar?`."
-      nav_bar?
-    end
-
     def nav_bar?
       !!self.navigation_controller
     end
@@ -53,20 +45,6 @@ module ProMotion
       val
     end
 
-    # [DEPRECATED]
-    def load_view_controller
-      PM.logger.deprecated  "`load_view_controller` is deprecated and doesn't actually do anything anymore. You can safely remove it from your code."
-    end
-
-    def set_tab_bar_item(args = {})
-      self.tab_bar_item = args
-      refresh_tab_bar_item
-    end
-
-    def refresh_tab_bar_item
-      self.tabBarItem = create_tab_bar_item(self.tab_bar_item) if self.tab_bar_item
-    end
-
     def add_nav_bar(args = {})
       self.navigation_controller ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
@@ -88,10 +66,13 @@ module ProMotion
     end
 
     def set_nav_bar_button(side, args={})
-      args[:style]  ||= UIBarButtonItemStyleBordered
+      args[:style] = map_bar_button_item_style(args[:style])
       args[:target] ||= self
       args[:action] ||= nil
-      button_type = args[:image] || args[:button] || args[:system_icon] || args[:title] || "Button"
+      args[:system_item] ||= args[:system_icon] # backwards compatibility
+      args[:system_item] = map_bar_button_system_item(args[:system_item]) if args[:system_item] && args[:system_item].is_a?(Symbol)
+      
+      button_type = args[:image] || args[:button] || args[:system_item] || args[:title] || "Button"
 
       button = bar_button_item button_type, args
 
@@ -100,7 +81,8 @@ module ProMotion
 
       button
     end
-
+    
+    # TODO: Make this better. Not able to do image: "logo", for example.
     def bar_button_item(button_type, args)
       case button_type
       when UIBarButtonItem
@@ -110,8 +92,8 @@ module ProMotion
       when String
         UIBarButtonItem.alloc.initWithTitle(button_type, style: args[:style], target: args[:target], action: args[:action])
       else
-        if args[:system_icon]
-          UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_icon], target: args[:target], action: args[:action])
+        if args[:system_item]
+          UIBarButtonItem.alloc.initWithBarButtonSystemItem(args[:system_item], target: args[:target], action: args[:action])
         else
           PM.logger.error("Please supply a title string, a UIImage or :system.")
           nil
@@ -119,47 +101,43 @@ module ProMotion
       end
     end
 
-    # [DEPRECATED]
-    def view_controller=(vc)
-      set_view_controller(vc)
-    end
-
     def first_screen?
       self.first_screen == true
     end
 
-    # [DEPRECATED]
-    def set_view_controller(vc)
-      PM.logger.deprecated "`set_view_controller` is deprecated and discontinued.  Please inherit from the UIViewController you wish to use and include ProMotion::ScreenViewController instead."
-      self
-    end
-
     def view_did_load; end
 
     def view_will_appear(animated)
       self.will_appear
+
+      self.will_present if isMovingToParentViewController
     end
     def will_appear; end
+    def will_present; end
 
     def view_did_appear(animated)
       self.on_appear
+
+      self.on_present if isMovingToParentViewController
     end
     def on_appear; end
+    def on_present; end
 
     def view_will_disappear(animated)
       self.will_disappear
+
+      self.will_dismiss if isMovingFromParentViewController
     end
     def will_disappear; end
+    def will_dismiss; end
 
     def view_did_disappear(animated)
       self.on_disappear
-    end
-    def on_disappear; end
 
-    def view_controller
-      PM.logger.deprecated "`view_controller` is deprecated, as screens are now UIViewController subclasses."
-      self
+      self.on_dismiss if isMovingFromParentViewController
     end
+    def on_disappear; end
+    def on_dismiss; end
 
     def should_rotate(orientation)
       case orientation
@@ -223,6 +201,52 @@ module ProMotion
       supported_device_families.include?(family)
     end
 
+    def bounds
+      return self.view_or_self.bounds
+    end
+
+    def frame
+      return self.view_or_self.frame
+    end
+    
+    def map_bar_button_item_style(symbol)
+      symbol = {
+        plain:    UIBarButtonItemStylePlain,
+        bordered: UIBarButtonItemStyleBordered,
+        done:     UIBarButtonItemStyleDone
+      }[symbol] if symbol.is_a?(Symbol)
+      symbol || UIBarButtonItemStyleBordered
+    end
+    
+    def map_bar_button_system_item(symbol)
+      {
+        done:         UIBarButtonSystemItemDone,
+        cancel:       UIBarButtonSystemItemCancel,
+        edit:         UIBarButtonSystemItemEdit,
+        save:         UIBarButtonSystemItemSave,
+        add:          UIBarButtonSystemItemAdd,
+        flexible_space: UIBarButtonSystemItemFlexibleSpace,
+        fixed_space:    UIBarButtonSystemItemFixedSpace,
+        compose:      UIBarButtonSystemItemCompose,
+        reply:        UIBarButtonSystemItemReply,
+        action:       UIBarButtonSystemItemAction,
+        organize:     UIBarButtonSystemItemOrganize,
+        bookmarks:    UIBarButtonSystemItemBookmarks,
+        search:       UIBarButtonSystemItemSearch,
+        refresh:      UIBarButtonSystemItemRefresh,
+        stop:         UIBarButtonSystemItemStop,
+        camera:       UIBarButtonSystemItemCamera,
+        trash:        UIBarButtonSystemItemTrash,
+        play:         UIBarButtonSystemItemPlay,
+        pause:        UIBarButtonSystemItemPause,
+        rewind:       UIBarButtonSystemItemRewind,
+        fast_forward: UIBarButtonSystemItemFastForward,
+        undo:         UIBarButtonSystemItemUndo,
+        redo:         UIBarButtonSystemItemRedo,
+        page_curl:    UIBarButtonSystemItemPageCurl
+      }[symbol] ||    UIBarButtonSystemItemDone
+    end
+
     # Class methods
     module ClassMethods
       def debug_mode
@@ -246,6 +270,7 @@ module ProMotion
 
     def self.included(base)
       base.extend(ClassMethods)
+      base.extend(TabClassMethods) # TODO: Is there a better way?
     end
   end
 end