motion-prime 0.1.7 → 0.2.0

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

@@ -1,11 +1,53 @@
 module MotionPrime
   class BaseFieldSection < BaseSection
+    include BW::KVO
     attr_accessor :form
 
+    after_render :on_section_render
+
     def initialize(options = {})
-      super
       @form = options.delete(:form)
+      if options[:observe_errors_for]
+        @observe_errors_for = self.send(:instance_eval, &options.delete(:observe_errors_for))
+      end
+      super
       @container_options = options.delete(:container)
+      observe_model_errors
+    end
+
+    def render_element?(element_name)
+      case element_name.to_sym
+      when :error_message
+        @observe_errors_for && @observe_errors_for.errors[name].present?
+      when :label
+        not @options[:label] === false
+      else true
+      end
+    end
+
+    def on_section_render
+      @status_for_updated = :rendered
+    end
+
+    def observe_model_errors
+      return unless @observe_errors_for
+      observe @observe_errors_for.errors, name do |old_value, new_value|
+        if @status_for_updated == :rendered
+          clear_observer_and_reload
+        else
+          create_elements
+          form.table_view.reloadData
+        end
+      end
+    end
+
+    def clear_observer_and_reload
+      unobserve @observe_errors_for.errors, name
+      reload_section
+    end
+
+    def build_options_for_element(opts)
+      super.merge(observe_errors_for: @observe_errors_for)
     end
 
     def form_name
@@ -56,5 +98,14 @@ module MotionPrime
       end
       view(:input).delegate = self.form
     end
+
+    def reload_section
+      form.reload_cell(self)
+    end
+
+    def container_height
+      error_height = element(:error_message).try(:content_height)
+      super + error_height.to_i
+    end
   end
 end

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

@@ -28,11 +28,24 @@ module MotionPrime
         ],
       }.merge(options[:arrow] || {})
     end
+    element :error_message, type: :error_message do
+      {
+        styles: [
+          :base_field_label,
+          :base_string_field_label,
+          :"#{form_name}_field_label",
+          :"#{form_name}_#{name}_field_label",
+          :base_error_message
+        ],
+        hidden: proc { form.model && form.model.errors[name].blank? },
+        text: proc { form.model and form.model.errors[name].join("\n") }
+      }
+    end
 
     after_render :bind_select_button
 
     def bind_select_button
-      view(:button).on :touch do
+      view(:button).on :touch_down do
         form.send(options[:action]) if options[:action]
       end
     end

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

@@ -10,15 +10,30 @@ module MotionPrime
         ]
       }.merge(options[:label] || {})
     end
+
     element :input, type: :text_field do
+      styles = [
+        :base_field_input,
+        :base_string_field_input,
+        :"#{form_name}_field_input",
+        :"#{form_name}_#{name}_field_input"
+      ]
+      styles << :base_field_input_with_errors if form.model && form.model.errors[name].present?
+      {styles: styles}.merge(options[:input] || {})
+    end
+
+    element :error_message, type: :error_message do
       {
         styles: [
-          :base_field_input,
-          :base_string_field_input,
-          :"#{form_name}_field_input",
-          :"#{form_name}_#{name}_field_input"
+          :base_field_label,
+          :base_string_field_label,
+          :"#{form_name}_field_label",
+          :"#{form_name}_#{name}_field_label",
+          :base_error_message
         ],
-      }.merge(options[:input] || {})
+        hidden: proc { form.model && form.model.errors[name].blank? },
+        text: proc { form.model and form.model.errors[name].join("\n") }
+      }
     end
     after_render :bind_text_input
   end

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

@@ -0,0 +1,33 @@
+module MotionPrime
+  class SwitchFieldSection < BaseFieldSection
+    element :label, type: :label do
+      {
+        styles: [
+          :base_field_label,
+          :base_switch_label,
+          :"#{form_name}_switch_label",
+          :"#{form_name}_#{name}_switch_label"
+        ]
+      }.merge(options[:label] || {})
+    end
+    element :input, type: :switch do
+      {
+        styles: [
+          :base_field_switch,
+          :"#{form_name}_field_switch",
+          :"#{form_name}_#{name}_field_switch"
+        ]
+      }.merge(options[:input] || {})
+    end
+    element :hint, type: :label do
+      {
+        styles: [
+          :base_field_label,
+          :base_switch_hint,
+          :"#{form_name}_switch_hint",
+          :"#{form_name}_#{name}_switch_hint"
+        ]
+      }.merge(options[:hint] || {})
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+motion_require '../table.rb'
+module MotionPrime
+  class TableFieldSection < TableSection
+    attr_accessor :form, :cell_element
+
+    def initialize(options = {})
+      @form = options.delete(:form)
+      @container_options = options.delete(:container)
+      super
+    end
+
+    def render_table
+      @styles ||= []
+      @styles += [
+        :"#{form.name}_table",
+        :"#{form.name}_#{name}_table"]
+      super
+    end
+
+    def cell
+      cell_element || begin
+        first_element = elements.values.first
+        first_element.view.superview
+      end
+    end
+
+    def table_data
+      form.send("#{name}_table_data")
+    end
+
+    def container_height
+      form.send("#{name}_height")
+    end
+
+    def on_click(table, index)
+      section = data[index.row]
+      form.send("#{name}_selected", section)
+    end
+  end
+end

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

