Skip to content

Commit f67e11e

Browse files
mstothmstoth
committed
fix for iOS5.0 navigation bar back button
1 parent 4a1c005 commit f67e11e

36 files changed

+383
-126
lines changed

‎VirtualApp.xcodeproj/project.pbxproj

+21-20
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
A48D201B1349982600B13EC5 /* SummaryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D20071349980F00B13EC5 /* SummaryViewController.m */; };
6262
A48D201C1349982600B13EC5 /* PeopleViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D20091349981000B13EC5 /* PeopleViewController.m */; };
6363
A48D201D1349982600B13EC5 /* ProfileParserDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D200B1349981100B13EC5 /* ProfileParserDelegate.m */; };
64-
A48D201E1349982600B13EC5 /* MapAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D200D1349981300B13EC5 /* MapAnnotation.m */; };
6564
A48D201F1349982600B13EC5 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D200F1349981500B13EC5 /* WebViewController.m */; };
6665
A48D20201349982600B13EC5 /* MoreInfoViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D20111349981700B13EC5 /* MoreInfoViewController.m */; };
6766
A48D20211349982600B13EC5 /* ImagesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = A48D20131349981900B13EC5 /* ImagesViewController.m */; };
@@ -277,8 +276,6 @@
277276
A48D20091349981000B13EC5 /* PeopleViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PeopleViewController.m; sourceTree = "<group>"; };
278277
A48D200A1349981100B13EC5 /* ProfileParserDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProfileParserDelegate.h; sourceTree = "<group>"; };
279278
A48D200B1349981100B13EC5 /* ProfileParserDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ProfileParserDelegate.m; sourceTree = "<group>"; };
280-
A48D200C1349981200B13EC5 /* MapAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapAnnotation.h; sourceTree = "<group>"; };
281-
A48D200D1349981300B13EC5 /* MapAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapAnnotation.m; sourceTree = "<group>"; };
282279
A48D200E1349981400B13EC5 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
283280
A48D200F1349981500B13EC5 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
284281
A48D20101349981600B13EC5 /* MoreInfoViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MoreInfoViewController.h; sourceTree = "<group>"; };
@@ -736,8 +733,6 @@
736733
A48D20091349981000B13EC5 /* PeopleViewController.m */,
737734
A48D200A1349981100B13EC5 /* ProfileParserDelegate.h */,
738735
A48D200B1349981100B13EC5 /* ProfileParserDelegate.m */,
739-
A48D200C1349981200B13EC5 /* MapAnnotation.h */,
740-
A48D200D1349981300B13EC5 /* MapAnnotation.m */,
741736
A48D200E1349981400B13EC5 /* WebViewController.h */,
742737
A48D200F1349981500B13EC5 /* WebViewController.m */,
743738
A48D20101349981600B13EC5 /* MoreInfoViewController.h */,
@@ -1240,6 +1235,9 @@
12401235
/* Begin PBXProject section */
12411236
A48D1FBB134992E800B13EC5 /* Project object */ = {
12421237
isa = PBXProject;
1238+
attributes = {
1239+
LastUpgradeCheck = 0420;
1240+
};
12431241
buildConfigurationList = A48D1FBE134992E800B13EC5 /* Build configuration list for PBXProject "VirtualApp" */;
12441242
compatibilityVersion = "Xcode 3.2";
12451243
developmentRegion = English;
@@ -1381,7 +1379,6 @@
13811379
A48D201B1349982600B13EC5 /* SummaryViewController.m in Sources */,
13821380
A48D201C1349982600B13EC5 /* PeopleViewController.m in Sources */,
13831381
A48D201D1349982600B13EC5 /* ProfileParserDelegate.m in Sources */,
1384-
A48D201E1349982600B13EC5 /* MapAnnotation.m in Sources */,
13851382
A48D201F1349982600B13EC5 /* WebViewController.m in Sources */,
13861383
A48D20201349982600B13EC5 /* MoreInfoViewController.m in Sources */,
13871384
A48D20211349982600B13EC5 /* ImagesViewController.m in Sources */,
@@ -1566,6 +1563,7 @@
15661563
);
15671564
GCC_PRECOMPILE_PREFIX_HEADER = YES;
15681565
GCC_PREFIX_HEADER = "Logic Test/Logic Test-Prefix.pch";
1566+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
15691567
INFOPLIST_FILE = "Logic Test/Logic Test-Info.plist";
15701568
OTHER_LDFLAGS = (
15711569
"-framework",
@@ -1586,6 +1584,7 @@
15861584
);
15871585
GCC_PRECOMPILE_PREFIX_HEADER = YES;
15881586
GCC_PREFIX_HEADER = "Logic Test/Logic Test-Prefix.pch";
1587+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
15891588
INFOPLIST_FILE = "Logic Test/Logic Test-Info.plist";
15901589
OTHER_LDFLAGS = (
15911590
"-framework",
@@ -1600,14 +1599,11 @@
16001599
isa = XCBuildConfiguration;
16011600
buildSettings = {
16021601
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
1603-
CODE_SIGN_IDENTITY = "iPhone Developer";
1602+
CODE_SIGN_IDENTITY = "iPhone Distribution";
16041603
GCC_C_LANGUAGE_STANDARD = gnu99;
16051604
GCC_OPTIMIZATION_LEVEL = 0;
16061605
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
1607-
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = (
1608-
DEBUG,
1609-
LOCAL,
1610-
);
1606+
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = DEBUG;
16111607
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
16121608
GCC_VERSION = com.apple.compilers.llvmgcc42;
16131609
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1626,7 +1622,7 @@
16261622
isa = XCBuildConfiguration;
16271623
buildSettings = {
16281624
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
1629-
CODE_SIGN_IDENTITY = "iPhone Developer";
1625+
CODE_SIGN_IDENTITY = "iPhone Distribution";
16301626
GCC_C_LANGUAGE_STANDARD = gnu99;
16311627
GCC_VERSION = com.apple.compilers.llvmgcc42;
16321628
GCC_WARN_ABOUT_RETURN_TYPE = YES;
@@ -1647,7 +1643,7 @@
16471643
buildSettings = {
16481644
ALWAYS_SEARCH_USER_PATHS = NO;
16491645
CODE_SIGN_ENTITLEMENTS = "";
1650-
CODE_SIGN_IDENTITY = "iPhone Developer";
1646+
CODE_SIGN_IDENTITY = "iPhone Distribution";
16511647
COPY_PHASE_STRIP = NO;
16521648
FRAMEWORK_SEARCH_PATHS = (
16531649
"$(inherited)",
@@ -1656,6 +1652,7 @@
16561652
GCC_DYNAMIC_NO_PIC = NO;
16571653
GCC_PRECOMPILE_PREFIX_HEADER = YES;
16581654
GCC_PREFIX_HEADER = "VirtualApp/VirtualApp-Prefix.pch";
1655+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
16591656
INFOPLIST_FILE = "VirtualApp/VirtualApp-Info.plist";
16601657
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
16611658
LIBRARY_SEARCH_PATHS = (
@@ -1674,7 +1671,7 @@
16741671
buildSettings = {
16751672
ALWAYS_SEARCH_USER_PATHS = NO;
16761673
CODE_SIGN_ENTITLEMENTS = "";
1677-
CODE_SIGN_IDENTITY = "iPhone Developer";
1674+
CODE_SIGN_IDENTITY = "iPhone Distribution";
16781675
"CODE_SIGN_IDENTITY[sdk=*]" = "iPhone Distribution";
16791676
COPY_PHASE_STRIP = YES;
16801677
FRAMEWORK_SEARCH_PATHS = (
@@ -1683,6 +1680,7 @@
16831680
);
16841681
GCC_PRECOMPILE_PREFIX_HEADER = YES;
16851682
GCC_PREFIX_HEADER = "VirtualApp/VirtualApp-Prefix.pch";
1683+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
16861684
INFOPLIST_FILE = "VirtualApp/VirtualApp-Info.plist";
16871685
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
16881686
LIBRARY_SEARCH_PATHS = (
@@ -1709,6 +1707,7 @@
17091707
);
17101708
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17111709
GCC_PREFIX_HEADER = "VirtualAppTests/VirtualAppTests-Prefix.pch";
1710+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
17121711
INFOPLIST_FILE = "VirtualAppTests/VirtualAppTests-Info.plist";
17131712
OTHER_LDFLAGS = (
17141713
"-framework",
@@ -1731,6 +1730,7 @@
17311730
);
17321731
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17331732
GCC_PREFIX_HEADER = "VirtualAppTests/VirtualAppTests-Prefix.pch";
1733+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
17341734
INFOPLIST_FILE = "VirtualAppTests/VirtualAppTests-Info.plist";
17351735
OTHER_LDFLAGS = (
17361736
"-framework",
@@ -1746,12 +1746,10 @@
17461746
isa = XCBuildConfiguration;
17471747
buildSettings = {
17481748
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
1749-
CODE_SIGN_IDENTITY = "iPhone Developer";
1749+
CODE_SIGN_IDENTITY = "iPhone Distribution";
17501750
GCC_C_LANGUAGE_STANDARD = gnu99;
1751-
GCC_PREPROCESSOR_DEFINITIONS = (
1752-
DEBUG,
1753-
LOCAL,
1754-
);
1751+
GCC_PREPROCESSOR_DEFINITIONS = "";
1752+
"GCC_PREPROCESSOR_DEFINITIONS[arch=*]" = "";
17551753
GCC_VERSION = com.apple.compilers.llvmgcc42;
17561754
GCC_WARN_ABOUT_RETURN_TYPE = YES;
17571755
GCC_WARN_UNUSED_VARIABLE = YES;
@@ -1771,14 +1769,15 @@
17711769
buildSettings = {
17721770
ALWAYS_SEARCH_USER_PATHS = NO;
17731771
CODE_SIGN_ENTITLEMENTS = "";
1774-
CODE_SIGN_IDENTITY = "iPhone Developer";
1772+
CODE_SIGN_IDENTITY = "iPhone Distribution";
17751773
COPY_PHASE_STRIP = YES;
17761774
FRAMEWORK_SEARCH_PATHS = (
17771775
"$(inherited)",
17781776
"\"$(SRCROOT)\"",
17791777
);
17801778
GCC_PRECOMPILE_PREFIX_HEADER = YES;
17811779
GCC_PREFIX_HEADER = "VirtualApp/VirtualApp-Prefix.pch";
1780+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
17821781
INFOPLIST_FILE = "VirtualApp/VirtualApp-Info.plist";
17831782
IPHONEOS_DEPLOYMENT_TARGET = 4.1;
17841783
LIBRARY_SEARCH_PATHS = (
@@ -1804,6 +1803,7 @@
18041803
);
18051804
GCC_PRECOMPILE_PREFIX_HEADER = YES;
18061805
GCC_PREFIX_HEADER = "VirtualAppTests/VirtualAppTests-Prefix.pch";
1806+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
18071807
INFOPLIST_FILE = "VirtualAppTests/VirtualAppTests-Info.plist";
18081808
OTHER_LDFLAGS = (
18091809
"-framework",
@@ -1825,6 +1825,7 @@
18251825
);
18261826
GCC_PRECOMPILE_PREFIX_HEADER = YES;
18271827
GCC_PREFIX_HEADER = "Logic Test/Logic Test-Prefix.pch";
1828+
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
18281829
INFOPLIST_FILE = "Logic Test/Logic Test-Info.plist";
18291830
OTHER_LDFLAGS = (
18301831
"-framework",

‎VirtualApp.xcodeproj/project.xcworkspace/xcuserdata/michaeltoth.xcuserdatad/UserInterfaceState.xcuserstate

-1.85 MB
Binary file not shown.

‎VirtualApp.xcodeproj/project.xcworkspace/xcuserdata/michaeltoth.xcuserdatad/WorkspaceSettings.xcsettings

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<integer>0</integer>
99
<key>IDEWorkspaceUserSettings_DerivedDataLocationStyle</key>
1010
<integer>0</integer>
11+
<key>IDEWorkspaceUserSettings_HasAskedToTakeAutomaticSnapshotBeforeSignificantChanges</key>
12+
<true/>
1113
<key>IDEWorkspaceUserSettings_LiveSourceIssuesEnabled</key>
1214
<true/>
1315
<key>IDEWorkspaceUserSettings_SnapshotAutomaticallyBeforeSignificantChanges</key>

‎VirtualApp.xcodeproj/xcuserdata/michaeltoth.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist

+8-8
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
continueAfterRunningActions = "No"
1010
isPathRelative = "1"
1111
filePath = "VirtualApp/RootViewController.m"
12-
timestampString = "333246091.915999"
12+
timestampString = "343540068.120313"
1313
startingColumnNumber = "9223372036854775807"
1414
endingColumnNumber = "9223372036854775807"
15-
startingLineNumber = "744"
16-
endingLineNumber = "744"
15+
startingLineNumber = "745"
16+
endingLineNumber = "745"
1717
landmarkName = "-connectionDidFinishLoading:"
1818
landmarkType = "5">
1919
</FileBreakpoint>
@@ -22,13 +22,13 @@
2222
ignoreCount = "0"
2323
continueAfterRunningActions = "No"
2424
isPathRelative = "1"
25-
filePath = "VirtualApp/RootViewController.m"
26-
timestampString = "333246091.915999"
25+
filePath = "VirtualApp/MenuViewController.m"
26+
timestampString = "345780842.024665"
2727
startingColumnNumber = "9223372036854775807"
2828
endingColumnNumber = "9223372036854775807"
29-
startingLineNumber = "709"
30-
endingLineNumber = "709"
31-
landmarkName = "-connection:didFailWithError:"
29+
startingLineNumber = "814"
30+
endingLineNumber = "814"
31+
landmarkName = "-tabBar:didSelectItem:"
3232
landmarkType = "5">
3333
</FileBreakpoint>
3434
</FileBreakpoints>

‎VirtualApp/0001.png

-1.12 KB
Loading

‎VirtualApp/0002.png

-1.76 KB
Loading

‎VirtualApp/0003.png

-2.17 KB
Loading

‎VirtualApp/0004.png

-2.34 KB
Loading

‎VirtualApp/0005.png

-2 KB
Loading

‎VirtualApp/0006.png

-1.74 KB
Loading

‎VirtualApp/0007.png

-1.5 KB
Loading

‎VirtualApp/0008.png

-319 Bytes
Loading

‎VirtualApp/0009.png

466 Bytes
Loading

‎VirtualApp/0010.png

-386 Bytes
Loading

‎VirtualApp/0011.png

-1019 Bytes
Loading

‎VirtualApp/0012.png

-1.33 KB
Loading

‎VirtualApp/0013.png

-1.54 KB
Loading

‎VirtualApp/0014.png

-2.03 KB
Loading

‎VirtualApp/0015.png

-2.25 KB
Loading

‎VirtualApp/0016.png

-1.82 KB
Loading

‎VirtualApp/ContactViewController.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
#import "ContactViewController.h"
1010
#import "ProfileParserDelegate.h"
11-
#import "MapAnnotation.h"
11+
// #import "MapAnnotation.h"
1212
#import "GeneralParser.h"
1313
#import "ParseOperation.h"
1414

‎VirtualApp/ImagePageViewController.h

+18-3
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,33 @@
77
//
88

99
#import <UIKit/UIKit.h>
10+
#import "URLCacheConnection.h"
1011

11-
12-
@interface ImagePageViewController : UIViewController <NSXMLParserDelegate> {
12+
@interface ImagePageViewController : UIViewController <NSXMLParserDelegate, URLCacheConnectionDelegate> {
1313
BOOL accumulatingChars;
1414
NSMutableString *currentStringValue;
1515
NSString *imageFileName;
1616
NSString *imageID;
17+
NSString *filePath;
18+
NSString *imageFileNameWithoutPath;
19+
NSString *dataPath;
20+
NSDate *fileDate;
21+
URLCacheConnection *myConnection;
22+
NSError *error;
23+
UIActivityIndicatorView *activityIndicator;
24+
UIImageView *customActivityIndicator;
25+
1726
}
1827
@property (nonatomic, retain) NSString *imageFileName;
1928
@property (nonatomic, retain) NSString *imageID;
2029
@property (nonatomic, retain) NSString *fileName;
2130
@property (nonatomic, retain) IBOutlet UIImageView *imageView;
2231
- (IBAction)share:(id)sender;
23-
32+
- (void) getFileModificationDate;
33+
- (void) startAnimation;
34+
- (void) stopAnimation;
35+
- (void) displayImageWithURL:(NSURL *)theURL;
36+
- (void) displayCachedImage;
37+
- (void) initCache;
38+
- (void) createCustomActivityIndicator;
2439
@end

0 commit comments

Comments
 (0)