ProMotion 2.4.2 → 2.5.0.beta1

data/lib/ProMotion/collection/collection_screen.rb

@@ -0,0 +1,8 @@
+module ProMotion
+  class CollectionScreen < CollectionViewController
+    include ProMotion::ScreenModule
+    include ProMotion::CollectionBuilder
+    include ProMotion::Collection
+  end
+end
+

data/lib/ProMotion/collection/data/collection_data.rb

@@ -0,0 +1,32 @@
+module ProMotion
+  class CollectionData
+    include ProMotion::Table::Utils
+    include ProMotion::CollectionDataBuilder
+
+    attr_accessor :data, :collection_view
+
+    def initialize(data, collection_view)
+      self.data            = data
+      self.collection_view = WeakRef.new(collection_view)
+    end
+
+    def section(index)
+      sections.at(index) || []
+    end
+
+    def sections
+      self.data
+    end
+
+    def section_length(index)
+      section(index).length
+    end
+
+    def cell(params={})
+      params  = index_path_to_section_index(params)
+      section = self.data[params[:section]]
+      c       = section.at(params[:index].to_i)
+      set_data_cell_defaults(c)
+    end
+  end
+end

data/lib/ProMotion/collection/data/collection_data_builder.rb

@@ -0,0 +1,18 @@
+module ProMotion
+  module CollectionDataBuilder
+    def set_data_cell_defaults(data_cell)
+      data_cell[:cell_identifier] ||= PM::CollectionViewCell::KIdentifier
+      data_cell[:properties]      ||= data_cell[:style] || data_cell[:styles]
+
+      data_cell[:accessory]       = {
+        view:      data_cell[:accessory],
+        value:     data_cell[:accessory_value],
+        action:    data_cell[:accessory_action],
+        arguments: data_cell[:accessory_arguments]
+      } unless data_cell[:accessory].nil? || data_cell[:accessory].is_a?(Hash)
+
+      data_cell
+    end
+
+  end
+end

data/lib/ProMotion/delegate/delegate_module.rb

@@ -2,7 +2,7 @@ module ProMotion
   module DelegateModule
     include ProMotion::Support
     include ProMotion::Tabs
-    include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+    include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad || (UIDevice.currentDevice.systemVersion.to_i >= 8 )
 
     attr_accessor :window, :home_screen
 

data/lib/ProMotion/ipad/split_screen.rb

@@ -58,7 +58,6 @@ module ProMotion
     end
 
     def split_screen_setup(split, args)
-      args[:icon] ||= args[:item] # TODO: Remove in PM 2.2+.
       if (args[:item] || args[:title]) && respond_to?(:create_tab_bar_item)
         split.tabBarItem = create_tab_bar_item(args)
       end

data/lib/ProMotion/repl/live_reloader.rb

@@ -0,0 +1,76 @@
+class LiveReloader
+  attr_reader :path_query, :opts
+
+  def initialize(path, opts={})
+    @path_query = path
+    @opts = opts
+  end
+
+  def watch(&callback)
+    log path_query
+    log live_file_paths
+
+    @live_reload_timer = every(opts[:interval] || 0.5) do
+      live_files.each do |live_file, modified_date|
+        if File.exist?(live_file) && File.mtime(live_file) > modified_date
+          new_code = File.read(live_file)
+          eval(new_code)
+          callback.call *[live_file, new_code, parse_class_names(new_code)].first(callback.arity)
+          reload_live_files
+        end
+      end
+    end
+
+    log "Watching #{path_query}."
+    self
+  end
+
+  def stop
+    @live_reload_timer.invalidate if @live_reload_timer
+    @live_reload_timer = nil
+    log "Stopped."
+    self
+  end
+
+  def debug?
+    @opts[:debug]
+  end
+
+  private
+
+  def every(interval, &callback)
+    NSTimer.scheduledTimerWithTimeInterval(interval, target: callback, selector: 'call:', userInfo: nil, repeats: true)
+  end
+
+  def live_files
+    @live_files ||= live_file_paths.inject({}) do |out, live_file_path_file|
+      out[live_file_path_file] = File.mtime(live_file_path_file)
+      out
+    end
+  end
+
+  def reload_live_files
+    @live_files = nil
+    live_files
+  end
+
+  def log(s)
+    puts s.inspect if debug?
+    s
+  end
+
+  def project_root_path
+    NSBundle.mainBundle.infoDictionary["ProjectRootPath"]
+  end
+
+  def live_file_paths
+    log Dir.glob("#{project_root_path}/#{path_query}").to_a
+  end
+
+  def parse_class_names(code)
+    log code.split("\n").map do |code_line|
+      matched = code_line.match(/^\s*class\s+(\S+)\s+</)
+      matched[1] if matched
+    end.to_a.compact.to_a
+  end
+end

