ProMotion 0.4.1 → 0.5.0

data/Rakefile

@@ -15,7 +15,7 @@ Motion::Project::App.setup do |app|
   app.deployment_target = "5.0"
   app.device_family = [:iphone, :ipad]
 
-  app.detect_dependencies = false
+  app.detect_dependencies = true
 
   # Preload screens
   # app.files = Dir.glob(File.join(app.project_dir, 'lib/**/*.rb')) | app.files

data/lib/ProMotion.rb

@@ -0,0 +1,14 @@
+unless defined?(Motion::Project::Config)
+  raise "This file must be required within a RubyMotion project Rakefile."
+end
+
+require "ProMotion/version"
+
+Motion::Project::App.setup do |app|
+  # app_delegate = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/app_delegate.rb'))
+  # app.files = Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')) | app_delegate | app.files
+
+  original_files = app.files
+  app.files = FileList[File.join(File.dirname(__FILE__), 'ProMotion/**/*.rb')].exclude(File.join(File.dirname(__FILE__), 'ProMotion/app_delegate.rb'))
+  app.files = app.files | Dir.glob(File.join(File.dirname(__FILE__), 'ProMotion/app_delegate.rb')) | original_files
+end

data/lib/ProMotion/app_delegate.rb

@@ -0,0 +1,63 @@
+module ProMotion
+  class AppDelegateParent
+    include ProMotion::ScreenTabs
+    attr_accessor :window
+    
+    def application(application, didFinishLaunchingWithOptions:launch_options)
+      return true if RUBYMOTION_ENV == "test"
+
+      Console.log(" Your AppDelegate (usually in app_delegate.rb) needs an on_load(options) method.", with_color: Console::RED_COLOR) unless self.respond_to?("on_load:")
+
+      on_load(application, launch_options)
+
+      open_home_screen if has_home_screen
+
+      true
+    end
+    
+    def app_delegate
+      UIApplication.sharedApplication.delegate
+    end
+
+    def app_window
+      self.app_delegate.window
+    end
+
+    def load_root_screen(new_screen)
+      new_screen = new_screen.main_controller if new_screen.respond_to?(:main_controller)
+
+      self.window ||= UIWindow.alloc.initWithFrame(UIScreen.mainScreen.bounds)
+      self.window.rootViewController = new_screen
+      self.window.makeKeyAndVisible
+    end
+
+    def open_screen(screen)
+      home(screen)
+    end
+    alias :open :open_screen
+
+    def home(screen)
+      screen = screen.new if screen.respond_to?(:new)
+      @home_screen = screen
+    end
+
+    def open_root_screen(new_screen)
+      home(new_screen)
+      open_home_screen
+    end
+    alias :fresh_start :open_root_screen
+
+    def open_home_screen
+      get_home_screen.send(:on_load) if get_home_screen.respond_to?(:on_load)
+      load_root_screen get_home_screen
+    end
+    
+    def get_home_screen
+      @home_screen
+    end
+
+    def has_home_screen
+      @home_screen.nil? == false
+    end
+  end
+end

data/lib/ProMotion/cocoatouch/NavigationController.rb

@@ -0,0 +1,4 @@
+module ProMotion
+  class NavigationController < UINavigationController
+  end
+end

data/lib/ProMotion/cocoatouch/TableViewCell.rb

@@ -0,0 +1,16 @@
+module ProMotion
+  class TableViewCell < UITableViewCell
+    attr_accessor :image_size
+
+    def layoutSubviews
+      super
+
+      if self.image_size && self.imageView.image && self.imageView.image.size && self.imageView.image.size.width > 0
+        f = self.imageView.frame
+        size_inset_x = (self.imageView.size.width - self.image_size) / 2
+        size_inset_y = (self.imageView.size.height - self.image_size) / 2
+        self.imageView.frame = CGRectInset(f, size_inset_x, size_inset_y)
+      end
+    end
+  end
+end

data/lib/ProMotion/cocoatouch/TableViewController.rb

@@ -0,0 +1,50 @@
+module ProMotion
+  class TableViewController < UITableViewController
+    def self.new(args = {})
+      s = self.alloc.initWithNibName(nil, bundle:nil)
+      s.on_create(args) if s.respond_to?(:on_create)
+      s
+    end
+
+    def viewDidLoad
+      super
+      self.view_did_load if self.respond_to?(:view_did_load)
+    end
+
+    def viewWillAppear(animated)
+      super
+      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:")
+    end
+    
+    def viewWillDisappear(animated)
+      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:")
+      super      
+    end
+
+    def shouldAutorotateToInterfaceOrientation(orientation)
+      self.should_rotate(orientation)
+    end
+
+    def shouldAutorotate
+      self.should_autorotate
+    end
+
+    def willRotateToInterfaceOrientation(orientation, duration:duration)
+      self.will_rotate(orientation, duration)
+    end
+    
+    def didRotateFromInterfaceOrientation(orientation)
+      self.on_rotate
+    end
+  end
+end

