RedAlert 1.2 → 1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a17fdee3c942135d661b71f10e02a3fa7c897945
-  data.tar.gz: 3b1d14668db687b50e4f7f0005246f93dc08b52f
+  metadata.gz: 02b0f4505dfe14f9f67e9c99070dff3b86ca4a5c
+  data.tar.gz: bf71b9ea2ca435a52add2bf6f55a5072c7a22f1c
 SHA512:
-  metadata.gz: d9e215e14fa0911d4c5f5e10226ddf7867457637f255635f4f767faa80604afd86964c9d1dede48e5f0a7e1ea87cac7c281f3174f3eb3ad427e5c31c6b25ad5f
-  data.tar.gz: 3129e78629f9b47b6ef29dba0cc6e983dfda0cd322885b9a72b96e26325bf84b6e46759c37a9cca57a95dd8723c98db72f58251f3b7a1d20bfc4fa6afa5882d5
+  metadata.gz: af89a90bf422ae0cc3fb8047477b6e296b8f23328add78bae48d4053b51fdbf8395db3845e9ef32d351e2f656d0021fb35b338bd5309931ba6d087cf4b9b18f1
+  data.tar.gz: 9250c0b48d2d9cf6d5c36b1b988e2299e78ad52d19e0b9e6b5f6557150872dc43fcc32b67f83358e6383615592d3423eb862ceccc904952223238de7d6b8320c

data/README.md

