diff --git a/iphone/Barcodes/Barcodes-Info.plist b/iphone/Barcodes/Barcodes-Info.plist index 1210ba481..041d4ac0a 100644 --- a/iphone/Barcodes/Barcodes-Info.plist +++ b/iphone/Barcodes/Barcodes-Info.plist @@ -26,5 +26,7 @@ NSMainNibFile MainWindow + UIStatusBarHidden + diff --git a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj index 51d66d7ba..7782e48b4 100755 --- 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 = ""; }; 1FB437B612928EDA002D63E8 /* ModalViewControllerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ModalViewControllerDelegate.h; sourceTree = ""; }; + 1FCC10A712C15F68009040CF /* Scanning.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Scanning.png; path = images/Scanning.png; sourceTree = ""; }; + 1FCC10A812C15F68009040CF /* Scanning@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Scanning@2x.png"; path = "images/Scanning@2x.png"; sourceTree = ""; }; 1FF80CD712A3AB1B00FE297C /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = fr; path = fr.lproj/About.html; sourceTree = ""; }; 1FF80CD812A3AB1B00FE297C /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = fr.lproj/DecoderView.xib; sourceTree = ""; }; 1FF80CD912A3AB1B00FE297C /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.html; name = fr; path = fr.lproj/Hints.html; sourceTree = ""; }; @@ -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 = ( diff --git a/iphone/Barcodes/Classes/ArchiveController.h b/iphone/Barcodes/Classes/ArchiveController.h index c6c725104..b31bba8ad 100644 --- 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 diff --git a/iphone/Barcodes/Classes/ArchiveController.m b/iphone/Barcodes/Classes/ArchiveController.m index 95c54baca..3329fffef 100644 --- 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 { diff --git a/iphone/Barcodes/Classes/BarcodesAppDelegate.h b/iphone/Barcodes/Classes/BarcodesAppDelegate.h index 35e9d4677..098aefd96 100644 --- a/iphone/Barcodes/Classes/BarcodesAppDelegate.h +++ b/iphone/Barcodes/Classes/BarcodesAppDelegate.h @@ -10,11 +10,11 @@ @interface BarcodesAppDelegate : NSObject { 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 diff --git a/iphone/Barcodes/Classes/BarcodesAppDelegate.m b/iphone/Barcodes/Classes/BarcodesAppDelegate.m index 056612a63..43afb7f2f 100644 --- 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]; } diff --git a/iphone/Barcodes/Classes/Database.h b/iphone/Barcodes/Classes/Database.h index 38ec771dc..764fd0401 100644 --- 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; diff --git a/iphone/Barcodes/Classes/Database.m b/iphone/Barcodes/Classes/Database.m index cd4897c63..1c86c8368 100644 --- 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 { diff --git a/iphone/Barcodes/Classes/ScanViewController.m b/iphone/Barcodes/Classes/ScanViewController.m index 7457b1cc1..6f51ed6c6 100644 --- 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) { diff --git a/iphone/Barcodes/Classes/ZXMainViewController.mm b/iphone/Barcodes/Classes/ZXMainViewController.mm index 0da49372d..f54e4c104 100644 --- a/iphone/Barcodes/Classes/ZXMainViewController.mm +++ b/iphone/Barcodes/Classes/ZXMainViewController.mm @@ -13,6 +13,7 @@ #import #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 diff --git a/iphone/Barcodes/MainWindow.xib b/iphone/Barcodes/MainWindow.xib index 545654f63..16b0753a9 100644 --- a/iphone/Barcodes/MainWindow.xib +++ b/iphone/Barcodes/MainWindow.xib @@ -12,7 +12,7 @@ YES - + YES @@ -41,12 +41,10 @@ IBCocoaTouchFramework - + 1316 {320, 480} - - 1 MSAxIDEAA @@ -57,38 +55,111 @@ IBCocoaTouchFramework YES - + + 1 IBCocoaTouchFramework NO - - - 256 - {0, 0} - NO - YES - YES + + + IBCocoaTouchFramework + + 6 + + + + + 1 + IBCocoaTouchFramework + NO + + + 256 + {320, 44} + NO + YES + YES + IBCocoaTouchFramework + + + YES + + + + + Item + IBCocoaTouchFramework + + + + 1 + + IBCocoaTouchFramework + NO + + YES - - - - ZXing Barcodes Scanner + + + Scanning + + NSImage + Scanning.png + IBCocoaTouchFramework + - - ZXMainViewController + + 1 IBCocoaTouchFramework NO + + + 256 + {320, 44} + NO + YES + YES + IBCocoaTouchFramework + + + YES + + + + Item + IBCocoaTouchFramework + + + ZXMainViewController + + 1 + + IBCocoaTouchFramework + NO + + + + + + + 266 + {{129, 330}, {163, 49}} + + 3 + MCAwAA + + IBCocoaTouchFramework @@ -113,11 +184,11 @@ - navigationController + tabBarController - + - 16 + 23 @@ -154,33 +225,90 @@ - 12 - + 17 + YES - - + + + - 13 - + 18 + + + + + 50 + YES - + + + - + - 14 - - + 51 + + - 15 - - + 52 + + + YES + + + + + + 53 + + + + + 54 + + + + + 59 + + + YES + + + + + + + + 60 + + + + + 61 + + + YES + + + + + + 62 + + + + + 63 + + @@ -190,26 +318,22 @@ YES -1.CustomClassName -2.CustomClassName - 12.IBEditorWindowLastContentRect - 12.IBPluginDependency - 13.CustomClassName - 13.IBPluginDependency - 14.IBPluginDependency - 15.IBPluginDependency + 17.IBEditorWindowLastContentRect + 17.IBPluginDependency + 18.IBPluginDependency 2.IBAttributePlaceholdersKey 2.IBEditorWindowLastContentRect 2.IBPluginDependency 3.CustomClassName 3.IBPluginDependency + 52.CustomClassName + 61.CustomClassName YES UIApplication UIResponder - {{0, 265}, {320, 480}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - ZXMainViewController - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{315, 193}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -223,6 +347,8 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin BarcodesAppDelegate com.apple.InterfaceBuilder.IBCocoaTouchPlugin + ArchiveController + ZXMainViewController @@ -241,11 +367,30 @@ - 16 + 63 YES + + ArchiveController + UITableViewController + + delegate + id + + + delegate + + delegate + id + + + + IBProjectSource + Classes/ArchiveController.h + + BarcodesAppDelegate NSObject @@ -253,12 +398,12 @@ YES YES - navigationController + tabBarController window YES - UINavigationController + UITabBarController UIWindow @@ -266,14 +411,14 @@ YES YES - navigationController + tabBarController window YES - navigationController - UINavigationController + tabBarController + UITabBarController window @@ -564,6 +709,38 @@ UIKit.framework/Headers/UISearchDisplayController.h + + UITabBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UITabBar.h + + + + UITabBarController + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITabBarController.h + + + + UITabBarItem + UIBarItem + + IBFrameworkSource + UIKit.framework/Headers/UITabBarItem.h + + + + UITableViewController + UIViewController + + IBFrameworkSource + UIKit.framework/Headers/UITableViewController.h + + UITextView UIScrollView @@ -614,10 +791,7 @@ UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - + UIViewController @@ -650,6 +824,10 @@ YES Barcodes.xcodeproj 3 + + Scanning.png + {20, 17} + 132 diff --git a/iphone/Barcodes/ZXMainViewController.xib b/iphone/Barcodes/ZXMainViewController.xib index a1cbd1697..8c389875e 100644 --- a/iphone/Barcodes/ZXMainViewController.xib +++ b/iphone/Barcodes/ZXMainViewController.xib @@ -42,33 +42,21 @@ 274 YES - - - 292 - {{199, -7}, {120, 66}} - - NO - IBCocoaTouchFramework - - NSImage - clickHere.png - - 292 - {{95, 54}, {128, 128}} + {{96, 111}, {128, 128}} NO IBCocoaTouchFramework 0 0 - + Helvetica-Bold 15 16 - + 3 MQA @@ -76,7 +64,7 @@ 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - + 3 MC41AA @@ -85,118 +73,32 @@ ZxingLarge.png - + 292 - {{282, 376}, {18, 19}} - - NO - IBCocoaTouchFramework - 0 - 0 - - 4 - YES - - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - - - - - - 292 - {{4, 206}, {311, 152}} - - NO - IBCocoaTouchFramework - - NSImage - LatestResultBackground.png - - - - - 292 - {{20, 221}, {94, 18}} + {{76, 20}, {167, 29}} NO YES 7 NO IBCocoaTouchFramework - Latest result : - + Touch to Scan + Helvetica-Bold - 14 + 24 16 - - 1 - MCAwIDAAA + + 3 + MC4zNzU5MTI0MDg4AA - + 1 10 - - - 292 - {{19, 244}, {280, 95}} - - - 3 - MSAwAA - - YES - YES - IBCocoaTouchFramework - 1 - NO - - - 2 - IBCocoaTouchFramework - - 15 - - - - 292 - {{13, 366}, {150, 35}} - - NO - IBCocoaTouchFramework - 0 - 0 - - 1 - View Full Archive - - - - - - - 292 - {{146, 216}, {154, 27}} - - NO - IBCocoaTouchFramework - 0 - 0 - - 1 - - - 1 - MC4wOTgwMzkyMTcyOSAwLjA5ODAzOTIxNzI5IDAuMDk4MDM5MjE3MjkAA - - - - {320, 416} + {320, 367} 1 @@ -206,6 +108,7 @@ NO + IBCocoaTouchFramework @@ -229,49 +132,6 @@ 7 - - - info: - - - 7 - - 9 - - - - showArchive: - - - 7 - - 14 - - - - resultView - - - - 16 - - - - lastResultAction: - - - 7 - - 22 - - - - lastActionButton - - - - 23 - @@ -287,14 +147,8 @@ YES - - - - - - - + @@ -309,44 +163,14 @@ - - 8 - - - 6 - 10 - - - - - 17 - - - - - 19 - - - - - 15 - - - - - 21 - - - - - 20 - + 24 + @@ -359,56 +183,24 @@ -2.CustomClassName 1.IBEditorWindowLastContentRect 1.IBPluginDependency - 10.IBPluginDependency - 10.IBViewBoundsToFrameTransform - 15.IBPluginDependency - 15.IBViewBoundsToFrameTransform - 17.IBPluginDependency - 19.IBPluginDependency - 19.IBViewBoundsToFrameTransform - 20.IBPluginDependency - 20.IBViewBoundsToFrameTransform - 21.IBPluginDependency - 21.IBViewBoundsToFrameTransform + 24.IBPluginDependency + 24.IBViewBoundsToFrameTransform 6.IBPluginDependency 6.IBViewBoundsToFrameTransform - 8.IBPluginDependency - 8.IBViewBoundsToFrameTransform YES ZXMainViewController UIResponder - {{468, 276}, {320, 480}} + {{340, 276}, {320, 480}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABAoAAAw98AAA + P4AAAL+AAABCmgAAwoIAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABBoAAAw8iAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABAgAAAw8wAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDSQAAwsYAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDDQAAw46AAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABCvgAAw3gAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDjQAAw8SAAA + P4AAAL+AAABCzgAAw3YAAA @@ -428,7 +220,7 @@ - 23 + 24 @@ -629,14 +421,6 @@ UIKit.framework/Headers/UIControl.h - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - UILabel UIView @@ -756,19 +540,8 @@ Barcodes.xcodeproj 3 - YES - - YES - LatestResultBackground.png - ZxingLarge.png - clickHere.png - - - YES - {311, 158} - {128, 128} - {179, 99} - + ZxingLarge.png + {128, 128} 132 diff --git a/iphone/Barcodes/design/Transparent-logo.png b/iphone/Barcodes/design/Transparent-logo.png new file mode 100644 index 000000000..52447abbe Binary files /dev/null and b/iphone/Barcodes/design/Transparent-logo.png differ diff --git a/iphone/Barcodes/design/Transparent-logo.psd b/iphone/Barcodes/design/Transparent-logo.psd new file mode 100644 index 000000000..f15c3c210 Binary files /dev/null and b/iphone/Barcodes/design/Transparent-logo.psd differ diff --git a/iphone/Barcodes/images/Scanning.png b/iphone/Barcodes/images/Scanning.png new file mode 100644 index 000000000..c69fd092b Binary files /dev/null and b/iphone/Barcodes/images/Scanning.png differ diff --git a/iphone/Barcodes/images/Scanning@2x.png b/iphone/Barcodes/images/Scanning@2x.png new file mode 100644 index 000000000..a9d574a16 Binary files /dev/null and b/iphone/Barcodes/images/Scanning@2x.png differ