data/lib/ProMotion/cocoatouch/ViewController.rb

@@ -0,0 +1,52 @@
+module ProMotion
+  class ViewController < UIViewController
+    def self.new(args = {})
+      s = self.alloc.initWithNibName(nil, bundle:nil)
+      s.on_create(args) if s.respond_to?(:on_create)
+      s
+    end
+
+    def viewDidLoad
+      super
+      self.view_did_load if self.respond_to?(:view_did_load)
+    end
+
+    def viewWillAppear(animated)
+      super
+      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:")
+    end
+    
+    def viewWillDisappear(animated)
+      self.view_will_disappear(animated) if self.respond_to?("view_will_disappear:")
+      super      
+    end
+    
+    def viewDidDisappear(animated)
+      if self.respond_to?("view_did_disappear:")
+        self.view_did_disappear(animated)
+      end
+      super      
+    end
+
+    def shouldAutorotateToInterfaceOrientation(orientation)
+      self.should_rotate(orientation)
+    end
+
+    def shouldAutorotate
+      self.should_autorotate
+    end
+
+    def willRotateToInterfaceOrientation(orientation, duration:duration)
+      self.will_rotate(orientation, duration)
+    end
+    
+    def didRotateFromInterfaceOrientation(orientation)
+      self.on_rotate
+    end
+  end
+end

data/lib/ProMotion/helpers/console.rb

@@ -0,0 +1,24 @@
+module ProMotion
+  class Console
+    NAME = "RubyMotion::Console: "
+    DEFAULT_COLOR = [ '', '' ]
+    RED_COLOR = [ "\e[0;31m", "\e[0m" ] # Must be in double quotes
+    GREEN_COLOR = [ "\e[0;32m", "\e[0m" ] 
+    PURPLE_COLOR = [ "\e[0;35m", "\e[0m" ] 
+
+    class << self
+      def log(log, with_color:color)
+        puts color[0] + NAME + log + color[1]
+      end
+      
+      def log(log, withColor:color)
+        warn "[DEPRECATION] `log(log, withColor:color)` is deprecated. Use `log(log, with_color:color)`"
+        self.log(log, with_color:color)
+      end
+
+      def log(log)
+        log(log, with_color: DEFAULT_COLOR)
+      end
+    end
+  end
+end

data/lib/ProMotion/helpers/measure_helper.rb

@@ -0,0 +1,20 @@
+module ProMotion
+  class MeasureHelper
+    class << self
+      def content_height(view)
+        warn "[DEPRECATION] `MeasureHelper.content_height` is deprecated. Include the module `ScreenElements` to get access to this method (already included in Screen)."
+
+        height = 0
+        view.subviews.each do |subview|
+          next if subview.isHidden
+          y = subview.frame.origin.y
+          h = subview.frame.size.height
+          if (y + h) > height
+            height = y + h
+          end
+        end
+        height
+      end
+    end
+  end
+end

data/lib/ProMotion/helpers/system_helper.rb

@@ -0,0 +1,29 @@
+module ProMotion
+  module SystemHelper
+    module_function
+
+    def ios_version
+      UIDevice.currentDevice.systemVersion
+    end
+
+    def ios_version_is?(version)
+      ios_version == version
+    end
+
+    def ios_version_greater?(version)
+      ios_version > version
+    end
+
+    def ios_version_greater_eq?(version)
+      ios_version >= version
+    end
+
+    def ios_version_less?(version)
+      ios_version < version
+    end
+
+    def ios_version_less_eq?(version)
+      ios_version <= version
+    end
+  end
+end

data/lib/ProMotion/helpers/tab_bar.rb