@@ -11,16 +11,33 @@ module MotionPrime
       }.merge(options[:label] || {})
     end
     element :input, type: :text_view do
+      styles = [
+        :base_field_input,
+        :base_text_field_input,
+        :"#{form_name}_field_input",
+        :"#{form_name}_#{name}_field_input"
+      ]
+      styles << :base_field_input_with_errors if form.model && form.model.errors[name].present?
+
       {
-        styles: [
-          :base_field_input,
-          :base_text_field_input,
-          :"#{form_name}_field_input",
-          :"#{form_name}_#{name}_field_input"
-        ],
+        styles: styles,
         editable: true
       }.merge(options[:input] || {})
     end
+
+    element :error_message, type: :error_message do
+      {
+        styles: [
+          :base_field_label,
+          :base_string_field_label,
+          :"#{form_name}_field_label",
+          :"#{form_name}_#{name}_field_label",
+          :base_error_message
+        ],
+        hidden: proc { form.model && form.model.errors[name].blank? },
+        text: proc { form.model and form.model.errors[name].join("\n") }
+      }
+    end
     after_render :bind_text_input
   end
 end

data/motion-prime/sections/table.rb

@@ -12,22 +12,36 @@ module MotionPrime
     end
 
     def data
-      @data ||= begin
-        table_data
-      end
+      @data ||= table_data
+    end
+
+    def data_stamp_for(id)
+      @data_stamp[id.to_i]
+    end
+
+    def set_data_stamp(cell_ids)
+      @data_stamp ||= []
+      cell_ids.each { |id| @data_stamp[id] = Time.now.to_f }
     end
 
     def reload_data
       @did_appear = false
       @data = nil
-      @data_stamp = Time.now.to_i
+      set_data_stamp((0..elements_options.count-1).to_a)
       table_view.reloadData
     end
 
+    def table_styles
+      styles = [:base_table, name.to_sym]
+      styles += @styles if @styles.present?
+      styles
+    end
+
     def render_table
-      @data_stamp = Time.now.to_i
+      set_data_stamp((0..elements_options.count-1))
+
       self.table_view = screen.table_view(
-        styles: [:base_table, name.to_sym], delegate: self, data_source: self
+        styles: table_styles, delegate: self, data_source: self
       ).view
     end
 
@@ -36,6 +50,9 @@ module MotionPrime
 
       # define default styles for cell
       styles = [:"#{name}_cell"]
+      Array.wrap(@styles).each do |table_style|
+        styles << :"#{table_style}_cell"
+      end
       if item.respond_to?(:container_styles) && item.container_styles.present?
         styles += Array.wrap(item.container_styles)
       end
@@ -67,9 +84,9 @@ module MotionPrime
       record = data[index.row]
       if record && record.model &&
          record.model.respond_to?(:id) && record.model.id.present?
-        "cell_#{record.model.id}_#{@data_stamp}"
+        "cell_#{record.model.id}_#{data_stamp_for(index.row)}"
       else
-        "cell_#{index.section}_#{index.row}_#{@data_stamp}"
+        "cell_#{index.section}_#{index.row}_#{data_stamp_for(index.row)}"
       end
     end
 

data/motion-prime/styles/base.rb

@@ -37,7 +37,7 @@ MotionPrime::Styles.define :base do
     height: 20,
     left: 0,
     right: 0,
-    font: proc { APP_CONFIG[:css_font_base].uifont(12) },
+    font: proc { MotionPrime::Config.font.name.uifont(12) },
     size_to_fit: true
 
   # available options for input:
@@ -50,8 +50,8 @@ MotionPrime::Styles.define :base do
       border_width: 1,
       border_color: :gray
     },
-    font: proc { APP_CONFIG[:css_font_base].uifont(16) },
-    placeholder_font: proc { APP_CONFIG[:css_font_base].uifont(16) },
+    font: proc { MotionPrime::Config.font.name.uifont(16) },
+    placeholder_font: proc { MotionPrime::Config.font.name.uifont(16) },
     background_color: :white,
     left: 0,
     right: 0,
@@ -59,6 +59,12 @@ MotionPrime::Styles.define :base do
     bottom: 0,
     padding_top: 4
 
