motion-prime 0.8.4 → 0.8.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmViYTYyYjYzMjkwMGEzMzVkZWQ4ZGVmOGM3NjBmYzQ0YWViZTJmNA==
+    MzczMDQyODkxMTkxZTg5MTY4MjhlYTlkN2NkNmMzNjBiZTI4MTM2Mw==
   data.tar.gz: !binary |-
-    MDJlN2YxOGJhMWIwZTU2MjVmNmQ1NzM4YjQ5MWY0ZDFmYzZhZWE1Nw==
+    Y2IxMjIyNGI0MGM3Y2M4MWM3NWMzMjMxYTY3NjE1OWUwOTM0MzA0NQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjljMjBmZDg2MDI1NTYxYTliMzgxZGE4MDQyNDViMmE4OTMxYThlMjJiM2Jk
-    YWNkYmQwODA5MzVmODk4OWE5YjVkNTUwYTEyNGJiMThhODgwYjMyNzUzZmRl
-    NzA0MDUzNzhiZTYwOTkwYjI1NDMyNGJlNTZmMjVmZTkwNzkyZDI=
+    ZDZjNmZiZjNiM2IyYTYxZGJjOWNlZTYzM2JiZGJiZWE2YTIxYmRhODE1NDli
+    ZmFiNTMxNmYzZWE3ZGM2YWQyMTg2ZWEwNTFhYmE4N2VkZTRjZTNjMjUzZmJi
+    NGEzZjQ5OTY0YjE4Y2JjOWJjOGM4NzMxYzc0MTNjMTNlYTUwNjM=
   data.tar.gz: !binary |-
-    YTEwNWUzNWZjMWNlMzQwN2JjZTdlYWViODBlZWU5MWMwNzY4ZDFhNThhODkw
-    NjRlZGViMTJmMWIyMmE4ODA2MTg5MmFhYmY2ZjlkYmM1NGJiMjcwZjA4OWY0
-    MGRmMjg5MjE4YTZiZDc2YzNhZjQ1MjU4ODhmYTFmNzIyOGE0ZmI=
+    YWQ4ZmVmMzM0ZDc5YWQxYzM1YWM2ODM5MDRlMDcwZDE0MjhiNDViZmIzYjI1
+    MjYzNTc2ZTIzMWIwMTNkMjJiNDIzODM2MTJlYjM1ZWVlNGFkNGE2MGYyYzg4
+    ZDU0YWNhNzMyZmYzNjRjY2U4NDBkNGJhZjU4MmVhYWYxM2FjZTE=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+=== 0.8.5
+* Table header improvements.
+* Fix bug: header section draw elements doesn't work
+
 === 0.8.3 - 0.8.4
 * Ability to pass UIButton to set_navigation_left_button/set_navigation_right_button
 * Bug fixes

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    motion-prime (0.8.4)
+    motion-prime (0.8.5)
       afmotion (~> 2.0.0)
       bubble-wrap (~> 1.4.0)
       cocoapods

data/ROADMAP.md

@@ -1,8 +1,8 @@
-=== 0.8.2
+=== 0.9.0
 * Move api_client and model sync mixin to prime_api gem.
 * Move bind keyboard events to forms.
 
-=== 0.9.0
+=== 0.1.0
 * bug: if mp label do not have text and was set as hidden, it should unhide after setting text
 * bug: size_to_fit works incorrect with relative width.
 * bug: bind_keyboard_close breaks bind_guesture
@@ -15,10 +15,10 @@
 * add different templates. some templates should be more like final app.
 * add size_to_fit support for images.
 
-=== 1.0.0
+=== 1.1.0
 * add sections/screens/models generator
 
-=== 1.1.0
+=== 1.2.0
 * add cell preload for reverse scrolling table.
 * add computed_options.get(), this will allow to make sure that options is computed.
 * add testing framework

data/files/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gem 'motion-cocoapods', '~> 1.4.0'
 gem 'motion-support', '~> 0.2.4'
 
-gem 'motion-prime', '0.8.4'
+gem 'motion-prime', '0.8.5'
 
 # add reside menu for sidebar support
 gem 'prime_reside_menu', '~> 0.1.4'

data/motion-prime/elements/table_header.rb

@@ -0,0 +1,7 @@
+module MotionPrime
+  class TableHeaderElement < BaseElement
+    def view_class
+      "MPTableHeaderWithSectionView"
+    end
+  end
+end

data/motion-prime/sections/base_section.rb

@@ -331,7 +331,7 @@ module MotionPrime
       def build_element(options = {})
         type = options.delete(:type)
         render_as = options.delete(:as).to_s
