[iphone/Barcodes] UI simplified to make a simple UITabBarController based app, where first tab anables to scan, and second allows access to history

git-svn-id: https://zxing.googlecode.com/svn/trunk@1691 59b500cc-1b3d-0410-9834-0bbf25fbcc57
2025-03-05 20:48:51 -08:00 · 2010-12-22 17:35:17 +00:00 · 2010-12-22 17:35:17 +00:00 · 685c98b828
parent b54780cc5b
commit 685c98b828
16 changed files with 316 additions and 335 deletions
--- a/iphone/Barcodes/Barcodes-Info.plist
+++ b/iphone/Barcodes/Barcodes-Info.plist
@ -26,5 +26,7 @@
 	<true/>
 	<key>NSMainNibFile</key>
 	<string>MainWindow</string>
+	<key>UIStatusBarHidden</key>
+	<false/>
 </dict>
 </plist>
--- a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj
+++ b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj
@ -55,6 +55,8 @@
 		1FB4369612918FF0002D63E8 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1FB4369512918FF0002D63E8 /* ScanViewController.m */; };
 		1FB4369A12919014002D63E8 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FB4369912919014002D63E8 /* libsqlite3.dylib */; };
 		1FB436DF129194E7002D63E8 /* scans.db in Resources */ = {isa = PBXBuildFile; fileRef = 1FB436DE129194E7002D63E8 /* scans.db */; };
+		1FCC10A912C15F68009040CF /* Scanning.png in Resources */ = {isa = PBXBuildFile; fileRef = 1FCC10A712C15F68009040CF /* Scanning.png */; };
+		1FCC10AA12C15F68009040CF /* Scanning@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1FCC10A812C15F68009040CF /* Scanning@2x.png */; };
 		1FF80D1012A3AE5400FE297C /* ZXMainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1FF80D0F12A3AE5400FE297C /* ZXMainViewController.xib */; };
 		288765FD0DF74451002DB57D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 288765FC0DF74451002DB57D /* CoreGraphics.framework */; };
 		28AD733F0D9D9553002E5188 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD733E0D9D9553002E5188 /* MainWindow.xib */; };
