ProMotion 0.7.8 → 1.0.0

data/Rakefile

@@ -11,7 +11,8 @@ require 'ProMotion'
 Motion::Project::App.setup do |app|
   app.name = 'ProMotionTest'
   app.version = "0.99.0"
-  app.redgreen_style = :focused # :focused, :full
+  app.redgreen_style = :full # :focused, :full
+  app.frameworks += %w(CoreLocation MapKit)
 
   # Devices
   app.deployment_target = "6.0"
@@ -40,6 +41,10 @@ namespace :spec do
     App.config.instance_variable_set("@spec_files", spec_files)
     Rake::Task["simulator"].invoke
   end
+  
+  task :func do
+    Rake::Task["spec:functional"].invoke
+  end
 
   task :functional do
     App.config.spec_mode = true
@@ -48,4 +53,9 @@ namespace :spec do
     App.config.instance_variable_set("@spec_files", spec_files)
     Rake::Task["simulator"].invoke
   end
+
+end
+
+task :sim_close do
+  sh "osascript -e 'tell application \"iphone simulator\" to quit'"
 end

data/app/screens/basic_screen.rb

@@ -1,27 +1,3 @@
 class BasicScreen < PM::Screen
   title "Basic"
-
-  def on_init
-    # Fires right after the screen is initialized
-  end
-
-  def on_load
-    # Fires just before a screen is opened for the first time.
-  end
-
-  def will_appear
-    # Fires every time the screen will appear
-  end
-
-  def on_appear
-    # Fires just after the screen appears somewhere (after animations are complete)
-  end
-
-  def will_disappear
-    # Fires just before the screen will disappear
-  end
-
-  def on_disappear
-    # Fires after the screen is fully hidden
-  end
 end

data/lib/ProMotion/cocoatouch/split_view_controller.rb

@@ -0,0 +1,29 @@
+module ProMotion
+  class SplitViewController < UISplitViewController
+    def master_screen
+      s = self.viewControllers.first
+      s.respond_to?(:visibleViewController) ? s.visibleViewController : s
+    end
+    
+    def detail_screen
+      s = self.viewControllers.last
+      s.respond_to?(:visibleViewController) ? s.visibleViewController : s
+    end
+    
+    def master_screen=(s)
+      self.viewControllers = [ (s.navigationController || s), self.viewControllers.last]
+    end
+    
+    def detail_screen=(s)
+      # set the button from the old detail screen to the new one
+      button = detail_screen.navigationItem.leftBarButtonItem
+      s.navigationItem.leftBarButtonItem = button
+
+      self.viewControllers = [self.viewControllers.first, (s.navigationController || s)]
+    end
+    
+    def screens=(s_array)
+      self.viewControllers = s_array
+    end
+  end
+end

data/lib/ProMotion/cocoatouch/tab_bar_controller.rb

@@ -0,0 +1,43 @@
+module ProMotion
+  class TabBarController < UITabBarController
+    
+    def self.new(*screens)
+      tab_bar_controller = alloc.init
+
+      view_controllers = []
+
+      screens = screens.flatten.map { |s| s.respond_to?(:new) ? s.new : s } # Initialize any classes
+
+      tag_index = 0
+      screens.each do |s|
+        s.tabBarItem.tag = tag_index
+        s.tab_bar = tab_bar_controller if s.respond_to?("tab_bar=")
+        view_controllers << (s.navigationController || s)
+        tag_index += 1
+      end
+
+      tab_bar_controller.viewControllers = view_controllers
+      tab_bar_controller
+    end
+    
+    def open_tab(tab)
+      if tab.is_a? String
+        selected_tab_vc = find_tab(tab)
+      elsif tab.is_a? Numeric
+        selected_tab_vc = viewControllers[tab]
+      end
+      
+      if selected_tab_vc
+        self.selectedViewController = selected_tab_vc if selected_tab_vc
+      else
+        PM.logger.error "Unable to open tab #{tab.to_s} -- not found."
+        nil
+      end
+    end
+    
+    def find_tab(tab_title)
+      self.viewControllers.select{ |vc| vc.tabBarItem.title == tab_title }.first
+    end
+  
+  end
+end

data/lib/ProMotion/cocoatouch/{TableViewCell.rb → table_view_cell.rb}

@@ -15,6 +15,5 @@ module ProMotion
         self.imageView.frame = CGRectInset(f, size_inset_x, size_inset_y)
       end
     end
-
   end
 end

data/lib/ProMotion/cocoatouch/{ViewController.rb → view_controller.rb}

@@ -5,6 +5,11 @@ module ProMotion
       s.on_create(args) if s.respond_to?(:on_create)
       s
     end
+    
+    def loadView
+      super
+      self.send(:on_load) if self.respond_to?(:on_load)
+    end
 
     def viewDidLoad
       super
@@ -49,4 +54,4 @@ module ProMotion
       self.on_rotate
     end
   end
-end
+end

data/lib/ProMotion/{screen_helpers → containers}/split_screen.rb

@@ -17,8 +17,6 @@ module ProMotion
       master = master.new if master.respond_to?(:new)
       detail = detail.new if detail.respond_to?(:new)
 
