@@ -34,6 +34,18 @@ NSLog(@"Your first name preference is set to %@", [AppPrefsUtil getPref:@"firstNameKey"]); + NSString *string1 = [[NSString alloc] init]; + NSLog(@"location = %p",string1); + + NSMutableDictionary *myDict = [[NSMutableDictionary alloc] init]; + [myDict setValue:@"scott" forKey:@"key1"]; + [myDict setObject:@"scott2" forKey:@"key2"]; + + NSLog(@"key1= %@", [myDict valueForKey:@"key1"]); + NSLog(@"key2= %@", [myDict objectForKey:@"key2"]); + + [myDict release]; + [window addSubview:[navigationController view]]; [window makeKeyAndVisible]; } Classes/core/AppDelegate.m @@ -31,9 +31,10 @@ NSInteger responseCode = (NSInteger) [response statusCode]; if(responseCode!=200) { NSLog(@"Http response code: %d", responseCode); - NSString *reason = [[NSString alloc] initWithFormat:@"Received a bad http response code %d", responseCode]; - + NSString *reason = [NSString stringWithFormat:@"Received a bad http response code %d", responseCode]; NSException *exception = [NSException exceptionWithName:@"HttpResponseException" reason:reason userInfo:nil]; + [reason release]; + @throw exception; } Classes/util/NetworkUtil.m @@ -22,9 +22,12 @@ - (void)saveAction { if([person dirty]) { [PersonDAO updatePerson:person]; + + int prevControllerIndex = [[[self navigationController] viewControllers] count] - 2; + [[[[[self navigationController] viewControllers] objectAtIndex:prevControllerIndex] tableView] reloadData]; } - [self.navigationController popViewControllerAnimated:YES];; + [self.navigationController popViewControllerAnimated:YES]; } #pragma mark View Related Classes/ux/DetailViewController.m @@ -21,7 +21,7 @@ self.cloudRows = [parser items]; [parser release]; - NSString *countString = [[NSString alloc] initWithFormat:@"%d", [self.cloudRows count]]; + NSString *countString = [NSString stringWithFormat:@"%d", [self.cloudRows count]]; UITabBarController *tabBar = (UITabBarController*) [self parentViewController]; [[[ tabBar viewControllers] objectAtIndex:JSON_TAB] tabBarItem].badgeValue = countString; [countString release]; Classes/ux/Tab1Controller.m @@ -20,7 +20,7 @@ self.cloudRows = [parser items]; [parser release]; - NSString *countString = [[NSString alloc] initWithFormat:@"%d", [self.cloudRows count]]; + NSString *countString = [NSString stringWithFormat:@"%d", [self.cloudRows count]]; UITabBarController *tabBar = (UITabBarController*) [self parentViewController]; [[[ tabBar viewControllers] objectAtIndex:XML_TAB] tabBarItem].badgeValue = countString; [countString release]; Classes/ux/Tab2Controller.m @@ -17,6 +17,7 @@ UINavigationController *addNavigationController; IBOutlet UITableView *tableView; IBOutlet UISearchBar *searchBar; + IBOutlet UIActivityIndicatorView *activityView; NSMutableArray *indexedLetters; NSMutableArray *displayList; } @@ -31,5 +32,6 @@ - (IBAction)addButtonClicked; - (IBAction)switchChanged:(id)sender; +- (void)refreshChanges; @end Classes/ux/TableViewController.h @@ -15,6 +15,7 @@ @interface TableViewController() - (void)setupIndexedData; +- (void)loadDataThread:(id)sender; @end @implementation TableViewController @@ -52,6 +53,19 @@ [person setActiveFlag:senderSwitcher.isOn]; } +- (void)loadDataThread:(id)sender { + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + [activityView startAnimating]; + [self setupIndexedData]; + [tableView reloadData]; + [activityView stopAnimating]; + [pool release]; +} + +- (void)refreshChanges { + NSLog(@"refreshing changes!"); +} + #pragma mark View Related @@ -66,11 +80,17 @@ self.title = @"Table List"; //tableView.backgroundColor = [UIColor clearColor]; tableView.backgroundColor = [UIColor whiteColor]; + [activityView setHidesWhenStopped:YES]; + + [NSThread detachNewThreadSelector:@selector(loadDataThread:) toTarget:self withObject:nil]; } - (void)viewWillAppear:(BOOL)animated { - [self setupIndexedData]; - [self.tableView reloadData]; + //[self setupIndexedData]; + //[self.tableView reloadData]; + + + //[NSThread detachNewThreadSelector:@selector(loadDataThread:) toTarget:self withObject:nil]; } - (void)setEditing:(BOOL)editing animated:(BOOL)animated @@ -87,11 +107,20 @@ - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { // Number of sections is the number of region dictionaries - return [displayList count]; + + if(displayList==nil) { + return 1; + } else { + return [displayList count]; + } } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + if(displayList==nil) { + return 0; + } + // Number of rows is the number of names in the region dictionary for the specified section NSDictionary *letterDictionary = [displayList objectAtIndex:section]; NSMutableArray *zonesForLetter = [letterDictionary objectForKey:@"persons"]; @@ -253,6 +282,7 @@ [tableView release]; [displayList release]; [indexedLetters release]; + [activityView release]; [super dealloc]; } Classes/ux/TableViewController.m @@ -254,7 +254,7 @@ <dict> <key>PBXSmartGroupTreeModuleColumnWidthsKey</key> <array> - <real>239</real> + <real>221</real> </array> <key>PBXSmartGroupTreeModuleColumnsKey_v4</key> <array> @@ -273,12 +273,12 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>8</integer> + <integer>10</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 0}, {239, 652}}</string> + <string>{{0, 0}, {221, 652}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -290,11 +290,11 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {256, 670}}</string> + <string>{{0, 0}, {238, 670}}</string> <key>GroupTreeTableConfiguration</key> <array> <string>MainColumn</string> - <real>239</real> + <real>221</real> </array> <key>RubberWindowFrame</key> <string>0 146 1440 732 0 0 1440 878 </string> @@ -302,18 +302,20 @@ <key>Module</key> <string>PBXSmartGroupTreeModule</string> <key>Proportion</key> - <string>256pt</string> + <string>238pt</string> </dict> <dict> <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>JsonParser.m</string> + <string>DetailViewController.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -321,48 +323,38 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>JsonParser.m</string> + <string>DetailViewController.m</string> <key>_historyCapacity</key> <integer>10</integer> <key>bookmark</key> - <string>D225831E0E4A952B000B3D05</string> + <string>D2B568320E4E43F500E0ABBE</string> <key>history</key> <array> - <string>D22582650E4A8A9A000B3D05</string> - <string>D22582AB0E4A8F78000B3D05</string> - <string>D22582AC0E4A8F78000B3D05</string> - <string>D22582AD0E4A8F78000B3D05</string> - <string>D22582AE0E4A8F78000B3D05</string> - <string>D22582C10E4A9052000B3D05</string> - <string>D22582C20E4A9052000B3D05</string> - <string>D22582E60E4A91EC000B3D05</string> - <string>D225831B0E4A952B000B3D05</string> - <string>D225831C0E4A952B000B3D05</string> + <string>D2F31EB00E4BA8010047BEEC</string> + <string>D2F31EB20E4BA8010047BEEC</string> + <string>D2F31EC90E4BAA7C0047BEEC</string> + <string>D27159010E4BCC0300D97785</string> + <string>D271593A0E4BCF6A00D97785</string> + <string>D2B568140E4E42F400E0ABBE</string> + <string>D2B568200E4E436200E0ABBE</string> + <string>D2B568210E4E436200E0ABBE</string> + <string>D2B5682C0E4E43BC00E0ABBE</string> + <string>D2B5682D0E4E43BC00E0ABBE</string> + </array> + <key>nextStack</key> + <array> + <string>D2B5682E0E4E43BC00E0ABBE</string> </array> <key>prevStack</key> <array> - <string>D22582690E4A8A9A000B3D05</string> - <string>D225826A0E4A8A9A000B3D05</string> - <string>D225826C0E4A8A9A000B3D05</string> - <string>D225827F0E4A8DDD000B3D05</string> - <string>D22582800E4A8DDD000B3D05</string> - <string>D225828C0E4A8E91000B3D05</string> - <string>D225828D0E4A8E91000B3D05</string> - <string>D225828E0E4A8E91000B3D05</string> - <string>D225828F0E4A8E91000B3D05</string> - <string>D22582900E4A8E91000B3D05</string> - <string>D22582910E4A8E91000B3D05</string> - <string>D22582920E4A8E91000B3D05</string> - <string>D22582930E4A8E91000B3D05</string> - <string>D22582B00E4A8F78000B3D05</string> - <string>D22582B10E4A8F78000B3D05</string> - <string>D22582B20E4A8F78000B3D05</string> - <string>D22582B30E4A8F78000B3D05</string> - <string>D22582C40E4A9052000B3D05</string> - <string>D22582C50E4A9052000B3D05</string> - <string>D22582E80E4A91EC000B3D05</string> - <string>D22582E90E4A91EC000B3D05</string> - <string>D225831D0E4A952B000B3D05</string> + <string>D2F31E930E4B9CC20047BEEC</string> + <string>D2F31E960E4B9CC20047BEEC</string> + <string>D2F31EB40E4BA8010047BEEC</string> + <string>D2F31EB50E4BA8010047BEEC</string> + <string>D2F31EB80E4BA8010047BEEC</string> + <string>D27159030E4BCC0300D97785</string> + <string>D2B568190E4E42F400E0ABBE</string> + <string>D2B568230E4E436200E0ABBE</string> </array> </dict> <key>SplitCount</key> @@ -374,18 +366,16 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 0}, {1179, 421}}</string> + <string>{{0, 0}, {1197, 391}}</string> <key>RubberWindowFrame</key> <string>0 146 1440 732 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> <key>Proportion</key> - <string>421pt</string> + <string>391pt</string> </dict> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> @@ -396,18 +386,18 @@ <key>GeometryConfiguration</key> <dict> <key>Frame</key> - <string>{{0, 426}, {1179, 244}}</string> + <string>{{0, 396}, {1197, 274}}</string> <key>RubberWindowFrame</key> <string>0 146 1440 732 0 0 1440 878 </string> </dict> <key>Module</key> <string>XCDetailModule</string> <key>Proportion</key> - <string>244pt</string> + <string>274pt</string> </dict> </array> <key>Proportion</key> - <string>1179pt</string> + <string>1197pt</string> </dict> </array> <key>Name</key> @@ -422,9 +412,9 @@ </array> <key>TableOfContents</key> <array> - <string>D22582540E4A85A7000B3D05</string> + <string>D2B567E00E4BD27B00E0ABBE</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>D22582550E4A85A7000B3D05</string> + <string>D2B567E10E4BD27B00E0ABBE</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -558,12 +548,11 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>D22582570E4A85A7000B3D05</string> - <string>D22582580E4A85A7000B3D05</string> - <string>1C530D57069F1CE1000CFCEE</string> - <string>1C78EAAD065D492600B07095</string> + <string>D2B567EF0E4BD29F00E0ABBE</string> + <string>D2B567F00E4BD29F00E0ABBE</string> <string>1CD10A99069EF8BA00B06720</string> <string>D23823480E375E5B00865DF0</string> + <string>1C78EAAD065D492600B07095</string> <string>/Users/scott/sandbox/iphone/iPhone-Sandbox/iPhone-Sandbox.xcodeproj</string> </array> <key>WindowString</key> @@ -583,14 +572,12 @@ <key>Dock</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CD0528F0623707200166675</string> <key>PBXProjectModuleLabel</key> - <string>AppDelegate.m</string> + <string></string> <key>StatusBarVisibility</key> <true/> </dict> @@ -646,7 +633,7 @@ <key>TableOfContents</key> <array> <string>D23823480E375E5B00865DF0</string> - <string>D22581F50E49E433000B3D05</string> + <string>D2B567E20E4BD27B00E0ABBE</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -766,13 +753,13 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>D22581F60E49E433000B3D05</string> + <string>D2B567E30E4BD27B00E0ABBE</string> <string>1C162984064C10D400B95A72</string> - <string>D22581F70E49E433000B3D05</string> - <string>D22581F80E49E433000B3D05</string> - <string>D22581F90E49E433000B3D05</string> - <string>D22581FA0E49E433000B3D05</string> - <string>D22581FB0E49E433000B3D05</string> + <string>D2B567E40E4BD27B00E0ABBE</string> + <string>D2B567E50E4BD27B00E0ABBE</string> + <string>D2B567E60E4BD27B00E0ABBE</string> + <string>D2B567E70E4BD27B00E0ABBE</string> + <string>D2B567E80E4BD27B00E0ABBE</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> @@ -862,8 +849,8 @@ <key>TableOfContents</key> <array> <string>1C530D57069F1CE1000CFCEE</string> - <string>D22581FD0E49E433000B3D05</string> - <string>D22581FE0E49E433000B3D05</string> + <string>D22DE2F60E4B27380044BE63</string> + <string>D22DE2F70E4B27380044BE63</string> <string>1CDD528C0622207200134675</string> <string>1CD0528E0623707200166675</string> </array> @@ -928,7 +915,7 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>D22581FF0E49E433000B3D05</string> + <string>D2B567E90E4BD27B00E0ABBE</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> @@ -938,7 +925,7 @@ <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>Identifier</key> iPhone-Sandbox.xcodeproj/scott.mode1v3 @@ -9,7 +9,7 @@ <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> <integer value="9"/> - <integer value="18"/> + <integer value="28"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -123,6 +123,17 @@ <string key="IBPrompt"/> <string key="IBPlaceholder">Enter search criteria</string> </object> + <object class="IBUIActivityIndicatorView" id="700765090"> + <reference key="NSNextResponder" ref="402610265"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{144, 198}, {20, 20}}</string> + <reference key="NSSuperview" ref="402610265"/> + <bool key="IBUIOpaque">NO</bool> + <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <bool key="IBUIUserInteractionEnabled">NO</bool> + <bool key="IBUIHidesWhenStopped">NO</bool> + <int key="IBUIStyle">2</int> + </object> </object> <string key="NSFrameSize">{320, 460}</string> <reference key="NSSuperview"/> @@ -195,6 +206,14 @@ </object> <int key="connectionID">27</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">activityView</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="700765090"/> + </object> + <int key="connectionID">29</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -235,6 +254,7 @@ <reference ref="706265920"/> <reference ref="838387238"/> <reference ref="708052741"/> + <reference ref="700765090"/> </object> <reference key="parent" ref="360949347"/> </object> @@ -273,6 +293,11 @@ <reference key="object" ref="838387238"/> <reference key="parent" ref="402610265"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">28</int> + <reference key="object" ref="700765090"/> + <reference key="parent" ref="402610265"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -288,6 +313,7 @@ <string>22.IBPluginDependency</string> <string>24.IBPluginDependency</string> <string>25.IBPluginDependency</string> + <string>28.IBPluginDependency</string> <string>3.IBEditorWindowLastContentRect</string> <string>3.IBPluginDependency</string> <string>9.IBEditorWindowLastContentRect</string> @@ -304,6 +330,7 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>{{555, 361}, {320, 460}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>{{164, 295}, {320, 44}}</string> @@ -330,7 +357,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">27</int> + <int key="maxID">29</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -362,11 +389,13 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>activityView</string> <string>searchBar</string> <string>tableView</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> + <string>UIActivityIndicatorView</string> <string>UISearchBar</string> <string>UITableView</string> </object> @@ -376,6 +405,14 @@ <string key="minorKey">Classes/ux/TableViewController.h</string> </object> </object> + <object class="IBPartialClassDescription"> + <string key="className">TableViewController</string> + <string key="superclassName">UIViewController</string> + <object class="IBClassDescriptionSource" key="sourceIdentifier"> + <string key="majorKey">IBUserSource</string> + <string key="minorKey"/> + </object> + </object> </object> </object> <int key="IBDocument.localizationMode">0</int> resources/nib/TableViewController.xib ea3be3f88ecb1f104236cdd01bb9d990aa1cd3a1 Scott F. Walter iamjediknight@gmail.com http://github.com/iamjediknight/iphone-sandbox/commit/9a66bd304bcccd5f09c33bb0302075e3cc8451d6 9a66bd304bcccd5f09c33bb0302075e3cc8451d6 2008-08-09T14:32:43-07:00 2008-08-09T14:32:43-07:00 refactored so that data is not reloaded unecessarily 57d7e8a6bc73fa76e638d63c9a6e8a2dea0cfe5a Scott F. Walter iamjediknight@gmail.com