ProMotion-XLForm 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdb1986018fcffdf8c45322d5d9efc70d9a47ef1
-  data.tar.gz: fbc2a8ac3073bb74bf6fedd1e26e0fc96dc7d906
+  metadata.gz: 05c859ed838fdd140e797b1dcbe49c572398a592
+  data.tar.gz: 6c48299595d9d3324c4495169245c6339cb5adbb
 SHA512:
-  metadata.gz: 4f2f6064a0d9cb7aabf0da03a97d6e0b5e6ded73dcba949d66b9ce254786d49cc71bb021f6d1c158792dfd63a5c50a716de375005afb1abbee6e88986636605d
-  data.tar.gz: 52db2a4bc3ee8507ef7cf7e05363595440d86e46bf02eb7f1e482b52a7759cc523677960fb46b316cfd433b281ad4014213cfe2db59ceb47ca2e09bd12e546e7
+  metadata.gz: '0885792527bcbd81684b5bc5f9505c447a011fd3e27c9f14700c9d83cfd11522709a54b25a975bc71cc645f253baa71c6363d1f7df0e4a37350bb3d089933811'
+  data.tar.gz: 897df3976ae5e677566390e7370602eebf954bdd37769f54bfc21816c0640d2e532b0d9cd89a966169a589af18e5c5873fa6c2203fce256941e926674ce65d21

data/README.md

@@ -77,6 +77,7 @@ end
 * :integer
 * :decimal
 * :textview
+* :zip_code
 * :selector_push
 * :selector_popover
 * :selector_action_sheet

data/lib/ProMotion-XLForm.rb

@@ -26,7 +26,7 @@ Motion::Project::App.setup do |app|
   app.files << File.join(lib_dir_path, "ProMotion/XLForm/ui_alert_controller.rb")
 
   app.pods do
-    pod 'XLForm', git: 'https://github.com/xmartlabs/XLForm.git'
+    pod 'XLForm', '3.1.1'
     pod 'RSColorPicker'
   end
 end

data/lib/ProMotion/XLForm/xl_form.rb

@@ -60,6 +60,7 @@ module ProMotion
         integer: XLFormRowDescriptorTypeInteger,
         decimal: XLFormRowDescriptorTypeDecimal,
         textview: XLFormRowDescriptorTypeTextView,
+        zip_code: XLFormRowDescriptorTypeZipCode,
         selector_push: XLFormRowDescriptorTypeSelectorPush,
         selector_popover: XLFormRowDescriptorTypeSelectorPopover,
         selector_action_sheet: XLFormRowDescriptorTypeSelectorActionSheet,

data/lib/ProMotion/XLForm/xl_form_cell_builder.rb

@@ -44,7 +44,7 @@ module ProMotion
         cell.cellConfigAtConfigure.setObject(true, forKey: "stepControl.wraps")
         cell.cellConfigAtConfigure.setObject(min, forKey: "stepControl.minimumValue") if min
         cell.cellConfigAtConfigure.setObject(max, forKey: "stepControl.maximumValue") if max
-        cell.cellConfigAtConfigure.setObject(step, forKey: "stepControl.maximumValue") if step
+        cell.cellConfigAtConfigure.setObject(step, forKey: "stepControl.stepValue") if step
       end
 
       # slider

data/lib/ProMotion/XLForm/xl_form_screen.rb

@@ -11,36 +11,15 @@ module ProMotion
 
       form_options = self.class.get_form_options
 
-      if form_options[:on_cancel]
-        on_cancel = form_options[:on_cancel]
-        title = NSLocalizedString('Cancel', nil)
-        item = :cancel
-        if on_cancel.is_a? Hash
-          title = on_cancel[:title] if on_cancel[:title]
-          item = on_cancel[:item] if on_cancel[:item]
-        end
+      on_cancel = form_options[:on_cancel]
+      on_save = form_options[:on_save]
 
-        set_nav_bar_button :left, {
-          system_item: item,
-          title: title,
-          action: 'on_cancel:'
-        }
+      if on_cancel
+        set_nav_bar_button :left, button_config(on_cancel, default_item: :cancel, action: 'on_cancel:')
       end
 
-      if form_options[:on_save]
-        on_cancel = form_options[:on_save]
-        title = NSLocalizedString('Save', nil)
-        item = :save
-        if on_cancel.is_a? Hash
-          title = on_cancel[:title] if on_cancel[:title]
-          item = on_cancel[:item] if on_cancel[:item]
-        end
-
-        set_nav_bar_button :right, {
-          system_item: item,
-          title: title,
-          action: 'on_save:'
-        }
+      if on_save
+        set_nav_bar_button :right, button_config(on_save, default_item: :save, action: 'on_save:')
       end
 
       # support for RMQ stylesheet using `form_view`
@@ -53,6 +32,23 @@ module ProMotion
       self.form_added if self.respond_to?(:form_added)
     end
 
+    def button_config(user_config, opts = {})
+      button_config = { action: opts[:action] } # always call internal method before calling user-defined method
+
+      if user_config.is_a? Hash
+        title = user_config[:title]
+        item = user_config[:item] || user_config[:system_item]
+      end
+
+      if title
+        button_config[:title] = title
+      else
+        button_config[:system_item] = item || opts[:default_item]
+      end
+
+      set_nav_bar_button :right, button_config
+    end
+
     def form_data
       PM.logger.info "You need to implement a `form_data` method in #{self.class.to_s}."
       []
@@ -203,6 +199,7 @@ module ProMotion
     end
 
     protected
+
     def on_cancel(_)
       form_options = self.class.get_form_options
       if form_options[:on_cancel]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-XLForm
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Benjamin Michotte
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-08 00:00:00.000000000 Z
+date: 2018-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ProMotion
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Adds PM::XLFormScreen support to ProMotion, similar to ProMotion-form.