diff --git a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj index def76abda..ef4f9df6e 100755 --- a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj +++ b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 1F91E0C11292BAD5003A0BFD /* LatestResultBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F91E0C01292BAD5003A0BFD /* LatestResultBackground.png */; }; 1F91E0D71292CA8C003A0BFD /* LatestResultBackground@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F91E0D61292CA8C003A0BFD /* LatestResultBackground@2x.png */; }; 1F91E0E31292D1DC003A0BFD /* clickHere.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F91E0E21292D1DC003A0BFD /* clickHere.png */; }; + 1F91E1081292E397003A0BFD /* ZxingLarge@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F91E1071292E397003A0BFD /* ZxingLarge@2x.png */; }; 1FB4301D128FFDCF002D63E8 /* libZXingWidget.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1FB4301C128FFDCD002D63E8 /* libZXingWidget.a */; }; 1FB43030128FFF56002D63E8 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 1FB4302E128FFF56002D63E8 /* icon.png */; }; 1FB43031128FFF56002D63E8 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1FB4302F128FFF56002D63E8 /* icon@2x.png */; }; @@ -86,6 +87,7 @@ 1F91E0C01292BAD5003A0BFD /* LatestResultBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = LatestResultBackground.png; path = images/LatestResultBackground.png; sourceTree = ""; }; 1F91E0D61292CA8C003A0BFD /* LatestResultBackground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "LatestResultBackground@2x.png"; path = "images/LatestResultBackground@2x.png"; sourceTree = ""; }; 1F91E0E21292D1DC003A0BFD /* clickHere.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = clickHere.png; path = images/clickHere.png; sourceTree = ""; }; + 1F91E1071292E397003A0BFD /* ZxingLarge@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "ZxingLarge@2x.png"; path = "images/ZxingLarge@2x.png"; sourceTree = ""; }; 1FB43017128FFDCD002D63E8 /* ZXingWidget.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = ZXingWidget.xcodeproj; path = ../ZXingWidget/ZXingWidget.xcodeproj; sourceTree = SOURCE_ROOT; }; 1FB4302E128FFF56002D63E8 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = images/icon.png; sourceTree = ""; }; 1FB4302F128FFF56002D63E8 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon@2x.png"; path = "images/icon@2x.png"; sourceTree = ""; }; @@ -230,6 +232,7 @@ 1FB4302D128FFF46002D63E8 /* images */ = { isa = PBXGroup; children = ( + 1F91E1071292E397003A0BFD /* ZxingLarge@2x.png */, 1F91E0E21292D1DC003A0BFD /* clickHere.png */, 1F91E0D61292CA8C003A0BFD /* LatestResultBackground@2x.png */, 1F91E0C01292BAD5003A0BFD /* LatestResultBackground.png */, @@ -409,6 +412,7 @@ 1F91E0C11292BAD5003A0BFD /* LatestResultBackground.png in Resources */, 1F91E0D71292CA8C003A0BFD /* LatestResultBackground@2x.png in Resources */, 1F91E0E31292D1DC003A0BFD /* clickHere.png in Resources */, + 1F91E1081292E397003A0BFD /* ZxingLarge@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/iphone/Barcodes/Classes/ZXMainViewController.xib b/iphone/Barcodes/Classes/ZXMainViewController.xib index 8c45f0a23..7b01d889d 100644 --- a/iphone/Barcodes/Classes/ZXMainViewController.xib +++ b/iphone/Barcodes/Classes/ZXMainViewController.xib @@ -42,7 +42,7 @@ 274 YES - + 292 {{199, 42}, {120, 66}} @@ -70,7 +70,7 @@ 17 16 - + 1 MCAwIDAAA @@ -128,7 +128,7 @@ - + 292 {{4, 258}, {311, 152}} @@ -140,7 +140,7 @@ LatestResultBackground.png - + 292 {{20, 269}, {94, 18}} @@ -156,12 +156,12 @@ 14 16 - + 1 10 - + 292 {{19, 292}, {280, 95}} @@ -182,7 +182,7 @@ 15 - + 292 {{13, 414}, {150, 35}} @@ -195,7 +195,7 @@ 1 View Full Archive - + @@ -241,7 +241,7 @@ showArchive: - + 7 @@ -251,7 +251,7 @@ resultView - + 16 @@ -271,13 +271,13 @@ YES - - - + + + - - + + @@ -299,7 +299,7 @@ 10 - + @@ -314,22 +314,22 @@ 15 - + 17 - + 19 - + 20 - + @@ -459,35 +459,14 @@ - YES - - YES - latestResultLabel - resultView - - - YES - UILabel - UITextView - + resultView + UITextView - YES - - YES - latestResultLabel - resultView - - - YES - - latestResultLabel - UILabel - - - resultView - UITextView - + resultView + + resultView + UITextView diff --git a/iphone/Barcodes/images/ZxingLarge.png b/iphone/Barcodes/images/ZxingLarge.png index 688a5a3ef..e2904a9e7 100644 Binary files a/iphone/Barcodes/images/ZxingLarge.png and b/iphone/Barcodes/images/ZxingLarge.png differ diff --git a/iphone/Barcodes/images/ZxingLarge@2x.png b/iphone/Barcodes/images/ZxingLarge@2x.png new file mode 100644 index 000000000..1505ba21d Binary files /dev/null and b/iphone/Barcodes/images/ZxingLarge@2x.png differ diff --git a/iphone/Barcodes/images/zxing-512-rounded.png b/iphone/Barcodes/images/zxing-512-rounded.png new file mode 100644 index 000000000..e42cb6e35 Binary files /dev/null and b/iphone/Barcodes/images/zxing-512-rounded.png differ