+  style :field_input_with_errors,
+    layer: {
+      border_color: proc { MotionPrime::Config.color.error }
+    },
+    text_color: proc { MotionPrime::Config.color.error }
+
   # available options for submit button:
   # @button_type: :rounded, :custom
   # @background_color: COLOR
@@ -86,7 +92,7 @@ MotionPrime::Styles.define :base do
     },
     title_color: :gray,
     title_label: {
-      font: proc { APP_CONFIG[:css_font_base].uifont(16) }
+      font: proc { MotionPrime::Config.font.name.uifont(16) }
     }
   style :select_field_arrow,
     image: "images/forms/select_arrow.png",
@@ -105,4 +111,25 @@ MotionPrime::Styles.define :base do
     width: 300,
     height: 150,
     top: 30, left: 0
+
+  style :error_message,
+    top: nil,
+    bottom: 0,
+    width: 300,
+    line_break_mode: :wordwrap,
+    number_of_lines: 0,
+    text_color: proc { MotionPrime::Config.color.error }
+
+  style :field_switch,
+    top: 10,
+    width: 79,
+    height: 27,
+    right: 0
+
+  style :switch_label,
+    top: 10,
+    font: proc { MotionPrime::Config.font.name.uifont(16) }
+
+  style :switch_hint,
+    top: 40
 end

data/motion-prime/support/dm_button.rb

@@ -1,6 +1,6 @@
 class DMButton < UIButton
   include MotionPrime::KeyValueStore
-  attr_accessor :paddingLeft, :paddingTop, :padding
+  attr_accessor :paddingLeft, :paddingRight, :paddingTop, :padding
 
   def setTitle(value)
     setTitle value, forState: UIControlStateNormal
@@ -8,10 +8,11 @@ class DMButton < UIButton
 
   def drawPadding(rect)
     padding_left = self.paddingLeft || self.padding || 5
+    padding_right = self.paddingRight || padding_left || 5
     padding_top = self.paddingTop || self.padding || 0
     self.setTitleEdgeInsets UIEdgeInsetsMake(
       padding_top, padding_left,
-      padding_top, padding_left
+      padding_top, padding_right
     )
   end
 

data/motion-prime/version.rb

@@ -1,3 +1,3 @@
 module MotionPrime
-  VERSION = "0.1.7"
+  VERSION = "0.2.0"
 end

data/motion-prime/views/layout.rb

@@ -14,8 +14,8 @@ module MotionPrime
       options = builder.options.merge(calculate_frame: true, bounds: bounds)
       view = builder.view
       view_stack.last.addSubview(view) unless view_stack.empty?
-
       setup(view, options, &block)
+      view.on_added if view.respond_to?(:on_added)
 
       view
     end

data/motion-prime/views/view_builder.rb

@@ -8,78 +8,94 @@ module MotionPrime
     end
 
     def view_for_class(klass, root_klass, options = {})
-      if VIEWS_MAP.key?(klass.name)
-        VIEWS_MAP[klass.name].call root_klass, options
+      if views_map.key?(klass.name)
+        views_map[klass.name].call root_klass, options
       else
         view_for_class klass.superclass, root_klass, options
       end
     end
 
