V2.0

.gitignore

@@ -1,10 +1,3 @@
-FGallery/FGallery.xcodeproj/project.xcworkspace/contents.xcworkspacedata
-FGallery/FGallery.xcodeproj/project.xcworkspace/xcuserdata/grantdavis.xcuserdatad/UserInterfaceState.xcuserstate
-FGallery/FGallery.xcodeproj/xcuserdata/grantdavis.xcuserdatad/xcschemes/FGallery.xcscheme
-FGallery/FGallery.xcodeproj/xcuserdata/grantdavis.xcuserdatad/xcschemes/xcschememanagement.plist
-FGallery/FGallery.xcodeproj/project.xcworkspace/xcuserdata/grantdavis.xcuserdatad/WorkspaceSettings.xcsettings
-
-
 # Xcode
 build/*
 *.pbxuser
@@ -30,3 +23,5 @@ profile
 # Files that might appear on external disk
 .Spotlight-V100
 .Trashes
+
+Project/Pods

FGallery/en.lproj/Localizable.strings → Assets/GDIImageGallery.bundle/en.lproj/Localizable.strings

@@ -1,5 +1,5 @@
 /* 
-  FGalleryStrings.strings
+  GDIImageGalleryStrings.strings
   Created by Zadia Software on 06/04/12.
 */
 

FGallery/es.lproj/Localizable.strings → Assets/GDIImageGallery.bundle/es.lproj/Localizable.strings

@@ -1,5 +1,5 @@
 /* 
- FGalleryStrings.strings
+ GDIImageGalleryStrings.strings
  Created by Zadia Software on 06/04/12.
  */
 

CHANGELOG.md

@@ -0,0 +1,29 @@
+# GDIImageGallery CHANGELOG
+
+## 2.0
+* FGallery has been renamed to GDIImageGallery
+* iOS7 Support
+* Cocoapod support
+* Major project restructuring (for cocoapds)
+
+In Development:
+* Rebuild thumbnail view with UICollectionView
+* Add support for thumbnail view subclasses to customize the UICollectionView
+
+## 1.3
+* Various fixes and merged pull requests.
+
+## 1.2
+* Adds new 'startingIndex' property. As you might guess, it allows a developer to specify what the starting index should be for the gallery. This must be set before the view is built in the ViewController. Defaults to 0.
+* Adds new 'beginsInThumbnailView' property. Allows the developer to indicate that the view should initialize and show the thumbnail view when first displaying instead of starting on the first image. This must be set before the view is presented. Defaults to 'NO'.
+* FGallery classes are now contained in an FGallery group, separate from other code classes that are part of the demo. 
+
+
+## 1.1
+* Added support for translucent navigation bars
+* Added support to hide the right navigation button and therefore disable thumbnails through a new useThumbnailView property.
+* Added better memory management for building and destroying view objects.
+* Fixed a crash in the network images demo.
+
+## 1.0
+* First release!

Classes/GDIImageGallery.h

@@ -0,0 +1,9 @@
+//
+//  GDIImageGallery.h
+//  GDIImageGallery
+//
+//  Created by Grant Davis on 12/8/13.
+//  Copyright (c) 2013 Grant Davis Interactive, LLC. All rights reserved.
+//
+
+#import "GDIImageGalleryViewController.h"

Classes/GDIImageGalleryCollectionViewController.h

@@ -0,0 +1,17 @@
+//
+//  GDIThumbnailCollectionViewController.h
+//  GDIImageGallery
+//
+//  Created by Grant Davis on 12/9/13.
+//  Copyright (c) 2013 Grant Davis Interactive, LLC. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@class GDIImageGalleryViewController;
+@interface GDIImageGalleryCollectionViewController : UICollectionViewController
+
+@property (nonatomic, weak) GDIImageGalleryViewController *imageGalleryVC;
+@property (nonatomic) CGSize thumbnailSize;
+
+@end

Classes/GDIImageGalleryCollectionViewController.m

@@ -0,0 +1,85 @@
+//
+//  GDIThumbnailCollectionViewController.m
+//  GDIImageGallery
+//
+//  Created by Grant Davis on 12/9/13.
+//  Copyright (c) 2013 Grant Davis Interactive, LLC. All rights reserved.
+//
+#import "GDIImageGalleryCollectionViewController.h"
+#import "GDIImageGalleryViewController.h"
+
+
+@interface GDIImageGalleryCollectionViewController ()
+
+@end
+
+
+@implementation GDIImageGalleryCollectionViewController
+
+
+- (id)initWithCollectionViewLayout:(UICollectionViewLayout *)layout
+{
+    if (self = [super initWithCollectionViewLayout:layout]) {
+        self.thumbnailSize = CGSizeMake(88.f, 88.f);
+    }
+    return self;
+}
+
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+
+    self.view.layer.borderColor = [UIColor yellowColor].CGColor;
+    self.view.layer.borderWidth = 1.f;
+
+    self.collectionView.backgroundColor =
+    self.view.backgroundColor = [[UIColor redColor] colorWithAlphaComponent:.5];
+    NSLog(@"top layout guide length %.2f", self.topLayoutGuide.length);
+
+    [self.collectionView registerClass:[UICollectionViewCell class]
+            forCellWithReuseIdentifier:@"thumb"];
+    UICollectionViewFlowLayout *flowLayout = (UICollectionViewFlowLayout *)self.collectionViewLayout;
+    flowLayout.sectionInset = UIEdgeInsetsMake(10.f, 10.f, 10.f, 10.f);
+}
+
+
+- (void)viewDidLayoutSubviews
+{
+    [super viewDidLayoutSubviews];
+    self.collectionView.contentInset = UIEdgeInsetsMake(self.imageGalleryVC.topLayoutGuide.length,
+                                                        0,
+                                                        self.imageGalleryVC.bottomLayoutGuide.length,
+                                                        0);
+}
+
+
+- (void)setThumbnailSize:(CGSize)thumbnailSize
+{
+    _thumbnailSize = thumbnailSize;
+
+    if ([self.collectionViewLayout isKindOfClass:[UICollectionViewFlowLayout class]]) {
+        UICollectionViewFlowLayout *flowLayout = (UICollectionViewFlowLayout *)self.collectionViewLayout;
+        flowLayout.itemSize = thumbnailSize;
+    }
+}
+
+
+#pragma mark - UICollectionViewDataSource
+
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section
+{
+    return [self.imageGalleryVC.photoSource numberOfPhotosForPhotoGallery:self.imageGalleryVC];
+}
+
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath
+{
+    UICollectionViewCell *cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"thumb"
+                                                                           forIndexPath:indexPath];
+    cell.backgroundColor = [UIColor yellowColor];
+    return cell;
+}
+
+@end

