motion-prime 0.7.2 → 0.8.0

data/motion-prime/elements/draw/image.rb

@@ -66,14 +66,15 @@ module MotionPrime
 
     def load_image
       return if image_data || !computed_options[:url]
+      # TODO: why so many references?
+      @strong_refs = section.strong_references + [screen.main_controller.strong_ref]
       BW::Reactor.schedule do
         manager = SDWebImageManager.sharedManager
-        @strong_refs = section.strong_references
         manager.downloadWithURL(computed_options[:url],
           options: 0,
           progress: lambda{ |r_size, e_size|  },
           completed: lambda{ |image, error, type, finished|
-            if !image || screen.retainCount == 1 || section.retainCount == 1
+            if !image || screen.main_controller.retainCount == 1 || section.retainCount == 1
               @strong_refs = nil
               return
             end

data/motion-prime/elements/draw/label.rb

@@ -41,6 +41,8 @@ module MotionPrime
       draw_in_context(UIGraphicsGetCurrentContext())
     end
 
+    # using hack for bug described here: http://stackoverflow.com/questions/19232850/nsattributedstring-drawinrect-disappears-when-the-frame-is-offset
+    # TODO: check it in iOS 7.1 and remove CGContext manuplations (pass innerRect/topLeftCorner) if fixed
     def draw_in_context(context)
       return if computed_options[:hidden]
       size_to_fit_if_needed
@@ -53,11 +55,16 @@ module MotionPrime
       if options[:is_html] || options[:line_spacing] || options[:line_height] || options[:underline]
         prepared_text = options[:is_html] ? html_string(options) : attributed_string(options)
 
+        CGContextSaveGState(context)
         if options[:inner_rect]
-          prepared_text.drawInRect(options[:inner_rect])
+          rect = options[:inner_rect]
+          CGContextTranslateCTM(context, *rect.origin.to_a)
+          prepared_text.drawInRect(CGRectMake(0, 0, *rect.size.to_a))
         else
-          prepared_text.drawAtPoint(options[:top_left_corner])
+          CGContextTranslateCTM(context, *options[:top_left_corner].to_a)
+          prepared_text.drawAtPoint(CGPointMake(0, 0))
         end
+        CGContextRestoreGState(context)
       else
         # regular string
         prepared_text = options[:text]

data/motion-prime/helpers/has_search_bar.rb

@@ -2,6 +2,7 @@
 module MotionPrime
   module HasSearchBar
     def add_search_bar(options = {}, &block)
+      @_search_timeout = options.delete(:timeout)
       target = options.delete(:target)
 
       @_search_bar = create_search_bar(options)
@@ -20,6 +21,7 @@ module MotionPrime
     end
 
     def dealloc
+      BW::Reactor.cancel_timer(@_search_timer) if @_search_timer
       @_search_bar.try(:setDelegate, nil)
       @_search_bar = nil
       super
@@ -35,10 +37,17 @@ module MotionPrime
     end
 
     def searchBar(search_bar, textDidChange: text)
-      @search_callback.call(text)
+      BW::Reactor.cancel_timer(@_search_timer) if @_search_timer
+      if @_search_timeout
+        @_search_timer = BW::Reactor.add_timer(@_search_timeout.to_f/1000, proc{ @search_callback.call(text) }.weak!)
+      else
+        @search_callback.call(text)
+      end
     end
 
     def searchBarSearchButtonClicked(search_bar)
+      BW::Reactor.cancel_timer(@_search_timer) if @_search_timer
+      @search_callback.call(search_bar.text)
       search_bar.resignFirstResponder
     end
   end

data/motion-prime/screens/_base_mixin.rb

@@ -12,7 +12,7 @@ module MotionPrime
     include MotionPrime::ScreenNavigationMixin
     include MotionPrime::ScreenSectionsMixin
 
-    attr_accessor :parent_screen, :modal, :params, :main_section, :options, :tab_bar
+    attr_accessor :parent_screen, :modal, :params, :options, :tab_bar
     class_attribute :current_screen
 
     def app_delegate

data/motion-prime/screens/_sections_mixin.rb

@@ -14,6 +14,10 @@ module MotionPrime
       render_sections
     end
 
+    def all_sections
+      @sections.values
+    end
+
     def create_sections
       section_options = self.class._section_options
       return unless section_options
@@ -31,16 +35,16 @@ module MotionPrime
 
     def render_sections
       return unless @sections
-      if @sections.count > 1
-        @main_section = MotionPrime::TableSection.new(model: @sections.values, screen: self)
+      if all_sections.count > 1
+        @main_section = MotionPrime::TableSection.new(model: all_sections, screen: self)
         @main_section.render
       else
-        @sections.first.render
+        all_sections.first.render
       end
     end
 
     def main_section
-      @main_section || @sections.first
+      @main_section || all_sections.first
     end
 
     module ClassMethods

data/motion-prime/sections/__section_with_container_mixin.rb

@@ -0,0 +1,52 @@
+module MotionPrime
+  module SectionWithContainerMixin
+    extend ::MotionSupport::Concern
+
+    included do
+      class_attribute :container_element_options
+    end
+
+    def container_view
+      container_element.try(:view)
+    end
+
+    def init_container_element(options = {})
+      @container_element ||= begin
+        options.merge!({
+          screen: screen,
+          section: self.weak_ref,
+          has_drawn_content: true
+        })
+        container_element_options = self.class.container_element_options.clone
+        type = container_element_options.delete(:type)
+        options.merge!(container_element_options)
+        MotionPrime::BaseElement.factory(type, options)
+      end
+    end
+
+    def load_container_with_elements(options = {})
+      init_container_element(options[:container] || {})
+      @container_element.compute_options! unless @container_element.computed_options
+      compute_element_options(options[:elements] || {})
+
+      if respond_to?(:prerender_elements_for_state) && prerender_enabled?
+        prerender_elements_for_state(:normal)
+      end
+    end
+
+    private
+      def compute_element_options(options = {})
+        self.elements.values.each do |element|
+          element.size_to_fit_if_needed if element.is_a?(LabelDrawElement)
+          element.compute_options! if element.respond_to?(:computed_options) && !element.computed_options
+        end
+      end
+
+
+    module ClassMethods
+      def container_element(options)
+        self.container_element_options = options
+      end
+    end
+  end
+end

data/motion-prime/sections/_cell_section_mixin.rb

@@ -3,11 +3,14 @@ module MotionPrime
   module CellSectionMixin
     extend ::MotionSupport::Concern
 
+    include SectionWithContainerMixin
+
     attr_writer :table
     attr_reader :pending_display
 
     included do
       class_attribute :custom_cell_name
+      container_element type: :table_view_cell
     end
 
     def table
@@ -42,27 +45,10 @@ module MotionPrime
     end
 
     def init_container_element(options = {})
-      @container_element ||= begin
-        options.merge!({
-          screen: screen,
-          section: self.weak_ref,
-          has_drawn_content: true
-        })
-        options[:styles] ||= []
-        options[:styles] = [:"#{table.name}_first_cell"] if table.data.first == self
-        options[:styles] = [:"#{table.name}_last_cell"] if table.data.last == self
-        MotionPrime::BaseElement.factory(:table_view_cell, options)
-      end
-    end
-
-    # FIXME: Why this duplicates functionality from other parts, e.g. draw_in?
-    def load_container_element(options = {})
-      init_container_element(options)
-      load_elements
-      @container_element.compute_options! unless @container_element.computed_options
-      if respond_to?(:prerender_elements_for_state) && prerender_enabled?
-        prerender_elements_for_state(:normal)
-      end
+      options[:styles] ||= []
+      options[:styles] = [:"#{table.name}_first_cell"] if table.data.first == self
+      options[:styles] = [:"#{table.name}_last_cell"] if table.data.last == self
+      super(options)
     end
 
     def pending_display!

data/motion-prime/sections/_delegate_mixin.rb

@@ -0,0 +1,12 @@
+module MotionPrime
+  module DelegateMixin
+    def delegated_by(view)
+      @delegated_views ||= []
+      @delegated_views << view
+    end
+
+    def clear_delegated
+      Array.wrap(@delegated_views).each { |view| view.setDelegate(nil) }
+    end
+  end
+end

data/motion-prime/sections/_draw_section_mixin.rb

@@ -4,30 +4,13 @@ module MotionPrime
 
     include HasStyles
     include FrameCalculatorMixin
+    include SectionWithContainerMixin
+
     attr_accessor :container_element, :container_gesture_recognizers, :cached_draw_image
+
     included do
       class_attribute :prerender_enabled
-    end
-
-    def container_view
-      container_element.try(:view)
-    end
-
-    def init_container_element(options = {})
-      @container_element ||= begin
-        options.merge!({
-          screen: screen,
-          section: self.weak_ref,
-          has_drawn_content: true
-        })
-        options[:styles] ||= []
-        MotionPrime::BaseElement.factory(:view_with_section, options)
-      end
-    end
-
-    def load_container_element(options = {})
-      init_container_element(options)
-      @container_element.compute_options! unless @container_element.computed_options
+      container_element type: :view_with_section
     end
 
     def draw_in(rect, state = :normal)

data/motion-prime/sections/base_section.rb

@@ -19,6 +19,7 @@ module MotionPrime
     include HasNormalizer
     include HasClassFactory
     include DrawSectionMixin
+    include DelegateMixin
 
     attr_accessor :screen, :model, :name, :options, :elements, :section_styles
     class_attribute :elements_options, :container_options, :keyboard_close_bindings
@@ -145,13 +146,6 @@ module MotionPrime
       self.instance_eval(&@options_block) if @options_block.is_a?(Proc)
     end
 
-    def load_elements
-      self.elements.values.each do |element|
-        element.size_to_fit_if_needed if element.is_a?(LabelDrawElement)
-        element.compute_options! if element.respond_to?(:computed_options) && !element.computed_options
-      end
-    end
-
     def add_element(key, options = {})
       return unless render_element?(key)
       opts = options.clone
@@ -334,6 +328,12 @@ module MotionPrime
       end
 
     class << self
+      def inherited(subclass)
+        subclass.elements_options = self.elements_options.try(:clone)
+        subclass.container_options = self.container_options.try(:clone)
+        subclass.keyboard_close_bindings = self.keyboard_close_bindings.try(:clone)
+      end
+
       def element(name, options = {}, &block)
         options[:name] ||= name
         options[:type] ||= :label

data/motion-prime/sections/form.rb

@@ -210,6 +210,13 @@ module MotionPrime
     end
 
     class << self
+      def inherited(subclass)
+        super
+        subclass.fields_options = self.fields_options.try(:clone)
+        subclass.text_field_limits = self.text_field_limits.try(:clone)
+        subclass.text_view_limits = self.text_view_limits.try(:clone)
+      end
+
       def field(name, options = {}, &block)
         options[:name] = name
         options[:type] ||= :string

data/motion-prime/sections/form/base_field_section.rb

@@ -103,6 +103,15 @@ module MotionPrime
       NSLog("can't blur on element #{self.class_name_without_kvo}")
     end
 
+    def default_label_options
+      label_options = options[:label]
+      if label_options.has_key?(:text)
+        label_options
+      else
+        {text: options[:name].to_s.titleize}.merge(label_options)
+      end
+    end
+
     def bind_text_input
       view(:input).on :change do |view|
         focus

data/motion-prime/sections/form/date_field_section.rb

@@ -2,7 +2,7 @@ module MotionPrime
   class DateFieldSection < BaseFieldSection
     container height: 190
     element :label, type: :label do
-      options[:label] || {}
+      default_label_options
     end
     element :date_picker, type: :date_picker do
       options[:input] || {}

data/motion-prime/sections/form/form_delegate.rb

@@ -22,7 +22,6 @@ module MotionPrime
       table_section.allow_string_replacement?(text_field, limit, range, string)
     end
 
-
     def textViewDidBeginEditing(text_view)
       table_section.on_input_edit_begin(text_view)
     end

data/motion-prime/sections/form/password_field_section.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class PasswordFieldSection < BaseFieldSection
     element :label, type: :label do
-      options[:label] || {}
+      default_label_options
     end
     element :input, type: :text_field, delegate: proc { form.table_delegate } do
       {secure_text_entry: true}.merge(options[:input] || {})

data/motion-prime/sections/form/select_field_section.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class SelectFieldSection < BaseFieldSection
     element :label, type: :label do
-      options[:label] || {}
+      default_label_options
     end
     element :button, type: :button do
       options[:button] || {}

data/motion-prime/sections/form/string_field_section.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class StringFieldSection < BaseFieldSection
     element :label, type: :label do
-      options[:label] || {}
+      default_label_options
     end
 
     element :input, type: :text_field, delegate: proc { form.table_delegate } do

data/motion-prime/sections/form/submit_field_section.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class SubmitFieldSection < BaseFieldSection
     element :submit, type: :button do
-      {title: options[:title]}.merge(options[:button] || {})
+      {title: options[:name].to_s.titleize}.merge(options[:button] || {})
     end
     element :error_message, type: :error_message, text: proc { all_errors.join("\n") if observing_errors? }
 

data/motion-prime/sections/form/switch_field_section.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class SwitchFieldSection < BaseFieldSection
     element :label, type: :label do
-      options[:label] || {}
+      default_label_options
     end
     element :input, type: :switch do
       options[:input] || {}

data/motion-prime/sections/form/text_field_section.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class TextFieldSection < BaseFieldSection
     element :label, type: :label do
-      options[:label] || {}
+      default_label_options
     end
     element :input, type: :text_view, delegate: proc { form.table_delegate } do
       {editable: true}.merge(options[:input] || {})

data/motion-prime/sections/tabbed.rb

@@ -85,6 +85,13 @@ module MotionPrime
     end
 
     class << self
+      def inherited(subclass)
+        super
+        subclass.tabs_options = self.tabs_options.try(:clone)
+        subclass.tabs_default = self.tabs_default.try(:clone)
+        subclass.tabs_indexes = self.tabs_indexes.try(:clone)
+      end
+
       def tab(id, options = {})
         options[:name] ||= id.to_s.titleize
         options[:id] = id

data/motion-prime/sections/table.rb

@@ -58,6 +58,13 @@ module MotionPrime
       @preloader_queue[-1] = :cancelled if @preloader_queue.present?
     end
 
+    def add_cells(cells)
+      prepare_table_cells(cells)
+      @data ||= []
+      @data += cells
+      reload_table_data
+    end
+
     def reload_cell(section)
       section.elements.values.each(&:compute_options!)
       section.cached_draw_image = nil
@@ -307,7 +314,7 @@ module MotionPrime
       def load_cell_by_index(index, options = {})
         section = rows_for_section(index.section)[index.row]
         if section.load_section && options[:preload] && !section.container_element && async_data? # perform only if just loaded
-          section.load_container_element(container_element_options_for(index))
+          section.load_container_with_elements(container: container_element_options_for(index))
         end
         section
       end
@@ -387,17 +394,17 @@ module MotionPrime
         @preloader_queue ||= []
         @strong_refs ||= []
 
-        # TODO: do not release parent_objcets unless finished
-        BW::Reactor.schedule(@preloader_queue.count) do |queue_id|
-          @preloader_queue[queue_id] = :in_progress
-          @strong_refs[queue_id] = screen.main_controller.strong_ref
+        # TODO: we do we need to keep screen ref too?
+        queue_id = @preloader_queue.count
+        @strong_refs[queue_id] = [screen.strong_ref, screen.main_controller.strong_ref]
+        @preloader_queue[queue_id] = :in_progress
+        BW::Reactor.schedule(queue_id) do |queue_id|
           result = load_count.times do |offset|
             if @preloader_queue[queue_id] == :cancelled
               @strong_refs[queue_id] = nil
               break
             end
-
-            if screen.retainCount == 1
+            if screen.main_controller.retainCount == 1
               @strong_refs[queue_id] = nil
               @preloader_queue[queue_id] = :dealloc
               break
@@ -423,6 +430,12 @@ module MotionPrime
       end
 
     class << self
+      def inherited(subclass)
+        super
+        subclass.async_data_options = self.async_data_options.try(:clone)
+        subclass.section_header_options = self.section_header_options.try(:clone)
+      end
+
       def async_table_data(options = {})
         self.async_data_options = options
       end