ruby_motion_query 1.6.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b355a45a7110338fc6c02889a66d384c1734a33a
-  data.tar.gz: fc38661d7c12c3e2f87d416dae6033a50c37bd84
+  metadata.gz: f671d2796fc4aff7e4d887b96f0264e77f2325a1
+  data.tar.gz: 86fdf864c95877496ec43b14a5eb151b1a74a4f4
 SHA512:
-  metadata.gz: f53052d866be68dd0477ef021b73ed699d8e17e22a644376f2f54de0f596906bfafad95ce426b94e473182ee52cf65017ede0dde8d4adeeb22d601e9e2f9a28a
-  data.tar.gz: 760ac10daad4c5931d39c7e5723a86966cd952408f97c5a643989e16e7052bbad680fc8e6e95618e355767a192fe31da9ee8440401d9a57ba55d875c5b252cd7
+  metadata.gz: 80f58e497f9f38d112c473e329ea51a83e229fab1b4a5a9b27cd1a0df39204dbe581e5d174f59971bfa2f52197a39f22862a62acc449c65439692e68453441ad
+  data.tar.gz: e25c918eb3455eec499c009f577f318f883e7439db5b9cb93706b34432eb77090144c85475fe2d7ef146277eb7a3c96ba5d64b233391f7746ea48dd50417bf90

data/motion/ruby_motion_query/actions.rb

@@ -51,7 +51,7 @@ module RubyMotionQuery
           when UIButton             then view.titleForState(UIControlStateNormal)
           when UIImageView          then view.image
           #when UITableView          then
-          #when UISwitch             then
+          when UISwitch             then view.on?
           #when UIDatePicker         then
           #when UISegmentedControl   then
           #when UIRefreshControl     then

data/motion/ruby_motion_query/animations.rb

@@ -128,6 +128,29 @@ module RubyMotionQuery
       out
     end
 
