ProMotion 0.7.8 → 1.0.0

data/lib/ProMotion/cocoatouch/SplitViewController.rb

@@ -1,23 +0,0 @@
-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.pm_main_controller, 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.pm_main_controller]
-  end
-  def screens=(s_array)
-    self.viewControllers = s_array
-  end
-end

data/lib/ProMotion/helpers/console.rb

@@ -1,29 +0,0 @@
-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)
-        return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
-        PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
-        puts color[0] + NAME + log + color[1]
-      end
-
-      def log(log, withColor:color)
-        return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
-        PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
-        self.log(log, with_color:color)
-      end
-
-      def log(log)
-        return if defined?(RUBYMOTION_ENV) && RUBYMOTION_ENV == "test"
-        PM.logger.deprecated "ProMotion::Console.log is deprecated. Use PM.logger (see README)"
-        log(log, with_color: DEFAULT_COLOR)
-      end
-    end
-  end
-end

data/lib/ProMotion/helpers/measure_helper.rb

@@ -1,20 +0,0 @@
-module ProMotion
-  class MeasureHelper
-    class << self
-      def content_height(view)
-        PM.logger.deprecated "`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

@@ -1,29 +0,0 @@
-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/view_helper.rb

@@ -1,82 +0,0 @@
-module ProMotion
-  module ViewHelper
-    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 objective_c_method_name(meth)
-      meth.split('_').inject([]){ |buffer,e| buffer.push(buffer.empty? ? e : e.capitalize) }.join
-    end
-
-    def set_easy_attributes(parent, element, args={})
-      attributes = {}
-
-      if args[:resize]
-        attributes[:autoresizingMask]  = UIViewAutoresizingNone
-        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleLeftMargin   if args[:resize].include?(:left)
-        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleRightMargin  if args[:resize].include?(:right)
-        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleTopMargin    if args[:resize].include?(:top)
-        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleBottomMargin if args[:resize].include?(:bottom)
-        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleWidth        if args[:resize].include?(:width)
-        attributes[:autoresizingMask] |= UIViewAutoresizingFlexibleHeight       if args[:resize].include?(:height)
-      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 frame_from_array(array)
-      PM.logger.deprecated "`frame_from_array` is deprecated and will be removed. Use RubyMotion's built-in [[x, y], [width, height]] or CGRectMake(x, y, w, h)."
-      return CGRectMake(array[0], array[1], array[2], array[3]) if array.length == 4
-      PM.logger.error "frame_from_array expects an array with four elements: [x, y, width, height]"
-      CGRectZero.dup
-    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 ||= self.superview
-      while this_view != nil do
-        return this_view if this_view.is_a? type
-        this_view = this_view.superview
-      end
-      nil
-    end
-  end
-end

data/lib/ProMotion/screen_helpers/screen_elements.rb

@@ -1,36 +0,0 @@
-module ProMotion
-  module ScreenElements
-    include ProMotion::ViewHelper
-
-    def add(element, attrs = {})
-      add_to self.view, 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 bounds
-      return self.view.bounds
-    end
-
-    def frame
-      return self.view.frame
-    end
-
-  end
-end

data/lib/ProMotion/screen_helpers/screen_tabs.rb

