Version 2.4

honood · Sep 20, 2011 · 4c77676 · 4c77676
1 parent 3579fe5
commit 4c77676
Show file tree

Hide file tree

Showing 23 changed files with 525 additions and 197 deletions.
diff --git a/Graphics/Reader-Button-H.png b/Graphics/Reader-Button-H.png
diff --git a/Graphics/Reader-Button-H@2x.png b/Graphics/Reader-Button-H@2x.png
diff --git a/Graphics/Reader-Button-N.png b/Graphics/Reader-Button-N.png
diff --git a/Graphics/Reader-Button-N@2x.png b/Graphics/Reader-Button-N@2x.png
diff --git a/Graphics/Reader-Mark-N.png b/Graphics/Reader-Mark-N.png
diff --git a/Graphics/Reader-Mark-N@2x.png b/Graphics/Reader-Mark-N@2x.png
diff --git a/README b/README
@@ -1,5 +1,5 @@
 
-Basic PDF Reader/Viewer V2.3 for iOS
+PDF Reader/Viewer V2.4 for iOS
 
 INTRODUCTION
 ============
@@ -189,7 +189,11 @@ HISTORY
 
 	- Added page thumbnail document navigation.
 	- Added support for page bookmarks.
-	- Some more assorted bug fixes.
+
+2011-09-20: Version 2.4.0
+
+	- Replaced UIToolbars with custom toolbars.
+	- Some more assorted bug fixes and tweaks.
 
 CONTACT INFO
 ============

diff --git a/Reader-Info.plist b/Reader-Info.plist
@@ -25,7 +25,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.3.0</string>
+	<string>2.4.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIPrerenderedIcon</key>

diff --git a/Reader.xcodeproj/project.pbxproj b/Reader.xcodeproj/project.pbxproj
@@ -14,6 +14,11 @@
 		450A670411D27B9D00014BF5 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 450A670311D27B9D00014BF5 /* QuartzCore.framework */; };
 		4541A9D8122EA716001A5E60 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4541A9D7122EA716001A5E60 /* Localizable.strings */; };
 		4555C74C14211A00005F448D /* ReaderBookDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4555C74B14211A00005F448D /* ReaderBookDelegate.m */; };
+		455C7891142687CA0053D73B /* UIXToolbarView.m in Sources */ = {isa = PBXBuildFile; fileRef = 455C7890142687CA0053D73B /* UIXToolbarView.m */; };
+		455C789D14268F6A0053D73B /* Reader-Button-H.png in Resources */ = {isa = PBXBuildFile; fileRef = 455C789914268F6A0053D73B /* Reader-Button-H.png */; };
+		455C789E14268F6A0053D73B /* Reader-Button-H@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 455C789A14268F6A0053D73B /* Reader-Button-H@2x.png */; };
+		455C789F14268F6A0053D73B /* Reader-Button-N.png in Resources */ = {isa = PBXBuildFile; fileRef = 455C789B14268F6A0053D73B /* Reader-Button-N.png */; };
+		455C78A014268F6A0053D73B /* Reader-Button-N@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 455C789C14268F6A0053D73B /* Reader-Button-N@2x.png */; };
 		458DDFD7140D45FA00C5DA94 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 458DDFD6140D45FA00C5DA94 /* ImageIO.framework */; };
 		45AB72C6141FBFCA003524C3 /* AppIcon-057.png in Resources */ = {isa = PBXBuildFile; fileRef = 45AB72B9141FBFCA003524C3 /* AppIcon-057.png */; };
 		45AB72C7141FBFCA003524C3 /* AppIcon-072.png in Resources */ = {isa = PBXBuildFile; fileRef = 45AB72BA141FBFCA003524C3 /* AppIcon-072.png */; };
