motion-prime 0.3.3 → 0.4.0

data/motion-prime/sections/table.rb

@@ -5,6 +5,7 @@ module MotionPrime
     include HasStyleChainBuilder
     include HasSearchBar
 
+    class_attribute :async_data_options
     attr_accessor :table_element, :did_appear
     before_render :render_table
 
@@ -12,42 +13,30 @@ module MotionPrime
       []
     end
 
-    def data
-      @data ||= table_data.tap { |cells| set_cells_table(cells) }
-    end
-
-    def set_cells_table(cells)
-      cells.each { |cell| cell.table = self if cell.respond_to?(:table=) }
+    def async_data?
+      self.class.async_data_options
     end
 
-    def data_stamp_for(id)
-      @data_stamp[id]
+    def data
+      @data || set_table_data
     end
 
-    def set_data_stamp(cell_ids)
-      @data_stamp ||= {}
-      [*cell_ids].each { |id| @data_stamp[id] = Time.now.to_f }
+    def reload_data
+      reset_data
+      @async_loaded_data = table_data if async_data?
+      table_view.reloadData
     end
 
-    def reset_data_stamps
-      keys = data.each_with_index.map do |row, id|
-        if row.is_a?(Array)
-          section = id
-          rows = (0...row.count)
-        else
-          section = 0
-          rows = [id]
-        end
-        rows.map { |row| "#{section}_#{row}" }
-      end.flatten
-      set_data_stamp(keys)
+    def refresh_if_needed
+      table_view.reloadData if @data.nil?
     end
 
-    def reload_data
+    def reset_data
       @did_appear = false
       @data = nil
-      reset_data_stamps
-      table_view.reloadData
+      @async_loaded_data = nil
+      @next_portion_starts_from = nil
+      @data_stamp = nil
     end
 
     def table_styles
@@ -88,7 +77,7 @@ module MotionPrime
       if cell.is_a?(BaseFieldSection)
         # form cell: _<type>_<field_name> = `_field_email`
         suffixes << :"#{type}_#{cell.name}" if cell.name
-      elsif cell.respond_to?(:cell_name) # BaseCellSection
+      elsif cell.respond_to?(:cell_name) # cell section came from table
         # table cell: _<table_cell_name> = `_title`
         suffixes << cell.cell_name
       end
@@ -104,13 +93,15 @@ module MotionPrime
     end
 
     def render_table
-      reset_data_stamps
       options = {
         styles: table_styles.values.flatten,
         delegate: self,
         data_source: self,
         style: (UITableViewStyleGrouped unless flat_data?)
       }
+      if async_data? && self.class.async_data_options.has_key?(:estimated_row_height)
+        options[:estimated_row_height] = self.class.async_data_options[:estimated_row_height]
+      end
       self.table_element = screen.table_view(options)
     end
 
@@ -126,60 +117,22 @@ module MotionPrime
       table_view.try(:show)
     end
 
-    def numberOfSectionsInTableView(tableView)
-      number_of_sections
-    end
-
-    def number_of_sections
-      has_many_sections? ? data.count : 1
-    end
-
-    def has_many_sections?
-      data.any? && data.first.is_a?(Array)
-    end
-
-    def row_by_index(index)
-      rows_for_section(index.section)[index.row]
-    end
-
-
     def render_cell(index, table)
       item = row_by_index(index)
-
-      # DrawSection allows as to draw inside the cell view, so we can setup
-      # to use cell view as container
-      if item.is_a?(MotionPrime::DrawSection)
-        item.render(to: screen, as: :cell,
-          styles: cell_styles(item).values.flatten,
-          reuse_identifier: cell_name(table, index)
-        )
-      else
-        screen.table_view_cell section: item, reuse_identifier: cell_name(table, index), parent_view: table_view do
-          item.render(to: screen)
-        end
+      screen.table_view_cell section: item, reuse_identifier: cell_name(table, index), parent_view: table_view, has_drawn_content: true do |container_view, container_element|
+        # DrawSection allows as to draw inside the cell view, so we can setup
+        # to use cell view as container
+        item.container_element = container_element
+        item.render
       end
     end
 
