motion-prime 0.3.2 → 0.3.3

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

@@ -1,66 +1,85 @@
 motion_require '../draw.rb'
 module MotionPrime
   class LabelDrawElement < DrawElement
-    include MotionPrime::ElementTextDimensionsMixin
-    include MotionPrime::ElementContentPaddingMixin
+    include ElementContentTextMixin
+    include DrawBackgroundMixin
+
+    def default_padding_for(side)
+      return super unless side.to_s == 'top'
+      @padding_top || 0
+    end
 
     def draw_in(rect)
+      return if computed_options[:hidden]
+      size_to_fit_if_needed or set_text_position
       options = computed_options
-      return if options[:hidden]
 
-      size_to_fit_if_needed
+      # render background and border
+      background_rect = CGRectMake(computed_left, computed_top, computed_outer_width, computed_outer_height)
+      draw_background_in(background_rect, options)
 
-      # render background
-      bg_color = options[:background_color]
-      if bg_color
-        rect = CGRectMake(
-          computed_left, computed_top, computed_width, computed_height
-        )
+      # render text
+      color = (options[:text_color] || :black).uicolor
+      font = (options[:font] || :system).uifont
+      alignment = (options.has_key?(:text_alignment) ? options[:text_alignment] : :left).uitextalignment
+      line_break_mode = (options.has_key?(:line_break_mode) ? options[:line_break_mode] : :wordwrap).uilinebreakmode
+      label_text = options[:text].to_s
 
-        if computed_options[:layer] && radius = options[:layer][:corner_radius]
-          bezierPath = UIBezierPath.bezierPathWithRoundedRect rect, cornerRadius: radius
-          context = UIGraphicsGetCurrentContext()
-          CGContextSetStrokeColorWithColor(context, bg_color.uicolor.cgcolor)
-          CGContextSetFillColorWithColor(context, bg_color.uicolor.cgcolor)
-          bezierPath.stroke
-          bezierPath.fill
-        else
-          bg_color.uicolor.setFill
-          UIRectFill(rect)
-        end
+      top_left_corner = CGPointMake(computed_inner_left, computed_inner_top)
+      if options[:number_of_lines].to_i.zero?
+        rect = CGRectMake(*top_left_corner.to_a, computed_width, computed_height)
       end
 
-      # render text
-      color = options[:text_color] || :black
-      color.uicolor.set
-      font = options[:font] || :system
-      if options[:number_of_lines] != 0
-        options[:text].to_s.drawAtPoint(
-          CGPointMake(computed_inner_left, computed_inner_top),
-          withFont: font.uifont
-        )
+      if options[:line_spacing] || options[:underline]
+        # attributed string
+        paragrahStyle = NSMutableParagraphStyle.alloc.init
+
+        paragrahStyle.setLineSpacing(options[:line_spacing]) if options[:line_spacing]
+        paragrahStyle.setAlignment(alignment)
+        paragrahStyle.setLineBreakMode(line_break_mode)
+        attributes = {}
+        attributes[NSParagraphStyleAttributeName] = paragrahStyle
+        attributes[NSForegroundColorAttributeName] = color
+        attributes[NSFontAttributeName] = font
+
+        label_text = NSMutableAttributedString.alloc.initWithString(label_text, attributes: attributes)
+        if underline_range = options[:underline]
+          # FIXME
+          # label_text = NSMutableAttributedString.alloc.initWithAttributedString(label_text)
+          # label_text.addAttributes({NSUnderlineStyleAttributeName => NSUnderlineStyleSingle}, range: underline_range)
+        end
+
+        rect ? label_text.drawInRect(rect) : label_text.drawAtPoint(top_left_corner)
       else
-        rect = CGRectMake(
-          computed_inner_left, computed_inner_top,
-          computed_width, computed_height
-        )
-        line_break = options.has_key?(:line_break_mode) ? options[:line_break_mode] : :wordwrap
-        alignment = options.has_key?(:text_alignment) ? options[:text_alignment] : :left
-        options[:text].to_s.drawInRect(
-          rect, withFont: font.uifont,
-          lineBreakMode: line_break.uilinebreakmode,
-          alignment: alignment.uitextalignment
-        )
+        # regular string
+        color.set
+        if rect
+          label_text.drawInRect(rect,
+            withFont: font,
+            lineBreakMode: line_break_mode,
+            alignment: alignment)
+        else
+          label_text.drawAtPoint(top_left_corner, withFont: font)
+        end
       end
     end
 
     def size_to_fit_if_needed
       if computed_options[:size_to_fit]