data/lib/ProMotion/repl/repl.rb

@@ -0,0 +1,65 @@
+if RUBYMOTION_ENV == "development"
+  puts "Type `pm_live` to enable ProMotion's live reload system."
+  module Kernel
+    def pm_live(opts={})
+      @screen_watcher.stop if @screen_watcher
+      @view_watcher.stop if @view_watcher
+      if opts == false || opts.to_s.downcase == "off"
+        "Live reloading of PM screens is now off."
+      else
+        @screen_watcher = LiveReloader.new("app/screens/**/*.rb", opts).watch do |reloaded_file, new_code, class_names|
+          vcs = pm_all_view_controllers(UIApplication.sharedApplication.delegate.window.rootViewController)
+          vcs.each do |vc|
+            if pm_is_in_ancestry?(vc, class_names)
+              puts "Sending :on_live_reload to #{vc.inspect}." if opts[:debug]
+              vc.send(:on_live_reload) if vc.respond_to?(:on_live_reload)
+            end
+          end
+        end
+
+        @view_watcher = LiveReloader.new("app/views/**/*.rb", opts).watch do |reloaded_file, new_code, class_names|
+          views = pm_all_views(UIApplication.sharedApplication.delegate.window)
+          views.each do |view|
+            if pm_is_in_ancestry?(view, class_names)
+              puts "Sending :on_live_reload to #{view.inspect}." if opts[:debug]
+              view.send(:on_live_reload) if view.respond_to?(:on_live_reload)
+            end
+          end
+        end
+
+        "Live reloading of screens and views is now on."
+      end
+    end
+    alias_method :pm_live_screens, :pm_live
+
+
+    private
+
+    # Very permissive. Might get unnecessary reloads. That's okay.
+    def pm_is_in_ancestry?(vc, screen_names)
+      screen_names.any? do |screen_name|
+        vc.class.to_s.include?(screen_name) ||
+        vc.class.ancestors.any? do |ancestor|
+          screen_name.include?(ancestor.to_s)
+        end
+      end
+    end
+
+    def pm_all_view_controllers(root_view_controller)
+      vcs = [ root_view_controller ]
+      if root_view_controller.respond_to?(:viewControllers)
+        vcs = vcs + root_view_controller.viewControllers.map{|vc| pm_all_view_controllers(vc) }
+      end
+      if root_view_controller.respond_to?(:childViewControllers)
+        vcs = vcs + root_view_controller.childViewControllers.map{|vc| pm_all_view_controllers(vc) }
+      end
+      vcs.flatten.uniq
+    end
+
+    def pm_all_views(root_view)
+      views = [ root_view ]
+      views = views + views.map{|v| v.subviews.map{|sv| pm_all_views(sv) } }
+      views.flatten.uniq
+    end
+  end
+end

data/lib/ProMotion/screen/nav_bar_module.rb

@@ -53,6 +53,8 @@ module ProMotion
     alias_method :set_toolbar_button,  :set_toolbar_items
 
     def add_nav_bar(args = {})
+      args = self.class.get_nav_bar.merge(args)
+      return unless args[:nav_bar]
       self.navigationController ||= begin
         self.first_screen = true if self.respond_to?(:first_screen=)
         nav = (args[:nav_controller] || NavigationController).alloc.initWithRootViewController(self)
@@ -61,7 +63,12 @@ module ProMotion
         nav
       end
       self.navigationController.toolbarHidden = !args[:toolbar] unless args[:toolbar].nil?
