Pesto: Init + wire up settings VC.

traviskaufman · traviskaufman · commit b78ccf7d7fd0 · 2016-01-28T14:01:01.000-05:00
Summary: This commit introduces a VC for the settings view within the Pesto demo app. The settings VC is presented modally when a user taps the "Settings" item from the side menu. The actual settings VC is not implemented, rather just a dummy settings cell that can be used for design feedback + POC. Test Plan: 1. Open the Pesto demo app 2. Open the side menu 3. Tap "Settings" 4. Observe the settings VC is presented modally. 5. Rotate the device 6. Observe the dummy settings "cell" adapts to the rotation. Reviewers: #material_components_ios_owners, junius Reviewed By: #material_components_ios_owners, junius Projects: #material_components_ios Differential Revision: http://codereview.cc/D88
diff --git a/demos/Pesto/Pesto.xcodeproj/project.pbxproj b/demos/Pesto/Pesto.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		C9A8552B1C4EDFAA003CADF7 /* PestoSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C9A8552A1C4EDFAA003CADF7 /* PestoSettingsViewController.m */; };
 		CE6A9B25D9A958C060ABB21D /* libPods-Pesto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B0D8C7972AFCDCD5C9447F8E /* libPods-Pesto.a */; };
 		DE381E1A1C457CEE00019C1D /* PestoCardCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = DE381E191C457CEE00019C1D /* PestoCardCollectionViewCell.m */; };
 		DE381E401C45A9FB00019C1D /* PestoSideView.m in Sources */ = {isa = PBXBuildFile; fileRef = DE381E3F1C45A9FB00019C1D /* PestoSideView.m */; };
@@ -22,6 +23,8 @@
 /* Begin PBXFileReference section */
 		B0D8C7972AFCDCD5C9447F8E /* libPods-Pesto.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Pesto.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		BD25922DF748FCA11BCF30C4 /* Pods-Pesto.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pesto.release.xcconfig"; path = "Pods/Target Support Files/Pods-Pesto/Pods-Pesto.release.xcconfig"; sourceTree = "<group>"; };
+		C9A855291C4EDFAA003CADF7 /* PestoSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PestoSettingsViewController.h; sourceTree = "<group>"; };
+		C9A8552A1C4EDFAA003CADF7 /* PestoSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PestoSettingsViewController.m; sourceTree = "<group>"; };
 		D36B00D81356A416449940A7 /* Pods-Pesto.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Pesto.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Pesto/Pods-Pesto.debug.xcconfig"; sourceTree = "<group>"; };
 		DE381E181C457CE300019C1D /* PestoCardCollectionViewCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PestoCardCollectionViewCell.h; sourceTree = "<group>"; };
 		DE381E191C457CEE00019C1D /* PestoCardCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PestoCardCollectionViewCell.m; sourceTree = "<group>"; };
@@ -105,6 +108,8 @@
 				DE381E3F1C45A9FB00019C1D /* PestoSideView.m */,
 				DEBEDF2D1C3EF5D5004B614B /* PestoViewController.h */,
 				DEBEDF2E1C3EF5D5004B614B /* PestoViewController.m */,
+				C9A855291C4EDFAA003CADF7 /* PestoSettingsViewController.h */,
+				C9A8552A1C4EDFAA003CADF7 /* PestoSettingsViewController.m */,
 				DEBEDF271C3EF5D5004B614B /* Supporting Files */,
 			);
 			path = Pesto;
@@ -239,6 +244,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				C9A8552B1C4EDFAA003CADF7 /* PestoSettingsViewController.m in Sources */,
 				DEBEDF2F1C3EF5D5004B614B /* PestoViewController.m in Sources */,
 				DE381E1A1C457CEE00019C1D /* PestoCardCollectionViewCell.m in Sources */,
 				DE5EF8671C404E0E00D2D4B9 /* PestoDetailViewController.m in Sources */,
