motion-floating-action-button 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36a201791e012cee17461f1c130c3fbc71bdd649
-  data.tar.gz: 32f1046c5cbd21d3ca57a5695d11b2aa05f2ec89
+  metadata.gz: 21f77174714fce7c67752d5b3dfad72ea42f2123
+  data.tar.gz: d10f0b0ed15dd568fe61dfc284fe06d81a0c5dfa
 SHA512:
-  metadata.gz: 5a81d2c38848d516b843faf2e93426f33976509050f754862cceaf251381d6040b4593eabed91e5594edd587e6ec5b41b99b56fb92117ef8ce890606421b9128
-  data.tar.gz: eb52bfe6557ca58130ea59cecc510ecaa47abaedd6c9d2355f079fb3ccb106c7fe5631b8373c93e4d0ccc674b74b29091e8d67f49d4f0e480e28047e4fbe07c3
+  metadata.gz: 6d503b15e9d35bad03375d7827b89bd9ce9ce79dc3735e3b946cc1c75818a963e982ca2961cb74ab31b0535676b0b58c1000447b46f694ac09fdd049c84626e2
+  data.tar.gz: cfe183e4a5746ebfa72dfee433ffc4dc4833ebaf6565726ce2fa88605834993de6cbc9dd3d9edb9773bd08268af06044df1d7a8d6878fb6acb92bf65bf3458b3

data/README.md

@@ -4,8 +4,9 @@ Motion-Swipe for RubyMotion
 
 Trying to add a Google inbox like floating button gem for RubyMotion. PRs for fixes, refactors and features accepted!
 
-This is a wrapper around gizmoboy7's VCFloatingActionButton written in obj-c. He does an excellent job detailing how it all works, so that you can customize it easily. So see his source: https://github.com/gizmoboy7/VCFloatingActionButton
+This is a wrapper around gizmoboy7's VCFloatingActionButton written in obj-c. We've included some of the fixes in the issues and pull requests from his repo and have made some customizations here too, so it is diverged and will likely stay that way. See his source: https://github.com/gizmoboy7/VCFloatingActionButton
 
+We'd like to dedicate this gem to @andrewhavens, may he eschew iOS guidelines in the future.
 
 __setup needed for storyboard file usage__
 