-    def on_click(table, index)
-    end
-
-    def on_appear; end
     def on_row_render(cell, index); end
+    def on_appear; end
+    def on_click(table, index); end
 
-    def cell_name(table, index)
-      record = row_by_index(index)
-      if record && record.model &&
-         record.model.respond_to?(:id) && record.model.id.present?
-        "cell_#{record.model.id}_#{data_stamp_for("#{index.section}_#{index.row}")}"
-      else
-        "cell_#{index.section}_#{index.row}_#{data_stamp_for("#{index.section}_#{index.row}")}"
-      end
-    end
-
-    def cached_cell(index, table = nil)
-      table ||= self.table_view
-      table.dequeueReusableCellWithIdentifier(cell_name(table, index))
-    end
+    # ALIASES
+    # ---------------------
 
     # def tableView(table, viewForFooterInSection: section) # cause bug in ios7.0.0-7.0.2
     #   UIView.new
@@ -188,8 +141,9 @@ module MotionPrime
     #   0.1
     # end
 
-    # ALIASES
-    # ---------------------
+    def numberOfSectionsInTableView(tableView)
+      number_of_sections
+    end
 
     def tableView(table, cellForRowAtIndexPath:index)
       @rendered_cells ||= []
@@ -198,6 +152,8 @@ module MotionPrime
       cell = cached_cell(index, table) || render_cell(index, table).tap do |cell|
         @rendered_cells[index.section][index.row] = cell
         on_row_render(cell, index)
+
+        preload_sections_for(index)
       end
 
       # run table view is appeared callback if needed
@@ -215,16 +171,152 @@ module MotionPrime
       on_click(table, index)
     end
 
-    def tableView(table, heightForRowAtIndexPath:index)
-      rows_for_section(index.section)[index.row].container_height
+    def tableView(table, heightForRowAtIndexPath: index)
+      load_cell_by_index(index)
+      cell = rows_for_section(index.section)[index.row]
+      cell.container_height
+    end
+
+    def number_of_sections
+      has_many_sections? ? data.count : 1
+    end
+
+    def has_many_sections?
+      data.any? && data.first.is_a?(Array)
     end
 
     def flat_data?
-      number_of_sections == 1
+      !has_many_sections?
+    end
+
+    def row_by_index(index)
+      rows_for_section(index.section)[index.row]
     end
 
     def rows_for_section(section)
       flat_data? ? data : data[section]
     end