diff --git a/demos/Pesto/Pesto/PestoSettingsViewController.h b/demos/Pesto/Pesto/PestoSettingsViewController.h
@@ -0,0 +1,4 @@
+#import <UIKit/UIKit.h>
+
+@interface PestoSettingsViewController : UIViewController
+@end
diff --git a/demos/Pesto/Pesto/PestoSettingsViewController.m b/demos/Pesto/Pesto/PestoSettingsViewController.m
@@ -0,0 +1,88 @@
+#import "PestoSettingsViewController.h"
+
+#import "MaterialSwitch.h"
+#import "MaterialTypography.h"
+
+static CGFloat kPestoSettingsViewControllerCellViewInset = 20.f;
+static CGFloat kPestoSettingsViewControllerCellViewHeight = 48.f;
+
+@interface PestoSettingsViewControllerCellView : UIView
+
+@property(nonatomic) NSString *labelText;
+@property(nonatomic) BOOL on;
+
+@end
+
+@interface PestoSettingsViewControllerCellView ()
+
+@property(nonatomic) UILabel *labelView;
+@property(nonatomic) MDCSwitch *switchView;
+
+@end
+
+@implementation PestoSettingsViewControllerCellView
+
+- (id)initWithCoder:(NSCoder *)aDecoder {
+  self = [super initWithCoder:aDecoder];
+  return self;
+}
+
+- (id)initWithFrame:(CGRect)frame {
+  self = [super initWithFrame:frame];
+  if (self) {
+    CGRect descRect = CGRectMake(0, 0, self.bounds.size.width * 0.75f, self.bounds.size.height);
+    _labelView = [[UILabel alloc] initWithFrame:descRect];
+    _labelView.font = [MDCTypography body1Font];
+    _labelView.alpha = [MDCTypography body1FontOpacity];
+    _labelView.autoresizingMask = UIViewAutoresizingFlexibleWidth |
+                                  UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleRightMargin;
+
+    _switchView = [[MDCSwitch alloc] initWithFrame:CGRectZero];
+    CGFloat switchX = self.bounds.size.width - _switchView.frame.size.width;
+    CGFloat switchY = (self.bounds.size.height - _switchView.frame.size.height) / 2.f;
+    _switchView.frame = CGRectOffset(_switchView.frame, switchX, switchY);
+    _switchView.onTintColor = [UIColor colorWithRed:0.09f green:0.54f blue:0.44f alpha:1.f];
+    _switchView.autoresizingMask = UIViewAutoresizingFlexibleLeftMargin |
+                                   UIViewAutoresizingFlexibleTopMargin |
+                                   UIViewAutoresizingFlexibleBottomMargin;
+
+    [self addSubview:_labelView];
+    [self addSubview:_switchView];
+  }
+  return self;
+}
+
+- (void)setLabelText:(NSString *)labelText {
+  _labelText = labelText;
+  _labelView.text = _labelText;
+  [self setNeedsLayout];
+}
+
+- (void)setOn:(BOOL)on {
+  _on = on;
+  _switchView.on = on;
+}
+
+@end
+
+@implementation PestoSettingsViewController
+
+- (void)viewDidLoad {
+  [super viewDidLoad];
+  CGRect testViewFrame = CGRectMake(0,
+                                    10.f,
+                                    self.view.bounds.size.width,
+                                    kPestoSettingsViewControllerCellViewHeight);
+  CGRect insetFrame = CGRectInset(testViewFrame, kPestoSettingsViewControllerCellViewInset, 0);
+  PestoSettingsViewControllerCellView *testCellView = [[PestoSettingsViewControllerCellView alloc]
+      initWithFrame:insetFrame];
+  testCellView.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+  testCellView.labelText = @"Settings view needs more work?";
+  testCellView.on = YES;
+
+  self.view.backgroundColor = [UIColor whiteColor];
+
+  [self.view addSubview:testCellView];
+}
+
+@end
diff --git a/demos/Pesto/Pesto/PestoSideView.h b/demos/Pesto/Pesto/PestoSideView.h
@@ -1,7 +1,17 @@
 #import <UIKit/UIKit.h>
 
+@class PestoSideView;
+@protocol PestoSideViewDelegate <NSObject>
+
+@optional
+- (void)sideViewDidSelectSettings:(PestoSideView *)sideView;
+
+@end
+
 @interface PestoSideView : UIView
 