@@ -13,6 +14,21 @@ You need to move the .xib file `resources` into your app's `resources` folder. R
 
 __create a floating action button view__
 ``` ruby
+
+# If you are not using a nav bar, you can ignore these values.
+nav_bar_height = self.navigation_controller.navigationBar.frame.size.height
+nav_bar = self.navigation_controller.navigationBar
+scroll_view = UITableView.new  # haven't played with the scroll view option myself
+    
+@addButton = MotionFloatingActionButton.new(
+      CGRectMake(device.width*3/4, device.height/2+nav_bar_height, device.width*1/4, device.height/2),
+      normal_image: rmq.image.resource('icons/plus'),
+      pressed_image: rmq.image.resource('icons/plus'),
+      scroll_view: scroll_view, #optional
+      navigation_bar: nav_bar, #optional
+    )
+
+# Older way but should still work
 @addButton = MotionFloatingActionButton.build({
   floating_frame: CGRectMake(device.width*3/4, device.height/2, device.width*1/4, device.height/2),
   normal_image: rmq.image.resource('icons/plus'), # or UIImage.imageNamed('plus')

data/lib/motion-floating-action-button/motion-floating-action-button.rb

@@ -2,13 +2,54 @@ module MotionFloatingActionButton
 
   module_function
 
+  def new(  floating_frame, 
+            options
+          )
+
+    normal_image = options[:normal_image] || UIImage.imageNamed('plus')
+    pressed_image = options[:pressed_image] || UIImage.imageNamed('plus')
+    navigation_bar = options[:navigation_bar]
+    scroll_view = options[:scroll_view]
+
+    if scroll_view && navigation_bar
+      addButton = VCFloatingActionButton.alloc.initWithFrame(floating_frame, 
+        normalImage: normal_image, 
+        andPressedImage: pressed_image,
+        withScrollview: scroll_view,
+        andNavigationBar: navigation_bar
+      )
+    elsif scroll_view
+      addButton = VCFloatingActionButton.alloc.initWithFrame(floating_frame, 
+        normalImage: normal_image, 
+        andPressedImage: pressed_image, 
+        withScrollview: scroll_view,
+      )
+    elsif navigation_bar
+      addButton = VCFloatingActionButton.alloc.initWithFrame(floating_frame, 
+        normalImage: normal_image, 
+        andPressedImage: pressed_image, 
+        andNavigationBar: navigation_bar
+      )
+    else
+      addButton = VCFloatingActionButton.alloc.initWithFrame(floating_frame, 
+        normalImage: normal_image, 
+        andPressedImage: pressed_image
+      )
+    end
+
+    addButton
+  end
+          
+
   def build(args)
 
     @floating_frame = args[:floating_frame] || CGRectMake(device.width*3/4, device.height/2, device.width*1/4, device.height/2)
     @normal_image = args[:normal_image]
     @pressed_image = args[:pressed_image]
+    @navigation_bar = args[:navigation_bar]
 
-    addButton = VCFloatingActionButton.alloc.initWithFrame(@floating_frame, normalImage: @normal_image, andPressedImage: @pressed_image, withScrollview: UITableView.new)
+    # addButton = VCFloatingActionButton.alloc.initWithFrame(@floating_frame, normalImage: @normal_image, andPressedImage: @pressed_image) #, withScrollview: UITableView.new)
+    addButton = VCFloatingActionButton.alloc.initWithFrame(@floating_frame, normalImage: @normal_image, andPressedImage: @pressed_image, andNavigationBar: @navigation_bar)
 
     addButton
   end

data/vendor/motion-floating-action-button/VCFloatingActionButton.h

@@ -32,12 +32,36 @@
 @property (strong,nonatomic) UIImage *pressedImage, *normalImage;
 @property (strong,nonatomic) NSDictionary *menuItemSet;
 
+@property UIBlurEffectStyle blurEffectStyle;
+@property float backgroundAlpha;
+@property UIColor *menuTextColor;
+
 
 @property BOOL isMenuVisible;
 @property UIView *windowView;
 
--(id)initWithFrame:(CGRect)frame normalImage:(UIImage*)passiveImage andPressedImage:(UIImage*)activeImage withScrollview:(UIScrollView*)scrView;
-//-(void) setupButton;
+//For use in a scroll view
+-(id)initWithFrame:(CGRect)frame
+       normalImage:(UIImage*)passiveImage
+   andPressedImage:(UIImage*)activeImage
+    withScrollview:(UIScrollView*)scrView;
+
+//For use in not a scroll view
+-(id)initWithFrame:(CGRect)frame
+       normalImage:(UIImage*)passiveImage
+   andPressedImage:(UIImage*)activeImage;
+
+-(id)initWithFrame:(CGRect)frame 
+       normalImage:(UIImage*)passiveImage 
+   andPressedImage:(UIImage*)activeImage
+  andNavigationBar:(UINavigationBar*)navBar;
+
+//For use with a nav bar and a scroll view
+-(id)initWithFrame:(CGRect)frame 
+       normalImage:(UIImage*)passiveImage 
+   andPressedImage:(UIImage*)activeImage
+    withScrollview:(UIScrollView*)scrView
+  andNavigationBar:(UINavigationBar*)navBar;
 
 
 @end

data/vendor/motion-floating-action-button/VCFloatingActionButton.m

@@ -26,7 +26,9 @@ CGFloat buttonToScreenHeight;
 
 @synthesize bgScroller;
 
--(id)initWithFrame:(CGRect)frame normalImage:(UIImage*)passiveImage andPressedImage:(UIImage*)activeImage withScrollview:(UIScrollView*)scrView
+-(id)initWithFrame:(CGRect)frame
+        normalImage:(UIImage*)passiveImage
+        andPressedImage:(UIImage*)activeImage
 {
     self = [super initWithFrame:frame];
     if (self)
@@ -42,7 +44,6 @@ CGFloat buttonToScreenHeight;
         _menuTable = [[UITableView alloc]initWithFrame:CGRectMake(SCREEN_WIDTH/4, 0, 0.75*SCREEN_WIDTH,SCREEN_HEIGHT - (SCREEN_HEIGHT - CGRectGetMaxY(self.frame)) )];
         _menuTable.scrollEnabled = NO;
         
-        
         _menuTable.tableHeaderView = [[UIView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH/2, CGRectGetHeight(frame))];
         
         _menuTable.delegate = self;
@@ -51,18 +52,81 @@ CGFloat buttonToScreenHeight;
         _menuTable.backgroundColor = [UIColor clearColor];
         _menuTable.transform = CGAffineTransformMakeRotation(-M_PI); //Rotate the table
         
-        previousOffset = scrView.contentOffset.y;
-        
-        bgScroller = scrView;
+        // previousOffset = scrView.contentOffset.y;
+        previousOffset = 0;
+        bgScroller = nil;
 
         _pressedImage = activeImage;
         _normalImage = passiveImage;
         [self setupButton];
+
+        self.blurEffectStyle = UIBlurEffectStyleDark;
+        self.backgroundAlpha = 0.8;
         
     }
     return self;
 }
 
+-(id)initWithFrame:(CGRect)frame
+       normalImage:(UIImage*)passiveImage
+   andPressedImage:(UIImage*)activeImage
+    andNavigationBar:(UINavigationBar*)navBar
+{
+    self = [self initWithFrame:frame
+                   normalImage:passiveImage
+               andPressedImage:activeImage];
+    if(navBar) {
+      int statusBar = [UIApplication sharedApplication].statusBarFrame.size.height;
+
+      _buttonView.frame = CGRectMake(frame.origin.x,
+                                     frame.origin.y + navBar.frame.size.height + statusBar,
+                                     frame.size.width,
+                                     frame.size.height);
+
+      _menuTable.frame = CGRectMake(SCREEN_WIDTH/4,
+                                    0,
+                                    0.75*SCREEN_WIDTH,
+                                    SCREEN_HEIGHT - (SCREEN_HEIGHT - CGRectGetMaxY(self.frame) - navBar.frame.size.height - statusBar));
+    }
+    return self;
+}
+
+-(id)initWithFrame:(CGRect)frame
+       normalImage:(UIImage*)passiveImage
+   andPressedImage:(UIImage*)activeImage
+    withScrollview:(UIScrollView*)scrView
+{
+    self = [self initWithFrame:frame
+                   normalImage:passiveImage
+               andPressedImage:activeImage];
+    if (self)
+    {
+        previousOffset = scrView.contentOffset.y;
+        
+        bgScroller = scrView;
+    }
+    return self;
+}
+
+-(id)initWithFrame:(CGRect)frame
+       normalImage:(UIImage*)passiveImage
+   andPressedImage:(UIImage*)activeImage
+    withScrollview:(UIScrollView*)scrView
+  andNavigationBar:(UINavigationBar*)navBar
+{
+    self = [self initWithFrame:frame
+                   normalImage:passiveImage
+               andPressedImage:activeImage
+              andNavigationBar:navBar];
+    if (self)
+    {
+        previousOffset = scrView.contentOffset.y;
+        
+        bgScroller = scrView;
+    }
+    return self;
+}
+        
 
 -(void)setHideWhileScrolling:(BOOL)hideWhileScrolling
 {
@@ -91,7 +155,8 @@ CGFloat buttonToScreenHeight;
     [_buttonView addGestureRecognizer:buttonTap3];
     
     
-    UIBlurEffect *blur = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
+    // UIBlurEffect *blur = [UIBlurEffect effectWithStyle:UIBlurEffectStyleDark];
+    UIBlurEffect *blur = [UIBlurEffect effectWithStyle:self.blurEffectStyle];
     UIVisualEffectView *vsview = [[UIVisualEffectView alloc]initWithEffect:blur];
     
 
@@ -164,14 +229,14 @@ CGFloat buttonToScreenHeight;
 -(void) showMenu:(id)sender
 {
     
-    self.pressedImageView.transform = CGAffineTransformMakeRotation(M_PI);
+    self.pressedImageView.transform = CGAffineTransformMakeRotation(-M_PI/4);
     self.pressedImageView.alpha = 0.0; //0.3
     [UIView animateWithDuration:animationTime/2 animations:^
      {
          self.bgView.alpha = 1;
          
         
-         self.normalImageView.transform = CGAffineTransformMakeRotation(-M_PI);
+         self.normalImageView.transform = CGAffineTransformMakeRotation(M_PI/4);
          self.normalImageView.alpha = 0.0; //0.7
 
          
@@ -194,7 +259,7 @@ CGFloat buttonToScreenHeight;
      {
          self.bgView.alpha = 0;
          self.pressedImageView.alpha = 0.f;
-         self.pressedImageView.transform = CGAffineTransformMakeRotation(-M_PI);
+         self.pressedImageView.transform = CGAffineTransformMakeRotation(-M_PI/4);
          self.normalImageView.transform = CGAffineTransformMakeRotation(0);
          self.normalImageView.alpha = 1.f;
      } completion:^(BOOL finished)
@@ -351,6 +416,8 @@ CGFloat buttonToScreenHeight;
     cell.imgView.image = [UIImage imageNamed:[_imageArray objectAtIndex:indexPath.row]];
     cell.title.text    = [_labelArray objectAtIndex:indexPath.row];
 
+    cell.title.textColor = self.menuTextColor;
+
     
     return cell;
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: motion-floating-action-button
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Damien Sutevski
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies: []
 description: Easily create a floating action button interface.
 email: dameyawn@gmail.com
@@ -21,6 +21,7 @@ files:
 - lib/motion-floating-action-button.rb
 - lib/motion-floating-action-button/motion-floating-action-button.rb
 - resources/floatTableViewCell.xib
+- resources/plus.png
 - vendor/motion-floating-action-button/VCFloatingActionButton.h
 - vendor/motion-floating-action-button/VCFloatingActionButton.m
 - vendor/motion-floating-action-button/build-iPhoneSimulator/VCFloatingActionButton.m.o
@@ -54,5 +55,6 @@ rubyforge_project:
 rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
-summary: Cool floating action button feature for RubyMotion iOS
+summary: Cool material design (based on Google's design) floating action button feature
+  for RubyMotion iOS
 test_files: []