@@ -1,95 +0,0 @@
-module ProMotion
-  module ScreenTabs
-    def tab_bar_controller(*screens)
-      tab_bar_controller = UITabBarController.alloc.init
-
-      view_controllers = []
-      tag_index = 0
-
-      screens.map! { |s| s.respond_to?(:new) ? s.new : s } # Initialize any classes
-
-      screens.each do |s|
-        s = s.new if s.respond_to?(:new)
-
-        s.tabBarItem.tag = tag_index
-
-        s.parent_screen = self if self.is_a?(UIViewController) && s.respond_to?("parent_screen=")
-        s.tab_bar = tab_bar_controller if s.respond_to?("tab_bar=")
-
-        view_controllers << s.pm_main_controller
-
-        tag_index += 1
-
-        s.on_load if s.respond_to?(:on_load)
-      end
-
-      tab_bar_controller.viewControllers = view_controllers
-      tab_bar_controller
-    end
-
-    # Open a UITabBarController with the specified screens as the
-    # root view controller of the current app.
-    # @param [Array] A comma-delimited list of screen classes or instances.
-    # @return [UITabBarController]
-    def open_tab_bar(*screens)
-      tab_bar = tab_bar_controller(*screens)
-
-      a = self.respond_to?(:open_root_screen) ? self : UIApplication.sharedApplication.delegate
-
-      a.open_root_screen(tab_bar)
-      tab_bar
-    end
-
-    def open_tab(tab)
-      if tab.is_a? String
-        return self.select(self.tab_bar, title: tab)
-      elsif tab.is_a? Numeric
-        tab_bar_controller.selectedIndex = tab
-        return tab_bar_controller.viewControllers[tab]
-      else
-        $stderr.puts "Unable to open tab #{tab.to_s} because it isn't a string."
-      end
-    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(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 select(tab_bar_controller, title: title)
-      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 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
-  end
-end

data/lib/ProMotion/screens/_table_screen_module.rb

@@ -1,47 +0,0 @@
-module ProMotion
-  module TableScreenModule
-    include PlainTable
-    include SearchableTable
-    include RefreshableTable
-    include ScreenModule
-
-    def update_table_data
-      self.update_table_view_data(table_data)
-    end
-
-    module TableClassMethods
-      # Searchable
-      def searchable(params={})
-        @searchable_params = params
-        @searchable = true
-      end
-
-      def get_searchable_params
-        @searchable_params ||= nil
-      end
-
-      def get_searchable
-        @searchable ||= false
-      end
-
-      # Refreshable
-      def refreshable(params = {})
-        @refreshable_params = params
-        @refreshable = true
-      end
-
-      def get_refreshable
-        @refreshable ||= false
-      end
-
-      def get_refreshable_params
-        @refreshable_params ||= nil
-      end
-
-    end
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.extend(TableClassMethods)
-    end
-  end
-end

data/lib/ProMotion/screens/_tables/_refreshable_table.rb

@@ -1,45 +0,0 @@
-module ProMotion
-  module RefreshableTable
-    def make_refreshable(params={})
-      pull_message = params[:pull_message] || "Pull to refresh"
-      @refreshing = params[:refreshing] || "Refreshing data..."
-      @updated_format = params[:updated_format] || "Last updated at %s"
-      @updated_time_format = params[:updated_time_format] || "%l:%M %p"
-      @refreshable_callback = params[:callback]|| :on_refresh
-
-      @refresh_control = UIRefreshControl.alloc.init
-      @refresh_control.attributedTitle = NSAttributedString.alloc.initWithString(pull_message)
-      @refresh_control.addTarget(self, action:'refreshView:', forControlEvents:UIControlEventValueChanged)
-      self.refreshControl = @refresh_control
-    end
-    alias :makeRefreshable :make_refreshable
-
-    def start_refreshing
-      return unless @refresh_control
-
-      @refresh_control.beginRefreshing
-    end
-    alias :begin_refreshing :start_refreshing
-
-    def end_refreshing
-      return unless @refresh_control
-
-      @refresh_control.attributedTitle = NSAttributedString.alloc.initWithString(sprintf(@updated_format, Time.now.strftime(@updated_time_format)))
-      @refresh_control.endRefreshing
-    end
-    alias :stop_refreshing :end_refreshing
-
-    ######### iOS methods, headless camel case #######
-
-    # UIRefreshControl Delegates
-    def refreshView(refresh)
-      refresh.attributedTitle = NSAttributedString.alloc.initWithString(@refreshing)
-      if @refreshable_callback && self.respond_to?(@refreshable_callback)
-        self.send(@refreshable_callback)
-      else
-        PM.logger.warn "You must implement the '#{@refreshable_callback}' method in your TableScreen."
-      end
-    end
-
-  end
-end

data/lib/ProMotion/screens/_tables/_searchable_table.rb

@@ -1,60 +0,0 @@
-module ProMotion
-  module SearchableTable
-
-    def make_searchable(params={})
-      params = set_searchable_param_defaults(params)
-
-      search_bar = create_search_bar(params)
-
-      if params[:search_bar] && params[:search_bar][:placeholder]
-        search_bar.placeholder = params[:search_bar][:placeholder]
-      end
-
-      @table_search_display_controller = UISearchDisplayController.alloc.initWithSearchBar(search_bar, contentsController: params[:content_controller])
-      @table_search_display_controller.delegate = params[:delegate]
-      @table_search_display_controller.searchResultsDataSource = params[:data_source]
-      @table_search_display_controller.searchResultsDelegate = params[:search_results_delegate]
-
-      self.table_view.tableHeaderView = search_bar
-    end
-    alias :makeSearchable :make_searchable
-
-    def set_searchable_param_defaults(params)
-      params[:content_controller] ||= params[:contentController]
-      params[:data_source] ||= params[:searchResultsDataSource]
-      params[:search_results_delegate] ||= params[:searchResultsDelegate]
-
-      params[:frame] ||= CGRectMake(0, 0, 320, 44) # TODO: Don't hardcode this...
-      params[:content_controller] ||= self
-      params[:delegate] ||= self
-      params[:data_source] ||= self
-      params[:search_results_delegate] ||= self
-      params
-    end
-
-    def create_search_bar(params)
-      search_bar = UISearchBar.alloc.initWithFrame(params[:frame])
-      search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
-      search_bar
-    end
-
-    ######### iOS methods, headless camel case #######
-
-    def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
-      @promotion_table_data.search(search_string)
-      true
-    end
-
-    def searchDisplayControllerWillEndSearch(controller)
-      @promotion_table_data.stop_searching
-      @promotion_table_data_data = nil
-      self.table_view.setScrollEnabled true
-      self.table_view.reloadData
-    end
-
-    def searchDisplayControllerWillBeginSearch(controller)
-      self.table_view.setScrollEnabled false
-    end
-
-  end
-end