@@ -99,6 +99,20 @@ You can even use the `make_button` helper to create custom buttons to add:
   rmq.app.alert(title: "Actions!", message: "Actions created with `make_button` helper.", actions: button_list)
 ```
 
+
+If you want to present your alert in :sheet style and you are on iPad, you have to provide the `:source` for the popover (either a UIView or a UIBarButtonItem)
+```ruby
+rmq.append(UIButton, :my_button).on(:tap) do |sender|
+  rmq.app.alert(title: "Actions!", message: "Alert from a Popover.", actions: [:ok, :cancel], style:sheet, source: sender)
+end
+```
+
+*iOS 8+ options*
+These options work only on iOS 8+
+* `:modal` will prevent the popover to be close by tapping outside the popover
+* `:arrow_direction` will force the direction of the popover arrow. Valid values are `:up`, `:down`, `:left`, `:right` or `:any`
+
+
 ## Available Templates
 
 Button templates are provided [HERE](https://github.com/GantMan/RedAlert/blob/master/lib/project/button_templates.rb)
@@ -143,6 +157,8 @@ Because capabilities of iOS 7 & 8 alert-components are different, just a few edg
 
 **Ability to add textfields to alerts (Like Username/Password) by [Derek Greenberg](https://github.com/GantMan/RedAlert/pull/10) and notable work by [Jon Silverman](https://github.com/GantMan/RedAlert/pull/9)**
 
+**iPad and popover support by [Benjamin Michotte](https://github.com/GantMan/RedAlert/pull/17)**
+
 Feel free to read up on UIAlertController to see what all is wrapped up in this gem.
 * [Hayageek](http://hayageek.com/uialertcontroller-example-ios/)
 * [NSHipster](http://nshipster.com/uialertcontroller/)

data/lib/project/action_sheet_provider.rb

@@ -10,6 +10,8 @@ module RubyMotionQuery
       @actions = actions
       @opts = opts
 
+      raise ArgumentError.new "Please provide a :source view to use :sheet on iPad" if rmq.device.ipad? and !@opts[:source]
+
       # grab the first cancel action
       cancel_action = actions.find { |action| action.cancel? }
 
@@ -43,7 +45,17 @@ module RubyMotionQuery
     def show
       # when we show, the view controller will disappear because a different _UIAlertOverlayWindow window will take its place
       @view_controller = rmq.view_controller
-      @action_sheet.showInView(@view_controller.view)
+
+      if rmq.device.ipad?
+        source = @opts[:source]
+        if source.is_a?(UIBarButtonItem)
+          @action_sheet.showFromBarButtonItem(source, animated: true)
+        else
+          @action_sheet.showFromRect(source.frame, inView: @view_controller.view, animated: true)
+        end
+      else
+        @action_sheet.showInView(@view_controller.view)
+      end
     end
 
     private

data/lib/project/alert_constants.rb

@@ -12,5 +12,13 @@ module RubyMotionQuery
       destructive: UIAlertActionStyleDestructive
     }
 
+    ALERT_POPOVER_ARROW_DIRECTION = {
+      up: UIPopoverArrowDirectionUp,
+      down: UIPopoverArrowDirectionDown,
+      left: UIPopoverArrowDirectionLeft,
+      right: UIPopoverArrowDirectionRight,
+      any: UIPopoverArrowDirectionAny
+    }
+
   end
-end
+end

data/lib/project/alert_controller_provider.rb

@@ -47,6 +47,34 @@ module RubyMotionQuery
         @alert_controller.addAction action
       end
 
+      # popover
+      if @opts[:style] == :sheet and rmq.device.ipad?
+        raise ArgumentError.new "Please provide a :source view to use :sheet on iPad" unless @opts[:source]
+        source = @opts[:source]
+        @alert_controller.setModalPresentationStyle(UIModalPresentationPopover)
+        if @opts[:modal]
+          @alert_controller.setModalInPopover(true)
+        end
+        if source.is_a?(UIBarButtonItem)
+          @alert_controller.popoverPresentationController.barButtonItem = source
+        else
+          @alert_controller.popoverPresentationController.sourceView = source
+        end
+        @alert_controller.popoverPresentationController.sourceRect = source.bounds
+
+        if @opts[:arrow_direction]
+          directions = @opts[:arrow_direction]
+          unless directions.is_a?(Array)
+            directions = [directions]
+          end
+          arrow_direction = 0
+          directions.each do |direction|
+            arrow_direction |= RubyMotionQuery::AlertConstants::ALERT_POPOVER_ARROW_DIRECTION[direction]
+          end
+          @alert_controller.popoverPresentationController.permittedArrowDirections = arrow_direction
+        end
+      end
+
       self
     end
 

data/lib/project/field_templates.rb

@@ -6,7 +6,7 @@ module RubyMotionQuery
     # 2 - Add the test
     # 3 - Add symbol to the README.md list
 
-    def self.add_template_fieldset(template)
+    def self.add_template_fieldset(template, opts={})
 
       login             = NSLocalizedString("Login", nil)
       password          = NSLocalizedString("Password", nil)
@@ -19,13 +19,13 @@ module RubyMotionQuery
           fieldset[:alert_view_style] = UIAlertViewStylePlainTextInput
           fieldset[:fields] =
           [
-            rmq.app.make_field(:text, keyboard_type: :default, secure_text_entry: false, placeholder: '')
+            rmq.app.make_field(:text, keyboard_type: :default, secure_text_entry: false, placeholder: opts.fetch(:placeholder,''))
           ]
         when :secure
           fieldset[:alert_view_style] = UIAlertViewStyleSecureTextInput
           fieldset[:fields] =
             [
-              rmq.app.make_field(:text, keyboard_type: :default, secure_text_entry: true, placeholder: '')
+              rmq.app.make_field(:text, keyboard_type: :default, secure_text_entry: true, placeholder: opts.fetch(:placeholder,''))
             ]
         when :login
           fieldset[:alert_view_style] = UIAlertViewStyleLoginAndPasswordInput

data/lib/project/red_alert.rb

@@ -19,8 +19,17 @@ module RubyMotionQuery
         # ------------------------------------
         opts           = {message: opts} if opts.is_a? String
         opts           = {style: :alert, animated: true, show_now: true}.merge(opts)
-        opts[:message] = opts[:message] ? opts[:message].to_s : NSLocalizedString("Alert!", nil)
+		# Ability to make no message
+        opts[:message] = if opts.has_key?(:message)
+          opts[:message].nil? ? nil : opts[:message].to_s
+        else
+          NSLocalizedString("Alert!", nil)
+        end
+
         opts[:style]   = VALID_STYLES.include?(opts[:style]) ? opts[:style] : :alert
+        if opts[:style] == :sheet and rmq.device.ipad? and opts[:source].nil?
+          raise ArgumentError.new "Please provide a :source view to use :sheet on iPad"
+        end
         opts[:fields]  = opts[:style] == :custom && opts[:fields] ? opts[:fields] : {text: {placeholder: ''}}
         api            = rmq.device.ios_at_least?(8) ? :modern : :deprecated
         api            = :deprecated if rmq.device.ios_at_least?(8) && opts[:api] == :deprecated
@@ -47,7 +56,7 @@ module RubyMotionQuery
         fieldset = {alert_view_style: UIAlertViewStyleDefault, fields: []}
 
         if TEMPLATE_FIELD_STYLES.include?(opts[:style])
-          fieldset = add_template_fieldset(opts[:style])
+          fieldset = add_template_fieldset(opts[:style], opts)
         elsif opts[:style] == :custom
           fieldset = custom_fieldset(opts[:api], opts[:fields])
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: RedAlert
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '1.3'
 platform: ruby
 authors:
 - Gant Laborde
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-23 00:00:00.000000000 Z
+date: 2015-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_motion_query