@@ -66,6 +71,12 @@
 		4541A9D5122EA686001A5E60 /* en */ = {isa = PBXFileReference; fileEncoding = 10; indentWidth = 4; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; tabWidth = 4; };
 		4555C74A14211A00005F448D /* ReaderBookDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ReaderBookDelegate.h; sourceTree = "<group>"; };
 		4555C74B14211A00005F448D /* ReaderBookDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ReaderBookDelegate.m; sourceTree = "<group>"; };
+		455C788F142687CA0053D73B /* UIXToolbarView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UIXToolbarView.h; path = Sources/UIXToolbarView.h; sourceTree = "<group>"; };
+		455C7890142687CA0053D73B /* UIXToolbarView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = UIXToolbarView.m; path = Sources/UIXToolbarView.m; sourceTree = "<group>"; };
+		455C789914268F6A0053D73B /* Reader-Button-H.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Reader-Button-H.png"; path = "Graphics/Reader-Button-H.png"; sourceTree = "<group>"; };
+		455C789A14268F6A0053D73B /* Reader-Button-H@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Reader-Button-H@2x.png"; path = "Graphics/Reader-Button-H@2x.png"; sourceTree = "<group>"; };
+		455C789B14268F6A0053D73B /* Reader-Button-N.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Reader-Button-N.png"; path = "Graphics/Reader-Button-N.png"; sourceTree = "<group>"; };
+		455C789C14268F6A0053D73B /* Reader-Button-N@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Reader-Button-N@2x.png"; path = "Graphics/Reader-Button-N@2x.png"; sourceTree = "<group>"; };
 		458DDFD6140D45FA00C5DA94 /* ImageIO.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ImageIO.framework; path = System/Library/Frameworks/ImageIO.framework; sourceTree = SDKROOT; };
 		45AB72B9141FBFCA003524C3 /* AppIcon-057.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "AppIcon-057.png"; path = "Graphics/AppIcon-057.png"; sourceTree = "<group>"; };
 		45AB72BA141FBFCA003524C3 /* AppIcon-072.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "AppIcon-072.png"; path = "Graphics/AppIcon-072.png"; sourceTree = "<group>"; };
@@ -222,6 +233,10 @@
 				45AB72B9141FBFCA003524C3 /* AppIcon-057.png */,
 				45AB72BA141FBFCA003524C3 /* AppIcon-072.png */,
 				45AB72BB141FBFCA003524C3 /* AppIcon-114.png */,
+				455C789914268F6A0053D73B /* Reader-Button-H.png */,
+				455C789A14268F6A0053D73B /* Reader-Button-H@2x.png */,
+				455C789B14268F6A0053D73B /* Reader-Button-N.png */,
+				455C789C14268F6A0053D73B /* Reader-Button-N@2x.png */,
 				45AB72BC141FBFCA003524C3 /* Reader-Email.png */,
 				45AB72BD141FBFCA003524C3 /* Reader-Email@2x.png */,
 				45AB72BE141FBFCA003524C3 /* Reader-Mark-N.png */,
@@ -284,6 +299,8 @@
 				45AB730C141FC0B1003524C3 /* ReaderThumbView.m */,
 				45AB72FD141FC0B1003524C3 /* ReaderScrollView.h */,
 				45AB72FE141FC0B1003524C3 /* ReaderScrollView.m */,
+				455C788F142687CA0053D73B /* UIXToolbarView.h */,
+				455C7890142687CA0053D73B /* UIXToolbarView.m */,
 			);
 			name = Support;
 			sourceTree = "<group>";
@@ -354,6 +371,10 @@
 				45AB72DC141FC039003524C3 /* Document.pdf in Resources */,
 				45AB72DE141FC043003524C3 /* LICENSE in Resources */,
 				45AB72E0141FC04B003524C3 /* README in Resources */,
+				455C789D14268F6A0053D73B /* Reader-Button-H.png in Resources */,
+				455C789E14268F6A0053D73B /* Reader-Button-H@2x.png in Resources */,
+				455C789F14268F6A0053D73B /* Reader-Button-N.png in Resources */,
+				455C78A014268F6A0053D73B /* Reader-Button-N@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -387,6 +408,7 @@
 				45AB7324141FC0B1003524C3 /* ThumbsMainToolbar.m in Sources */,
 				45AB7325141FC0B1003524C3 /* ThumbsViewController.m in Sources */,
 				4555C74C14211A00005F448D /* ReaderBookDelegate.m in Sources */,