-    VIEWS_MAP = {
-      'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
-      'UIControl' => Proc.new {|klass, options| klass.alloc.init },
-      'UIActionSheet' => Proc.new {|klass, options|
-        title = options.delete(:title) || ''
-        delegate = options.delete(:delegate)
-        cancel_button_title = options.delete(:cancel_button_title)
-        destructive_button_title = options.delete(:destructive_button_title)
-        other_button_titles = options.delete(:other_button_titles)
+    def views_map
+      self.class.views_map
+    end
+
+    class << self
+      def register(name, &block)
+        views_map[name] = block
+      end
+
+      def views_map
+        @views_map ||= default_views_map
+      end
+
+      def default_views_map
+        {
+          'UIView' => Proc.new {|klass, options| klass.alloc.initWithFrame CGRectZero },
+          'UIControl' => Proc.new {|klass, options| klass.alloc.init },
+          'UIActionSheet' => Proc.new {|klass, options|
+            title = options.delete(:title) || ''
+            delegate = options.delete(:delegate)
+            cancel_button_title = options.delete(:cancel_button_title)
+            destructive_button_title = options.delete(:destructive_button_title)
+            other_button_titles = options.delete(:other_button_titles)
 
-        klass.alloc.initWithTitle title,
-          delegate: delegate,
-          cancelButtonTitle: cancel_button_title,
-          destructiveButtonTitle: destructive_button_title,
-          otherButtonTitles: other_button_titles, nil
-      },
-      'UIActivityIndicatorView' => Proc.new{|klass, options|
-        style = options.delete(:style) || :large.uiactivityindicatorstyle
-        klass.alloc.initWithActivityIndicatorStyle style
-      },
-      'UIButton' => Proc.new{|klass, options|
-        is_custom_button = options[:background_image] || options[:title_color]
-        default_button_type = is_custom_button ? :custom : :rounded
-        button_type = (options.delete(:button_type) || default_button_type).uibuttontype
-        klass.buttonWithType button_type
-      },
-      'UIImageView' => Proc.new{|klass, options|
-        image = options.delete(:image)
-        highlighted_image = options.delete(:highlighted_image)
+            klass.alloc.initWithTitle title,
+              delegate: delegate,
+              cancelButtonTitle: cancel_button_title,
+              destructiveButtonTitle: destructive_button_title,
+              otherButtonTitles: other_button_titles, nil
+          },
+          'UIActivityIndicatorView' => Proc.new{|klass, options|
+            style = options.delete(:style) || :large.uiactivityindicatorstyle
+            klass.alloc.initWithActivityIndicatorStyle style
+          },
+          'UIButton' => Proc.new{|klass, options|
+            is_custom_button = options[:background_image] || options[:title_color]
+            default_button_type = is_custom_button ? :custom : :rounded
+            button_type = (options.delete(:button_type) || default_button_type).uibuttontype
+            klass.buttonWithType button_type
+          },
+          'UIImageView' => Proc.new{|klass, options|
+            image = options.delete(:image)
+            highlighted_image = options.delete(:highlighted_image)
 
-        if !image.nil? && !highlighted_image.nil?
-          klass.alloc.initWithImage image.uiimage, highlightedImage: highlighted_image.uiimage
-        elsif !image.nil?
-          klass.alloc.initWithImage image.uiimage
-        else
-          klass.alloc.initWithFrame CGRectZero
-        end
-      },
-      'UIProgressView' => Proc.new{|klass, options|
-        style = options.delete(:style) || UIProgressViewStyleDefault
-        klass.alloc.initWithProgressViewStyle style
-      },
-      'UISegmentedControl' => Proc.new{|klass, options|
-        items = options.delete(:items) || []
-        klass.alloc.initWithItems items
-      },
-      'UITableView' => Proc.new{|klass, options|
-        style = options.delete(:style) || UITableViewStylePlain
-        klass.alloc.initWithFrame CGRectZero, style: style
-      },
-      'UITableViewCell' => Proc.new{|klass, options|
-        style = options.delete(:style) || UITableViewCellStyleDefault
-        klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
-      },
-      'UISearchBar' => Proc.new{|klass, options|
-        klass = options[:search_field_background_image] ? UISearchBarCustom : UISearchBar
-        search_bar = klass.alloc.init
-        search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
-        search_bar
-      },
-      'GMSMapView' => Proc.new{|klass, options|
-        camera = GMSCameraPosition.cameraWithLatitude(35.689466, longitude: 139.700196, zoom: 15)
-        map = GMSMapView.mapWithFrame(CGRectZero, camera: camera)
-        map
-      }
-    }
+            if !image.nil? && !highlighted_image.nil?
+              klass.alloc.initWithImage image.uiimage, highlightedImage: highlighted_image.uiimage
+            elsif !image.nil?
+              klass.alloc.initWithImage image.uiimage
+            else
+              klass.alloc.initWithFrame CGRectZero
+            end
+          },
+          'UIProgressView' => Proc.new{|klass, options|
+            style = options.delete(:style) || UIProgressViewStyleDefault
+            klass.alloc.initWithProgressViewStyle style
+          },
+          'UISegmentedControl' => Proc.new{|klass, options|
+            items = options.delete(:items) || []
+            klass.alloc.initWithItems items
+          },
+          'UITableView' => Proc.new{|klass, options|
+            style = options.delete(:style) || UITableViewStylePlain
+            klass.alloc.initWithFrame CGRectZero, style: style
+          },
+          'UITableViewCell' => Proc.new{|klass, options|
+            style = options.delete(:style) || UITableViewCellStyleDefault
+            klass.alloc.initWithStyle style, reuseIdentifier: options.delete(:reuse_identifier)
+          },
+          'UISearchBar' => Proc.new{|klass, options|
+            klass = options[:search_field_background_image] ? UISearchBarCustom : UISearchBar
+            search_bar = klass.alloc.init
+            search_bar.autoresizingMask = UIViewAutoresizingFlexibleWidth
+            search_bar
+          },
+          'GMSMapView' => Proc.new{|klass, options|
+            camera = GMSCameraPosition.cameraWithLatitude(35.689466, longitude: 139.700196, zoom: 15)
+            map = GMSMapView.mapWithFrame(CGRectZero, camera: camera)
+            map
+          }
+        }
+      end
+    end
   end
 end