+    # @return [RMQ]
+    def sink(opts = {})
+      opts = {
+        duration: 0.4,
+        animations: ->(cq) {
+          cq.style {|st| st.scale = 1.0}
+        }
+      }.merge(opts)
+
+      out = @rmq.animate(
+        duration: opts[:duration_out] || 0.1,
+        animations: ->(q) {
+          q.style {|st| st.scale = 0.9}
+        },
+        completion: ->(did_finish, completion_rmq) {
+          if did_finish
+            completion_rmq.animate(opts)
+          end
+        }
+      )
+      out
+    end
+
     # @return [RMQ]
     def sink_and_throb(opts = {})
       opts = {
@@ -220,7 +243,8 @@ module RubyMotionQuery
         duration: 0.5,
         options: UIViewAnimationOptionCurveEaseIn,
         before: ->(bq) {
-          start_frame = bq.get.frame
+          bq.hide
+          start_frame = bq.get.frame.dup
 
           case from_direction
           when :right
@@ -232,6 +256,7 @@ module RubyMotionQuery
           else :bottom
             bq.move(t: rmq.device.height)
           end
+          bq.show
           start_frame
         },
         animations: ->(aq, return_var) {

data/motion/ruby_motion_query/app.rb

@@ -121,10 +121,16 @@ module RubyMotionQuery
       def current_view_controller(root_view_controller = nil)
         if root_view_controller || ((window = RMQ.app.window) && (root_view_controller = window.rootViewController))
           case root_view_controller
+          when UIMoreNavigationController # This must be above UINavigationController because it's a subclass
+            root_view_controller.visibleViewController
           when UINavigationController
             current_view_controller(root_view_controller.visibleViewController)
           when UITabBarController
-            current_view_controller(root_view_controller.selectedViewController)
+            if root_view_controller.viewControllers.count > 5 && root_view_controller.selectedIndex >= 4
+              current_view_controller(root_view_controller.moreNavigationController)
+            else
+              current_view_controller(root_view_controller.selectedViewController)
+            end
           else
             if root_view_controller.respond_to?(:visibleViewController)
               current_view_controller(root_view_controller.visibleViewController)

data/motion/ruby_motion_query/base.rb

@@ -271,6 +271,10 @@ module RubyMotionQuery
       puts out
     end
 
+    def log_tree
+      self.log :tree
+    end
+
     def tree_to_s(selected_views, depth = 0)
       out = ""
 

data/motion/ruby_motion_query/color.rb

@@ -161,13 +161,9 @@ module RubyMotionQuery
 
     def self.from_base_color(values)
       base = values[:base] || values[:color]
-      begin
-        r, g, b, a = Pointer.new('d'), Pointer.new('d'), Pointer.new('d'), Pointer.new('d')
-        base.getRed(r, green: g, blue: b, alpha: a)
-      rescue
-        r, g, b, a = Pointer.new('f'), Pointer.new('f'), Pointer.new('f'), Pointer.new('f')
-        base.getRed(r, green: g, blue: b, alpha: a)
-      end
+      type = CGSize.type[/(f|d)/]
+      r, g, b, a = Pointer.new(type), Pointer.new(type), Pointer.new(type), Pointer.new(type)
+      base.getRed(r, green: g, blue: b, alpha: a)
 
       r = values[:r] || values[:red] || r.value
       g = values[:g] || values[:green] || g.value

data/motion/ruby_motion_query/data.rb

@@ -64,6 +64,12 @@ module RubyMotionQuery
       styles[0] = value
     end
 
+    # view.rmq_data.styles = [:something]
+    # Convenience method for setting the entire styles variable
+    def styles=(s)
+      @_styles = Array(s)
+    end
+
     #view.rmq_data.styles
     def styles
       @_styles ||= []

data/motion/ruby_motion_query/device.rb

@@ -90,7 +90,9 @@ module RubyMotionQuery
       end
 
       def simulator?
-        @_simulator = !(UIDevice.currentDevice.model =~ /simulator/i).nil? if @_simulator.nil?
+        if @_simulator.nil?
+          @_simulator = !(UIDevice.currentDevice.name.downcase =~ /simulator/).nil?
+        end
         @_simulator
       end
 
@@ -114,6 +116,11 @@ module RubyMotionQuery
         @_five_point_five_inch
       end
 
+      def twelve_point_nine_inch?
+        @_twelve_point_nine_inch = (Device.height == 1366.0) if @_twelve_point_nine_inch.nil?
+        @_twelve_point_nine_inch
+      end
+
       def retina?
         if @_retina.nil?
           main_screen = Device.screen
@@ -190,6 +197,8 @@ module RubyMotionQuery
           puts "screen size: 4\""
         elsif three_point_five_inch?
           puts "screen size: 3.5\""
+        elsif twelve_point_nine_inch?
+          puts "screen size: 12.9\""
         end
       end
 

data/motion/ruby_motion_query/events.rb

@@ -106,9 +106,20 @@ module RubyMotionQuery
       self
     end
 
-    def trigger(event)
+    def trigger(event_name)
       selected.each do |view|
-        events(view)[event].block.call(view.rmq) if events(view)[event]
+        event = events(view)[event_name]
+
+        if event
+          case event.block.arity
+          when 2
+            event.block.call(view, event)
+          when 1
+            event.block.call(view)
+          else
+            event.block.call
+          end
+        end
       end
 
       self

data/motion/ruby_motion_query/font.rb

@@ -25,10 +25,10 @@ module RubyMotionQuery
       #
       #
       #   # Another way is to add named fonts:
-      #   RubyMotionQuery::Font.add_named_font :large,  STANDARD_FONT, 44
+      #   RubyMotionQuery::Font.add_named :large,  STANDARD_FONT, 44
       #
       #   # In a stylesheet you can just do
-      #   font.add_named_font :large,  STANDARD_FONT, 44
+      #   font.add_named :large,  STANDARD_FONT, 44
       #
       #   # The use like so in your stylesheet:
       #   font = font.large
@@ -75,7 +75,7 @@ module RubyMotionQuery
       #
       # @example
       #   font = rmq.font.system(18)
-      def system(size = nil)
+      def system(size = UIFont.systemFontSize)
         UIFont.systemFontOfSize(size)
       end
 

data/motion/ruby_motion_query/image.rb

@@ -17,7 +17,7 @@ module RubyMotionQuery
 
       # @return [UIImage]
       def resource_for_device(file_base_name, opts = {})
-        ext = if RMQ.device.five_point_five_inch?
+        ext = if RMQ.device.five_point_five_inch? || RMQ.device.ipad?
           "-736h"
         elsif RMQ.device.four_point_seven_inch?
           "-667h"

data/motion/ruby_motion_query/rect.rb

@@ -368,6 +368,10 @@ module RubyMotionQuery
           t = root_view_point.y
         end
 
+        if rmq.app.development? && (w <= 0 || h <= 0)
+          puts "#{view.rmq_data.style_name}: One or more values in your frame is a negative or zero. If this is unexpected, check your styles.\nFrame values: {l: #{l}, t: #{t}, w: #{w}, h: #{h}}"
+        end
+
         [l,t,w,h]
       end
 

data/motion/ruby_motion_query/stylers/ui_text_field_styler.rb

@@ -67,7 +67,7 @@ module RubyMotionQuery
 
       # managing overlay views
       def clear_button_mode ; view.clearButtonMode ; end
-      def clear_button_mode=(v) ; view.clearButtonMode = v ; end
+      def clear_button_mode=(v) ; view.clearButtonMode = TEXT_FIELD_MODES[v] || v ; end
 
       def left_view ; view.leftView ; end
       def left_view=(v) ; view.leftView = v ; end

data/motion/ruby_motion_query/stylers/ui_view_styler.rb

@@ -387,6 +387,11 @@ module RubyMotionQuery
       end
       def shadow_opacity ; @view.layer.shadowOpacity ; end
 
+      def shadow_radius=(radius)
+        @view.layer.shadowRadius = radius
+      end
+      def shadow_radius ; @view.layer.shadowRadius ; end
+
       def shadow_path=(path)
         @view.layer.shadowPath = path
       end

data/motion/ruby_motion_query/stylesheet.rb

@@ -55,6 +55,13 @@ module RubyMotionQuery
     end
     alias :remove_styles :remove_style
 
+    def remove_all_styles
+      selected.each do |view|
+        view.rmq_data.styles = nil
+      end
+      self
+    end
+
     # Pass a block to apply styles, an inline way of applynig a style
     # @example
     #   rmq(view).style{|st| st.background_color = rmq.color.blue}
@@ -283,6 +290,10 @@ module RubyMotionQuery
       device.five_point_five_inch?
     end
 
+    def twelve_point_nine_inch?
+      device.twelve_point_nine_inch?
+    end
+
     def retina?
       device.retina?
     end

data/motion/ruby_motion_query/version.rb

@@ -1,5 +1,5 @@
 module RubyMotionQuery
-  VERSION = "1.6.1"
+  VERSION = "1.7.0"
 
   class RMQ
     def version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_motion_query
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Todd Werth
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-11-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bacon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -148,9 +134,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: RubyMotionQuery - RMQ
 test_files: []
-has_rdoc: