Add filters

Author: danielebogo

.gitignore

@@ -19,3 +19,4 @@ DerivedData
 
 #CocoaPods
 Pods
+Podfile.lock

DBCamera.podspec

@@ -1,15 +1,16 @@
 Pod::Spec.new do |s|
   s.name = 'DBCamera'
-  s.version = '2.2.2'
+  s.version = '2.3'
   s.license = 'MIT'
   s.summary = 'DBCamera is a simple custom camera with AVFoundation'
   s.homepage = 'https://github.com/danielebogo/DBCamera'
   s.author = { 'Daniele Bogo' => '[email protected]' }
-  s.source = { :git => 'https://github.com/danielebogo/DBCamera.git', :tag => '2.2.2' }
+  s.source = { :git => 'https://github.com/danielebogo/DBCamera.git', :tag => '2.3' }
   s.platform = :ios, '6.0'
   s.requires_arc = true
 
-  s.source_files = 'DBCamera/Categories/*.{h,m}', 'DBCamera/Controllers/*.{h,m}', 'DBCamera/Headers/*.{h,m}', 'DBCamera/Managers/*.{h,m}', 'DBCamera/Objects/*.{h,m}', 'DBCamera/Views/*.{h,m}'
-  s.resource = ['DBCamera/Resources/*.{xib,xcassets}', 'DBCamera/Localizations/**']
-  s.framework = 'AVFoundation', 'CoreMedia'
+  s.source_files = 'DBCamera/Categories/*.{h,m}', 'DBCamera/Controllers/*.{h,m}', 'DBCamera/Headers/*.{h,m}', 'DBCamera/Managers/*.{h,m}', 'DBCamera/Objects/*.{h,m}', 'DBCamera/Views/*.{h,m}', 'DBCamera/Filters/*.{h,m}'
+  s.resource = ['DBCamera/Resources/*.{xib,xcassets}', 'DBCamera/Localizations/**', 'DBCamera/Filters/*.{acv}']
+  s.framework = 'AVFoundation', 'CoreMedia', 'QuartzCore'
+  s.dependency 'GPUImage', '~> 0.1'
 end

DBCamera/Controllers/DBCameraBaseCropViewController.m

@@ -260,7 +260,7 @@ - (BOOL) handleGestureState:(UIGestureRecognizerState)state
 }
 
 