-      [ master, detail ].map { |s| s.on_load if s.respond_to?(:on_load) }
-
       split = split_screen_controller master, detail
       if args.has_key?(:icon) or args.has_key?(:title)
         split.tabBarItem = create_tab_bar_item(args)

data/lib/ProMotion/containers/tabs.rb

@@ -0,0 +1,95 @@
+module ProMotion
+  module Tabs
+    include Conversions
+    
+    attr_accessor :tab_bar, :tab_bar_item
+    
+    def open_tab_bar(*screens)
+      self.tab_bar = PM::TabBarController.new(screens)
+
+      delegate = self.respond_to?(:open_root_screen) ? self : UIApplication.sharedApplication.delegate
+
+      delegate.open_root_screen(self.tab_bar)
+      self.tab_bar
+    end
+
+    def open_tab(tab)
+      self.tab_bar.open_tab(tab)
+    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 && self.respond_to?(:tabBarItem=)
+    end
+
+    def set_tab_bar_badge(number)
+      self.tab_bar_item[:badge] = number
+      refresh_tab_bar_item
+    end
+
+    def create_tab_bar_icon(icon, tag)
+      return UITabBarItem.alloc.initWithTabBarSystemItem(icon, tag: tag)
+    end
+
+    def create_tab_bar_icon_custom(title, image_name, tag)
+      icon_image = UIImage.imageNamed(image_name)
+      return UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
+    end
+
+    def create_tab_bar_item(tab={})
+      title = "Untitled"
+      title = tab[:title] if tab[:title]
+      tab[:tag] ||= @current_tag ||= 0
+      @current_tag = tab[:tag] + 1
+
+      tab_bar_item = create_tab_bar_icon(map_tab_symbol(tab[:system_icon]), tab[:tag]) if tab[:system_icon]
+      tab_bar_item = create_tab_bar_icon_custom(title, tab[:icon], tab[:tag]) if tab[:icon]
+
+      tab_bar_item.badgeValue = tab[:badge_number].to_s unless tab[:badge_number].nil? || tab[:badge_number] <= 0
+
+      return tab_bar_item
+    end
+    
+    def replace_current_item(tab_bar_controller, view_controller: vc)
+      controllers = NSMutableArray.arrayWithArray(tab_bar_controller.viewControllers)
+      controllers.replaceObjectAtIndex(tab_bar_controller.selectedIndex, withObject: vc)
+      tab_bar_controller.viewControllers = controllers
+    end
+    
+    def map_tab_symbol(symbol)
+      @_tab_symbols ||= {
+        more:         UITabBarSystemItemMore,
+        favorites:    UITabBarSystemItemFavorites,
+        featured:     UITabBarSystemItemFeatured,
+        top_rated:    UITabBarSystemItemTopRated,
+        recents:      UITabBarSystemItemRecents,
+        contacts:     UITabBarSystemItemContacts,
+        history:      UITabBarSystemItemHistory,
+        bookmarks:    UITabBarSystemItemBookmarks,
+        search:       UITabBarSystemItemSearch,
+        downloads:    UITabBarSystemItemDownloads,
+        most_recent:  UITabBarSystemItemMostRecent,
+        most_viewed:  UITabBarSystemItemMostViewed
+      }
+      @_tab_symbols[symbol] || symbol
+    end
+    
+    module TabClassMethods
+      def tab_bar_item(args={})
+        @tab_bar_item = args
+      end
+      def get_tab_bar_item
+        @tab_bar_item
+      end
+    end
+    
+    def self.included(base)
+      base.extend(TabClassMethods)
+    end
+    
+  end
+end

data/lib/ProMotion/delegate/delegate.rb

@@ -1,16 +1,5 @@
 module ProMotion
-  class Delegate
-
-    include ProMotion::ScreenTabs
-    include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2") # Only with iPad
-    include ProMotion::DelegateHelper
-    include ProMotion::DelegateNotifications
-
-  end
-
-  class AppDelegateParent < Delegate
-    def self.inherited(klass)
-      PM.logger.deprecated "PM::AppDelegateParent is deprecated. Use PM::Delegate."
-    end
+  class Delegate < DelegateParent
+    include ProMotion::DelegateModule
   end
 end

data/lib/ProMotion/delegate/{delegate_helper.rb → delegate_module.rb}

@@ -1,28 +1,41 @@
 module ProMotion
-  module DelegateHelper
+  module DelegateModule
+
+    include ProMotion::Tabs
+    include ProMotion::SplitScreen if NSBundle.mainBundle.infoDictionary["UIDeviceFamily"].include?("2") # Only with iPad
+    include ProMotion::DelegateNotifications
 
     attr_accessor :window, :aps_notification, :home_screen
 
-    def application(application, didFinishLaunchingWithOptions:launch_options)
+    def application(application, willFinishLaunchingWithOptions:launch_options)
+      will_load(application, launch_options) if respond_to?(:will_load)
+    end
 
+    def application(application, didFinishLaunchingWithOptions:launch_options)
       apply_status_bar
-
       on_load application, launch_options
-
       check_for_push_notification launch_options