-        if render_as != 'draw' && (render_as == 'view' || self.is_a?(BaseFieldSection) || self.is_a?(BaseHeaderSection))
+        if render_as != 'draw' && (render_as == 'view' || self.is_a?(BaseFieldSection) || self.is_a?(FormHeaderSection))
           BaseElement.factory(type, options)
         else
           DrawElement.factory(type, options) || BaseElement.factory(type, options)

data/motion-prime/sections/form.rb

@@ -247,7 +247,7 @@ module MotionPrime
       end
 
       def init_form_headers
-        options = Array.wrap(self.class.group_header_options).clone
+        options = Array.wrap(self.class.group_header_options).map(&:clone)
         options.compact.each { |opts| normalize_options(opts) }
         self.group_header_options = options.delete_if.each_with_index { |opts, id| grouped_data[id].nil? }
       end

data/motion-prime/sections/form/{base_header_section.rb → form_header_section.rb}

@@ -1,17 +1,11 @@
+motion_require '../header.rb'
 module MotionPrime
-  class BaseHeaderSection < Section
-    include CellSectionMixin
+  class FormHeaderSection < HeaderSection
     DEFAULT_HEADER_HEIGHT = 20
 
     element :title, text: proc { @options[:title] }
     element :hint, text: proc { @options[:hint] }
 
-    before_initialize :prepare_header_options
-
-    def prepare_header_options
-      @cell_type = :header
-    end
-
     def render_element?(name)
       @options[name].present?
     end

data/motion-prime/sections/header.rb

@@ -0,0 +1,11 @@
+module MotionPrime
+  class HeaderSection < Section
+    include Prime::CellSectionMixin
+
+    before_initialize :prepare_header_options
+
+    def prepare_header_options
+      @cell_type = :header
+    end
+  end
+end

data/motion-prime/sections/table.rb

@@ -100,10 +100,10 @@ module MotionPrime
     def delete_cell_sections(sections)
       paths = []
       Array.wrap(sections).each do |section|
-        index = @data.try(:index, section)
+        index = index_for_cell_section(section)
         next Prime.logger.debug("Delete cell section: `#{section.name}` is not in the list") unless index
-        paths << NSIndexPath.indexPathForRow(index, inSection: 0)
-        delete_from_data(section)
+        paths << index
+        delete_from_data(index)
       end
       if paths.any?
         table_view.beginUpdates
@@ -113,13 +113,37 @@ module MotionPrime
       paths
     end
 
-    def delete_from_data(section)
-      # section will not deallocate if you'll just write @data.delete(section)
-      unless index = @data.try(:index, section)
-        Prime.logger.debug("Delete cell section from @data: `#{section.name}` is not in the list") and return
+    # Delete section from data at index
+    # 
+    # @param index [NSIndexPath] index of cell which will be removed from table data.
+    def delete_from_data(index)
+      if flat_data?
+        delete_from_flat_data(index)
+      else
+        delete_from_groped_data(index)
+      end
+    end
+
+    def delete_from_flat_data(index)
+      @data[index.row] = nil
+      @data.delete_at(index.row)
+    end
+
+    def delete_from_groped_data(index)
+      @data[index.section][index.row] = nil
+      @data[index.section].delete_at(index.row)
+    end
+
+    def index_for_cell_section(section)
+      if flat_data?
+        row = @data.try(:index, section)
+        NSIndexPath.indexPathForRow(row, inSection: 0)
+      else
+        (@data || []).each_with_index do |cell_sections, group|
+          row = cell_sections.index(section)
+          return NSIndexPath.indexPathForRow(row, inSection: group) if row
+        end
       end
-      @data[index] = nil
-      @data.delete_at(index)
     end
 
     def reload_cell_section(section)
@@ -225,14 +249,14 @@ module MotionPrime
       view
     end
 
-    def render_header(section)
-      return unless options = self.group_header_options.try(:[], section)
-      self.group_header_sections[section] ||= BaseHeaderSection.new(options.merge(screen: screen, table: self.weak_ref))
+    def render_header(group)
+      return unless options = self.group_header_options.try(:[], group)
+      self.group_header_sections[group] ||= FormHeaderSection.new(options.merge(screen: screen, table: self.weak_ref))
     end
 
-    def header_section_for_group(section)
+    def header_section_for_group(group)
       self.group_header_sections ||= []
-      self.group_header_sections[section] || render_header(section)
+      self.group_header_sections[group] || render_header(group)
     end
 
     def on_cell_render(cell, index); end
@@ -285,12 +309,18 @@ module MotionPrime
     def header_cell_in_group(table, group)
       return unless header = header_section_for_group(group)
 
-      reuse_identifier = "header_#{group}"
+      reuse_identifier = "header_#{group}_#{@header_stamp}"
       cached = table.dequeueReusableHeaderFooterViewWithIdentifier(reuse_identifier)
       return cached if cached.present?
 
       styles = cell_section_styles(header).values.flatten