-      self.navigationController.setNavigationBarHidden(args[:hide_nav_bar], animated: false) unless args[:hide_nav_bar].nil?
+    end
+
+    def view_will_appear(animated)
+      if @screen_options && !@screen_options[:hide_nav_bar].nil?
+        self.navigationController.setNavigationBarHidden(@screen_options[:hide_nav_bar], animated: false)
+      end
     end
 
   private

data/lib/ProMotion/screen/screen_module.rb

@@ -5,15 +5,16 @@ module ProMotion
     include ProMotion::Styling
     include ProMotion::NavBarModule
     include ProMotion::Tabs
-    include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+    include ProMotion::SplitScreen if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad || (UIDevice.currentDevice.systemVersion.to_i >= 8 )
 
     attr_accessor :parent_screen, :first_screen, :modal, :split_screen
 
     def screen_init(args = {})
+      @screen_options = args
       check_ancestry
       resolve_title
       apply_properties(args)
-      add_nav_bar(args) if args[:nav_bar]
+      add_nav_bar(args)
       add_nav_bar_buttons
       tab_bar_setup
       try :on_init
@@ -38,6 +39,7 @@ module ProMotion
     end
 
     def view_will_appear(animated)
+      super
       resolve_status_bar
       self.will_appear
 
@@ -70,6 +72,18 @@ module ProMotion
     def on_disappear; end
     def on_dismiss; end
 
+    def did_receive_memory_warning
+      self.on_memory_warning
+    end
+    def on_memory_warning
+      mp "Received memory warning in #{self.inspect}. You should implement on_memory_warning in your secreen.", force_color: :red
+    end
+
+    def on_live_reload
+      self.view.subviews.each(&:removeFromSuperview)
+      on_load
+    end
+
     def should_rotate(orientation)
       case orientation
       when UIInterfaceOrientationPortrait
@@ -175,6 +189,7 @@ module ProMotion
         status_bar_hidden false
         status_bar_style UIStatusBarStyleDefault
       else
+        return status_bar_hidden true if UIApplication.sharedApplication.isStatusBarHidden
         status_bar_hidden false
         global_style = NSBundle.mainBundle.objectForInfoDictionaryKey("UIStatusBarStyle")
         status_bar_style global_style ? Object.const_get(global_style) : UIStatusBarStyleDefault
@@ -218,7 +233,7 @@ module ProMotion
         end
         @title = t if t
         @title_type = :text if t
-        @title ||= self.to_s
+        @title
       end
 
       def title_type
@@ -251,6 +266,14 @@ module ProMotion
         @status_bar_animation || UIStatusBarAnimationSlide
       end
 
+      def nav_bar(enabled, args={})
+        @nav_bar_args = ({ nav_bar: enabled }).merge(args)
+      end
+
+      def get_nav_bar
+        @nav_bar_args ||= { nav_bar: false }
+      end
+
       def nav_bar_button(side, args={})
         @nav_bar_button_args = args
         @nav_bar_button_args[:side] = side

data/lib/ProMotion/screen/screen_navigation.rb

@@ -82,6 +82,9 @@ module ProMotion
       # Instantiate screen if given a class
       screen = screen.new if screen.respond_to?(:new)
 
+      # Store screen options
+      screen.instance_variable_set(:@screen_options, args)
+
       # Set parent
       screen.parent_screen = self if screen.respond_to?(:parent_screen=)
 

data/lib/ProMotion/table/cell/table_view_cell_module.rb

@@ -19,6 +19,17 @@ module ProMotion
       set_accessory_type
     end
 
+    def layoutSubviews
+      super
+
+      # Support changing sizes of the image view
+      if (data_cell[:image] && data_cell[:image].is_a?(Hash) && data_cell[:image][:size])
+        self.imageView.bounds = CGRectMake(0, 0, data_cell[:image][:size], data_cell[:image][:size]);
+      elsif (data_cell[:remote_image] && data_cell[:remote_image][:size])
+        self.imageView.bounds = CGRectMake(0, 0, data_cell[:remote_image][:size], data_cell[:remote_image][:size]);
+      end
+    end
+
   protected
 
     # TODO: Remove this in ProMotion 2.1. Just for migration purposes.

