formotion 1.3.1 → 1.4.0

data/lib/formotion/row_type/slider_row.rb

@@ -8,7 +8,7 @@ module Formotion
       SLIDER_VIEW_TAG = 1200
 
       def build_cell(cell)
-        cell.selectionStyle = UITableViewCellSelectionStyleNone
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleNone
         slideView = UISlider.alloc.initWithFrame(CGRectZero)
         cell.accessoryView = cell.editingAccessoryView = slideView
         row.range ||= (1..10)
@@ -52,4 +52,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/static_row.rb

@@ -8,4 +8,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/row_type/string_row.rb

@@ -21,6 +21,7 @@ module Formotion
       # Also does the layoutSubviews swizzle trick
       # to size the UITextField so it won't bump into the titleLabel.
       def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         field = UITextField.alloc.initWithFrame(CGRectZero)
         field.tag = TEXT_FIELD_TAG
 
@@ -72,6 +73,7 @@ module Formotion
           end
         end
 
+        field.font = BW::Font.new(row.font) if row.font
         field.placeholder = row.placeholder
         field.text = row_value
         cell.addSubview(field)
@@ -131,13 +133,7 @@ module Formotion
       end
 
       def on_select(tableView, tableViewDelegate)
-        super or _on_select(tableView, tableViewDelegate)
-      end
-
-      def _on_select(tableView, tableViewDelegate)
-        if !row.editable?
-          return
-        else
+        if row.editable?
           row.text_field.becomeFirstResponder
         end
       end

data/lib/formotion/row_type/subform_row.rb

@@ -7,6 +7,7 @@ module Formotion
       LABEL_TAG=1001
 
       def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         cell.accessoryType = cell.editingAccessoryType = UITableViewCellAccessoryDisclosureIndicator
 
         cell.contentView.addSubview(self.display_key_label)
@@ -27,6 +28,7 @@ module Formotion
         end
 
         display_key_label.highlightedTextColor = cell.textLabel.highlightedTextColor
+        nil
       end
 
       def update_cell(cell)
@@ -52,4 +54,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/row_type/switch_row.rb

@@ -6,7 +6,7 @@ module Formotion
       include BW::KVO
 
       def build_cell(cell)
-        cell.selectionStyle = UITableViewCellSelectionStyleNone
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleNone
         switchView = UISwitch.alloc.initWithFrame(CGRectZero)
         switchView.accessibilityLabel = (row.title || "") + " Switch"
         cell.accessoryView = cell.editingAccessoryView = switchView
@@ -27,4 +27,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/tags_row.rb