+@property(weak) id<PestoSideViewDelegate> delegate;
+
 - (void)showSideView;
 
 - (void)hideSideView;
diff --git a/demos/Pesto/Pesto/PestoSideView.m b/demos/Pesto/Pesto/PestoSideView.m
@@ -15,7 +15,7 @@
 
 @interface PestoSideViewCollectionViewCell : UICollectionViewCell
 
-@property (nonatomic) NSString *title;
+@property(nonatomic) NSString *title;
 
 @end
 
@@ -24,7 +24,6 @@ @implementation PestoSideViewCollectionViewCell
 - (id)initWithFrame:(CGRect)frame {
   self = [super initWithFrame:frame];
   if (self) {
-
   }
   return self;
 }
@@ -50,19 +49,29 @@ - (void)prepareForReuse {
 
 @end
 
+@class PestoSideContentView;
+@protocol PestoSideContentViewDelegate <NSObject>
+
+@optional
+- (void)sideContentView:(PestoSideContentView *)sideContentView
+ didSelectItemWithTitle:(NSString *)title;
+
+@end
+
 @interface PestoSideContentView : UIView <UICollectionViewDataSource,
                                           UICollectionViewDelegateFlowLayout>
 
-@property (nonatomic) NSArray *titles;
-@property (nonatomic) NSCache *imageCache;
-@property (nonatomic) UICollectionView *collectionView;
+@property(nonatomic) NSArray *titles;
+@property(nonatomic) NSCache *imageCache;
+@property(nonatomic) UICollectionView *collectionView;
+@property(weak) id<PestoSideContentViewDelegate> delegate;
 
 @end
 
 @implementation PestoSideContentView
 
 - (void)layoutSubviews {
-  _titles = @[  @"Home", @"Favorite", @"Saved", @"Trending", @"Settings" ];
+  _titles = @[ @"Home", @"Favorite", @"Saved", @"Trending", @"Settings" ];
 
   CGRect avatarRect = CGRectMake(0, 0, kPestoSideViewAvatarDim, kPestoSideViewAvatarDim);
   NSString *imageURL = [kPestoSideViewWidthBaseURL stringByAppendingString:@"avatar.jpg"];
@@ -138,7 +147,7 @@ - (UIImageView *)imageViewWithURL:(NSString *)url {
   dispatch_async(dispatch_get_global_queue(0, 0), ^{
     NSData *imageData = [_imageCache objectForKey:url];
     if (!imageData) {
-      imageData = [[NSData alloc] initWithContentsOfURL: [NSURL URLWithString:url]];
+      imageData = [[NSData alloc] initWithContentsOfURL:[NSURL URLWithString:url]];
       [_imageCache setObject:imageData forKey:url];
     }
     if (imageData == nil) {
@@ -156,7 +165,7 @@ + (Class)layerClass {
   return [MDCShadowLayer class];
 }
 
-# pragma mark - UICollectionViewDataSource
+#pragma mark - UICollectionViewDataSource
 
 - (NSInteger)collectionView:(UICollectionView *)collectionView
      numberOfItemsInSection:(NSInteger)section {
@@ -174,26 +183,30 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView
   return cell;
 }
 
+#pragma mark - UICollectionViewDelegateFlowLayout
+
 - (void)collectionView:(UICollectionView *)collectionView
     didSelectItemAtIndexPath:(NSIndexPath *)indexPath {
+  if (self.delegate &&
+      [self.delegate respondsToSelector:@selector(sideContentView:didSelectItemWithTitle:)]) {
+    [self.delegate sideContentView:self didSelectItemWithTitle:_titles[[indexPath row]]];
+  }
 }
 
-# pragma mark - UICollectionViewDelegateFlowLayout
-
 - (CGSize)collectionView:(UICollectionView *)collectionView
-                  layout:(UICollectionViewLayout*)collectionViewLayout
+                  layout:(UICollectionViewLayout *)collectionViewLayout
   sizeForItemAtIndexPath:(NSIndexPath *)indexPath {
   return CGSizeMake(collectionView.bounds.size.width, 40.f);
 }
 
 @end
 
-@interface PestoSideView () <UIGestureRecognizerDelegate>
+@interface PestoSideView () <UIGestureRecognizerDelegate, PestoSideContentViewDelegate>
 
-@property (nonatomic) CGFloat xDelta;
-@property (nonatomic) CGFloat xStart;
-@property (nonatomic) PestoSideContentView *contentView;
-@property (nonatomic) UIButton *dismissButton;
+@property(nonatomic) CGFloat xDelta;
+@property(nonatomic) CGFloat xStart;
+@property(nonatomic) PestoSideContentView *contentView;
+@property(nonatomic) UIButton *dismissButton;
 
 @end
 
@@ -206,12 +219,15 @@ - (id)initWithFrame:(CGRect)frame {
         CGRectMake(-kPestoSideViewWidth, 0, kPestoSideViewWidth, self.frame.size.height);
     _contentView = [[PestoSideContentView alloc] initWithFrame:contentViewFrame];
     _contentView.backgroundColor = [UIColor whiteColor];
+    _contentView.delegate = self;
     [self addSubview:_contentView];
 
     UITapGestureRecognizer *tapRecognizer =
         [[UITapGestureRecognizer alloc] initWithTarget:self
                                                 action:@selector(hideSideView)];
+    tapRecognizer.delegate = self;
     [self addGestureRecognizer:tapRecognizer];
+
     UIPanGestureRecognizer *panRecognizer =
         [[UIPanGestureRecognizer alloc] initWithTarget:self
                                                 action:@selector(panGestureRecognized:)];
@@ -230,31 +246,39 @@ - (void)layoutSubviews {
 
 - (void)showSideView {
   [UIView animateWithDuration:kPestoSideViewAnimationDuration
-                        delay:0
-                      options:UIViewAnimationOptionCurveEaseOut
-                   animations:^ {
-                     _contentView.transform = [PestoSideView showTransform];
-                   } completion:^(BOOL finished) {
-                     
-                   }];
+      delay:0
+      options:UIViewAnimationOptionCurveEaseOut
+      animations:^{
+        _contentView.transform = [PestoSideView showTransform];
+      }
+      completion:^(BOOL finished){
+
+      }];
 }
 
 - (void)hideSideView {
   [UIView animateWithDuration:kPestoSideViewAnimationDuration
-                        delay:0
-                      options:UIViewAnimationOptionCurveEaseOut
-                   animations:^ {
-                     _contentView.transform = [PestoSideView hideTransform];
-                   } completion:^(BOOL finished) {
-                     self.hidden = YES;
-                   }];
+      delay:0
+      options:UIViewAnimationOptionCurveEaseOut
+      animations:^{
+        _contentView.transform = [PestoSideView hideTransform];
+      }
+      completion:^(BOOL finished) {
+        self.hidden = YES;
+      }];
 }
 
 - (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
     shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer {
   return YES;
 }
 
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer
+       shouldReceiveTouch:(UITouch *)touch {
+  return [gestureRecognizer isKindOfClass:[UITapGestureRecognizer class]] &&
+         ![touch.view isDescendantOfView:_contentView];
+}
+
 - (void)panGestureRecognized:(UIPanGestureRecognizer *)recognizer {
   CGPoint tappedPoint = [recognizer locationInView:self];
   CGFloat xCoordinate = tappedPoint.x;
@@ -288,4 +312,16 @@ + (CGAffineTransform)hideTransform {
   return CGAffineTransformIdentity;
 }
 
+#pragma mark - PestoSideContentViewDelegate
+
+- (void)sideContentView:(PestoSideContentView *)sideContentView
+ didSelectItemWithTitle:(NSString *)title {
+  if (self.delegate) {
+    if ([title isEqualToString:@"Settings"] &&
+        [self.delegate respondsToSelector:@selector(sideViewDidSelectSettings:)]) {
+      [self.delegate sideViewDidSelectSettings:self];
+    }
+  }
+}
+
 @end
diff --git a/demos/Pesto/Pesto/PestoViewController.m b/demos/Pesto/Pesto/PestoViewController.m
diff --git a/demos/Pesto/Podfile.lock b/demos/Pesto/Podfile.lock

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +#import <UIKit/UIKit.h>
++
 +@interface PestoSettingsViewController : UIViewController
 +@end