-      wrapper = MotionPrime::BaseElement.factory(:table_view_header_footer_view, screen: screen, styles: styles, parent_view: table_view, reuse_identifier: reuse_identifier)
+      wrapper = MotionPrime::BaseElement.factory(:table_header, 
+        screen: screen, 
+        styles: styles, 
+        parent_view: table_view, 
+        reuse_identifier: reuse_identifier,
+        section: header
+      )
       wrapper.render do |container_view, container_element|
         header.container_element = container_element
         header.render
@@ -364,9 +394,14 @@ module MotionPrime
         end
       end
 
+      def set_header_stamp
+        @header_stamp = Time.now.to_i
+      end
+
       def reset_data_stamps
         keys = data.flatten.map(&:object_id)
         set_data_stamp(keys)
+        set_header_stamp
       end
 
       def create_section_elements

data/motion-prime/support/mp_cell_with_section.rb

@@ -4,7 +4,6 @@ class MPCellWithSection < UITableViewCell
 
   def setNeedsDisplay
     content_view.try(:setNeedsDisplay)
-
     super
   end
 

data/motion-prime/support/mp_table_header_with_section.rb

@@ -0,0 +1,23 @@
+class MPTableHeaderWithSectionView < UITableViewHeaderFooterView
+  attr_accessor :section, :selection_style, :content_view
+
+  def setSection(section)
+    @section = section.try(:weak_ref)
+    self.content_view.setSection(@section)
+  end
+
+  def setNeedsDisplay
+    content_view.try(:setNeedsDisplay)
+    super
+  end
+
+  def initialize_content
+    self.content_view = MPTableViewCellContentView.alloc.initWithFrame(self.bounds)
+    self.content_view.setBackgroundColor(:clear.uicolor)
+    self.content_view.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
+    self.content_view.top = 0
+    self.content_view.left = 0
+
+    self.addSubview(content_view)
+  end
+end

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

data/motion-prime/views/_frame_calculator_mixin.rb

@@ -7,6 +7,7 @@ module MotionPrime
       right   = options[:right]
       bottom  = options[:bottom]
       left    = options[:left]
+
       value_type = options[:value_type].to_s # absolute/relative
 
       if options[:height_to_fit].present? && height.nil? && (top.nil? || bottom.nil?)
@@ -72,6 +73,7 @@ module MotionPrime
         frame.origin.y = max_height / 2 - height / 2
       end
       frame.size.height = height
+
       frame
     rescue => e
       Prime.logger.error "can't calculate frame in #{self.class.name}. #{e}"

data/motion-prime/views/view_builder.rb

@@ -94,7 +94,16 @@ module MotionPrime
             end
 
             obj = klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
-            obj.initialize_content
+            obj.initialize_content if obj.respond_to?(:initialize_content)
+            obj
+          },
+          'UITableViewHeaderFooterView' => Proc.new{|klass, options|
+            if options[:has_drawn_content]
+              options[:background_color] = :clear
+              options.delete(:gradient)
+            end
+            obj = klass.alloc.initWithReuseIdentifier options.delete(:reuse_identifier)
+            obj.initialize_content if obj.respond_to?(:initialize_content)
             obj
           },
           'MPViewWithSection' => Proc.new{|klass, options|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-prime
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Iskander Haziev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -265,6 +265,7 @@ files:
 - motion-prime/elements/map.rb
 - motion-prime/elements/progress_hud.rb
 - motion-prime/elements/spinner.rb
+- motion-prime/elements/table_header.rb
 - motion-prime/elements/table_view.rb
 - motion-prime/elements/table_view_cell.rb
 - motion-prime/elements/text_field.rb
@@ -310,9 +311,9 @@ files:
 - 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
 - motion-prime/sections/form/date_field_section.rb
 - motion-prime/sections/form/form_delegate.rb
+- motion-prime/sections/form/form_header_section.rb
 - motion-prime/sections/form/password_field_section.rb
 - motion-prime/sections/form/select_field_section.rb
 - motion-prime/sections/form/static_field_section.rb
@@ -320,6 +321,7 @@ 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/header.rb
 - motion-prime/sections/tabbed.rb
 - motion-prime/sections/table.rb
 - motion-prime/sections/table/refresh_mixin.rb
@@ -337,6 +339,7 @@ files:
 - motion-prime/support/mp_label.rb
 - motion-prime/support/mp_search_bar_custom.rb
 - motion-prime/support/mp_spinner.rb
+- motion-prime/support/mp_table_header_with_section.rb
 - motion-prime/support/mp_table_view.rb
 - motion-prime/support/mp_text_field.rb
 - motion-prime/support/mp_text_view.rb