@@ -0,0 +1,172 @@
+motion_require 'base'
+
+# ideas and images taken from:
+# https://github.com/davbeck/TURecipientBar
+# License: https://github.com/davbeck/TURecipientBar/blob/master/LICENSE.md
+
+module Formotion
+  module RowType
+    class TagsRow < Base
+      include BW::KVO
+
+      TAGS_VIEW_TAG=1110
+      TAGS_EDIT_VIEW_TAG=1111
+
+      def build_cell(cell)
+        # only show the "plus" when editable
+        add_plus_accessory(cell) if row.editable?
+        
+        self.row.value = [] unless self.row.value.is_a?(Array)
+        
+        @scroll_view          = UIScrollView.alloc.init
+        @scroll_view.tag      = row.editable? ? TAGS_EDIT_VIEW_TAG : TAGS_VIEW_TAG
+        @scroll_view.delegate = self
+        @scroll_view.pagingEnabled        = false
+        @scroll_view.delaysContentTouches = true
+        @scroll_view.showsHorizontalScrollIndicator = false
+        @scroll_view.showsVerticalScrollIndicator   = false
+        @btns = {}
+        cell.addSubview(@scroll_view)
+        
+        row.value.each do |t|
+          add_tag(t)
+        end
+
+        cell.swizzle(:layoutSubviews) do
+          def layoutSubviews
+            old_layoutSubviews
+
+            # viewWithTag is terrible, but I think it's ok to use here...
+            edittable = false
+            formotion_field = self.viewWithTag(TAGS_VIEW_TAG)
+            # is an editable row
+            if formotion_field.nil?
+              edittable = true
+              formotion_field = self.viewWithTag(TAGS_EDIT_VIEW_TAG)
+            end
+            field_frame = formotion_field.frame
+    
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + Formotion::RowType::Base.field_buffer
+            edit_buffer = edittable ? 20.0 : 0.0
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - Formotion::RowType::Base.field_buffer - edit_buffer
+            
+            # rearrange the tags
+            last = CGRectMake(0.0, 0.0, 0.0, 0.0)
+            formotion_field.subviews.each do |sv|
+              now = sv.frame
+              now.origin.x = (last.origin.x+last.size.width)+5.0
+              now.origin.y = last.origin.y
+              if (now.origin.x+now.size.width)+3.0 > field_frame.size.width
+                now.origin.x = 5.0
+                now.origin.y += last.size.height + 5.0
+              end
+              sv.frame = now
+              last = now
+            end
+            
+            # set the height of the scroll box
+            max_height = self.frame.size.height - 3.0
+            field_frame.size.height = last.origin.y + last.size.height + 5.0
+            field_frame.size.height = max_height if field_frame.size.height > max_height
+            field_frame.origin.y = (self.frame.size.height - field_frame.size.height) / 2.0
+            
+            formotion_field.frame = field_frame
+            
+          end
+        end
+      end
+      
+      def _on_select(tableView, tableViewDelegate)
+      end
+
+      def add_plus_accessory(cell)
+        @add_button ||= begin
+          button = UIButton.buttonWithType(UIButtonTypeContactAdd)
+          button.when(UIControlEventTouchUpInside) do
+            if row.on_tap_callback
+              row.on_tap_callback.call(self.row)
+            end
+          end
+          button
+        end
+        cell.accessoryView = cell.editingAccessoryView = @add_button
+      end
+      
+      def image_for_state(state)
+        case state
+        when UIControlStateNormal
+          return UIImage.imageNamed("tags_row.png").stretchableImageWithLeftCapWidth(14, topCapHeight:0)
+          
+        when UIControlStateHighlighted, UIControlStateSelected
+          return UIImage.imageNamed("tags_row-selected.png").stretchableImageWithLeftCapWidth(14, topCapHeight:0)
+                    
+        end
+        nil
+      end
+      
+      def attrib_for_state(state)
+        case state
+        when UIControlStateNormal
+          return { NSFontAttributeName => UIFont.systemFontOfSize(14.0),
+                   NSForegroundColorAttributeName => UIColor.blackColor }
+          
+        when UIControlStateHighlighted, UIControlStateSelected
+          return { NSFontAttributeName => UIFont.systemFontOfSize(14.0),
+                   NSForegroundColorAttributeName => UIColor.whiteColor }
+                   
+        end
+      end
+      
+      def add_tag(text)
+        return if @btns.has_key?(text)
+      	btn = UIButton.buttonWithType(UIButtonTypeCustom)
+      	btn.adjustsImageWhenHighlighted = false
+      	btn.contentEdgeInsets = UIEdgeInsetsMake(0.0, 5.0, 0.0, 5.0)
+        textsize = text.sizeWithFont(UIFont.systemFontOfSize(14.0))
+        width = textsize.width+14.0
+        btn.frame = CGRectMake(0.0, 0.0, width, 24.0)
+        [UIControlStateNormal, UIControlStateHighlighted, UIControlStateSelected].each do |state|
+      	  btn.setBackgroundImage(image_for_state(state), forState:state)
+          attr_text = NSAttributedString.alloc.initWithString(text, attributes:attrib_for_state(state))          
+          btn.setAttributedTitle(attr_text, forState:state)
+        end
+
+        if row.editable?
+          btn.addTarget(self, action:'button_click:', forControlEvents:UIControlEventTouchUpInside)
+        end
+    
+      	btn.translatesAutoresizingMaskIntoConstraints = false
+      	@scroll_view.addSubview(btn)
+        unless row.value.include?(text)
+          row.value << text
+        end
+        @btns[text] = btn
+      end
+    
+      def button_click(btn)
+        @del_btn = btn
+        App.alert(BW.localized_string("Remove Tag?"), cancel_button_title: NO) do |alert|
+          alert.addButtonWithTitle(YES)
+          alert.delegate = self
+        end
+      end
+      
+      YES = BW.localized_string("Yes", nil)
+      NO = BW.localized_string("No", nil)
+
+      def alertView(alert_view, clickedButtonAtIndex:button_index)
+        if alert_view.buttonTitleAtIndex(button_index)==NO
+          @del_btn = nil
+          return
+        end 
+        @del_btn.removeFromSuperview
+        @btns.delete(@del_btn)
+        row.value.delete(@del_btn.currentAttributedTitle.string)
+      end
+  
+      def scrollViewDidScroll(_scroll_view)
+      end
+      
+    end
+  end
+end

data/lib/formotion/row_type/template_row.rb

@@ -27,11 +27,11 @@ module Formotion
       end
 
       def build_cell(cell)
-        cell.selectionStyle = UITableViewCellSelectionStyleBlue
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         @add_button ||= begin
           button = UIButton.buttonWithType(UIButtonTypeContactAdd)
           button.when(UIControlEventTouchUpInside) do
-            self.on_select(nil, nil)
+            self._on_select(nil, nil)
           end
           button
         end
@@ -125,4 +125,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/text_row.rb

@@ -10,6 +10,7 @@ module Formotion
       attr_accessor :field
 
       def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
 
         @field = UITextView.alloc.initWithFrame(CGRectZero)
         field.backgroundColor = UIColor.clearColor
@@ -21,6 +22,9 @@ module Formotion
         field.returnKeyType = row.return_key || UIReturnKeyDefault
         field.autocapitalizationType = row.auto_capitalization if row.auto_capitalization
         field.autocorrectionType = row.auto_correction if row.auto_correction
+
+        # must be set prior to placeholder!
+        field.font = BW::Font.new(row.font) if row.font
         field.placeholder = row.placeholder
         field.enabled = row.editable?
 
@@ -87,4 +91,4 @@ module Formotion
 
     end
   end
-end
+end

data/lib/formotion/row_type/web_view_row.rb

@@ -0,0 +1,44 @@
+motion_require 'base'
+
+module Formotion
+  module RowType
+    class WebViewRow < Base
+
+      WEB_VIEW_TAG=1100
+
+      def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
+
+        @web_view = UIWebView.alloc.init
+        @web_view.loadHTMLString(row.value, baseURL:nil) if row.value
+        @web_view.tag = WEB_VIEW_TAG
+        @web_view.contentMode = UIViewContentModeScaleAspectFit
+        @web_view.backgroundColor = UIColor.clearColor
+        cell.addSubview(@web_view)
+
+        cell.swizzle(:layoutSubviews) do
+          def layoutSubviews
+            old_layoutSubviews
+
+            # viewWithTag is terrible, but I think it's ok to use here...
+            formotion_field = self.viewWithTag(WEB_VIEW_TAG)
+
+            field_frame = formotion_field.frame
+            field_frame.origin.y = 10
+            field_frame.origin.x = self.textLabel.frame.origin.x + self.textLabel.frame.size.width + Formotion::RowType::Base.field_buffer
+            field_frame.size.width  = self.frame.size.width - field_frame.origin.x - Formotion::RowType::Base.field_buffer
+            field_frame.size.height = self.frame.size.height - Formotion::RowType::Base.field_buffer
+            formotion_field.frame = field_frame
+          end
+        end
+      end
+
+      def on_select(tableView, tableViewDelegate)
+        if !row.editable?
+          return
+        end
+      end
+
+    end
+  end
+end

data/lib/formotion/version.rb

@@ -1,3 +1,3 @@
 module Formotion
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/spec/form_spec.rb

@@ -52,6 +52,32 @@ describe "Forms" do
     row.title.should == "Label"
     row.subtitle.should == "Placeholder"
   end
+  
+  it "should return row by key" do
+    @form = Formotion::Form.new(sections: [{
+      rows: [{
+        key: :email,
+        type: :email,
+        editable: true,
+        title: 'Email'
+      }]
+    }])
+
+    expected = @form.sections[0].rows[0]
+    @form.row(:email).should == expected
+  end
+  
+  it "should return nil for row by key if key does not exist" do
+    @form = Formotion::Form.new(sections: [{
+      rows: [{
+        key: :email,
+        type: :email,
+        editable: true,
+        title: 'Email'
+      }]
+    }])
+    @form.row(:foobar).should.be.nil
+  end
 
   it "render works correctly" do
     @form = Formotion::Form.new(sections: [{

data/spec/functional/date_row_spec.rb

@@ -60,4 +60,10 @@ describe "FormController/DateRow" do
       end
     end
   end
+
+  it "doesn't have a clear button" do
+    tap("Date")
+    date_row.text_field.subviews.map(&:class).should.not.include UIButton
+  end
+
 end

data/spec/functional/picker_row_spec.rb

@@ -58,4 +58,9 @@ describe "FormController/PickerRow" do
       end
     end
   end
+
+  it "doesn't have a clear button" do
+    tap("Picker")
+    picker_row.text_field.subviews.map(&:class).should.not.include UIButton
+  end
 end

data/spec/row_type/back_spec.rb

@@ -8,7 +8,7 @@ describe "Back Row" do
   it "should pop subform on select" do
     form = FakeForm.new
     @row.instance_variable_set("@section", form)
-    @row.object.on_select(nil, nil)
+    @row.object._on_select(nil, nil)
     form.controller.pop_subform_called.should == true
   end
 end

data/spec/row_type/base_spec.rb

@@ -11,7 +11,7 @@ describe "Base Row Type" do
     tests_row :dummy
 
     it "should return false if callback is not defined" do
-      @row.object.on_select(nil, nil).should == false
+      @row.object._on_select(nil, nil).should == false
     end
 
     describe 'when on_tap_callback is set' do
@@ -24,11 +24,11 @@ describe "Base Row Type" do
       end
 
       it "should return true" do
-        @row.object.on_select(nil, nil).should == true
+        @row.object._on_select(nil, nil).should == true
       end
 
       it "should call the callback" do
-        @row.object.on_select(nil, nil)
+        @row.object._on_select(nil, nil)
         @called.should == true
       end