ProMotion-menu 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93421674ad0b5ccdd7bd9cfeddc82adf36e616f7
-  data.tar.gz: 8425768ebb4745a72c96767f7f7ff0dfea0a8fa4
+  metadata.gz: fc35b7957b121ac2a05e893420f5ec279adff29a
+  data.tar.gz: 31fbd21f28e8cb617f9fc67e8b48fb132a5c174d
 SHA512:
-  metadata.gz: 2c74585488af13f3e574c1b6331ca37645a0caf7bba48ac05d8eabc645a81464839bc2d4bacc766cde794cda4b1d037fed21e46dd48bf9d23f004d66b7e3df7d
-  data.tar.gz: 00fc0617192f9667f990530c96f95b34dea41e9059c4ed0dc90173be8fbdd0ac2ba1d167ef0d3ffbc97c822fc79a60a81de7bbbbe8669900a829dfbe8dd0881f
+  metadata.gz: 7e9363a5b97e96c48f11c2189d1fb4bfe8159f1683bbbefc13ce2501726acf548d14fd9189f7fdca3358b893862da9bad77d0e4f8a164f452d5ad98d990b20db
+  data.tar.gz: 77a145ec8c9a57dc52dcd3efc9c35578f4063184a9c0cbb42ff30e06d4ca358105b8e7866c89e0dcf9ef72e50e23e8ec37e5fedc6325640020e8d72f5e672d03

data/README.md

@@ -62,6 +62,7 @@ class MenuDrawer < PM::Menu::Drawer
     self.center = MyGreatAppScreen.new(nav_bar: true)
     self.left = NavigationScreen
     self.to_show = [:pan_bezel, :pan_nav_bar]
+    self.transition_animation = :swinging_door
     self.max_left_width = 250
     self.shadow = false
   end