-        @computed_options[:width] = content_outer_width
+        @computed_options[:width] ||= content_outer_width
         if computed_options[:width]
           @computed_options[:height] = content_outer_height
         end
         reset_computed_values
+        true
+      end
+    end
+
+    def set_text_position
+      if computed_options.slice(:padding_top, :padding_bottom, :padding).none?
+        computed_options[:width] ||= computed_width
+        @padding_top = (computed_outer_height - content_height)/2
+        # @padding_top += 1 unless @padding_top.zero?
       end
     end
   end

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

@@ -0,0 +1,14 @@
+motion_require '../draw.rb'
+module MotionPrime
+  class ViewDrawElement < DrawElement
+    include DrawBackgroundMixin
+
+    def draw_in(rect)
+      return if computed_options[:hidden]
+      options = computed_options
+
+      background_rect = CGRectMake(computed_left, computed_top, computed_outer_width, computed_outer_height)
+      draw_background_in(background_rect, options)
+    end
+  end
+end

data/motion-prime/elements/error_message.rb

@@ -2,7 +2,7 @@ motion_require './label'
 module MotionPrime
   class ErrorMessageElement < LabelElement
     include MotionPrime::ElementContentPaddingMixin
-    include MotionPrime::ElementTextDimensionsMixin
+    include MotionPrime::ElementContentTextMixin
 
     def view_class
       "MPLabel"

data/motion-prime/elements/label.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   class LabelElement < BaseElement
     include MotionPrime::ElementContentPaddingMixin
-    include MotionPrime::ElementTextDimensionsMixin
+    include MotionPrime::ElementContentTextMixin
 
     before_render :size_to_fit_if_needed
     after_render :size_to_fit

data/motion-prime/elements/text_field.rb

@@ -1,8 +1,8 @@
 module MotionPrime
   class TextFieldElement < BaseElement
     include MotionPrime::ElementContentPaddingMixin
-    include MotionPrime::ElementFieldDimensionsMixin
-    
+    include MotionPrime::ElementContentTextMixin
+
     def view_class
       "DMTextField"
     end

data/motion-prime/elements/text_view.rb

@@ -1,5 +1,8 @@
 module MotionPrime
   class TextViewElement < BaseElement
+    include MotionPrime::ElementContentPaddingMixin
+    include MotionPrime::ElementContentTextMixin
+    
     def view_class
       "DMTextView"
     end

data/motion-prime/helpers/has_style_chain_builder.rb

@@ -1,7 +1,7 @@
 module MotionPrime
   module HasStyleChainBuilder
     def build_styles_chain(base_styles, suffixes)
-      [*base_styles].uniq.compact.map { |base_style| [*suffixes].uniq.compact.map { |suffix| [base_style, suffix].join('_').to_sym } }.flatten
+      [*base_styles].compact.map(&:to_s).uniq.map { |base_style| [*suffixes].compact.map(&:to_s).uniq.map { |suffix| [base_style, suffix].join('_').to_sym } }.flatten
     end
   end
 end

data/motion-prime/helpers/has_styles.rb

@@ -0,0 +1,28 @@
+module MotionPrime
+  module HasStyles
+    def prepare_gradient(options)
+      colors = options[:colors].map(&:uicolor).map(&:cgcolor)
+      locations = options[:locations] if options[:locations]
+
+      if self.is_a?(DrawSection)
+        color_space = CGColorSpaceCreateDeviceRGB()
+        locations_pointer = Pointer.new(:float, 2)
+        locations.each_with_index { |loc, id| locations_pointer[id] = loc }
+        gradient = CGGradientCreateWithColors(color_space, colors, locations_pointer)
+        # CGColorSpaceRelease(color_space)
+      else
+        gradient = CAGradientLayer.layer
+
+        gradient.frame = if options[:frame_width]
+          CGRectMake(options[:frame_x].to_f, options[:frame_y].to_f, options[:frame_width].to_f, options[:frame_height].to_f)
+        else
+          options[:parent_frame] || CGRectZero
+        end
+
+        gradient.colors = colors
+        gradient.locations = locations
+      end
+      gradient
+    end
+  end
+end