+
+    def self.async_table_data(options = {})
+      self.async_data_options = options
+    end
+
+    def on_async_data_loaded; end
+    def on_async_data_preloaded(loaded_index); end
+
+    private
+      def set_table_data
+        cells = async_data? ? load_sections_async : table_data
+        prepare_table_cells(cells)
+        @data = cells
+        reset_data_stamps
+        load_sections unless async_data?
+        @data
+      end
+
+      def load_sections_async
+        @async_loaded_data || begin
+          BW::Reactor.schedule_on_main do
+            @async_loaded_data = table_data
+            @data = nil
+            table_view.reloadData
+            on_async_data_loaded
+          end
+          []
+        end
+      end
+
+      def cell_name(table, index)
+        record = row_by_index(index)
+        if record && record.model &&
+           record.model.respond_to?(:id) && record.model.id.present?
+          "cell_#{record.model.id}_#{data_stamp_for("#{index.section}_#{index.row}")}"
+        else
+          "cell_#{index.section}_#{index.row}_#{data_stamp_for("#{index.section}_#{index.row}")}"
+        end
+      end
+
+      def cached_cell(index, table = nil)
+        table ||= self.table_view
+        table.dequeueReusableCellWithIdentifier(cell_name(table, index))
+      end
+
+      def prepare_table_cells(cells)
+        cells.each do |cell|
+          cell.send(:extend, CellSectionMixin)
+          cell.screen = screen
+          cell.table = self if cell.respond_to?(:table=)
+        end
+      end
+
+      def load_cell_by_index(index)
+        cell = rows_for_section(index.section)[index.row]
+        return unless cell.load_section # return if already loaded
+        cell.load_elements
+      end
+
+      def data_stamp_for(id)
+        @data_stamp[id]
+      end
+
+      def set_data_stamp(cell_ids)
+        @data_stamp ||= {}
+        [*cell_ids].each { |id| @data_stamp[id] = Time.now.to_f }
+      end
+
+      def reset_data_stamps
+        keys = @data.each_with_index.map do |row, id|
+          if row.is_a?(Array)
+            section = id
+            rows = (0...row.count)
+          else
+            section = 0
+            rows = [id]
+          end
+          rows.map { |row| "#{section}_#{row}" }
+        end.flatten
+        set_data_stamp(keys)
+      end
+
+      def load_sections
+        return if async_data?
+        if flat_data?
+          data.each(&:load_section)
+        else
+          data.count.times { |section_data| section_data.each(&:load_section) }
+        end
+      end
+
+      def preload_sections_for(index)
+        return if !async_data? || @next_portion_starts_from == false
+        service = index_service
+
+        load_limit = self.class.async_data_options.try(:[], :preload_rows_count)
+        @next_portion_starts_from ||= index
+        start_preload_when_index_loaded = service.sum_index(@next_portion_starts_from, load_limit ? -load_limit/2 : 0)
+
+        if service.compare_indexes(index, start_preload_when_index_loaded) >= 0
+          section = @next_portion_starts_from.section
+          next_row = @next_portion_starts_from.row
+          left_to_load = rows_for_section(section).count - next_row
+
+          load_count = [left_to_load, load_limit].compact.min
+
+          next_index = @next_portion_starts_from
+          BW::Reactor.schedule do
+            load_count.times do |offset|
+              load_cell_by_index(next_index)
+              next_index = service.sum_index(next_index, 1) unless offset == load_count - 1
+            end
+            on_async_data_preloaded(next_index)
+          end
+
+          @next_portion_starts_from = service.sum_index(@next_portion_starts_from, load_count, false)
+        end
+      end
+
+      def index_service
+        TableDataIndexes.new(@data)
+      end
   end
 end

data/motion-prime/services/table_data_indexes.rb

@@ -0,0 +1,51 @@
+class TableDataIndexes
+  attr_reader :data
+
+  def initialize(data)
+    @data = data
+  end
+
+  def max_index(*indexes)
+    [*indexes].compact.max &method(:compare_indexes)
+  end
+
+  def compare_indexes(a, b)
+    return 0 if a == b
+    a.section > b.section || a.row > b.row ? 1 : -1
+  end
+
+  def sum_index(a, rows, crop_to_edges = true)
+    row = a.row + rows
+    section = a.section
+
+    max_row = count_in_section(a.section) - 1
+    if row < 0 || row > max_row
+      direction = row < 0 ? -1 : 1
+
+      section = a.section + direction
+      edge_row = [[0, row].max, max_row].min
+
+      if section < 0 || section >= sections_count
+        return crop_to_edges ? NSIndexPath.indexPathForRow(edge_row, inSection: a.section) : false
+      end
+
+      start_row = edge_row.zero? ? count_in_section(section) - 1 : 0
+      rows_left = rows - (edge_row - a.row) - direction
+      sum_index(NSIndexPath.indexPathForRow(start_row, inSection: section), rows_left)
+    else
+      NSIndexPath.indexPathForRow(row, inSection: section)
+    end
+  end
+
+  def count_in_section(id)
+    flat_data? ? data.count : data[id].count
+  end
+
+  def sections_count
+    flat_data? ? 1 : data.count
+  end
+
+  def flat_data?
+    !data.first.is_a?(Array)
+  end
+end

data/motion-prime/styles/_mixins.rb