@ -149,6 +151,8 @@
 		1FB4369912919014002D63E8 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
 		1FB436DE129194E7002D63E8 /* scans.db */ = {isa = PBXFileReference; lastKnownFileType = file; path = scans.db; sourceTree = "<group>"; };
 		1FB437B612928EDA002D63E8 /* ModalViewControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModalViewControllerDelegate.h; sourceTree = "<group>"; };
+		1FCC10A712C15F68009040CF /* Scanning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Scanning.png; path = images/Scanning.png; sourceTree = "<group>"; };
+		1FCC10A812C15F68009040CF /* Scanning@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Scanning@2x.png"; path = "images/Scanning@2x.png"; sourceTree = "<group>"; };
 		1FF80CD712A3AB1B00FE297C /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = fr; path = fr.lproj/About.html; sourceTree = "<group>"; };
 		1FF80CD812A3AB1B00FE297C /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/DecoderView.xib; sourceTree = "<group>"; };
 		1FF80CD912A3AB1B00FE297C /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = fr; path = fr.lproj/Hints.html; sourceTree = "<group>"; };
@ -238,6 +242,8 @@
 		1FB4302D128FFF46002D63E8 /* images */ = {
 			isa = PBXGroup;
 			children = (
+				1FCC10A712C15F68009040CF /* Scanning.png */,
+				1FCC10A812C15F68009040CF /* Scanning@2x.png */,
 				1F91E1071292E397003A0BFD /* ZxingLarge@2x.png */,
 				1F91E0E21292D1DC003A0BFD /* clickHere.png */,
 				1F91E0D61292CA8C003A0BFD /* LatestResultBackground@2x.png */,
@ -421,6 +427,8 @@
 				1F91E0E31292D1DC003A0BFD /* clickHere.png in Resources */,
 				1F91E1081292E397003A0BFD /* ZxingLarge@2x.png in Resources */,
 				1FF80D1012A3AE5400FE297C /* ZXMainViewController.xib in Resources */,
+				1FCC10A912C15F68009040CF /* Scanning.png in Resources */,
+				1FCC10AA12C15F68009040CF /* Scanning@2x.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@ -572,7 +580,7 @@
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Romain Pechayre (2CQ4EGKG4S)";
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = (
--- a/iphone/Barcodes/Classes/ArchiveController.h
+++ b/iphone/Barcodes/Classes/ArchiveController.h
@ -36,6 +36,5 @@
@property (nonatomic, retain) NSDateFormatter *dateFormatter;

 - (NSInteger)scanIndexForRow:(NSInteger)row;
- (id)init;

@end
--- a/iphone/Barcodes/Classes/ArchiveController.m
+++ b/iphone/Barcodes/Classes/ArchiveController.m
@ -34,14 +34,6 @@
@synthesize delegate;
@synthesize dateFormatter;

- (id)init {
-	if ((self = [super initWithStyle:UITableViewStylePlain])) {
-    scans = [[NSMutableArray alloc] init];
-    results = [[NSMutableArray alloc] init];
-    dateFormatter = [[NSDateFormatter alloc] init];
-	}
-	return self;
-}

 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
 	return 1;
@ -121,6 +113,18 @@

 - (void)viewDidLoad {
 	[super viewDidLoad];
+  NSMutableArray *theScans = [[NSMutableArray alloc] init];
+  self.scans = theScans;
+  [theScans release];
+  
+  NSMutableArray *theResults = [[NSMutableArray alloc] init];
+  self.results = theResults;
+  [theResults release];
+  
+  NSDateFormatter *theDateFormatter = [[NSDateFormatter alloc] init];
+  self.dateFormatter = theDateFormatter;
+  [theDateFormatter release];
+  
  self.title = NSLocalizedString(@"ScanArchiveTitle", @"Scan Archive");
  self.navigationItem.rightBarButtonItem = [self editButtonItem];
  //self.navigationItem.leftBarButtonItem = [[[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"Back",@"Back") style:UIBarButtonItemStyleDone target:self action:@selector(done:)] autorelease];
@ -139,12 +143,13 @@


 - (void)viewWillAppear:(BOOL)animated {
-	[super viewWillAppear:animated];
+  [super viewWillAppear:animated];
  self.scans = [NSMutableArray arrayWithArray:[[Database sharedDatabase] scans]];
  self.results = [NSMutableArray arrayWithCapacity:self.scans.count];
  for (Scan *scan in scans) {
    [results addObject:[UniversalResultParser parsedResultForString:scan.text]];
  }
+  [self.tableView reloadData];
 }

 - (void)viewDidAppear:(BOOL)animated {
--- a/iphone/Barcodes/Classes/BarcodesAppDelegate.h
+++ b/iphone/Barcodes/Classes/BarcodesAppDelegate.h
@ -10,11 +10,11 @@

@interface BarcodesAppDelegate : NSObject <UIApplicationDelegate> {
  UIWindow *window;
-  UINavigationController *navigationController;
+  UITabBarController *tabBarController;
  
 }

@property (nonatomic, retain) IBOutlet UIWindow *window;
-@property (nonatomic, retain) IBOutlet UINavigationController *navigationController;
+@property (nonatomic, retain) IBOutlet UITabBarController *tabBarController;
@end

--- a/iphone/Barcodes/Classes/BarcodesAppDelegate.m
+++ b/iphone/Barcodes/Classes/BarcodesAppDelegate.m
@ -11,9 +11,7 @@
@implementation BarcodesAppDelegate

@synthesize window;
-@synthesize navigationController;
-//@synthesize rootController;
-
+@synthesize tabBarController;

 #pragma mark -
 #pragma mark Application lifecycle
@ -21,7 +19,7 @@
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {    
    
    // Override point for customization after application launch.
-  [self.window addSubview:navigationController.view];
+  [self.window addSubview:tabBarController.view];
  [self.window makeKeyAndVisible];
  
  return YES;
@ -77,7 +75,7 @@


 - (void)dealloc {
-  [navigationController release];
+  [tabBarController release];
  [window release];
  [super dealloc];
 }
--- a/iphone/Barcodes/Classes/Database.h
+++ b/iphone/Barcodes/Classes/Database.h
@ -34,7 +34,7 @@

 + (id)sharedDatabase;

- (void)addScanWithText:(NSString *)text;
+- (Scan *)addScanWithText:(NSString *)text;
 - (NSArray *)scans;
 - (void)deleteScan:(Scan *)scan;

--- a/iphone/Barcodes/Classes/Database.m
+++ b/iphone/Barcodes/Classes/Database.m
@ -83,12 +83,17 @@ static Database *sharedDatabase = nil;
  return sharedDatabase;
 }

- (void)addScanWithText:(NSString *)text {
+- (Scan *)addScanWithText:(NSString *)text {
+  NSTimeInterval timeStamp = [[NSDate date] timeIntervalSince1970];
  sqlite3_bind_int(insertStatement, 1, nextScanIdent++);
  sqlite3_bind_text(insertStatement, 2, [text UTF8String], -1, SQLITE_TRANSIENT);
-  sqlite3_bind_double(insertStatement, 3, [[NSDate date] timeIntervalSince1970]);
+  sqlite3_bind_double(insertStatement, 3, timeStamp);
  sqlite3_step(insertStatement);
  sqlite3_reset(insertStatement);
+  NSDate* theDate = [NSDate dateWithTimeIntervalSince1970:timeStamp];
+  Scan *scan = [[[Scan alloc] initWithIdent:nextScanIdent text:text stamp:theDate] autorelease];
+
+  return scan;
 }

 - (NSArray *)scans {
--- a/iphone/Barcodes/Classes/ScanViewController.m
+++ b/iphone/Barcodes/Classes/ScanViewController.m
@ -149,7 +149,7 @@
 }

 - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-  UITableViewCell *cell;
+  UITableViewCell *cell = nil;
  
  if (indexPath.section == 0) {
    if (indexPath.row == 0) {
--- a/iphone/Barcodes/Classes/ZXMainViewController.mm
+++ b/iphone/Barcodes/Classes/ZXMainViewController.mm
@ -13,6 +13,7 @@
 #import <ResultAction.h>
 #import "ArchiveController.h"
 #import "Database.h"
+#import "ScanViewController.h"

@implementation ZXMainViewController
@synthesize actions;
@ -35,7 +36,7 @@
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {
  [super viewDidLoad];
-  self.navigationItem.title = @"ZXing Barcodes Scanner";
+  self.navigationItem.title = @"Barcodes";
  NSString *rawLatestResult = [[NSUserDefaults standardUserDefaults] objectForKey:@"lastScan"];
  if (!rawLatestResult) rawLatestResult = NSLocalizedString(@"Latest result will appear here once you have scanned a barcode at least once",@"Latest result will appear here once you have scanned a barcode at least once");
  [self setResultViewWithText:rawLatestResult];
@ -68,6 +69,7 @@
 - (void)messageReady:(id)sender {
  MessageViewController *messageController = sender;
  //[self presentModalViewController:messageController animated:YES];
+  //TODO: change this
  [self.navigationController pushViewController:messageController animated:YES];
  [messageController release];
 }
@ -82,6 +84,7 @@
  MessageViewController *aboutController =
  [[MessageViewController alloc] initWithMessageFilename:@"About"];
  aboutController.delegate = self;
+  //TODO: change this
  [self.navigationController pushViewController:aboutController animated:YES];
  [aboutController release];
 }
@ -89,6 +92,7 @@
 - (IBAction)showArchive:(id)sender {
  ArchiveController *archiveController = [[ArchiveController alloc] init];
  archiveController.delegate = self;
+  //TODO: change this
  [self.navigationController pushViewController:archiveController animated:YES];
  [archiveController release];
 }
@ -160,11 +164,22 @@
 #ifdef DEBUG  
  NSLog(@"result has %d actions", actions ? 0 : actions.count);
 #endif
-  [[Database sharedDatabase] addScanWithText:resultString];
+  Scan * scan = [[Database sharedDatabase] addScanWithText:resultString];
  [[NSUserDefaults standardUserDefaults] setObject:resultString forKey:@"lastScan"];
+
+  
+  //TODO: toggle view into result view that needs to be done.
+  ParsedResult *parsedResult = [[UniversalResultParser parsedResultForString:resultString] retain];
+  ScanViewController *scanViewController = [[ScanViewController alloc] initWithResult:parsedResult forScan:scan];
+  [self.navigationController pushViewController:scanViewController animated:NO];
+  [scanViewController release];
  [self performResultAction];
 }

+- (void)zxingControllerDidCancel:(ZXingWidgetController*)controller {
+  [self dismissModalViewControllerAnimated:YES];
+}
+
 - (void)confirmAndPerformAction:(ResultAction *)action {
  [action performActionWithController:self shouldConfirm:YES];
 }
@ -208,9 +223,7 @@
  }
 }

- (void)zxingControllerDidCancel:(ZXingWidgetController*)controller {
-  [self dismissModalViewControllerAnimated:YES];
-}
+


@end
--- a/iphone/Barcodes/MainWindow.xib
+++ b/iphone/Barcodes/MainWindow.xib
@ -12,7 +12,7 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="13"/>
+			<integer value="17"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@ -41,12 +41,10 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIWindow" id="380026005">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">1316</int>
 				<object class="NSPSMatrix" key="NSFrameMatrix"/>
 				<string key="NSFrameSize">{320, 480}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@ -57,38 +55,111 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIResizesToFullScreen">YES</bool>
 			</object>
-			<object class="IBUINavigationController" id="730892884">
+			<object class="IBUITabBarController" id="678502090">
+				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
 				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
 				<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 					<int key="interfaceOrientation">1</int>
 				</object>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				<bool key="IBUIHorizontal">NO</bool>
-				<object class="IBUINavigationBar" key="IBUINavigationBar" id="105422232">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<string key="NSFrameSize">{0, 0}</string>
-					<bool key="IBUIOpaque">NO</bool>
-					<bool key="IBUIClipsSubviews">YES</bool>
-					<bool key="IBUIMultipleTouchEnabled">YES</bool>
+				<object class="IBUINavigationController" key="IBUISelectedViewController" id="855389612">
+					<object class="IBUITabBarItem" key="IBUITabBarItem" id="92264355">
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						<reference key="IBUITabBar"/>
+						<int key="IBUISystemItemIdentifier">6</int>
+					</object>
+					<reference key="IBUIToolbarItems" ref="0"/>
+					<reference key="IBUIParentViewController" ref="678502090"/>
+					<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+						<int key="interfaceOrientation">1</int>
+					</object>
 					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					<bool key="IBUIHorizontal">NO</bool>
+					<object class="IBUINavigationBar" key="IBUINavigationBar" id="771179136">
+						<nil key="NSNextResponder"/>
+						<int key="NSvFlags">256</int>
+						<string key="NSFrameSize">{320, 44}</string>
+						<bool key="IBUIOpaque">NO</bool>
+						<bool key="IBUIClipsSubviews">YES</bool>
+						<bool key="IBUIMultipleTouchEnabled">YES</bool>
+						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+					</object>
+					<object class="NSMutableArray" key="IBUIViewControllers">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="IBUIViewController" id="164822150">
+							<reference key="IBUIToolbarItems" ref="0"/>
+							<object class="IBUINavigationItem" key="IBUINavigationItem" id="91454113">
+								<reference key="IBUINavigationBar"/>
+								<string key="IBUITitle">Item</string>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							</object>
+							<reference key="IBUIParentViewController" ref="855389612"/>
+							<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+								<int key="interfaceOrientation">1</int>
+							</object>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<bool key="IBUIHorizontal">NO</bool>
+						</object>
+					</object>
 				</object>
 				<object class="NSMutableArray" key="IBUIViewControllers">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIViewController" id="176689833">
-						<object class="IBUINavigationItem" key="IBUINavigationItem" id="566761887">
-							<reference key="IBUINavigationBar"/>
-							<string key="IBUITitle">ZXing Barcodes Scanner</string>
+					<object class="IBUINavigationController" id="453889573">
+						<object class="IBUITabBarItem" key="IBUITabBarItem" id="52235519">
+							<string key="IBUITitle">Scanning</string>
+							<object class="NSCustomResource" key="IBUIImage">
+								<string key="NSClassName">NSImage</string>
+								<string key="NSResourceName">Scanning.png</string>
+							</object>
 							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+							<reference key="IBUITabBar"/>
 						</object>
-						<reference key="IBUIParentViewController" ref="730892884"/>
-						<string key="IBUINibName">ZXMainViewController</string>
+						<reference key="IBUIToolbarItems" ref="0"/>
+						<reference key="IBUIParentViewController" ref="678502090"/>
 						<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
 							<int key="interfaceOrientation">1</int>
 						</object>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<bool key="IBUIHorizontal">NO</bool>
+						<object class="IBUINavigationBar" key="IBUINavigationBar" id="1065984176">
+							<nil key="NSNextResponder"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrameSize">{320, 44}</string>
+							<bool key="IBUIOpaque">NO</bool>
+							<bool key="IBUIClipsSubviews">YES</bool>
+							<bool key="IBUIMultipleTouchEnabled">YES</bool>
+							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+						</object>
+						<object class="NSMutableArray" key="IBUIViewControllers">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<object class="IBUIViewController" id="704077278">
+								<reference key="IBUIToolbarItems" ref="0"/>
+								<object class="IBUINavigationItem" key="IBUINavigationItem" id="1019617915">
+									<string key="IBUITitle">Item</string>
+									<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								</object>
+								<reference key="IBUIParentViewController" ref="453889573"/>
+								<string key="IBUINibName">ZXMainViewController</string>
+								<object class="IBUISimulatedOrientationMetrics" key="IBUISimulatedOrientationMetrics">
+									<int key="interfaceOrientation">1</int>
+								</object>
+								<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+								<bool key="IBUIHorizontal">NO</bool>
+							</object>
+						</object>
 					</object>
+					<reference ref="855389612"/>
+				</object>
+				<object class="IBUITabBar" key="IBUITabBar" id="146842078">
+					<nil key="NSNextResponder"/>
+					<int key="NSvFlags">266</int>
+					<string key="NSFrame">{{129, 330}, {163, 49}}</string>
+					<object class="NSColor" key="IBUIBackgroundColor">
+						<int key="NSColorSpace">3</int>
+						<bytes key="NSWhite">MCAwAA</bytes>
+					</object>
+					<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 				</object>
 			</object>
 		</object>
@ -113,11 +184,11 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">navigationController</string>
+						<string key="label">tabBarController</string>
 						<reference key="source" ref="664661524"/>
-						<reference key="destination" ref="730892884"/>
+						<reference key="destination" ref="678502090"/>
 					</object>
-					<int key="connectionID">16</int>
+					<int key="connectionID">23</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@ -154,33 +225,90 @@
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">12</int>
-						<reference key="object" ref="730892884"/>
+						<int key="objectID">17</int>
+						<reference key="object" ref="678502090"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="176689833"/>
-							<reference ref="105422232"/>
+							<reference ref="146842078"/>
+							<reference ref="855389612"/>
+							<reference ref="453889573"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">13</int>
-						<reference key="object" ref="176689833"/>
+						<int key="objectID">18</int>
+						<reference key="object" ref="146842078"/>
+						<reference key="parent" ref="678502090"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">50</int>
+						<reference key="object" ref="855389612"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="566761887"/>
+							<reference ref="92264355"/>
+							<reference ref="164822150"/>
+							<reference ref="771179136"/>
 						</object>
-						<reference key="parent" ref="730892884"/>
+						<reference key="parent" ref="678502090"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">14</int>
-						<reference key="object" ref="105422232"/>
-						<reference key="parent" ref="730892884"/>
+						<int key="objectID">51</int>
+						<reference key="object" ref="92264355"/>
+						<reference key="parent" ref="855389612"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="566761887"/>
-						<reference key="parent" ref="176689833"/>
+						<int key="objectID">52</int>
+						<reference key="object" ref="164822150"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="91454113"/>
+						</object>
+						<reference key="parent" ref="855389612"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">53</int>
+						<reference key="object" ref="91454113"/>
+						<reference key="parent" ref="164822150"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">54</int>
+						<reference key="object" ref="771179136"/>
+						<reference key="parent" ref="855389612"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">59</int>
+						<reference key="object" ref="453889573"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="52235519"/>
+							<reference ref="704077278"/>
+							<reference ref="1065984176"/>
+						</object>
+						<reference key="parent" ref="678502090"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">60</int>
+						<reference key="object" ref="52235519"/>
+						<reference key="parent" ref="453889573"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">61</int>
+						<reference key="object" ref="704077278"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="1019617915"/>
+						</object>
+						<reference key="parent" ref="453889573"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">62</int>
+						<reference key="object" ref="1019617915"/>
+						<reference key="parent" ref="704077278"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">63</int>
+						<reference key="object" ref="1065984176"/>
+						<reference key="parent" ref="453889573"/>
 					</object>
 				</object>
 			</object>
@ -190,26 +318,22 @@
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>-1.CustomClassName</string>
 					<string>-2.CustomClassName</string>
-					<string>12.IBEditorWindowLastContentRect</string>
-					<string>12.IBPluginDependency</string>
-					<string>13.CustomClassName</string>
-					<string>13.IBPluginDependency</string>
-					<string>14.IBPluginDependency</string>
-					<string>15.IBPluginDependency</string>
+					<string>17.IBEditorWindowLastContentRect</string>
+					<string>17.IBPluginDependency</string>
+					<string>18.IBPluginDependency</string>
 					<string>2.IBAttributePlaceholdersKey</string>
 					<string>2.IBEditorWindowLastContentRect</string>
 					<string>2.IBPluginDependency</string>
 					<string>3.CustomClassName</string>
 					<string>3.IBPluginDependency</string>
+					<string>52.CustomClassName</string>
+					<string>61.CustomClassName</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>UIApplication</string>
 					<string>UIResponder</string>
-					<string>{{0, 265}, {320, 480}}</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>ZXMainViewController</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>{{315, 193}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<object class="NSMutableDictionary">
@ -223,6 +347,8 @@
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>BarcodesAppDelegate</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+					<string>ArchiveController</string>
+					<string>ZXMainViewController</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@ -241,11 +367,30 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">16</int>
+			<int key="maxID">63</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">ArchiveController</string>
+					<string key="superclassName">UITableViewController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">delegate</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">delegate</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">delegate</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Classes/ArchiveController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">BarcodesAppDelegate</string>
 					<string key="superclassName">NSObject</string>
@ -253,12 +398,12 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>navigationController</string>
+							<string>tabBarController</string>
 							<string>window</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>UINavigationController</string>
+							<string>UITabBarController</string>
 							<string>UIWindow</string>
 						</object>
 					</object>
@ -266,14 +411,14 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>navigationController</string>
+							<string>tabBarController</string>
 							<string>window</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
 							<object class="IBToOneOutletInfo">
-								<string key="name">navigationController</string>
-								<string key="candidateClassName">UINavigationController</string>
+								<string key="name">tabBarController</string>
+								<string key="candidateClassName">UITabBarController</string>
 							</object>
 							<object class="IBToOneOutletInfo">
 								<string key="name">window</string>
@ -564,6 +709,38 @@
 						<string key="minorKey">UIKit.framework/Headers/UISearchDisplayController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITabBar</string>
+					<string key="superclassName">UIView</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UITabBar.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITabBarController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier" id="228028712">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITabBarItem</string>
+					<string key="superclassName">UIBarItem</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UITabBarItem.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">UITableViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBFrameworkSource</string>
+						<string key="minorKey">UIKit.framework/Headers/UITableViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UITextView</string>
 					<string key="superclassName">UIScrollView</string>
@ -614,10 +791,7 @@
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UITabBarController.h</string>
-					</object>
+					<reference key="sourceIdentifier" ref="228028712"/>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UIViewController</string>
@ -650,6 +824,10 @@
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
 		<string key="IBDocument.LastKnownRelativeProjectPath">Barcodes.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">Scanning.png</string>
+			<string key="NS.object.0">{20, 17}</string>
+		</object>
 		<string key="IBCocoaTouchPluginVersion">132</string>
 	</data>
 </archive>
--- a/iphone/Barcodes/ZXMainViewController.xib
+++ b/iphone/Barcodes/ZXMainViewController.xib
@ -42,33 +42,21 @@
 				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
-					<object class="IBUIImageView" id="912006692">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{199, -7}, {120, 66}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<object class="NSCustomResource" key="IBUIImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">clickHere.png</string>
-						</object>
-					</object>
 					<object class="IBUIButton" id="1005126370">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{95, 54}, {128, 128}}</string>
+						<string key="NSFrame">{{96, 111}, {128, 128}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSFont" key="IBUIFont" id="50803580">
+						<object class="NSFont" key="IBUIFont">
 							<string key="NSName">Helvetica-Bold</string>
 							<double key="NSSize">15</double>
 							<int key="NSfFlags">16</int>
 						</object>
-						<object class="NSColor" key="IBUIHighlightedTitleColor" id="85817449">
+						<object class="NSColor" key="IBUIHighlightedTitleColor" id="367658244">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MQA</bytes>
 						</object>
@ -76,7 +64,7 @@
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
 						</object>
-						<object class="NSColor" key="IBUINormalTitleShadowColor" id="931878472">
+						<object class="NSColor" key="IBUINormalTitleShadowColor">
 							<int key="NSColorSpace">3</int>
 							<bytes key="NSWhite">MC41AA</bytes>
 						</object>
@ -85,118 +73,32 @@
 							<string key="NSResourceName">ZxingLarge.png</string>
 						</object>
 					</object>
-					<object class="IBUIButton" id="171320148">
+					<object class="IBUILabel" id="270868112">
 						<reference key="NSNextResponder" ref="191373211"/>
 						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{282, 376}, {18, 19}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="50803580"/>
-						<int key="IBUIButtonType">4</int>
-						<bool key="IBUIShowsTouchWhenHighlighted">YES</bool>
-						<reference key="IBUIHighlightedTitleColor" ref="85817449"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="931878472"/>
-					</object>
-					<object class="IBUIImageView" id="466572544">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{4, 206}, {311, 152}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIUserInteractionEnabled">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<object class="NSCustomResource" key="IBUIImage">
-							<string key="NSClassName">NSImage</string>
-							<string key="NSResourceName">LatestResultBackground.png</string>
-						</object>
-					</object>
-					<object class="IBUILabel" id="38308048">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{20, 221}, {94, 18}}</string>
+						<string key="NSFrame">{{76, 20}, {167, 29}}</string>
 						<reference key="NSSuperview" ref="191373211"/>
 						<bool key="IBUIOpaque">NO</bool>
 						<bool key="IBUIClipsSubviews">YES</bool>
 						<int key="IBUIContentMode">7</int>
 						<bool key="IBUIUserInteractionEnabled">NO</bool>
 						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<string key="IBUIText">Latest result :</string>
-						<object class="NSFont" key="IBUIFont" id="192988789">
+						<string key="IBUIText">Touch to Scan</string>
+						<object class="NSFont" key="IBUIFont">
 							<string key="NSName">Helvetica-Bold</string>
-							<double key="NSSize">14</double>
+							<double key="NSSize">24</double>
 							<int key="NSfFlags">16</int>
 						</object>
-						<object class="NSColor" key="IBUITextColor" id="642293943">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MCAwIDAAA</bytes>
+						<object class="NSColor" key="IBUITextColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC4zNzU5MTI0MDg4AA</bytes>
 						</object>
-						<reference key="IBUIHighlightedColor" ref="85817449"/>
+						<reference key="IBUIHighlightedColor" ref="367658244"/>
 						<int key="IBUIBaselineAdjustment">1</int>
 						<float key="IBUIMinimumFontSize">10</float>
 					</object>
-					<object class="IBUITextView" id="132134303">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{19, 244}, {280, 95}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<object class="NSColor" key="IBUIBackgroundColor">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MSAwAA</bytes>
-						</object>
-						<bool key="IBUIClipsSubviews">YES</bool>
-						<bool key="IBUIMultipleTouchEnabled">YES</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIIndicatorStyle">1</int>
-						<bool key="IBUIEditable">NO</bool>
-						<string key="IBUIText"/>
-						<object class="IBUITextInputTraits" key="IBUITextInputTraits">
-							<int key="IBUIAutocapitalizationType">2</int>
-							<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						</object>
-						<int key="IBUIDataDetectorTypes">15</int>
-					</object>
-					<object class="IBUIButton" id="865902498">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{13, 366}, {150, 35}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="50803580"/>
-						<int key="IBUIButtonType">1</int>
-						<string key="IBUINormalTitle">View Full Archive</string>
-						<reference key="IBUIHighlightedTitleColor" ref="85817449"/>
-						<reference key="IBUINormalTitleColor" ref="642293943"/>
-						<reference key="IBUINormalTitleShadowColor" ref="931878472"/>
-					</object>
-					<object class="IBUIButton" id="1000912642">
-						<reference key="NSNextResponder" ref="191373211"/>
-						<int key="NSvFlags">292</int>
-						<string key="NSFrame">{{146, 216}, {154, 27}}</string>
-						<reference key="NSSuperview" ref="191373211"/>
-						<bool key="IBUIOpaque">NO</bool>
-						<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-						<int key="IBUIContentHorizontalAlignment">0</int>
-						<int key="IBUIContentVerticalAlignment">0</int>
-						<reference key="IBUIFont" ref="192988789"/>
-						<int key="IBUIButtonType">1</int>
-						<reference key="IBUIHighlightedTitleColor" ref="85817449"/>
-						<object class="NSColor" key="IBUINormalTitleColor">
-							<int key="NSColorSpace">1</int>
-							<bytes key="NSRGB">MC4wOTgwMzkyMTcyOSAwLjA5ODAzOTIxNzI5IDAuMDk4MDM5MjE3MjkAA</bytes>
-						</object>
-						<reference key="IBUINormalTitleShadowColor" ref="931878472"/>
-					</object>
 				</object>
-				<string key="NSFrameSize">{320, 416}</string>
+				<string key="NSFrameSize">{320, 367}</string>
 				<reference key="NSSuperview"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
@ -206,6 +108,7 @@
 				<object class="IBUISimulatedNavigationBarMetrics" key="IBUISimulatedTopBarMetrics">
 					<bool key="IBUIPrompted">NO</bool>
 				</object>
+				<object class="IBUISimulatedTabBarMetrics" key="IBUISimulatedBottomBarMetrics"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 		</object>
@ -229,49 +132,6 @@
 					</object>
 					<int key="connectionID">7</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">info:</string>
-						<reference key="source" ref="171320148"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">showArchive:</string>
-						<reference key="source" ref="865902498"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">14</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">resultView</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="132134303"/>
-					</object>
-					<int key="connectionID">16</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchEventConnection" key="connection">
-						<string key="label">lastResultAction:</string>
-						<reference key="source" ref="1000912642"/>
-						<reference key="destination" ref="372490531"/>
-						<int key="IBEventType">7</int>
-					</object>
-					<int key="connectionID">22</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">lastActionButton</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="1000912642"/>
-					</object>
-					<int key="connectionID">23</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@ -287,14 +147,8 @@
 						<reference key="object" ref="191373211"/>
 						<object class="NSMutableArray" key="children">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="171320148"/>
 							<reference ref="1005126370"/>
-							<reference ref="865902498"/>
-							<reference ref="38308048"/>
-							<reference ref="466572544"/>
-							<reference ref="132134303"/>
-							<reference ref="1000912642"/>
-							<reference ref="912006692"/>
+							<reference ref="270868112"/>
 						</object>
 						<reference key="parent" ref="0"/>
 					</object>
@ -309,44 +163,14 @@
 						<reference key="object" ref="975951072"/>
 						<reference key="parent" ref="0"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">8</int>
-						<reference key="object" ref="171320148"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">6</int>
 						<reference key="object" ref="1005126370"/>
 						<reference key="parent" ref="191373211"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">10</int>
-						<reference key="object" ref="865902498"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">17</int>
-						<reference key="object" ref="38308048"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">19</int>
-						<reference key="object" ref="466572544"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">15</int>
-						<reference key="object" ref="132134303"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">21</int>
-						<reference key="object" ref="1000912642"/>
-						<reference key="parent" ref="191373211"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">20</int>
-						<reference key="object" ref="912006692"/>
+						<int key="objectID">24</int>
+						<reference key="object" ref="270868112"/>
 						<reference key="parent" ref="191373211"/>
 					</object>
 				</object>
@ -359,56 +183,24 @@
 					<string>-2.CustomClassName</string>
 					<string>1.IBEditorWindowLastContentRect</string>
 					<string>1.IBPluginDependency</string>
-					<string>10.IBPluginDependency</string>
-					<string>10.IBViewBoundsToFrameTransform</string>
-					<string>15.IBPluginDependency</string>
-					<string>15.IBViewBoundsToFrameTransform</string>
-					<string>17.IBPluginDependency</string>
-					<string>19.IBPluginDependency</string>
-					<string>19.IBViewBoundsToFrameTransform</string>
-					<string>20.IBPluginDependency</string>
-					<string>20.IBViewBoundsToFrameTransform</string>
-					<string>21.IBPluginDependency</string>
-					<string>21.IBViewBoundsToFrameTransform</string>
+					<string>24.IBPluginDependency</string>
+					<string>24.IBViewBoundsToFrameTransform</string>
 					<string>6.IBPluginDependency</string>
 					<string>6.IBViewBoundsToFrameTransform</string>
-					<string>8.IBPluginDependency</string>
-					<string>8.IBViewBoundsToFrameTransform</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
 					<string>ZXMainViewController</string>
 					<string>UIResponder</string>
-					<string>{{468, 276}, {320, 480}}</string>
+					<string>{{340, 276}, {320, 480}}</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABAoAAAw98AAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABCmgAAwoIAAA</bytes>
 					</object>
 					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABBoAAAw8iAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABAgAAAw8wAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDSQAAwsYAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDDQAAw46AAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABCvgAAw3gAAA</bytes>
-					</object>
-					<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-					<object class="NSAffineTransform">
-						<bytes key="NSTransformStruct">P4AAAL+AAABDjQAAw8SAAA</bytes>
+						<bytes key="NSTransformStruct">P4AAAL+AAABCzgAAw3YAAA</bytes>
 					</object>
 				</object>
 			</object>
@ -428,7 +220,7 @@
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">23</int>
+			<int key="maxID">24</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -629,14 +421,6 @@
 						<string key="minorKey">UIKit.framework/Headers/UIControl.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">UIImageView</string>
-					<string key="superclassName">UIView</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBFrameworkSource</string>
-						<string key="minorKey">UIKit.framework/Headers/UIImageView.h</string>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">UILabel</string>
 					<string key="superclassName">UIView</string>
@ -756,19 +540,8 @@
 		<string key="IBDocument.LastKnownRelativeProjectPath">Barcodes.xcodeproj</string>
 		<int key="IBDocument.defaultPropertyAccessControl">3</int>
 		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
-			<bool key="EncodedWithXMLCoder">YES</bool>
-			<object class="NSArray" key="dict.sortedKeys">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>LatestResultBackground.png</string>
-				<string>ZxingLarge.png</string>
-				<string>clickHere.png</string>
-			</object>
-			<object class="NSMutableArray" key="dict.values">
-				<bool key="EncodedWithXMLCoder">YES</bool>
-				<string>{311, 158}</string>
-				<string>{128, 128}</string>
-				<string>{179, 99}</string>
-			</object>
+			<string key="NS.key.0">ZxingLarge.png</string>
+			<string key="NS.object.0">{128, 128}</string>
 		</object>
 		<string key="IBCocoaTouchPluginVersion">132</string>
 	</data>
--- a/iphone/Barcodes/design/Transparent-logo.png
+++ b/iphone/Barcodes/design/Transparent-logo.png
--- a/iphone/Barcodes/design/Transparent-logo.psd
+++ b/iphone/Barcodes/design/Transparent-logo.psd
--- a/iphone/Barcodes/images/Scanning.png
+++ b/iphone/Barcodes/images/Scanning.png
--- a/iphone/Barcodes/images/Scanning@2x.png
+++ b/iphone/Barcodes/images/Scanning@2x.png