@@ -0,0 +1,115 @@
+# [DEPRECATED]
+# Replaced by ScreenTabs module.
+module ProMotion
+  class TabBar
+    class << self
+      def create_tab_bar_controller_from_data(data)
+        warn "[DEPRECATION] `create_tab_bar_controller_from_data` is deprecated. Use `open_tab_bar` instead."
+
+        data = self.set_tags(data)
+
+        tab_bar_controller = UITabBarController.alloc.init
+        tab_bar_controller.viewControllers = self.tab_controllers_from_data(data)
+
+        return tab_bar_controller
+      end
+
+      def set_tags(data)
+        warn "[DEPRECATION] `set_tags` is deprecated."
+        tag_number = 0
+        
+        data.each do |d|
+          d[:tag] = tag_number
+          tag_number += 1
+        end
+
+        return data
+      end
+
+      def tab_bar_icon(icon, tag)
+        warn "[DEPRECATION] `TabBar.tab_bar_icon` is deprecated. Use `create_tab_bar_icon` in ScreenTabs instead."
+        return UITabBarItem.alloc.initWithTabBarSystemItem(icon, tag: tag)
+      end
+
+      def tab_bar_icon_custom(title, image_name, tag)
+        warn "[DEPRECATION] `TabBar.tab_bar_icon_custom` is deprecated. Use `create_tab_bar_icon_custom` in ScreenTabs instead."
+        icon_image = UIImage.imageNamed(image_name)
+        return UITabBarItem.alloc.initWithTitle(title, image:icon_image, tag:tag)
+      end
+
+      def tab_controllers_from_data(data)
+        warn "[DEPRECATION] `tab_controllers_from_data` is deprecated. Use `open_tab_bar` instead."
+        tab_controllers = []
+
+        data.each do |tab|
+          tab_controllers << self.controller_from_tab_data(tab)
+        end
+
+        return tab_controllers
+      end
+
+      def controller_from_tab_data(tab)
+        warn "[DEPRECATION] `controller_from_tab_data` is deprecated. Use `open_tab_bar` instead."
+        tab[:badge_number] ||= tab[:badgeNumber]
+        tab[:navigation_controller] ||= tab[:navigationController]
+
+        tab[:badge_number] = 0 unless tab[:badge_number]
+        tab[:tag] = 0 unless tab[:tag]
+        
+        view_controller = tab[:view_controller]
+        view_controller = tab[:view_controller].alloc.init if tab[:view_controller].respond_to?(:alloc)
+        
+        if tab[:navigation_controller]
+          controller = UINavigationController.alloc.initWithRootViewController(view_controller)
+        else
+          controller = view_controller
+        end
+
+        view_controller.tabBarItem = self.tabBarItem(tab)
+        view_controller.tabBarItem.title = view_controller.title unless tab[:title]
+
+        return controller
+      end
+
+      def tab_bar_item(tab)
+        warn "[DEPRECATION] `TabBar.tab_bar_item` is deprecated. Use `tab_bar_item` in ScreenTabs instead."
+        title = "Untitled"
+        title = tab[:title] if tab[:title]
+        tab[:tag] ||= @current_tag ||= 0
+        @current_tag = tab[:tag] + 1
+        
+        tab_bar_item = tab_bar_icon(tab[:system_icon], tab[:tag]) if tab[:system_icon]
+        tab_bar_item = 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 select(tab_bar_controller, title: title)
+        warn "[DEPRECATION] `TabBar.select` is deprecated. Use `open_tab` in ScreenTabs instead."
+        root_controller = nil
+        tab_bar_controller.viewControllers.each do |vc|
+          if vc.tabBarItem.title == title
+            tab_bar_controller.selectedViewController = vc
+            root_controller = vc
+            break
+          end
+        end
+        root_controller
+      end
+
+      def select(tab_bar_controller, tag: tag)
+        warn "[DEPRECATION] `TabBar.select:tag:` is deprecated. Use `open_tab` in ScreenTabs instead."
+        tab_bar_controller.selectedIndex = tag
+      end
+
+      def replace_current_item(tab_bar_controller, view_controller: vc)
+        warn "[DEPRECATION] `TabBar.replace_current_item` is deprecated. Use `replace_current_item` in ScreenTabs instead."
+        controllers = NSMutableArray.arrayWithArray(tab_bar_controller.viewControllers)
+        controllers.replaceObjectAtIndex(tab_bar_controller.selectedIndex, withObject: vc)
+        tab_bar_controller.viewControllers = controllers
+      end
+    end
+  end
+end

data/lib/ProMotion/helpers/view_helper.rb

@@ -0,0 +1,39 @@
+module ProMotion
+  module ViewHelper
+    def set_attributes(element, args = {})
+      args.each do |k, v|
+        if v.is_a? Hash
+          # TODO: Do this recursively
+          v.each do |k2, v2|
+            sub_element = element.send("#{k}")
+            sub_element.send("#{k2}=", v2) if sub_element.respond_to?("#{k2}=")
+          end
+        elsif v.is_a? Array
+          element.send("#{k}", *v) if element.respond_to?("#{k}")
+        else
+          element.send("#{k}=", v) if element.respond_to?("#{k}=")
+        end
+      end
+      element
+    end
+
+    def frame_from_array(array)
+      return CGRectMake(array[0], array[1], array[2], array[3]) if array.length == 4
+      Console.log(" - frame_from_array expects an array with four elements: [x, y, width, height]", withColor: Console::RED_COLOR)
+      CGRectZero
+    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
+  end
+end