@@ -0,0 +1,8 @@
+motion_require '../views/styles.rb'
+MotionPrime::Styles.define :_mixin do
+  style :multiline,
+    size_to_fit: true,
+    number_of_lines: 0,
+    line_break_mode: :wordwrap,
+    line_spacing: 2
+end

data/motion-prime/support/dm_cell_with_section.rb

@@ -7,6 +7,6 @@ class DMCellWithSection < UITableViewCell
 
   def drawRect(rect)
     super
-    section.draw_in(rect)
+    section.draw_in(rect) if section.respond_to?(:draw_in)
   end
 end

data/motion-prime/support/dm_text_field.rb

@@ -4,7 +4,16 @@
 class DMTextField < UITextField
   include MotionPrime::SupportKeyValueStore
   include MotionPrime::SupportPaddingAttribute
-  attr_accessor :placeholderColor, :placeholderFont, :readonly
+  attr_accessor :placeholderColor, :placeholderFont, :readonly, :placeholderAlignment
+
+
+  def self.default_padding_left
+    5
+  end
+
+  def self.default_padding_right
+    5
+  end
 
   # placeholder position
   def textRectForBounds(bounds)
@@ -20,7 +29,11 @@ class DMTextField < UITextField
     color = self.placeholderColor || :gray.uicolor
     color.setFill
     font = self.placeholderFont || self.font || :system.uifont(16)
-    self.placeholder.drawInRect(rect, withFont: font)
+
+    truncation = :tailtruncation.uilinebreakmode
+    alignment = (placeholderAlignment || :left)
+    alignment = alignment.uitextalignment if alignment.is_a?(Symbol)
+    self.placeholder.drawInRect(rect, withFont: font, lineBreakMode: truncation, alignment: alignment)
   end
 
   def padding_top # to center title label
@@ -30,20 +43,12 @@ class DMTextField < UITextField
     end
   end
 
-  def self.default_padding_left
-    5
-  end
-
-  def self.default_padding_right
-    5
-  end
-
   private
     def calculate_rect_for(bounds)
-      height_diff = self.bounds.size.height - (self.font.pointSize + padding_top*2)
+      height_diff = self.bounds.size.height - (self.font.pointSize + padding_top + padding_bottom)
       bounds = CGRectMake(bounds.origin.x, bounds.origin.y, bounds.size.width, bounds.size.height - height_diff)
       CGRectMake(
         bounds.origin.x + padding_left, bounds.origin.y + padding_top,
-        bounds.size.width - (padding_left + padding_right), bounds.size.height - padding_top*2)
+        bounds.size.width - (padding_left + padding_right), bounds.size.height - (padding_top + padding_bottom))
     end
 end

data/motion-prime/support/dm_text_view.rb

@@ -3,40 +3,27 @@
 # * support placeholder, placeholder_color, placeholder_font options
 class DMTextView < UITextView
   include MotionPrime::SupportKeyValueStore
-  DEFAULT_PADDING_LEFT = 7
+  include MotionPrime::SupportPaddingAttribute
+  attr_accessor :placeholderColor, :placeholderFont, :placeholder
 
-  attr_accessor :paddingLeft, :paddingTop, :padding,
-    :placeholderColor, :placeholderFont, :placeholder
+  def self.default_padding_left
+    5
+  end
 
-  def padding_top
-    paddingTop || padding || paddingLeft || 5
+  def self.default_padding_right
+    5
   end
 
   def drawPadding(rect)
     # add padding to UITextView
