ProMotion-XLForm 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02a3b9031223eeed2b269133801248640428cda1
-  data.tar.gz: c1122c6fb0bfc8b6b2ea35724f427fb9be5eb3d5
+  metadata.gz: 923b8c482cdd6c8250ad1d93674e85882d9b4b60
+  data.tar.gz: 2b0b483c71ab93876609e8cf21ceaa6841232520
 SHA512:
-  metadata.gz: 6a89a59030b0d934598ed8570e1e1ce98da593527fa8ab24c608100f99acf53c34018ee26af9ba0e652a55fc7d4dd59c8dd858c712d35b95eb6222e5b0da0faf
-  data.tar.gz: c2ad9973c172fc545d8a74d95b2a2a4d190dc497540812ae90946812c8c842d6025221b66a85060c662f17f713a0c4fd44a2f1793fca66a52b5f7db4446cd886
+  metadata.gz: 49b4311b2154e4cecb32d31df7410c864f07fc06a8957ff55fdfa894506bd82519f989d9b3e8d5ea1c53097d79da7e33c833799edb1f88e32f8f171a6bc93439
+  data.tar.gz: 68a272448f22f972bd4c4a56082d27317747052c2b75417b9d81bc779d831bff914149893754b8195d4fb7a4c9506055f5ee6d6850568125463c9e4c68948683

data/README.md

@@ -102,7 +102,8 @@ end
 * :button
 * :info
 * :step_counter