data/motion-prime/models/bag.rb

@@ -50,7 +50,7 @@ module MotionPrime
         object.map { |entity| prepare_for_store(entity) }.compact
       else
         object.bag_key = self.key
-        if object.id.present? && self.store && self.find(id: object.id).any?
+        if object.id.present? && self.store && self.find(id: object.id, bag_key: self.key).any?
           raise StoreError, "duplicated item added `#{object.class_name_without_kvo}` with `id` = #{object.id}"
         end
         object

data/motion-prime/models/sync.rb

@@ -38,6 +38,9 @@ module MotionPrime
         should_fetch
       end
 
+      should_fetch = persisted? if should_fetch.nil?
+      should_update ||= new_record? unless should_fetch
+
       method = sync_options[:method]
       method ||= if should_update
         persisted? ? :put : :post
@@ -51,9 +54,6 @@ module MotionPrime
         should_update = false
       end
 
-      should_fetch = !new_record? if should_fetch.nil?
-      should_update ||= new_record? unless should_fetch
-
       fetch_with_url url do |data, status_code|
         save if sync_options[:save]
         block.call(data, status_code) if use_callback
@@ -155,7 +155,7 @@ module MotionPrime
       use_callback = block_given?
       puts "SYNC: started sync for #{key} in #{self.class_name_without_kvo}"
       api_client.get normalize_sync_url(options[:sync_url]) do |response, status_code|
-        data = options.has_key?(:sync_key) ? response[options[:sync_key]] : response
+        data = options[:sync_key] && response ? response[options[:sync_key]] : response
         if data
           # Update/Create existing records
           data.each do |attributes|

data/motion-prime/screens/_base_mixin.rb

@@ -10,7 +10,7 @@ module MotionPrime
     include MotionPrime::ScreenOrientationsMixin
     include MotionPrime::ScreenNavigationMixin
 
-    attr_accessor :parent_screen, :modal, :params, :main_section, :options
+    attr_accessor :parent_screen, :modal, :params, :main_section, :options, :tab_bar
     class_attribute :current_screen
 
     included do

data/motion-prime/screens/extensions/_navigation_bar_mixin.rb

@@ -32,6 +32,13 @@ module MotionPrime
       end
     end
 
+    def set_navigation_right_image(args = {})
+      url = args.delete(:url)
+      view = add_view(UIImageView, args)
+      view.setImageWithURL NSURL.URLWithString(url), placeholderImage: nil
+      navigationItem.rightBarButtonItem = UIBarButtonItem.alloc.initWithCustomView(view)
+    end
+
     def create_navigation_button(title, args = {})
       args[:style]  ||= UIBarButtonItemStylePlain
       args[:target] ||= self

data/motion-prime/screens/sidebar_container_screen.rb

@@ -39,7 +39,7 @@ module MotionPrime
 
     def content_controller=(c)
       controller = prepare_controller(c)
-      if content_controller.nil?
+      if should_reinit_content?(controller)
         self.setContentViewController controller
       else
         content_controller.viewControllers = [controller]
@@ -57,9 +57,15 @@ module MotionPrime
 
     private
 
+      def should_reinit_content?(new_controller)
+        content_controller.nil? || 
+        content_controller.is_a?(TabBarController) ||
+        new_controller.is_a?(TabBarController)
+      end
+
       def prepare_controller(controller)
         controller = setup_screen_for_open(controller, {})
-        if content_controller.nil?
+        if should_reinit_content?(controller)
           controller.wrap_in_navigation if controller.respond_to?(:wrap_in_navigation)
           controller.send(:on_screen_load) if controller.respond_to?(:on_screen_load)
           controller = controller.main_controller if controller.respond_to?(:main_controller)

data/motion-prime/sections/_cell_section_mixin.rb

@@ -0,0 +1,25 @@
+module MotionPrime
+  module CellSectionMixin
+    attr_writer :table
+
+    def table
+      @table ||= options[:table]
+    end
+
+    def section_styles
+      @section_styles ||= table.try(:cell_styles, self) || {}
+    end
+
+    def cell_type
+      @cell_type ||= begin
+        self.is_a?(BaseFieldSection) ? :field : :cell
+      end
+    end
+
+    def cell_name
+      return name unless table
+      table_name = table.name.gsub('_table', '')
+      name.gsub("#{table_name}_", '')
+    end
+  end
+end