-    padding_left = (self.paddingLeft || self.padding || 5) - 5
-    padding_top = self.padding_top - 8
-    padding = UIEdgeInsetsMake(
-      padding_top, padding_left,
-      padding_top, padding_left
-    )
-    self.contentInset = padding
-
-    # must change frame before bounds because the text wrap is reformatted based on frame,
-    # don't include the top and bottom insets
-    insetFrame = UIEdgeInsetsInsetRect(frame, UIEdgeInsetsMake(0, padding.left, 0, padding.right))
-    # offset frame back to original x
-    offsetX = frame.origin.x - (insetFrame.origin.x - ( padding.left + padding.right ) / 2)
-    insetFrame = CGRectApplyAffineTransform(insetFrame, CGAffineTransformMakeTranslation(offsetX, 0))
-    self.frame = insetFrame
-    self.bounds = UIEdgeInsetsInsetRect(self.bounds, UIEdgeInsetsMake(0, -padding.left, 0, -padding.right))
+    self.textContainer.lineFragmentPadding = 0 # left/right
+    self.textContainerInset = self.padding_insets
   end
 
   def drawPlaceholder(rect)
-    padding_left = self.paddingLeft || self.padding || 5
     padding = UIEdgeInsetsMake(
       padding_top, padding_left,
-      padding_top, padding_left
+      padding_bottom, padding_right
     )
     if self.placeholder && self.text.blank?
       color = self.placeholderColor || :gray.uicolor

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.3.3"
+  VERSION = "0.4.0"
 end

data/motion-prime/views/layout.rb

@@ -1,4 +1,5 @@
 # TODO: make it part of Sections
+motion_require '../support/dm_cell_with_section'
 module MotionPrime
   module Layout
     def add_view(klass, options = {}, &block)
@@ -38,13 +39,14 @@ module MotionPrime
         [::UIActionSheet, ::UIActivityIndicatorView, ::UIButton, ::UIDatePicker, ::UIImageView, ::UILabel,
           ::UIPageControl, ::UIPickerView, ::UIProgressView, ::UIScrollView, ::UISearchBar, ::UISegmentedControl,
           ::UISlider, ::UIStepper, ::UISwitch, ::UITabBar, ::UITableView, ::UITableViewCell, ::UITextField, ::UITextView,
-          ::UIToolbar, ::UIWebView, ::UINavigationBar].each do |klass|
+          ::UIToolbar, ::UIWebView, ::UINavigationBar, ::DMCellWithSection].each do |klass|
 
           shorthand = "#{klass}"[2..-1].underscore.to_sym
 
           define_method(shorthand) do |options, &block|
+            options[:screen] = self
             element = MotionPrime::BaseElement.factory(shorthand, options)
-            element.render(to: self, &block)
+            element.render({}, &block)
             element
           end
         end

data/motion-prime/views/styles.rb

@@ -22,11 +22,13 @@ module MotionPrime
         parent = options.delete(:parent)
         namespace = options.delete(:parent_namspace) || @namespace
         parent ="#{namespace}_#{parent}".to_sym if namespace
+        mixins = Array.wrap(options.delete(:mixins)).map { |mixin_name| :"_mixin_#{mixin_name}" }
 
         names.each do |name|
           name = "#{@namespace}_#{name}".to_sym if @namespace
           @@repo[name] ||= {}
           @@repo[name].deep_merge!(self.class.for(parent)) if parent
+          @@repo[name].deep_merge!(self.class.for(mixins)) if mixins.present?
           @@repo[name].deep_merge! options
         end
       end

data/motion-prime/views/view_builder.rb

