motion-form 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6bd42abc43d04185da76e9b3b8155e66e3bcbf2
-  data.tar.gz: 3d356e286fb649efe437a0a54c7105a9cef21b82
+  metadata.gz: 17fd1f9a5463bdee3649012327557fd1d68eec18
+  data.tar.gz: dd0f05563e9c4d5a51594af6a869474bf1b4086c
 SHA512:
-  metadata.gz: ae7c9d463b1ff1de5b945744c4f4b8301b7b5719046650502eba5dc035510ace9f441b79a5dbccf293eaa9550c69821e0ee5b3bd000025dccae074c8b46eb51e
-  data.tar.gz: d37c7cca9a011af1f9daa58463dc620dd8e25736d15496186b9b2965e8a1017bd05167b70368dcf4f6f4500de09b3c424801aecd4a3b8db9de70035fe43d1a68
+  metadata.gz: e5945341d2e0ca7d5cd972a69497c08a410da80d197bbc001404887b36cfd4f407efb05e6106e513e68f4d1675bc7fd43f1160ce3f907b3757e4ee532740d5dd
+  data.tar.gz: 3202f56a063f6b2a8ae965ec8d2e09f1353426e784844908bd5f17c83c622a8799b665eac7ffe403e64a8bed380ca0fb9153e73372b7145df7e9d5cb5b53da12

data/README.md

@@ -22,19 +22,19 @@ form = MotionForm.form_for(view) do |form|
   # Ex: form.section do |section|
 
   form.section 'Profile' do |section|
-    section.input :name,      icon: :contact, value: 'David Copperfield'
-    section.input :username,  icon: :user
-    section.input :pinterest, icon: :pinterest
-    section.input :twitter,   icon: :twitter
-    section.input :website,   icon: :website
+    section.input :name,      label: 'Your name', value: 'David Copperfield'
+    section.input :username,  label: 'A username'
+    section.input :pinterest, label: 'Pinterest username'
+    section.input :twitter,   label: 'Twitter username'
+    section.input :website,   label: 'Personal website'
     section.text  :bio,       placeholder: 'Write a short bio...'
 
     section.button :submit, action: submit
   end
 
   form.section 'Account' do |section|
-    section.button :change_email, icon: :email, action: push_email_controller
-    section.button :change_password, icon: :lock, action: push_password_controller
+    section.button :change_email, action: push_email_controller
+    section.button :change_password, action: push_password_controller
   end
 end
 