-* :image
+* :image (ProMotion-XLForm specific)
+* :color (ProMotion-XLForm specific using [RSColorPicker](https://github.com/RSully/RSColorPicker))
 
 ### Class options
 
@@ -265,7 +266,7 @@ Finally, you can provide a PM::Validator with a `valid?(cell)` method.
       title: 'Appear when switch is on',
       name: :show_me,
       type: :info,
-      visible: {
+      hidden: {
         # the cell name wich will "trigger" the visibility
         name: :hide_and_seek,
 
@@ -281,7 +282,7 @@ Finally, you can provide a PM::Validator with a `valid?(cell)` method.
       type: :info,
 
       # you can also write it this way
-      visible: ':hide_and_seek == false'
+      hidden: ':hide_and_seek == false'
       # also valid ':some_text contains "a text"'
       #            ':some_text not contains "a text"'
     }
@@ -291,7 +292,6 @@ Finally, you can provide a PM::Validator with a `valid?(cell)` method.
 
 
 ## Todo
-- Validations
 - Tests
 - A lot of other things :)
 

data/lib/ProMotion-XLForm.rb

@@ -7,6 +7,7 @@ require 'motion-cocoapods'
 Motion::Project::App.setup do |app|
   lib_dir_path = File.dirname(File.expand_path(__FILE__))
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_image_selector_cell.rb")
+  app.files << File.join(lib_dir_path, "ProMotion/XLForm/cells/xl_form_color_selector_cell.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_class_methods.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_module.rb")
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/xl_form_view_controller.rb")
@@ -21,5 +22,6 @@ Motion::Project::App.setup do |app|
 
   app.pods do
     pod 'XLForm', '~> 3.0.0'
+    pod 'RSColorPicker'
   end
 end

data/lib/ProMotion/XLForm/cells/xl_form_color_selector_cell.rb

@@ -0,0 +1,175 @@
+class XLFormColorSelectorCell < XLFormBaseCell
+  def configure
+    super.tap do
+      self.selectionStyle = UITableViewCellSelectionStyleNone
+      @color_view = UIView.alloc.initWithFrame [[0, 0], [80, 30]]
+      @color_view.contentMode = UIViewContentModeScaleAspectFit
+      @color_view.layer.borderWidth = 1
+      @color_view.layer.borderColor = UIColor.blackColor.CGColor
+      @color_view.backgroundColor = UIColor.whiteColor
+      tap = UITapGestureRecognizer.alloc.initWithTarget(self, action: 'on_color_tap:')
+      self.addGestureRecognizer(tap)
+
+      self.accessoryView = @color_view
+    end
+  end
+
+  def on_color_tap(_)
+    unless self.rowDescriptor.disabled
+      self.formViewController.view.endEditing(true)
+
+      size = if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+        [400, 440]
+      else
+        [320, 440]
+      end
+      color_chooser = PMXLColorChooser.alloc.initWithFrame [[0, 0], size]
+      color_chooser.delegate = self
+      color_chooser.color = self.rowDescriptor.value || UIColor.whiteColor
+
+      if UIDevice.currentDevice.userInterfaceIdiom == UIUserInterfaceIdiomPad
+        controller = UIViewController.new
+        controller.view = color_chooser
+        @popover = UIPopoverController.alloc.initWithContentViewController controller
+        @popover.popoverContentSize = color_chooser.frame.size
+        f = self.contentView.convertRect(@color_view.frame, toView: self.formViewController.view)
+        @popover.presentPopoverFromRect(f,
+                                        inView:                   self.formViewController.view,
+                                        permittedArrowDirections: UIPopoverArrowDirectionAny,
+                                        animated:                 true)
+      else
+        controller = UIViewController.new
+        controller.view = color_chooser
+
+        navigation_controller = UINavigationController.alloc.initWithRootViewController(controller)
+        navigation_controller.navigationBar.translucent = false
+        right = UIBarButtonItem.alloc.initWithBarButtonSystemItem(UIBarButtonSystemItemDone,
+                                                                 target: self,
+                                                                 action: 'hide_picker:')
+        controller.navigationItem.rightBarButtonItem = right
+        if self.formViewController.presentedViewController
+          self.formViewController.dismissViewControllerAnimated(true,
+              completion: -> {
+                self.formViewController.presentViewController(navigation_controller,
+                                                              animated:   true,
+                                                              completion: nil)
+              })
+        else
+          self.formViewController.presentViewController(navigation_controller,
+                                                        animated:   true,
+                                                        completion: nil)
+        end
+      end
+    end
+  end
+
+  def hide_picker(_)
+    self.formViewController.dismissViewControllerAnimated(true, completion: nil)
+  end
+
+  def update
+    super.tap do
+      self.textLabel.text = (self.rowDescriptor.isRequired and self.rowDescriptor.title) ? "#{self.rowDescriptor.title}*" : self.rowDescriptor.title
+      @color_view.frame = [[305.0, 7.0], [80.0, 30.0]]
+      color = self.rowDescriptor.value
+      unless color
+        color = UIColor.whiteColor
+      end
+      @color_view.layer.borderColor = UIColor.blackColor.CGColor
+      @color_view.backgroundColor = color
+      self.textLabel.font = UIFont.preferredFontForTextStyle(UIFontTextStyleBody)
+    end
+  end
+
+  def colorPickerDidChangeSelection(color_picker)
+    color = color_picker.selectionColor
+    @color_view.backgroundColor = color
+    self.rowDescriptor.value = color
+  end
+end
+
+class PMXLColorChooser < UIView
+
+  attr_accessor :delegate
+
+  def initWithFrame(frame)
+    super.tap do
+      self.backgroundColor = UIColor.whiteColor
+
+      picker_frame = CGRectInset(frame, 10, 10)
+      picker_frame.size.height = picker_frame.size.width
+      @color_picker = RSColorPickerView.alloc.initWithFrame picker_frame
+      self.addSubview(@color_picker)
+
+      slider_frame = [[10, CGRectGetMaxX(picker_frame) + 5], [CGRectGetWidth(picker_frame), 30]]
+      @slider = PMXLBrightnessSlider.alloc.initWithFrame slider_frame
+      @slider.color_picker = @color_picker
+      self.addSubview(@slider)
+    end
+  end
+
+  def color=(value)
+    @color_picker.setSelectionColor(value)
+    @slider.value = @color_picker.brightness
+  end
+
+  def color
+    @color_picker.selectionColor
+  end
+
+  def delegate=(value)
+    @delegate = value
+    @color_picker.delegate = value
+  end
+
+end
+
+class PMXLBrightnessSlider < UISlider
+  attr_accessor :color_picker
+
+  def initWithFrame(frame)
+    super.tap do
+      init_routine
+    end
+  end
+
+  def initWithCoder(decoder)
+    super.tap do
+      init_routine
+    end
+  end
+
+  def init_routine
+    self.minimumValue = 0.0
+    self.maximumValue = 1.0
+    self.continuous = true
+
+    self.enabled = true
+    self.userInteractionEnabled = true
+
+    self.addTarget(self,
+                  action: 'slider_value_changed:',
+                  forControlEvents: UIControlEventValueChanged)
+  end
+
+  def slider_value_changed(_)
+    color_picker.setBrightness(self.value)
+  end
+
+  def drawRect(rect)
+    ctx = UIGraphicsGetCurrentContext()
+
+    space = CGColorSpaceCreateDeviceGray()
+    colors = [UIColor.blackColor, UIColor.whiteColor]
+
+    gradient = CGGradientCreateWithColors(space, colors, nil)
+
+    CGContextDrawLinearGradient(ctx, gradient, CGPointZero, [rect.size.width, 0], 0)
+  end
+
+  def color_picker=(value)
+    @color_picker = value
+    self.value = @color_picker.brightness unless @color_picker.nil?
+  end
+
+end

data/lib/ProMotion/XLForm/xl_form.rb

@@ -91,6 +91,8 @@ module ProMotion
           # image
           if cell_data[:type] == :image
             cell_class = XLFormImageSelectorCell if cell_class.nil?
+          elsif cell_data[:type] == :color
+            cell_class = XLFormColorSelectorCell if cell_class.nil?
           end
 
           cell.cellClass = cell_class if cell_class
@@ -114,23 +116,11 @@ module ProMotion
           cell.selectorTitle   = cell_data[:selector_title] if cell_data[:selector_title]
           cell.options = cell_data[:options]
 
-          value = cell_data[:value]
-          if value and cell.selectorOptions
-            cell.selectorOptions.each do |opt|
-              if opt.formValue == value
-                value = opt
-                break
-              end
-            end
-          end
-
-          cell.value    = value if value
-
           cell.disabled = !cell_data[:enabled] if cell_data[:enabled]
 
           # row visible
-          if cell_data[:visible]
-            predicate = cell_data[:visible]
+          if cell_data[:hidden]
+            predicate = cell_data[:hidden]
             if predicate.is_a?(Hash)
               tag = predicate[:name]
               operand = case predicate[:is]
@@ -222,6 +212,22 @@ module ProMotion
             end
           end
 
+          value = cell_data[:value]
+          if value and cell.selectorOptions
+            cell.selectorOptions.each do |opt|
+              if opt.formValue == value
+                value = opt
+                break
+              end
+            end
+          end
+
+          if value === true or value === false
+            value = value ? 1 : 0
+          end
+
+          cell.value = value
+
           section.addFormRow(cell)
 
           # multi sections
@@ -316,7 +322,8 @@ module ProMotion
           button:                      XLFormRowDescriptorTypeButton,
           info:                        XLFormRowDescriptorTypeInfo,
           step_counter:                XLFormRowDescriptorTypeStepCounter,
-          image:                       'XLFormRowDescriptorTypeImage'
+          image:                       'XLFormRowDescriptorTypeImage',
+          color:                       'XLFormRowDescriptorTypeColor',
       }[symbol] || symbol
     end
 

data/lib/ProMotion/XLForm/xl_form_patch.rb

@@ -17,15 +17,6 @@ end
 
 class XLFormRowDescriptor
 
-  alias :old_copyWithZone :copyWithZone
-
-  def copyWithZone(zone)
-    row_descriptor_copy = old_copyWithZone(zone)
-
-    row_descriptor_copy.valueTransformer = self.valueTransformer
-    row_descriptor_copy
-  end
-
   def options=(options)
     self.selectorOptions = parse_options(options)
   end

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -42,6 +42,8 @@ module ProMotion
                                      action:      'on_save:'
                                  }
       end
+
+      self.form_added if self.respond_to?(:form_added)
     end
 
     def form_data

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-XLForm
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Benjamin Michotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-03 00:00:00.000000000 Z
+date: 2015-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -75,6 +75,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/ProMotion-XLForm.rb
+- lib/ProMotion/XLForm/cells/xl_form_color_selector_cell.rb
 - lib/ProMotion/XLForm/cells/xl_form_image_selector_cell.rb
 - lib/ProMotion/XLForm/validators/regex_validator.rb
 - lib/ProMotion/XLForm/validators/url_validator.rb