@@ -32,10 +32,12 @@ module MotionPrime
         {
           'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
           'UILabel' => Proc.new {|klass, options|
-            if options[:line_spacing]
+            if options.slice(:line_spacing, :underline, :fragment_color).any?
               options[:attributed_text_options] = {
                 text: options.delete(:text),
-                line_spacing: options.delete(:line_spacing)
+                line_spacing: options.delete(:line_spacing),
+                fragment_color: options.delete(:fragment_color),
+                underline: options.delete(:underline)
               }
               [:text_alignment].each do |key|# add keys which must follow after attributed text here
                 value = options.delete(key)
@@ -101,6 +103,10 @@ module MotionPrime
           },
           'UITableViewCell' => Proc.new{|klass, options|
             style = options.delete(:style) || UITableViewCellStyleDefault
+            if options[:has_drawn_content]
+              options[:background_color] = :clear
+              options.delete(:gradient)
+            end
             klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
           },
           'UISearchBar' => Proc.new{|klass, options|

data/motion-prime/views/view_styler.rb

@@ -42,11 +42,11 @@ module MotionPrime
     def setValue(value, forUndefinedKey: key)
       # return if value.nil?
       # ignore options
-      return if options[:section].is_a?(DrawSection) && %w[gradient].include?(key.to_s)
+      return if key == 'section' && !view.respond_to?(:section=)
       return if key == 'size_to_fit' && view.is_a?(UILabel)
       return if (key == 'url' || key == 'default') && view.is_a?(UIImageView)
       return if %w[
-        styles
+        styles has_drawn_content
         width height top right bottom left value_type
         max_width max_outer_width min_width min_outer_width
         max_height max_outer_height min_height min_outer_width
@@ -123,6 +123,10 @@ module MotionPrime
           attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
           attributedString.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
         end
+        if fragment_color = value[:fragment_color]
+          attributedString = NSMutableAttributedString.alloc.initWithAttributedString(attributedString)
+          attributedString.addAttributes({NSForegroundColorAttributeName => fragment_color[:color].uicolor}, range: fragment_color[:range])
+        end
         if view.is_a?(UIButton)
           view.setAttributedTitle attributedString, forState: UIControlStateNormal
         else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.0
 platform: ruby
 authors:
 - Iskander Haziev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2013-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -225,7 +225,7 @@ files:
 - motion-prime/core_ext/kernel.rb
 - motion-prime/elements/_content_padding_mixin.rb
 - motion-prime/elements/_content_text_mixin.rb
-- motion-prime/elements/base.rb
+- motion-prime/elements/base_element.rb
 - motion-prime/elements/button.rb
 - motion-prime/elements/draw.rb
 - motion-prime/elements/draw/_draw_background_mixin.rb
@@ -237,9 +237,9 @@ files:
 - motion-prime/elements/image.rb
 - motion-prime/elements/label.rb
 - motion-prime/elements/map.rb
+- motion-prime/elements/table_view_cell.rb
 - motion-prime/elements/text_field.rb
 - motion-prime/elements/text_view.rb
-- motion-prime/helpers/cell_section.rb
 - motion-prime/helpers/has_authorization.rb
 - motion-prime/helpers/has_normalizer.rb
 - motion-prime/helpers/has_search_bar.rb
@@ -267,8 +267,8 @@ files:
 - motion-prime/screens/extensions/_navigation_bar_mixin.rb
 - motion-prime/screens/sidebar_container_screen.rb
 - motion-prime/sections/_cell_section_mixin.rb
-- motion-prime/sections/base.rb
-- motion-prime/sections/draw.rb
+- motion-prime/sections/_draw_mixin.rb
+- motion-prime/sections/base_section.rb
 - motion-prime/sections/form.rb
 - motion-prime/sections/form/base_field_section.rb
 - motion-prime/sections/form/base_header_section.rb
@@ -279,12 +279,11 @@ files:
 - motion-prime/sections/form/submit_field_section.rb
 - motion-prime/sections/form/switch_field_section.rb
 - motion-prime/sections/form/text_field_section.rb
-- motion-prime/sections/form/text_with_button_field_section.rb
 - motion-prime/sections/tabbed.rb
 - motion-prime/sections/table.rb
-- motion-prime/sections/table/base_cell_section.rb
-- motion-prime/sections/table/draw_cell_section.rb
 - motion-prime/sections/table/refresh_mixin.rb
+- motion-prime/services/table_data_indexes.rb
+- motion-prime/styles/_mixins.rb
 - motion-prime/styles/base.rb
 - motion-prime/styles/form.rb
 - motion-prime/support/_key_value_store.rb

data/motion-prime/helpers/cell_section.rb

@@ -1,9 +0,0 @@
-module MotionPrime
-  module CellSection
-    attr_accessor :cell_view
-
-    def cell
-      cell_view
-    end
-  end
-end