FGallery/Classes/FGalleryPhoto.h → Classes/GDIImageGalleryPhoto.h

@@ -1,6 +1,6 @@
 //
-//  FGalleryPhoto.h
-//  FGallery
+//  GDIImageGalleryPhoto.h
+//  GDIImageGallery
 //
 //  Created by Grant Davis on 5/20/10.
 //  Copyright 2011 Grant Davis Interactive, LLC. All rights reserved.
@@ -9,9 +9,9 @@
 #import <Foundation/Foundation.h>
 
 
-@protocol FGalleryPhotoDelegate;
+@protocol GDIImageGalleryPhotoDelegate;
 
-@interface FGalleryPhoto : NSObject {
+@interface GDIImageGalleryPhoto : NSObject {
 
 	// value which determines if the photo was initialized with local file paths or network paths.
 	BOOL _useNetwork;
@@ -34,14 +34,14 @@
 	UIImage *_thumbnail;
 	UIImage *_fullsize;
 
-	NSObject <FGalleryPhotoDelegate> *_delegate;
+	NSObject <GDIImageGalleryPhotoDelegate> *__unsafe_unretained _delegate;
 
 	NSUInteger tag;
 }
 
 
-- (id)initWithThumbnailUrl:(NSString*)thumb fullsizeUrl:(NSString*)fullsize delegate:(NSObject<FGalleryPhotoDelegate>*)delegate;
-- (id)initWithThumbnailPath:(NSString*)thumb fullsizePath:(NSString*)fullsize delegate:(NSObject<FGalleryPhotoDelegate>*)delegate;
+- (id)initWithThumbnailUrl:(NSString*)thumb fullsizeUrl:(NSString*)fullsize delegate:(NSObject<GDIImageGalleryPhotoDelegate>*)delegate;
+- (id)initWithThumbnailPath:(NSString*)thumb fullsizePath:(NSString*)fullsize delegate:(NSObject<GDIImageGalleryPhotoDelegate>*)delegate;
 
 - (void)loadThumbnail;
 - (void)loadFullsize;
@@ -60,22 +60,22 @@
 @property (nonatomic,readonly) UIImage *thumbnail;
 @property (nonatomic,readonly) UIImage *fullsize;
 
-@property (nonatomic,assign) NSObject<FGalleryPhotoDelegate> *delegate;
+@property (nonatomic,unsafe_unretained) NSObject<GDIImageGalleryPhotoDelegate> *delegate;
 
 @end
 
 
-@protocol FGalleryPhotoDelegate
+@protocol GDIImageGalleryPhotoDelegate
 
 @required
-- (void)galleryPhoto:(FGalleryPhoto*)photo didLoadThumbnail:(UIImage*)image;
-- (void)galleryPhoto:(FGalleryPhoto*)photo didLoadFullsize:(UIImage*)image;
+- (void)galleryPhoto:(GDIImageGalleryPhoto*)photo didLoadThumbnail:(UIImage*)image;
+- (void)galleryPhoto:(GDIImageGalleryPhoto*)photo didLoadFullsize:(UIImage*)image;
 
 @optional
-- (void)galleryPhoto:(FGalleryPhoto*)photo willLoadThumbnailFromUrl:(NSString*)url;
-- (void)galleryPhoto:(FGalleryPhoto*)photo willLoadFullsizeFromUrl:(NSString*)url;
+- (void)galleryPhoto:(GDIImageGalleryPhoto*)photo willLoadThumbnailFromUrl:(NSString*)url;
+- (void)galleryPhoto:(GDIImageGalleryPhoto*)photo willLoadFullsizeFromUrl:(NSString*)url;
 
-- (void)galleryPhoto:(FGalleryPhoto*)photo willLoadThumbnailFromPath:(NSString*)path;
-- (void)galleryPhoto:(FGalleryPhoto*)photo willLoadFullsizeFromPath:(NSString*)path;
+- (void)galleryPhoto:(GDIImageGalleryPhoto*)photo willLoadThumbnailFromPath:(NSString*)path;
+- (void)galleryPhoto:(GDIImageGalleryPhoto*)photo willLoadFullsizeFromPath:(NSString*)path;
 
 @end