Update EasyGallery (added slide show funciton)

Author: xcatsan

EasyGallery/Classes/EasyGalleryViewController.h

@@ -18,6 +18,7 @@
 
 @property (nonatomic, retain) NSMutableArray* imageFiles;
 @property (nonatomic, retain) IBOutlet XCGalleryView* galleryView;
+- (IBAction)playSlideShow:(id)sender;
 
 @end
 

EasyGallery/Classes/EasyGalleryViewController.m

@@ -27,7 +27,9 @@ @implementation EasyGalleryViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
 
-	self.galleryView.showcaseModeEnabled = YES;
+	self.galleryView.showcaseModeEnabled = NO;
+	self.galleryView.pageControlEnabled = NO;
+	
 }
 
 
@@ -50,7 +52,7 @@ - (void)viewDidUnload {
 
 #pragma mark -
 #pragma mark XCGalleryViewDelegate
--(NSInteger)numberViewsInGallery:(XCGalleryView*)galleryView
+-(NSInteger)numberImagesInGallery:(XCGalleryView*)galleryView
 {
 	return [self.imageFiles count];
 }
@@ -60,4 +62,17 @@ -(UIImage*)galleryImage:(XCGalleryView*)galleryView filenameAtIndex:(NSUInteger)
 	return [UIImage imageWithContentsOfFile:[self.imageFiles objectAtIndex:index]];
 }
 
+-(void)galleryDidStopSlideShow:(XCGalleryView*)galleryView
+{
+	NSLog(@"didStopSlideShow:");
+}
+
+
+#pragma mark -
+#pragma mark Event
+- (IBAction)playSlideShow:(id)sender
+{
+	[self.galleryView startSlideShow];
+}
+
 @end

EasyGallery/Classes/XCGalleryInnerScrollView.h

@@ -11,8 +11,11 @@
 
 @interface XCGalleryInnerScrollView : UIScrollView <UIScrollViewDelegate> {
 
+	UIImageView* imageView_;
 }
 
+@property (nonatomic, retain) UIImageView* imageView;
+
 + (CGRect)zoomRectForScrollView:(UIScrollView *)scrollView
 					  withScale:(float)scale withCenter:(CGPoint)center;
 

EasyGallery/Classes/XCGalleryInnerScrollView.m

@@ -11,6 +11,8 @@
 
 @implementation XCGalleryInnerScrollView
 
+@synthesize imageView = imageView_;
+
 -(UIView*)viewForZoomingInScrollView:(UIScrollView *)scrollView
 {
 	return [self.subviews objectAtIndex:0];
@@ -20,6 +22,8 @@ -(UIView*)viewForZoomingInScrollView:(UIScrollView *)scrollView
 -(id)initWithFrame:(CGRect)frame
 {
 	if (self = [super initWithFrame:frame]) {
+		
+		// setup scrollview
 //		[self setUserInteractionEnabled:YES];
 		self.delegate = self;
 		self.minimumZoomScale = 1.0;
@@ -29,6 +33,18 @@ -(id)initWithFrame:(CGRect)frame
 		self.backgroundColor = [UIColor blackColor];
 		self.clipsToBounds = YES;
 
+		// setup imageview
+		self.imageView =
+			[[[UIImageView alloc] initWithFrame:self.bounds] autorelease];
+		self.imageView.autoresizingMask =
+			UIViewAutoresizingFlexibleLeftMargin  |
+			UIViewAutoresizingFlexibleWidth       |
+			UIViewAutoresizingFlexibleRightMargin |
+			UIViewAutoresizingFlexibleTopMargin   |
+			UIViewAutoresizingFlexibleHeight      |
+			UIViewAutoresizingFlexibleBottomMargin;		
+		self.imageView.contentMode = UIViewContentModeScaleAspectFit;
+		[self addSubview:self.imageView];		
 	}
 	return self;
 }
@@ -64,4 +80,11 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event
 //		NSLog(@"offset: %@", NSStringFromCGPoint(self.contentOffset));
 }
 
+- (void) dealloc
+{
+	self.imageView = nil;
+	[super dealloc];
+}
+
+
 @end

EasyGallery/Classes/XCGalleryView.h

@@ -11,12 +11,13 @@
 @class XCGalleryView;
 @protocol XCGalleryViewDelegate
 
--(NSInteger)numberViewsInGallery:(XCGalleryView*)galleryView;
+-(NSInteger)numberImagesInGallery:(XCGalleryView*)galleryView;
 -(UIImage*)galleryImage:(XCGalleryView*)galleryView filenameAtIndex:(NSUInteger)index;
+-(void)galleryDidStopSlideShow:(XCGalleryView*)galleryView;
 
 @end
 
-
+@class XCGalleryInnerScrollView;
 @interface XCGalleryView : UIView <UIScrollViewDelegate> {
 
 	NSInteger currentImageIndex_;
@@ -43,22 +44,22 @@
 
 	BOOL pageControlEnabled_;
 	UIPageControl* pageControl_;
+	
+	// slide show status
+	BOOL isRunningSlideShow_;
+	NSTimeInterval slideShowDuration_;
+	NSTimer* timer_;
+	XCGalleryInnerScrollView* transitionInnerScrollView_;
 }
 
-@property (nonatomic, assign) NSInteger currentImageIndex;
-
-@property (nonatomic, retain) UIScrollView* scrollView;
-@property (nonatomic, assign) NSInteger contentOffsetIndex;
-
-@property (nonatomic, retain) NSMutableArray* innerScrollViews;
-
+// public properties
 @property (nonatomic, assign) IBOutlet id <XCGalleryViewDelegate> delegate;
-
 @property (nonatomic, assign) BOOL showcaseModeEnabled;
-@property (nonatomic, assign) CGSize showcaseMargin;
-@property (nonatomic, assign) CGSize viewSpacing;
-
 @property (nonatomic, assign) BOOL pageControlEnabled;
-@property (nonatomic, retain) UIPageControl* pageControl;
+@property (nonatomic, assign) BOOL isRunningSlideShow;
+@property (nonatomic, assign) NSTimeInterval slideShowDuration;
+
+// public methods
+- (void)startSlideShow;
 
 @end