+				455C7891142687CA0053D73B /* UIXToolbarView.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

diff --git a/Resources/en.lproj/Localizable.strings b/Resources/en.lproj/Localizable.strings
diff --git a/Sources/ReaderConstants.m b/Sources/ReaderConstants.m
@@ -1,6 +1,6 @@
 //
 //	ReaderConstants.m
-//	Reader v2.3.0
+//	Reader v2.4.0
 //
 //	Created by Julius Oklamcak on 2011-07-01.
 //	Copyright © 2011 Julius Oklamcak. All rights reserved.
@@ -14,4 +14,4 @@
 
 #import "ReaderConstants.h"
 
-NSString *const kReaderCopyrightNotice = @"Reader v2.3 • Copyright © 2011 Julius Oklamcak. All rights reserved.";
+NSString *const kReaderCopyrightNotice = @"Reader v2.4 • Copyright © 2011 Julius Oklamcak. All rights reserved.";
diff --git a/Sources/ReaderMainPagebar.h b/Sources/ReaderMainPagebar.h
@@ -1,6 +1,6 @@
 //
 //	ReaderMainPagebar.h
-//	Reader v2.3.0
+//	Reader v2.4.0
 //
 //	Created by Julius Oklamcak on 2011-09-01.
 //	Copyright © 2011 Julius Oklamcak. All rights reserved.
@@ -91,3 +91,16 @@
 - (id)initWithFrame:(CGRect)frame small:(BOOL)small;
 
 @end
+
+#pragma mark -
+
+//
+//	ReaderPagebarShadow class interface
+//
+
+@interface ReaderPagebarShadow : UIView
+{
+@private // Instance variables
+}
+
+@end
diff --git a/Sources/ReaderMainPagebar.m b/Sources/ReaderMainPagebar.m
@@ -1,6 +1,6 @@
 //
 //	ReaderMainPagebar.m
-//	Reader v2.3.0
+//	Reader v2.4.0
 //
 //	Created by Julius Oklamcak on 2011-09-01.
 //	Copyright © 2011 Julius Oklamcak. All rights reserved.
@@ -138,10 +138,16 @@ - (id)initWithFrame:(CGRect)frame document:(ReaderDocument *)object
 		self.backgroundColor = [UIColor clearColor];
 
 		CAGradientLayer *layer = (CAGradientLayer *)self.layer;
-		CGColorRef liteColor = [UIColor colorWithWhite:0.6f alpha:0.8f].CGColor;
-		CGColorRef darkColor = [UIColor colorWithWhite:0.2f alpha:0.8f].CGColor;
+		CGColorRef liteColor = [UIColor colorWithWhite:0.82f alpha:0.8f].CGColor;
+		CGColorRef darkColor = [UIColor colorWithWhite:0.32f alpha:0.8f].CGColor;
 		layer.colors = [NSArray arrayWithObjects:(id)liteColor, (id)darkColor, nil];
 
+		CGRect shadowRect = self.bounds; shadowRect.size.height = 4.0f; shadowRect.origin.y -= shadowRect.size.height;
+
+		ReaderPagebarShadow *shadowView = [[ReaderPagebarShadow alloc] initWithFrame:shadowRect];
+
+		[self addSubview:shadowView]; [shadowView release]; // Add the shadow to the view
+
 		CGFloat numberY = (0.0f - (PAGE_NUMBER_HEIGHT + PAGE_NUMBER_SPACE));
 		CGFloat numberX = ((self.bounds.size.width - PAGE_NUMBER_WIDTH) / 2.0f);
 		CGRect numberRect = CGRectMake(numberX, numberY, PAGE_NUMBER_WIDTH, PAGE_NUMBER_HEIGHT);
@@ -680,4 +686,72 @@ - (id)initWithFrame:(CGRect)frame small:(BOOL)small
 	return self;
 }
 
+- (void)dealloc
+{
+#ifdef DEBUGX
+	NSLog(@"%s", __FUNCTION__);
+#endif
+
+	[super dealloc];
+}
+
+@end
+
+#pragma mark -
+
+//
+//	ReaderPagebarShadow class implementation
+//
+
+@implementation ReaderPagebarShadow
+
+//#pragma mark Properties
+
+//@synthesize ;
+
+#pragma mark ReaderPagebarShadow class methods
+
++ (Class)layerClass
+{
+#ifdef DEBUGX
+	NSLog(@"%s", __FUNCTION__);
+#endif
+
+	return [CAGradientLayer class];
+}
+
+#pragma mark ReaderPagebarShadow instance methods
+
+- (id)initWithFrame:(CGRect)frame
+{
+#ifdef DEBUGX
+	NSLog(@"%s", __FUNCTION__);
+#endif
+
+	if ((self = [super initWithFrame:frame]))
+	{
+		self.autoresizesSubviews = NO;
+		self.userInteractionEnabled = NO;
+		self.contentMode = UIViewContentModeRedraw;
+		self.autoresizingMask = UIViewAutoresizingFlexibleWidth;
+		self.backgroundColor = [UIColor clearColor];
+
+		CAGradientLayer *layer = (CAGradientLayer *)self.layer;
+		CGColorRef blackColor = [UIColor colorWithWhite:0.42f alpha:1.0f].CGColor;
+		CGColorRef clearColor = [UIColor colorWithWhite:0.42f alpha:0.0f].CGColor;
+		layer.colors = [NSArray arrayWithObjects:(id)clearColor, (id)blackColor, nil];
+	}
+
+	return self;
+}
+
+- (void)dealloc
+{
+#ifdef DEBUGX
+	NSLog(@"%s", __FUNCTION__);
+#endif
+
+	[super dealloc];
+}
+
 @end
diff --git a/Sources/ReaderMainToolbar.h b/Sources/ReaderMainToolbar.h
@@ -1,6 +1,6 @@
 //
 //	ReaderMainToolbar.h
-//	Reader v2.3.0
+//	Reader v2.4.0
 //
 //	Created by Julius Oklamcak on 2011-07-01.
 //	Copyright © 2011 Julius Oklamcak. All rights reserved.
@@ -14,27 +14,27 @@
 
 #import <UIKit/UIKit.h>
 
+#import "UIXToolbarView.h"
+
 @class ReaderMainToolbar;
 
 @protocol ReaderMainToolbarDelegate <NSObject>
 
 @required // Delegate protocols
 
-- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar doneButton:(UIBarButtonItem *)button;
-- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar thumbsButton:(UIBarButtonItem *)button;
-- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar printButton:(UIBarButtonItem *)button;
-- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar emailButton:(UIBarButtonItem *)button;
-- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar markButton:(UIBarButtonItem *)button;
+- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar doneButton:(UIButton *)button;
+- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar thumbsButton:(UIButton *)button;
+- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar printButton:(UIButton *)button;
+- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar emailButton:(UIButton *)button;
+- (void)tappedInToolbar:(ReaderMainToolbar *)toolbar markButton:(UIButton *)button;
 
 @end
 
-@interface ReaderMainToolbar : UIToolbar
+@interface ReaderMainToolbar : UIXToolbarView
 {
 @private // Instance variables
 
-	UILabel *theTitleLabel;
-
-	UIBarButtonItem *markButton;
+	UIButton *markButton;
 
 	UIImage *markImageN;
 	UIImage *markImageY;
@@ -44,8 +44,6 @@
 
 - (id)initWithFrame:(CGRect)frame title:(NSString *)title;
 
-- (void)setToolbarTitle:(NSString *)title;
-
 - (void)setBookmarkState:(BOOL)state;
 
 - (void)hideToolbar;