@@ -117,6 +118,29 @@ app_delegate.menu.to_show = :pan_center
 
 ```
 
+## Transition Animation
+Changing the transition animation is easy:
+
+```ruby
+app_delegate.menu.transition_animation = :swinging_door
+
+# The following transition animation options are available:
+
+  :slide              # Default. Equivalent to :parallax_1 and similar to the menu
+                      # in Spotify's app.
+
+  :slide_and_scale    # A slide and scale visual effect similar to Mailbox.app.
+                      # Scales from 90% to 100%, translates x 50px, and sets alpha
+                      # from 0.0 to 1.0.
+
+  :swinging_door      # A swinging door effect
+
+  :parallax_n                   # A parallax effect where n is a parallax factor.
+  :parallax                     # Equiavlent of :parallax_3
+  :parallax_1                   # Equivalent of :slide
+  :"parallax_#{Float::MAX}"     # Equivalent of no animation at all.
+```
+
 ## Toggling the Menu Drawer Current Screen
 To make the menu drawer present the menu from anywhere in your app:
 

data/lib/ProMotion-menu.rb

@@ -13,6 +13,12 @@ Motion::Project::App.setup do |app|
     app.files.insert(insert_point, file)
   end
 
+  # For compatibility with libraries that set detect_dependencies to false
+  app.files_dependencies({
+    "#{core_lib}/drawer.rb" => [ "#{core_lib}/visibility.rb", "#{core_lib}/gestures.rb" ],
+    "#{core_lib}/delegate.rb" => [ "#{core_lib}/drawer.rb" ],
+  })
+  
   app.pods do
     pod 'MMDrawerController', '~> 0.5'
   end

data/lib/ProMotion/menu/drawer.rb

@@ -4,6 +4,7 @@ module ProMotion
       include ::ProMotion::ScreenModule
       include Gestures
       include Visibility
+      include Transition
 
       def self.new(center=nil, options={})
         menu = alloc.init
@@ -75,9 +76,11 @@ module ProMotion
     protected
 
       def prepare_controller_for_pm(controller)
-        controller = set_up_screen_for_open(controller, {})
-        ensure_wrapper_controller_in_place(controller, {})
-        controller.navigationController || controller
+        unless controller.nil?
+          controller = set_up_screen_for_open(controller, {})
+          ensure_wrapper_controller_in_place(controller, {})
+          controller.navigationController || controller
+        end
       end
 
       def default_completion_block

data/lib/ProMotion/menu/transition.rb

@@ -0,0 +1,48 @@
+module ProMotion; module Menu
+  module Transition
+
+     VISUAL_STATES = {
+      # Creates a slide and scale visual state block that gives an experience
+      # similar to Mailbox.app. It scales from 90% to 100%, and translates 50
+      # pixels in the x direction. In addition, it also sets alpha from 0.0 to 1.0.
+      slide_and_scale: MMDrawerVisualState.slideAndScaleVisualStateBlock,
+
+      # Creates a slide visual state block that gives the user an experience that
+      # slides at the same speed of the center view controller during animation.
+      # This is equal to calling parallaxVisualStateBlockWithParallaxFactor: with
+      # a parallax factor of 1.0. This is similar to the menu in Spotify's app.
+      slide: MMDrawerVisualState.slideVisualStateBlock,
+
+      # Creates a parallax experience that slides the side drawer view controller
+      # at a different rate than the center view controller during animation. For
+      # every parallaxFactor of points moved by the center view controller, the side
+      # drawer view controller will move 1 point. Passing in 1.0 is the equivalent
+      # of a applying a sliding animation, while passing in 'MAX_FLOAT' is the equivalent
+      # of having no animation at all.
+      parallax: MMDrawerVisualState.parallaxVisualStateBlockWithParallaxFactor(3),
+
+      # Creates a swinging door visual state block that gives the user an experience that
+      # animates the drawer in along the hinge.
+      swinging_door: MMDrawerVisualState.swingingDoorVisualStateBlock
+    }
+
+    def transition_animation=(visual_block)
+      # Parallax requires a parallax_factor. Set it by passing the visual_block
+      # block in with underscore parallax_factor attached to the end. i.e.
+      # transition_animation = :parallax_6 for parallax_factor 6.
+      self.setDrawerVisualStateBlock(mask_for_transition(visual_block))
+    end
+
+    def mask_for_transition(visual_block)
+      unless visual_block.nil?
+        if visual_block.include? "parallax"
+          parallax_factor = visual_block.include?("_") ? visual_block.split("_")[1].to_i : 3
+          visual_state = MMDrawerVisualState.parallaxVisualStateBlockWithParallaxFactor(parallax_factor)
+        end
+      end
+      visual_state ||= VISUAL_STATES[visual_block]
+      visual_state
+    end
+
+  end
+end; end

data/lib/ProMotion/menu/version.rb

@@ -1,7 +1,7 @@
 module ProMotion
   module Menu
 
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
 
   end
 end

data/spec/drawer_spec.rb

@@ -57,4 +57,12 @@ describe ProMotion::Menu::Drawer do
     menu.showsShadow.should == true
   end
 
+  it "doesn't crash if you set the left or right controller to nil" do
+    menu = ProMotion::Menu::Drawer.new(@content, left: nil, right: nil)
+
+    menu.left_controller.should == nil
+    menu.right_controller.should == nil
+    menu.center_controller.should == @content
+  end
+
 end

data/spec/transition_spec.rb

@@ -0,0 +1,40 @@
+describe ProMotion::Menu::Transition do
+
+  before do
+    @object = Object.new
+    @object.extend(ProMotion::Menu::Transition)
+
+    @delegate = UIApplication.sharedApplication.delegate
+    @left = LeftNavScreen.new
+    @right = RightNavScreen.new
+    @content = BlankScreen.new
+  end
+
+
+  describe "#visualStates" do
+
+    it "returns a visualStateBlock for slideAndScale" do
+      @object.mask_for_transition(:slide_and_scale).is_a?(Proc).should == true
+    end
+
+    it "returns a visualStateBlock for slide" do
+      @object.mask_for_transition(:slide).is_a?(Proc).should == true
+    end
+
+    it "returns a visualStateBlock for swingingDoor" do
+      @object.mask_for_transition(:slide_and_scale).is_a?(Proc).should == true
+    end
+
+    it "returns a visualStateBlock for parallax, when passing in a factor" do
+      @object.mask_for_transition(:parallax_5).is_a?(Proc).should == true
+    end
+
+    it "returns a visualStateBlock for parallax, default factor" do
+      @object.mask_for_transition(:parallax).is_a?(Proc).should == true
+    end
+
+  end
+
+
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ProMotion-menu
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matt Brewer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-06 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: motion-cocoapods
@@ -83,6 +83,7 @@ files:
 - lib/ProMotion/menu/delegate.rb
 - lib/ProMotion/menu/drawer.rb
 - lib/ProMotion/menu/gestures.rb
+- lib/ProMotion/menu/transition.rb
 - lib/ProMotion/menu/version.rb
 - lib/ProMotion/menu/visibility.rb
 - spec/app_delegate_spec.rb
@@ -91,6 +92,7 @@ files:
 - spec/helpers/blank_screen.rb
 - spec/helpers/left_nav_screen.rb
 - spec/helpers/right_nav_screen.rb
+- spec/transition_spec.rb
 - spec/visibility_spec.rb
 homepage: https://github.com/clearsightstudio/ProMotion-menu
 licenses:
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Provides a facebook/Path style slide menu for ProMotion RubyMotion apps.
@@ -123,4 +125,5 @@ test_files:
 - spec/helpers/blank_screen.rb
 - spec/helpers/left_nav_screen.rb
 - spec/helpers/right_nav_screen.rb
+- spec/transition_spec.rb
 - spec/visibility_spec.rb