formotion 1.3.1 → 1.4.0

data/lib/formotion/row_type/image_row.rb

@@ -13,6 +13,7 @@ module Formotion
       IMAGE_VIEW_TAG=1100
 
       def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
         # only show the "plus" when editable
         add_plus_accessory(cell) if row.editable?
 
@@ -90,6 +91,10 @@ module Formotion
           @camera = BW::Device.camera.send((source == :camera) ? :rear : :any)
           @camera.picture(source_type: source, media_types: [:image]) do |result|
             if result[:original_image]
+              #-Resize image when requested (no image upscale)
+              if result[:original_image].respond_to?(:resize_image_to_size) and row.max_image_size
+                result[:original_image]=result[:original_image].resize_image_to_size(row.max_image_size, false)
+              end
               row.value = result[:original_image]
             end
           end
@@ -100,7 +105,7 @@ module Formotion
         @add_button ||= begin
           button = UIButton.buttonWithType(UIButtonTypeContactAdd)
           button.when(UIControlEventTouchUpInside) do
-            self.on_select(nil, nil)
+            self._on_select(nil, nil)
           end
           button
         end

data/lib/formotion/row_type/map_row.rb

@@ -0,0 +1,79 @@
+motion_require 'base'
+
+module Formotion
+  module RowType
+    class MapRowData
+  
+      attr_accessor :pin, :options
+      #attr_accessor :title, :subtitle, :coordinate
+  
+      def initialize(title, subtitle, coordinate, options={})
+        @title=title
+        @subtitle=subtitle
+        @coordinate=coordinate
+        @options=options
+      end
+      
+      def title
+        @title
+      end
+      
+      def subtitle
+        @subtitle
+      end
+      
+      def coordinate
+        @coordinate
+      end
+  
+    end
+    
+    class MapRow < Base
+
+      MAP_VIEW_TAG=1100
+
+      def build_cell(cell)
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleBlue
+
+        @map_view = MKMapView.alloc.init
+        @map_view.delegate = self
+        if row.value
+          coord = (row.value.is_a?(Array) and row.value.size==2) ? CLLocationCoordinate2D.new(row.value[0], row.value[1]) : row.value
+          if coord.is_a?(CLLocationCoordinate2D)
+            region = MKCoordinateRegionMakeWithDistance(coord, 400.0, 480.0)
+            @map_view.setRegion(region, animated:true)
+            m=MapRowData.new(nil, nil, coord)
+            @map_view.addAnnotation(m)
+          end
+        end
+        @map_view.tag = MAP_VIEW_TAG
+        @map_view.contentMode = UIViewContentModeScaleAspectFit
+        @map_view.backgroundColor = UIColor.clearColor
+        cell.addSubview(@map_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(MAP_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/row_type/multi_choice_row.rb

@@ -0,0 +1,25 @@
+module Formotion
+  module RowType
+    module MultiChoiceRow
+
+    def build_cell(cell)
+      field = super(cell)
+      field.clearButtonMode = UITextFieldViewModeNever
+      field.swizzle(:caretRectForPosition) do
+        def caretRectForPosition(position)
+          CGRectZero
+        end
+      end
+      field
+    end
+
+    def add_callbacks(field)
+      super
+      field.should_change? do |text_field|
+        false
+      end
+    end
+
+    end
+  end
+end

data/lib/formotion/row_type/object_row.rb

@@ -0,0 +1,30 @@
+motion_require 'string_row'
+
+module Formotion
+  module RowType
+    class ObjectRow < StringRow
+
+      def build_cell(cell)
+        super.tap do |field|
+        
+          # "remove" the setText swizzle
+          if UIDevice.currentDevice.systemVersion >= "6.0" and field.respond_to?("old_setText")
+            unswizzle = Proc.new do
+              def setText(text)
+                old_setText(text)
+              end
+            end
+            field.instance_eval unswizzle
+          end
+
+        end
+      end
+
+      # overriden in subclasses
+      def row_value
+        row.value
+      end
+
+    end
+  end
+end

data/lib/formotion/row_type/options_row.rb

@@ -8,7 +8,7 @@ module Formotion
       include RowType::ItemsMapper
 
       def build_cell(cell)
-        cell.selectionStyle = UITableViewCellSelectionStyleNone
+        cell.selectionStyle = self.row.selection_style || UITableViewCellSelectionStyleNone
 
         segmentedControl = UISegmentedControl.alloc.initWithItems(item_names || [])
         segmentedControl.selectedSegmentIndex = name_index_of_value(row.value) if row.value
@@ -35,4 +35,4 @@ module Formotion
       end
     end
   end
-end
+end

data/lib/formotion/row_type/paged_image_row.rb

@@ -0,0 +1,257 @@
+motion_require 'base'
+
+# ideas taken from:
+# http://www.raywenderlich.com/10518/how-to-use-uiscrollview-to-scroll-and-zoom-content
+
+module Formotion
+  module RowType
+    class PagedImageRow < Base
+      TAKE = BW.localized_string("Take", nil)
+      DELETE = BW.localized_string("Delete", nil)
+      CHOOSE = BW.localized_string("Choose", nil)
+      CANCEL = BW.localized_string("Cancel", nil)
+
+      include BW::KVO
+
+      PAGE_VIEW_TAG=1110
+      SCROLL_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)
+        
+        @page_view     = UIPageControl.alloc.init
+        @page_view.tag = PAGE_VIEW_TAG
+        @page_view.pageIndicatorTintColor        = '#d0d0d0'.to_color
+        @page_view.currentPageIndicatorTintColor = '#505050'.to_color
+        @page_view.currentPage   = 0
+        @page_view.numberOfPages = self.row.value.size
+        @page_view.when(UIControlEventValueChanged) do
+          page_width = @scroll_view.frame.size.width
+          page=@page_view.currentPage
+          offset=((page * page_width * 2.0 - page_width) / 2.0) + (page_width/2.0)
+          point=@scroll_view.contentOffset
+          point.x=offset
+          @scroll_view.contentOffset=point
+        end
+        cell.addSubview(@page_view)
+        
+        @scroll_view          = UIScrollView.alloc.init
+        @scroll_view.tag      = SCROLL_VIEW_TAG
+        @scroll_view.delegate = self
+        @scroll_view.pagingEnabled        = true
+        @scroll_view.delaysContentTouches = true
+        @scroll_view.showsHorizontalScrollIndicator=false
+        @scroll_view.showsVerticalScrollIndicator=false
+        
+        pages_size = @scroll_view.frame.size
+        @scroll_view.contentSize = CGSizeMake(pages_size.width * self.row.value.size, pages_size.height)
+        @page_views = [nil]*self.row.value.size
+
+        cell.addSubview(@scroll_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(SCROLL_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
+            f_height = self.frame.size.height - 20 - Formotion::RowType::Base.field_buffer
+            field_frame.size.height = f_height
+            formotion_field.frame = field_frame
+            scroll_view=formotion_field
+            
+            formotion_field = self.viewWithTag(PAGE_VIEW_TAG)
+            field_frame = formotion_field.frame
+            field_frame.origin.y = 20 + f_height
+            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 = 10
+            formotion_field.frame = field_frame
+            
+            scroll_view.delegate.resizePages
+            scroll_view.delegate.clearPages
+          end
+        end
+      end
+
+      def on_select(tableView, tableViewDelegate)
+        if !row.editable?
+          return
+        end
+      end
+
+      def actionSheet(actionSheet, clickedButtonAtIndex: index)
+        if index == actionSheet.destructiveButtonIndex and !@photo_page.nil?
+          self.row.value[@photo_page]=nil
+          self.row.value.delete(nil)
+          self.resizePages
+          self.clearPages
+          return
+        end
+    
+        source = nil
+        case actionSheet.buttonTitleAtIndex(index)
+        when TAKE
+          source = :camera
+        when CHOOSE
+          source = :photo_library
+        when CANCEL
+        end
+
+        if source
+          @camera = BW::Device.camera.send((source == :camera) ? :rear : :any)
+          @camera.picture(source_type: source, media_types: [:image]) do |result|
+            if result[:original_image]
+              #-Resize image when requested (no image upscale)
+              if result[:original_image].respond_to?(:resize_image_to_size) and row.max_image_size
+                result[:original_image]=result[:original_image].resize_image_to_size(row.max_image_size, false)
+              end
+              # new photo
+              if @photo_page.nil?
+                self.row.value<<result[:original_image]
+              else # or overwrite photo
+                self.row.value[@photo_page]=result[:original_image]
+              end
+              self.resizePages
+              self.clearPages
+            end
+          end
+        end
+      end
+
+      def add_plus_accessory(cell)
+        @add_button ||= begin
+          button = UIButton.buttonWithType(UIButtonTypeContactAdd)
+          button.when(UIControlEventTouchUpInside) do
+            @page_view.becomeFirstResponder
+            take_photo
+          end
+          button
+        end
+        cell.accessoryView = cell.editingAccessoryView = @add_button
+      end
+      
+      #{{{Paged
+      def loadVisiblePages
+        # First, determine which page is currently visible
+        page_width = @scroll_view.frame.size.width
+        page = ((@scroll_view.contentOffset.x * 2.0 + page_width) / (page_width * 2.0)).floor
+        # Update the page control
+        @page_view.currentPage = page
+        # Work out which pages we want to load
+        first_page = page - 10
+        last_page = page + 1
+        # Purge anything before the first page
+        0.upto(first_page-1) do |i|
+          self.purgePage(i)
+        end
+        first_page.upto(last_page) do |i|
+          self.loadPage(i)
+        end
+        (last_page+1).upto(self.row.value.size-1) do |i|
+          self.purgePage(i)
+        end
+      end
+      
+      def get_active_page
+        page_width = @scroll_view.frame.size.width
+        ((@scroll_view.contentOffset.x * 2.0 + page_width) / (page_width * 2.0)).floor
+      end
+  
+      def pages_single_tap
+        page = get_active_page
+        if row.editable?
+          take_photo(page)
+        else
+          _on_select(nil, nil)
+        end
+      end
+  
+      def take_photo(_page=nil)
+        @photo_page=_page
+        @action_sheet = UIActionSheet.alloc.init
+        @action_sheet.delegate = self
+        @action_sheet.destructiveButtonIndex = (@action_sheet.addButtonWithTitle DELETE) unless _page.nil?
+        @action_sheet.addButtonWithTitle TAKE if BW::Device.camera.front? or BW::Device.camera.rear?
+        @action_sheet.addButtonWithTitle CHOOSE
+        @action_sheet.cancelButtonIndex = (@action_sheet.addButtonWithTitle CANCEL)
+        @action_sheet.showInView @scroll_view
+      end
+  
+      def clearPages
+        0.upto(@page_views.size-1) do |i|
+          self.purgePage(i) unless @page_views[i].nil?
+        end
+        self.loadVisiblePages
+      end
+  
+      def resizePages
+        pages_size = @scroll_view.frame.size
+        @scroll_view.contentSize = CGSizeMake(pages_size.width * self.row.value.size, pages_size.height)
+        #lf = @page_view.frame
+        #cf = @page_view.superview.frame
+        #old_width = lf.size.width
+        #lf.size.width = cf.size.width-(lf.origin.x*2+10*2)
+        #@page_view.frame=lf
+        #lf.size.width!=old_width
+        @page_view.currentPage   = 0
+        @page_view.numberOfPages = self.row.value.size
+      end
+  
+      def loadPage(_page)
+        if _page < 0 || _page >= self.row.value.size
+          # If it's outside the range of what we have to display, then do nothing
+          return
+        end
+        # Load an individual page, first seeing if we've already loaded it
+        page_view = @page_views[_page]
+        if page_view.nil?
+          frame=@scroll_view.bounds
+          frame.origin.x = frame.size.width * _page
+          frame.origin.y = 0.0
+          thumb = self.row.value[_page].resize_image_to_size([frame.size.height,frame.size.height], false)
+          new_page_view = UIImageView.alloc.initWithImage(thumb)
+          new_page_view.userInteractionEnabled = true
+          new_page_view.contentMode = UIViewContentModeScaleAspectFit
+          new_page_view.frame = frame
+          single_tap = UITapGestureRecognizer.alloc.initWithTarget(self, action:"pages_single_tap")
+          single_tap.numberOfTapsRequired = 1
+          new_page_view.addGestureRecognizer(single_tap)
+          @scroll_view.addSubview(new_page_view)
+          @page_views[_page]=new_page_view
+        end
+      end
+
+      def purgePage(_page)
+        if _page < 0 || _page >= self.row.value.size
+          # If it's outside the range of what we have to display, then do nothing
+          return
+        end
+        # Remove a page from the scroll view and reset the container array
+        page_view = @page_views[_page]
+        unless page_view.nil?
+          page_view.gestureRecognizers.each do |gr|
+            page_view.removeGestureRecognizer(gr)
+          end
+          page_view.removeFromSuperview
+          @page_views[_page]=nil
+        end
+      end
+  
+      def scrollViewDidScroll(_scroll_view)
+        # Load the pages which are now on screen
+        self.loadVisiblePages
+      end
+      #}}}
+      
+    end
+  end
+end

data/lib/formotion/row_type/picker_row.rb

@@ -1,10 +1,12 @@
 # currently supports only one component
 motion_require 'string_row'
+motion_require 'multi_choice_row'
 
 module Formotion
   module RowType
     class PickerRow < StringRow
       include RowType::ItemsMapper
+      include RowType::MultiChoiceRow
 
       def after_build(cell)
         self.row.text_field.inputView = self.picker