data/lib/ProMotion/table/extensions/searchable.rb

@@ -11,6 +11,8 @@ module ProMotion
           search_bar.placeholder = params[:search_bar][:placeholder]
         end
 
+        @no_results_text = params[:search_bar][:no_results] if params[:search_bar][:no_results]
+
         @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]
@@ -39,10 +41,19 @@ module ProMotion
         search_bar
       end
 
+      def set_no_results_text(controller)
+        Dispatch::Queue.main.async do
+          controller.searchResultsTableView.subviews.each do |v|
+            v.text = @no_results_text if v.is_a?(UILabel)
+          end
+        end if @no_results_text
+      end
+
       ######### iOS methods, headless camel case #######
 
       def searchDisplayController(controller, shouldReloadTableForSearchString:search_string)
         self.promotion_table_data.search(search_string)
+        set_no_results_text(controller) if @no_results_text
         true
       end
 

data/lib/ProMotion/table/table.rb

@@ -23,6 +23,10 @@ module ProMotion
       set_up_row_height
     end
 
+    def on_live_reload
+      update_table_data
+    end
+
     def check_table_data
       mp("Missing #table_data method in TableScreen #{self.class.to_s}.", force_color: :red) unless self.respond_to?(:table_data)
     end
@@ -287,6 +291,7 @@ module ProMotion
       section = promotion_table_data.section(index)
       view = section[:title_view]
       view = section[:title_view].new if section[:title_view].respond_to?(:new)
+      view.on_load if view.respond_to?(:on_load)
       view.title = section[:title] if view.respond_to?(:title=)
       view
     end
@@ -294,7 +299,13 @@ module ProMotion
     def tableView(_, heightForHeaderInSection: index)
       section = promotion_table_data.section(index)
       if section[:title_view] || section[:title].to_s.length > 0
-        section[:title_view_height] || tableView.sectionHeaderHeight
+        if section[:title_view_height]
+          section[:title_view_height]
+        elsif (section_header = tableView(_, viewForHeaderInSection: index)) && section_header.respond_to?(:height)
+          section_header.height
+        else
+          tableView.sectionHeaderHeight
+        end
       else
         0.0
       end

data/lib/ProMotion/table/table_builder.rb

@@ -1,11 +1,13 @@
 module ProMotion
   module TableBuilder
     def trigger_action(action, arguments, index_path)
-      return mp("Action not implemented: #{action.to_s}", force_color: :green) unless self.respond_to?(action)
-      case self.method(action).arity
-      when 0 then self.send(action) # Just call the method
-      when 2 then self.send(action, arguments, index_path) # Send arguments and index path
-      else self.send(action, arguments) # Send arguments
+      action = (action.is_a?(Proc) ? action : method(action))
+      case arity = action.arity
+      when 0 then action.call # Just call the proc or the method
+      when 2 then action.call(arguments, index_path) # Send arguments and index path
+      else
+        mp("Action should not have optional parameters: #{action.to_s} in #{self.inspect}", force_color: :yellow) if arity < 0
+        action.call(arguments) # Send arguments
       end
     end
 

data/lib/ProMotion/tabs/tabs.rb

@@ -50,10 +50,13 @@ module ProMotion
     end
 
     def create_tab_bar_item(tab={})
-      if tab[:system_icon] || tab[:icon]
-        mp("`system_icon:` no longer supported. Use `system_item:` instead.", force_color: :yellow) if tab[:system_icon]
-        mp("`icon:` no longer supported. Use `item:` instead.", force_color: :yellow) if tab[:icon]
+      if tab[:system_icon]
+        mp("`system_icon:` no longer supported. Use `system_item:` instead.", force_color: :yellow)
         tab[:system_item] ||= tab[:system_icon]
+      end
+
+      if tab[:icon]
+        mp("`icon:` no longer supported. Use `item:` instead.", force_color: :yellow)
         tab[:item] ||= tab[:icon]
       end