@@ -118,7 +118,6 @@ end
 
 ``` ruby
 MotionForm.config do |config|
-  config.icon_font                 = UIFont.fontWithName('dscovr', size: 14.0)
   config.section_header_color      = UIColor.blueColor
   config.section_header_text_color = UIColor.whiteColor
   config.button_text_color         = UIColor.redColor

data/lib/project/cells/base_cell.rb

@@ -9,8 +9,7 @@ class BaseCell < UITableViewCell
 
   def initWithStyle(style, reuseIdentifier: reuse_identifier)
     super.tap do |cell|
-      cell.selectionStyle = UITableViewCellSelectionStyleNone
-      cell.contentView.addSubview(text_field)
+      cell.selectionStyle         = UITableViewCellSelectionStyleNone
       cell.selectedBackgroundView = selected_background_view
     end
   end

data/lib/project/cells/button_cell.rb

@@ -12,25 +12,38 @@ class ButtonCell < TextInputCell
   def initWithStyle(style, reuseIdentifier: reuse_identifier)
     super.tap do |cell|
       cell.selectionStyle     = UITableViewCellSelectionStyleGray
+      cell.accessoryType      = UITableViewCellAccessoryDisclosureIndicator
       cell.text_field.enabled = false
 
-      cell.add_right_view
+      cell.text_label.textColor = MotionForm.button_text_color
+
       cell.add_tap_recognizer
     end
   end
 
+  def setup_constraints
+    text_label.translatesAutoresizingMaskIntoConstraints = false
+    contentView.addSubview(text_label)
+
+    contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat(
+      'H:|-margin-[label]-margin-|',
+      options: NSLayoutFormatAlignAllCenterY,
+      metrics: { 'margin' => 10 },
+      views:   subviews_dict))
+
+    contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat(
+      'V:|[label]|',
+      options: 0,
+      metrics: {},
+      views:   subviews_dict))
+  end
+
   def add_tap_recognizer
     addGestureRecognizer(tap_recognizer)
   end
 
   def label=(label)
-    text_field.attributedPlaceholder = build_highlighted_placeholder(label)
-  end
-
-  def build_highlighted_placeholder(label)
-    NSAttributedString.alloc.initWithString(
-      label,
-      attributes: { NSForegroundColorAttributeName =>  MotionForm.button_text_color })
+    text_label.text = label
   end
 
   def tap_recognizer
@@ -41,25 +54,6 @@ class ButtonCell < TextInputCell
     post('FormCellWasTapped', notification_payload)
   end
 
-  def add_right_view
-    text_field.rightView     = right_view
-    text_field.rightViewMode = UITextFieldViewModeAlways
-  end
-
-  def accessory=(icon)
-    right_view.name = icon
-  end
-
-  def right_view
-    @right_view ||= IconView.alloc.init
-  end
-
-  def layoutSubviews
-    super
-
-    right_view.frame = [[size.width - 56, 0], [36, 43]]
-  end
-
   def notification_payload
     { key: key }
   end

data/lib/project/cells/text_field_cell.rb

@@ -1,5 +1,4 @@
 motion_require './base_cell'
-motion_require '../views/icon_view'
 
 class TextFieldCell < BaseCell
   IDENTIFIER = 'TextFieldCell'
@@ -43,10 +42,6 @@ class TextFieldCell < BaseCell
   def secure=(secure)
   end
 
-  def icon=(icon)
-    left_view.name = icon
-  end
-
   def text_view
     @text_view ||= SZTextView.alloc.init.tap do |text_view|
       text_view.font     = UIFont.fontWithName('HelveticaNeue-Light', size: 14.0)
@@ -55,10 +50,6 @@ class TextFieldCell < BaseCell
   end
   alias_method :text_field, :text_view
 
-  def left_view
-    @left_view ||= IconView.alloc.init
-  end
-
   def value
     text_view.text
   end

data/lib/project/cells/text_input_cell.rb

@@ -1,17 +1,48 @@
 motion_require './base_cell'
-motion_require '../views/icon_view'
 
 class TextInputCell < BaseCell
   IDENTIFIER = 'TextInputCell'
 
   def initWithStyle(style, reuseIdentifier: reuse_identifier)
     super.tap do |cell|
+      cell.setup_constraints
+
       cell.observe('ButtonCallbackWillFire', 'resign_textfield:')
       cell.observe('FormWillValidate',       'resign_textfield:')
       cell.observe('FormWillRender',         'resign_textfield:')
     end
   end
 
+  def setup_constraints
+    [text_label, text_field].each do |subview|
+      subview.translatesAutoresizingMaskIntoConstraints = false
+      contentView.addSubview(subview)
+    end
+
+    contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat(
+      'H:|-margin-[label(100@1000)][input]-margin-|',
+      options: NSLayoutFormatAlignAllCenterY,
+      metrics: { 'margin' => 10 },
+      views:   subviews_dict))
+
+    contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat(
+      'V:|[label]|',
+      options: 0,
+      metrics: {},
+      views:   subviews_dict))
+
+    contentView.addConstraints(NSLayoutConstraint.constraintsWithVisualFormat(
+      'V:|[input]|',
+      options: 0,
+      metrics: {},
+      views:   subviews_dict))
+  end
+
+  def subviews_dict
+    { 'label' => text_label,
+      'input' => text_field }
+  end
+
   class << self
     def has_value?
       true
@@ -23,34 +54,35 @@ class TextInputCell < BaseCell
   end
 
   def label=(label)
-    text_field.placeholder = label
+    text_label.text = label
   end
 
   def secure=(secure)
     text_field.secureTextEntry = secure
   end
 
-  def icon=(icon)
-    left_view.name = icon
+  def placeholder=(placeholder)
+    text_field.placeholder = placeholder
   end
 
   def text_field
     @text_field ||= UITextField.alloc.init.tap do |field|
       field.autocorrectionType       = UITextAutocorrectionTypeNo
-      field.autoresizingMask         = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight
       field.backgroundColor          = UIColor.clearColor
       field.clearButtonMode          = UITextFieldViewModeWhileEditing
       field.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter
-      field.leftView                 = left_view
-      field.leftViewMode             = UITextFieldViewModeAlways
-      field.textColor                = UIColor.grayColor
+      field.textColor                = UIColor.darkGrayColor
+      field.font                     = UIFont.fontWithName('HelveticaNeue-Light', size: 16.0)
 
       field.delegate = self
     end
   end
 
-  def left_view
-    @left_view ||= IconView.alloc.init
+  def text_label
+    @text_label ||= UILabel.alloc.init.tap do |label|
+      label.textColor = UIColor.darkGrayColor
+      label.font      = UIFont.fontWithName('HelveticaNeue-Light', size: 18.0)
+    end
   end
 
   def value
@@ -61,11 +93,6 @@ class TextInputCell < BaseCell
     text_field.text = value
   end
 
-  def layoutSubviews
-    text_field.frame = [[10, 0], [300, 43]]
-    left_view.frame  = [[0, 0], [36, 43]]
-  end
-
   def textFieldDidBeginEditing(text_field)
     post('FormCellDidBeginEditing', notification_payload)
   end

data/lib/project/form/base.rb

@@ -7,7 +7,6 @@ module MotionForm
     def init
       initWithFrame(frame, style: UITableViewStylePlain).tap do |f|
         f.register_cells
-        f.separatorStyle = UITableViewCellSeparatorStyleNone
         f.translatesAutoresizingMaskIntoConstraints = false
 
         f.dataSource = self

data/lib/project/motion-form.rb

@@ -3,9 +3,7 @@ motion_require './cells/text_field_cell'
 
 module MotionForm
   class << self
-    attr_writer :icon_font,
-                :icon_mapper,
-                :section_header_color,
+    attr_writer :section_header_color,
                 :section_header_text_color,
                 :section_header_font,
                 :button_text_color
@@ -46,27 +44,19 @@ module MotionForm
     end
 
     def section_header_font
-      @section_header_font || UIFont.fontWithName('HelveticaNeue-Bold', size: 14.0)
-    end
-
-    def icon_font
-      @icon_font || UIFont.fontWithName('dscovr', size: 14.0)
-    end
-
-    def icon_mapper
-      @icon_mapper || FontIconMapper
+      @section_header_font || UIFont.fontWithName('HelveticaNeue', size: 14.0)
     end
 
     def section_header_color
-      @section_header_color || '#bac3c7'.to_color
+      @section_header_color || '#EFEFF4'.to_color
     end
 
     def section_header_text_color
-      @section_header_text_color || '#eaf0f1'.to_color
+      @section_header_text_color || '#232323'.to_color
     end
 
     def button_text_color
-      @button_text_color || '#bdc3c7'.to_color
+      @button_text_color || '#232323'.to_color
     end
   end
 end

data/lib/project/rows/base_row.rb

@@ -1,11 +1,10 @@
 class BaseRow
-  attr_reader :icon, :key, :label, :options
+  attr_reader :key, :label, :options
 
   def initialize(key, options)
     @key     = key
     @options = options
 
-    @icon  = options.fetch(:icon,  nil)
     @label = options.fetch(:label, key.to_s.titleize)
     @value = options.fetch(:value, nil)
   end
@@ -35,8 +34,8 @@ class BaseRow
   end
 
   def update_cell(cell)
-    cell.key   = key
-    cell.label = label
-    cell.icon  = icon
+    cell.key         = key
+    cell.label       = label
+    cell.placeholder = options.fetch(:placeholder, nil)
   end
 end

data/lib/project/rows/button_row.rb

@@ -2,23 +2,18 @@ motion_require '../cells/button_cell'
 motion_require './text_field_row'
 
 class ButtonRow < TextInputRow
-  attr_reader :on_tap_callback, :accessory
+  attr_reader :on_tap_callback
 
   def initialize(key, options)
     super
 
     @on_tap_callback = options.fetch(:action, lambda {})
-    @accessory       = options.fetch(:accessory, nil)
   end
 
   def cell_type
     ButtonCell
   end
 
-  def accessory
-    options.fetch(:accessory, nil)
-  end
-
   def listen
     observe('FormCellWasTapped', 'tapped:')
   end
@@ -34,6 +29,5 @@ class ButtonRow < TextInputRow
   def update_cell(cell)
     super
 
-    cell.accessory = accessory
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motion-form
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Devon Blandin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-keyboard-avoiding
@@ -108,7 +108,6 @@ files:
 - lib/project/cells/text_field_cell.rb
 - lib/project/cells/text_input_cell.rb
 - lib/project/controllers/form_controller.rb
-- lib/project/font_icon_mapper.rb
 - lib/project/form/base.rb
 - lib/project/motion-form.rb
 - lib/project/rows/base_row.rb
@@ -117,7 +116,6 @@ files:
 - lib/project/rows/text_input_row.rb
 - lib/project/section/section.rb
 - lib/project/string.rb
-- lib/project/views/icon_view.rb
 - lib/project/views/padded_label.rb
 - lib/project/views/section_header_view.rb
 homepage: https://github.com/dblandin/motion-form

data/lib/project/font_icon_mapper.rb

@@ -1,22 +0,0 @@
-module MotionForm
-  module FontIconMapper
-    class << self
-      def call(icon)
-        unicode(icon).hex.chr(Encoding::UTF_8)
-      end
-
-      def unicode(icon)
-        mappings[icon] || ''
-      end
-
-      def mappings
-        @mappings ||= begin
-          path = NSBundle.mainBundle.pathForResource('icons', ofType:'json')
-          data = NSData.dataWithContentsOfFile(path)
-
-          NSJSONSerialization.JSONObjectWithData(data, options: 0, error: nil)
-        end
-      end
-    end
-  end
-end

data/lib/project/views/icon_view.rb

@@ -1,18 +0,0 @@
-class IconView < UILabel
-  attr_reader :name
-
-  def init
-    super.tap do |view|
-      view.font            = MotionForm.icon_font
-      view.backgroundColor = UIColor.clearColor
-      view.textColor       = UIColor.grayColor
-      view.textAlignment   = NSTextAlignmentCenter
-    end
-  end
-
-  def name=(name)
-    @name = name
-
-    self.text = MotionForm.icon_mapper.call(name)
-  end
-end