data/motion-prime/sections/base.rb

@@ -23,6 +23,7 @@ module MotionPrime
     define_callbacks :render
 
     def initialize(options = {})
+      super
       @options = options
       @model = options[:model]
       @name = options[:name] ||= default_name
@@ -39,17 +40,25 @@ module MotionPrime
     end
 
     def container_options
-      @normalized_container_options or begin
-        # priority: class; from styles; passed directly
-        raw_container_options = self.class.container_options.try(:clone) || {}
-        passed_container_options = options.delete(:container) || {}
-        raw_container_options.merge!(passed_container_options)
-        @normalized_container_options = normalize_options(raw_container_options)
-        style_container_options = style_options.delete(:container) || {}
-        @normalized_container_options.merge!(style_container_options.except(*passed_container_options.keys))
+      @container_options ||= (style_options.delete(:container) || {}).merge(base_container_options)
+    end
+
+    def base_container_options
+      @base_container_options ||= begin
+        container_options = self.class.container_options.try(:clone) || {}
+        container_options.merge!(options.delete(:container) || {})
+        normalize_options(container_options)
       end
     end
 
+    def container_height
+      container_options[:height] || DEFAULT_CONTENT_HEIGHT
+    end
+
+    def container_styles
+      base_container_options[:styles]
+    end
+
     def default_name
       self.class_name_without_kvo.demodulize.underscore.gsub(/\_section$/, '')
     end
@@ -142,14 +151,6 @@ module MotionPrime
       end
     end
 
-    def container_height
-      container_options[:height] || DEFAULT_CONTENT_HEIGHT
-    end
-
-    def container_styles
-      container_options[:styles]
-    end
-
     def on_keyboard_show; end
     def on_keyboard_hide; end
     def keyboard_will_show; end

data/motion-prime/sections/draw.rb

@@ -10,6 +10,7 @@ module MotionPrime
     #   element :avatar, type: :image, image: 'defaults/avatar.jpg'
     # end
     #
+    include HasStyles
 
     attr_accessor :container_view
 
@@ -25,19 +26,21 @@ module MotionPrime
     end
 
     def render!
+      options = view_style_options
+      options.merge!(section: WeakRef.new(self), background_color: :clear)
+
       if container_options[:as].to_s == 'cell'
-        @container_view = screen.add_view DMCellWithSection, {
-          section: self, styles: container_options[:styles],
-          reuse_identifier: container_options[:reuse_identifier]
-        }
+        @container_view = screen.add_view DMCellWithSection, options.merge({
+          reuse_identifier: container_options[:reuse_identifier],
+          parent_view: (table if respond_to?(:table))
+        })
       else
-        @container_view = screen.add_view DMViewWithSection, {
-          section: self, styles: container_options[:styles],
-          width: container_options[:width] || 320,
+        @container_view = screen.add_view DMViewWithSection, options.merge({
+          width: container_options[:width] || 320, # TODO: remove these options (use styles)
           height: container_options[:height] || 100,
           top: container_options[:top] || 0,
           left: container_options[:left] || 0
-        }
+        })
       end
     end
 
@@ -61,9 +64,28 @@ module MotionPrime
       end
     end
 
+    def view_style_options
+      @view_style_options ||= begin
+        options = Styles.for(container_options[:styles])
+        normalize_options(options)
+        options
+      end
+    end
+
     def draw_background(rect)
-      if container_options[:background_color]
-        container_options[:background_color].uicolor.setFill
+      if gradient_options = view_style_options[:gradient]
+        start_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMinY(rect))
+        end_point = CGPointMake(CGRectGetMidX(rect), CGRectGetMaxY(rect))
+
+        context = UIGraphicsGetCurrentContext()
+        # CGContextSaveGState(context)
+        CGContextAddRect(context, rect)
+        CGContextClip(context)
+        gradient = prepare_gradient(gradient_options)
+        CGContextDrawLinearGradient(context, gradient, start_point, end_point, 0)
+        # CGContextRestoreGState(context)
+      elsif background_color = (container_options[:background_color] || view_style_options[:background_color])
+        background_color.uicolor.setFill
         UIRectFill(rect)
       end
     end