+      super rescue true # Can cause error message if no super is found, but it's harmless. Ignore.
+    end
 
-      # This will work when RubyMotion fixes a bug.
-      # defined?(super) ? super : true
+    def applicationDidBecomeActive(application)
+      on_activate if respond_to?(:on_activate)
+    end
 
-      # Workaround for now. Will display a NoMethodError, but ignore.
-      super rescue true
-      PM.logger.info "You can ignore the NoMethodError -- this is a RubyMotion bug that should be fixed soon."
+    def applicationWillResignActive(application)
+      will_deactivate if respond_to?(:will_deactivate)
     end
 
-    def applicationWillTerminate(application)
+    def applicationDidEnterBackground(application)
+      on_enter_background if respond_to?(:on_enter_background)
+    end
 
-      on_unload if respond_to?(:on_unload)
+    def applicationWillEnterForeground(application)
+      will_enter_foreground if respond_to?(:will_enter_foreground)
+    end
 
+    def applicationWillTerminate(application)
+      on_unload if respond_to?(:on_unload)
     end
 
     def app_delegate
@@ -40,14 +53,14 @@ module ProMotion
     def open_screen(screen, args={})
 
       screen = screen.new if screen.respond_to?(:new)
-      screen.send(:on_load) if screen.respond_to?(:on_load)
 
       self.home_screen = screen
 
       self.window ||= self.ui_window.alloc.initWithFrame(UIScreen.mainScreen.bounds)
-      self.window.rootViewController = screen.pm_main_controller
+      self.window.rootViewController = (screen.navigationController || screen)
       self.window.makeKeyAndVisible
 
+      screen
     end
     alias :open :open_screen
     alias :open_root_screen :open_screen
@@ -76,9 +89,9 @@ module ProMotion
 
       def status_bar_animation(opt)
         {
-          fade: UIStatusBarAnimationFade,
-          slide: UIStatusBarAnimationSlide,
-          none: UIStatusBarAnimationNone
+          fade:   UIStatusBarAnimationFade,
+          slide:  UIStatusBarAnimationSlide,
+          none:   UIStatusBarAnimationNone
         }[opt] || UIStatusBarAnimationNone
       end
 

data/lib/ProMotion/delegate/delegate_notifications.rb

@@ -5,7 +5,7 @@ module ProMotion
 
     def check_for_push_notification(options)
       if options && options[UIApplicationLaunchOptionsRemoteNotificationKey]
-        received_push_notification options[UIApplicationLaunchOptionsRemoteNotificationKey]
+        received_push_notification options[UIApplicationLaunchOptionsRemoteNotificationKey], true
       end
     end
 
@@ -14,10 +14,7 @@ module ProMotion
       notification_types = [ :badge, :sound, :alert, :newsstand ] if notification_types.include?(:all)
 
       types = UIRemoteNotificationTypeNone
-      types = types | UIRemoteNotificationTypeBadge if notification_types.include?(:badge)
-      types = types | UIRemoteNotificationTypeSound if notification_types.include?(:sound)
-      types = types | UIRemoteNotificationTypeAlert if notification_types.include?(:alert)
-      types = types | UIRemoteNotificationTypeNewsstandContentAvailability if notification_types.include?(:newsstand)
+      notification_types.each { |t| types = types | map_notification_symbol(t) }
 
       UIApplication.sharedApplication.registerForRemoteNotificationTypes types
     end
@@ -38,9 +35,9 @@ module ProMotion
       types
     end
 
-    def received_push_notification(notification)
+    def received_push_notification(notification, was_launched)
       @aps_notification = PM::PushNotification.new(notification)
-      on_push_notification(@aps_notification) if respond_to?(:on_push_notification)
+      on_push_notification(@aps_notification, was_launched) if respond_to?(:on_push_notification)
     end
 
     # CocoaTouch
@@ -54,7 +51,19 @@ module ProMotion
     end
 
     def application(application, didReceiveRemoteNotification:notification)
-      received_push_notification(notification)
+      received_push_notification(notification, false)
+    end
+    
+    protected
+    
+    def map_notification_symbol(symbol)
+      {
+        none:       UIRemoteNotificationTypeNone,
+        badge:      UIRemoteNotificationTypeBadge,
+        sound:      UIRemoteNotificationTypeSound,
+        alert:      UIRemoteNotificationTypeAlert,
+        newsstand:  UIRemoteNotificationTypeNewsstandContentAvailability
+      }[symbol] || UIRemoteNotificationTypeNone
     end
 
   end

data/lib/ProMotion/delegate/delegate_parent.rb

@@ -0,0 +1,11 @@
+module ProMotion
+  # This is a workaround to a RubyMotion bug that displays an error message when calling
+  # `super` from application:didFinishLaunchingWithOptions: (which you sometimes need to
+  # do when using a custom AppDelegate parent class).
+  # See issue: https://github.com/clearsightstudio/ProMotion/issues/116
+  class DelegateParent
+    def application(application, didFinishLaunchingWithOptions:options)
+      true
+    end
+  end
+end

data/lib/ProMotion/extensions/conversions.rb

@@ -0,0 +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