-- (void)checkBoundsWithTransform:(CGAffineTransform)transform
+- (void) checkBoundsWithTransform:(CGAffineTransform)transform
 {
     CGRect r1 = [self boundingBoxForRect:self.cropRect rotatedByRadians:[self imageRotation]];
     Rectangle r2 = [self applyTransform:transform toRect:self.initialImageFrame];

DBCamera/Controllers/DBCameraLibraryViewController.m

@@ -15,6 +15,7 @@
 #import "UIImage+Crop.h"
 #import "UIImage+TintColor.h"
 #import "DBCameraMacros.h"
+#import "DBCameraLoadingView.h"
 
 #ifndef DBCameraLocalizedStrings
 #define DBCameraLocalizedStrings(key) \
@@ -229,16 +230,8 @@ - (void) close
 - (UIView *) loading
 {
     if( !_loading ) {
-        _loading = [[UIView alloc] initWithFrame:(CGRect){ 0, 0, 100, 100 }];
-        [_loading.layer setCornerRadius:10];
-        [_loading setBackgroundColor:RGBColor(0x000000, .7)];
+        _loading = [[DBCameraLoadingView alloc] initWithFrame:(CGRect){ 0, 0, 100, 100 }];
         [_loading setCenter:self.view.center];
-        [_loading setAutoresizingMask:UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleBottomMargin];
-        
-        UIActivityIndicatorView *activity = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleWhite];
-        [activity setCenter:(CGPoint){ CGRectGetMidX(_loading.bounds), CGRectGetMidY(_loading.bounds) }];
-        [_loading addSubview:activity];
-        [activity startAnimating];
     }
 
     return _loading;

DBCamera/Controllers/DBCameraSegueViewController.h

@@ -10,6 +10,8 @@
 #import "DBCameraDelegate.h"
 #import "UIViewController+UIViewController_FullScreen.h"
 
+@class DBCameraFiltersView;
+
 /**
  *  DBCameraSegueViewController
  */
@@ -29,6 +31,16 @@
  */
 @property (nonatomic, assign) BOOL cropMode;
 
+/**
+ *  Filter collectionView
+ */
+@property (nonatomic, strong) DBCameraFiltersView *filtersView;
+
+/**
+ *  Filter to be applied to the image
+ */
+@property (nonatomic, readonly) NSIndexPath *selectedFilterIndex;
+
 /**
  *  The init method with the captured image and thumb
  *

DBCamera/Controllers/DBCameraSegueViewController.m

@@ -9,23 +9,35 @@
 #import "DBCameraSegueViewController.h"
 #import "DBCameraBaseCropViewController+Private.h"
 #import "DBCameraCropView.h"
+#import "DBCameraFiltersView.h"
+#import "DBCameraFilterCell.h"
+#import "DBCameraLoadingView.h"
 #import "UIImage+TintColor.h"
 
+#import <GPUImage/GPUImage.h>
+
+#define kFilterCellIdentifier @"filterCell"
+
 #ifndef DBCameraLocalizedStrings
 #define DBCameraLocalizedStrings(key) \
 NSLocalizedStringFromTable(key, @"DBCamera", nil)
 #endif
 
 #define buttonMargin 20.0f
 
-@interface DBCameraSegueViewController () <UIActionSheetDelegate> {
+static const CGSize kFilterCellSize = { 75, 90 };
+
+@interface DBCameraSegueViewController () <UIActionSheetDelegate, UICollectionViewDelegate, UICollectionViewDataSource> {
     DBCameraCropView *_cropView;
-    NSArray *_cropArray;
+    
+    NSArray *_cropArray, *_filtersList;
+    NSDictionary *_filterMapping;
     CGRect _pFrame, _lFrame;
 }
 
 @property (nonatomic, strong) UIView *navigationBar, *bottomBar;
 @property (nonatomic, strong) UIButton *useButton, *retakeButton, *cropButton;
+@property (nonatomic, strong) DBCameraLoadingView *loadingView;
 @end
 
 @implementation DBCameraSegueViewController
@@ -41,6 +53,13 @@ - (id) initWithImage:(UIImage *)image thumb:(UIImage *)thumb
     if (self) {
         // Custom initialization
         _cropArray = @[ @320, @213, @240, @192, @180 ];
+        _filtersList = @[ @"normal", @"1977", @"amaro", @"grey", @"hudson", @"mayfair", @"nashville", @"valencia" ];
+        _filterMapping = @{ @0:[[GPUImageFilter alloc] init], @1:[[GPUImageToneCurveFilter alloc] initWithACV:@"1977"],
+                            @2:[[GPUImageToneCurveFilter alloc] initWithACV:@"amaro"], @3:[[GPUImageGrayscaleFilter alloc] init],
+                            @4:[[GPUImageToneCurveFilter alloc] initWithACV:@"Hudson"], @5:[[GPUImageToneCurveFilter alloc] initWithACV:@"mayfair"],
+                            @6:[[GPUImageToneCurveFilter alloc] initWithACV:@"Nashville"], @7:[[GPUImageToneCurveFilter alloc] initWithACV:@"Valencia"] };
+        
+        _selectedFilterIndex = 0;
 
         [self setSourceImage:image];
         [self setPreviewImage:thumb];
@@ -59,16 +78,18 @@ - (void)viewDidLoad
 
     [self.view setUserInteractionEnabled:YES];
     [self.view setBackgroundColor:[UIColor blackColor]];
-    [self.view addSubview:self.navigationBar];
-    [self.view addSubview:self.bottomBar];
-    [self.view setClipsToBounds:YES];
 
     CGFloat cropX = ( CGRectGetWidth( self.frameView.frame) - 320 ) * .5;
     _pFrame = (CGRect){ cropX, ( CGRectGetHeight( self.frameView.frame) - 360 ) * .5, 320, 320 };
     _lFrame = (CGRect){ cropX, ( CGRectGetHeight( self.frameView.frame) - 240) * .5, 320, 240 };
 
     [self setCropRect:self.previewImage.size.width > self.previewImage.size.height ? _lFrame : _pFrame];
 
+    [self.view addSubview:self.filtersView];
+    [self.view addSubview:self.navigationBar];
+    [self.view addSubview:self.bottomBar];
+    [self.view setClipsToBounds:YES];
+    
     if( self.cameraSegueConfigureBlock )
         self.cameraSegueConfigureBlock(self);
 }
@@ -109,9 +130,10 @@ - (void) openActionsheet:(UIButton *)button
 
 - (void) createInterface
 {
-    CGFloat viewHeight = CGRectGetHeight([[UIScreen mainScreen] bounds]) - 64;
+    CGFloat viewHeight = CGRectGetHeight([[UIScreen mainScreen] bounds]) - 64 - 50;
     _cropView = [[DBCameraCropView alloc] initWithFrame:(CGRect){ 0, 64, 320, viewHeight }];
     [_cropView setHidden:YES];
+    
     [self setFrameView:_cropView];
 }
 
@@ -127,8 +149,10 @@ - (void) saveImage
     if ( [_delegate respondsToSelector:@selector(camera:didFinishWithImage:withMetadata:)] ) {
         if ( _cropMode )
             [self cropImage];
-        else
-            [_delegate camera:self didFinishWithImage:self.sourceImage withMetadata:self.capturedImageMetadata];
+        else{
+            UIImage *transform = [_filterMapping[@(_selectedFilterIndex.row)] imageByFilteringImage:self.sourceImage];
+            [_delegate camera:self didFinishWithImage:transform withMetadata:self.capturedImageMetadata];
+        }
     }
 }
 
@@ -145,6 +169,7 @@ - (void) cropImage
         dispatch_async(dispatch_get_main_queue(), ^{
             UIImage *transform =  [UIImage imageWithCGImage:resultRef scale:1.0 orientation:UIImageOrientationUp];
             CGImageRelease(resultRef);
+            transform = [_filterMapping[@(_selectedFilterIndex.row)] imageByFilteringImage:transform];
             [_delegate camera:self didFinishWithImage:transform withMetadata:self.capturedImageMetadata];
         });
     });
@@ -155,6 +180,29 @@ - (void) setCropMode:(BOOL)cropMode
     _cropMode = cropMode;
     [self.frameView setHidden:!_cropMode];
     [self.bottomBar setHidden:!_cropMode];
+    [self.filtersView setHidden:_cropMode];
+}
+
+- (DBCameraFiltersView *) filtersView
+{
+    if ( !_filtersView ) {
+        _filtersView = [[DBCameraFiltersView alloc] initWithFrame:(CGRect){ 0, CGRectGetHeight(self.view.frame)-kFilterCellSize.height, CGRectGetWidth(self.view.frame), kFilterCellSize.height} collectionViewLayout:[DBCameraFiltersView filterLayout]];
+        [_filtersView setDelegate:self];
+        [_filtersView setDataSource:self];
+        [_filtersView registerClass:[DBCameraFilterCell class] forCellWithReuseIdentifier:kFilterCellIdentifier];
+    }
+    
+    return _filtersView;
+}
+
+- (DBCameraLoadingView *) loadingView
+{
+    if ( !_loadingView ) {
+        _loadingView = [[DBCameraLoadingView alloc] initWithFrame:(CGRect){ 0, 0, 100, 100 }];
+        [_loadingView setCenter:self.view.center];
+    }
+    
+    return _loadingView;
 }
 
 - (UIView *) navigationBar
@@ -194,7 +242,7 @@ - (UIButton *) useButton
 {
     if ( !_useButton ) {
         _useButton = [self baseButton];
-        [_useButton setTitle:DBCameraLocalizedStrings(@"button.use") forState:UIControlStateNormal];
+        [_useButton setTitle:[DBCameraLocalizedStrings(@"button.use") uppercaseString] forState:UIControlStateNormal];
         [_useButton.titleLabel sizeToFit];
         [_useButton sizeToFit];
         [_useButton setFrame:(CGRect){ CGRectGetWidth(self.view.frame) - (CGRectGetWidth(_useButton.frame) + buttonMargin), 0, CGRectGetWidth(_useButton.frame) + buttonMargin, 60 }];
@@ -208,7 +256,7 @@ - (UIButton *) retakeButton
 {
     if ( !_retakeButton ) {
         _retakeButton = [self baseButton];
-        [_retakeButton setTitle:DBCameraLocalizedStrings(@"button.retake") forState:UIControlStateNormal];
+        [_retakeButton setTitle:[DBCameraLocalizedStrings(@"button.retake") uppercaseString] forState:UIControlStateNormal];
         [_retakeButton.titleLabel sizeToFit];
         [_retakeButton sizeToFit];
         [_retakeButton setFrame:(CGRect){ 0, 0, CGRectGetWidth(_retakeButton.frame) + buttonMargin, 60 }];
@@ -237,6 +285,7 @@ - (UIButton *) baseButton
     UIButton *button = [UIButton buttonWithType:UIButtonTypeCustom];
     [button setBackgroundColor:[UIColor clearColor]];
     [button setTitleColor:self.tintColor forState:UIControlStateNormal];
+    button.titleLabel.font = [UIFont systemFontOfSize:12];
 
     return button;
 }
@@ -246,6 +295,42 @@ - (BOOL) prefersStatusBarHidden
     return YES;
 }
 
+#pragma mark - UICollectionViewDataSource
+
+- (NSInteger) collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return _filtersList.count;
+}
+
+- (UICollectionViewCell *) collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    DBCameraFilterCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:kFilterCellIdentifier forIndexPath:indexPath];
+    [cell.imageView setImage:[UIImage imageNamed:[NSString stringWithFormat:@"%@Filter", _filtersList[indexPath.row]]]];
+    [cell.label setText:[_filtersList[indexPath.row] uppercaseString]];
+    [cell.imageView.layer setBorderWidth:(self.selectedFilterIndex.row == indexPath.row) ? 1.0 : 0.0];
+    
+    return cell;
+}
+
+- (CGSize) collectionView:(UICollectionView *)collectionView layout:(UICollectionViewLayout*)collectionViewLayout sizeForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    return kFilterCellSize;
+}
+
+#pragma mark - UICollectionViewDelegate
+
+- (void) collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    [self.view addSubview:self.loadingView];
+    
+    _selectedFilterIndex = indexPath;
+    [self.filtersView reloadData];
+    
+    UIImage *filteredImage = [_filterMapping[@(indexPath.row)] imageByFilteringImage:self.sourceImage];
+    [self.loadingView removeFromSuperview];
+    [self.imageView setImage:filteredImage];
+}
+
 #pragma mark - UIActionSheetDelegate
 
 - (void) actionSheet:(UIActionSheet *)actionSheet clickedButtonAtIndex:(NSInteger)buttonIndex

DBCamera/Controllers/DBCameraViewController.m

@@ -167,10 +167,8 @@ - (BOOL) prefersStatusBarHidden
 
 - (void) dismissCamera
 {
-    if ( _delegate && [_delegate respondsToSelector:@selector(dismissCamera)] )
-        [_delegate dismissCamera];
-    else
-        [self dismissViewControllerAnimated:YES completion:nil];
+    if ( _delegate && [_delegate respondsToSelector:@selector(dismissCamera:)] )
+        [_delegate dismissCamera:self];
 }
 
 - (DBCameraView *) cameraView

DBCamera/Filters/1977.acv

@@ -105,7 +105,7 @@
 /**
  *  Tells the delegate when the camera must be dismissed
  */
-- (void) dismissCamera;
+- (void) dismissCamera:(id)cameraViewController;
 @end
 
 /**

DBCamera/Filters/Hudson.acv

@@ -0,0 +1,21 @@
+//
+//  FilterCell.h
+//  DBCamera
+//
+//  Created by Marco De Nadai on 21/06/14.
+//  Copyright (c) 2014 PSSD - Daniele Bogo. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface DBCameraFilterCell : UICollectionViewCell
+/**
+ *  The name label of the filter
+ */
+@property (nonatomic, strong) UILabel *label;
+
+/**
+ *  The image view contains the example
+ */
+@property (nonatomic, strong) UIImageView *imageView;
+@end

DBCamera/Filters/Nashville.acv

@@ -0,0 +1,53 @@
+//
+//  FilterCell.m
+//  DBCamera
+//
+//  Created by Marco De Nadai on 21/06/14.
+//  Copyright (c) 2014 PSSD - Daniele Bogo. All rights reserved.
+//
+
+#import "DBCameraFilterCell.h"
+#import "DBCameraMacros.h"
+#import <QuartzCore/QuartzCore.h>
+
+static const NSUInteger kLabelHeight = 18;
+static const NSUInteger kCellPadding = 10;
+static const NSUInteger kBorderWidth = 1;
+
+@implementation DBCameraFilterCell
+
+- (id)initWithFrame:(CGRect)frame
+{
+    self = [super initWithFrame:frame];
+    if (self) {
+        // Initialization code
+        [self setBackgroundColor:RGBColor(0x101010, 1)];
+        
+        UIView *backgroundCellView = [[UIView alloc] initWithFrame:(CGRect){ 0, kBorderWidth, CGRectGetWidth(self.frame)-kBorderWidth, CGRectGetHeight(self.frame)-kBorderWidth*2 }];
+        [backgroundCellView setBackgroundColor:[UIColor blackColor]];
+        
+        _label = [[UILabel alloc] initWithFrame:CGRectMake(0, self.frame.size.height-kLabelHeight, self.frame.size.width, kLabelHeight-kCellPadding)];
+        [_label setFont:[UIFont systemFontOfSize:9]];
+        [_label setTextAlignment:NSTextAlignmentCenter];
+        [_label setTextColor:[UIColor whiteColor]];
+        [_label setBackgroundColor:[UIColor clearColor]];
+        [backgroundCellView addSubview:_label];
+        
+        _imageView = [[UIImageView alloc] initWithFrame:CGRectMake(kCellPadding, kCellPadding, CGRectGetWidth(self.frame)-kCellPadding*2, CGRectGetHeight(self.frame)-kLabelHeight-kCellPadding*2)];
+        [_imageView.layer setCornerRadius:4.0];
+        [_imageView.layer setBorderWidth:0.0];
+        [_imageView.layer setBorderColor:[RGBColor(0xffffff, .3) CGColor]];
+        [_imageView.layer setMasksToBounds:YES];
+        
+        [backgroundCellView addSubview:_imageView];
+        
+        [self addSubview:backgroundCellView];
+    }
+    return self;
+}
+
+- (void)setHighlighted:(BOOL)highlighted{
+    
+}
+
+@end