Classes/Commit.h Classes/Commit.m Classes/RepoCommitsViewController.h Classes/RepoCommitsViewController.m RepoCommitsView.xib images/octocat_small.png @@ -7,6 +7,7 @@ // #import "RepositoriesViewController.h" +#import "RepoCommitsViewController.h" @implementation RepositoriesViewController @@ -50,6 +51,7 @@ UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier]; if (cell == nil) { cell = [[[UITableViewCell alloc] initWithFrame:CGRectZero reuseIdentifier:CellIdentifier] autorelease]; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; } // Set up the cell... @@ -59,10 +61,16 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Navigation logic may go here. Create and push another view controller. - // AnotherViewController *anotherViewController = [[AnotherViewController alloc] initWithNibName:@"AnotherView" bundle:nil]; - // [self.navigationController pushViewController:anotherViewController]; - // [anotherViewController release]; + RepoCommitsViewController *repoCommitsViewController = [[[RepoCommitsViewController alloc] initWithNibName:@"RepoCommitsView" bundle:nil] autorelease]; + Repository *repository = [repositories objectAtIndex:[indexPath row]]; + + [repoCommitsViewController.repoCommits release]; + [repository.commits release]; + [repository loadCommits]; + repoCommitsViewController.repoCommits = repository.commits; + + [self.navigationController pushViewController:repoCommitsViewController animated:YES]; + [tableView deselectRowAtIndexPath:indexPath animated:YES]; } Classes/RepositoriesViewController.m @@ -9,13 +9,19 @@ @interface Repository : NSObject { NSString *name; + NSString *owner; NSNumber *privateRepo; + NSMutableArray *commits; } @property (nonatomic, retain) NSString *name; +@property (nonatomic, retain) NSString *owner; @property (nonatomic, retain) NSNumber *privateRepo; +@property (nonatomic, retain) NSMutableArray *commits; + (NSString *)indexURL; + (void)loadAll; +- (NSString *)commitsURL; +- (void)loadCommits; @end Classes/Repository.h @@ -8,12 +8,15 @@ #import "Repository.h" #import "Connector.h" +#import "Commit.h" @implementation Repository @synthesize name; +@synthesize owner; @synthesize privateRepo; +@synthesize commits; + (NSString *)indexURL { @@ -22,8 +25,15 @@ [[Config instance] gitHubUserName]]; } +- (NSString *)commitsURL { + // http://github.com/api/v1/json/caged/gitnub/commits/master + return [NSString stringWithFormat:@"%@/%@/%@/commits/master", + [[Config instance] baseAPIURL], + [self owner], + [self name]]; +} + + (void)loadAll { - NSString *resultJSON = [Connector postToURL:[self indexURL]]; NSMutableArray *publicRepoArray = [[[NSMutableArray alloc] init] autorelease]; @@ -36,6 +46,7 @@ for (NSDictionary *repository in repositories) { Repository *tempRepo = [[[Repository alloc] init] autorelease]; [tempRepo setName:[repository valueForKey:@"name"]]; + [tempRepo setOwner:[repository valueForKey:@"owner"]]; [tempRepo setPrivateRepo:[DataParser readInt:[repository valueForKey:@"private"]]]; DevLog2(@"Loaded Repo: %@", [tempRepo name]); @@ -51,9 +62,35 @@ [[Config instance] setPrivateRepositories:privateRepoArray]; } +- (void)loadCommits { + NSString *resultJSON = [Connector postToURL:[self commitsURL]]; + + NSMutableArray *commitsArray = [[[NSMutableArray alloc] init] autorelease]; + NSMutableArray *repoCommits = [[[NSMutableArray alloc] init] autorelease]; + + repoCommits = [[resultJSON JSONValue] valueForKey:@"commits"]; + + for (NSDictionary *commit in repoCommits) { + Commit *tempCommit = [[[Commit alloc] init] autorelease]; + [tempCommit setCommitID:[commit valueForKey:@"id"]]; + [tempCommit setMessage:[commit valueForKey:@"message"]]; + [tempCommit setUrl:[commit valueForKey:@"url"]]; + [tempCommit setAuthorName:[[commit valueForKey:@"author"] valueForKey:@"name"]]; + [tempCommit setAuthorEmail:[[commit valueForKey:@"author"] valueForKey:@"email"]]; + + DevLog2(@"Loaded Commit: %@", [tempCommit message]); + + [commitsArray addObject:tempCommit]; + } + + [self setCommits:commitsArray]; +} + - (void) dealloc { [name release]; + [owner release]; [privateRepo release]; + [commits release]; [super dealloc]; } Classes/Repository.m @@ -28,7 +28,7 @@ #pragma mark Table view methods - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 3; + return 4; } @@ -50,6 +50,10 @@ rows = 1; break; } + case 3: { + rows = 1; + break; + } } return rows; } @@ -94,8 +98,18 @@ case 2: { switch(indexPath.row) { case 0: { + cell.text = @"Search"; + cell.image = [UIImage imageNamed:@"octocat_small.png"]; + break; + } + } + break; + } + case 3: { + switch(indexPath.row) { + case 0: { cell.text = @"About GitHub GitPhone"; - cell.image = [UIImage imageNamed:@"gravatar.png"]; + cell.image = [UIImage imageNamed:@"octocat_small.png"]; break; } } Classes/RootViewController.m @@ -15,6 +15,10 @@ 2218F1350F2FE4110080FB02 /* RepositoriesViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 2218F1340F2FE4110080FB02 /* RepositoriesViewController.m */; }; 229445A10F2CFD4200502D5C /* private.png in Resources */ = {isa = PBXBuildFile; fileRef = 2294459F0F2CFD4200502D5C /* private.png */; }; 229445A20F2CFD4200502D5C /* public.png in Resources */ = {isa = PBXBuildFile; fileRef = 229445A00F2CFD4200502D5C /* public.png */; }; + 229F5CBE0F3DB4A400767944 /* octocat_small.png in Resources */ = {isa = PBXBuildFile; fileRef = 229F5CBD0F3DB4A400767944 /* octocat_small.png */; }; + 229F5CCA0F3DBB3900767944 /* RepoCommitsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 229F5CC90F3DBB3900767944 /* RepoCommitsViewController.m */; }; + 229F5CD40F3DBBF100767944 /* RepoCommitsView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 229F5CD30F3DBBF100767944 /* RepoCommitsView.xib */; }; + 229F5D000F3DBE9B00767944 /* Commit.m in Sources */ = {isa = PBXBuildFile; fileRef = 229F5CFF0F3DBE9B00767944 /* Commit.m */; }; 22E17B660F22334300D2853B /* Reachability.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E17B650F22334300D2853B /* Reachability.m */; }; 22E17B890F2233E400D2853B /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22E17B880F2233E400D2853B /* SystemConfiguration.framework */; }; 22E17B910F22361B00D2853B /* ConnectivityController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E17B900F22361B00D2853B /* ConnectivityController.m */; }; @@ -49,6 +53,12 @@ 2218F1340F2FE4110080FB02 /* RepositoriesViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RepositoriesViewController.m; sourceTree = "<group>"; }; 2294459F0F2CFD4200502D5C /* private.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = private.png; sourceTree = "<group>"; }; 229445A00F2CFD4200502D5C /* public.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = public.png; sourceTree = "<group>"; }; + 229F5CBD0F3DB4A400767944 /* octocat_small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = octocat_small.png; sourceTree = "<group>"; }; + 229F5CC80F3DBB3900767944 /* RepoCommitsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RepoCommitsViewController.h; sourceTree = "<group>"; }; + 229F5CC90F3DBB3900767944 /* RepoCommitsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RepoCommitsViewController.m; sourceTree = "<group>"; }; + 229F5CD30F3DBBF100767944 /* RepoCommitsView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RepoCommitsView.xib; sourceTree = "<group>"; }; + 229F5CFE0F3DBE9B00767944 /* Commit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Commit.h; sourceTree = "<group>"; }; + 229F5CFF0F3DBE9B00767944 /* Commit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Commit.m; sourceTree = "<group>"; }; 22E17B640F22334300D2853B /* Reachability.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reachability.h; sourceTree = "<group>"; }; 22E17B650F22334300D2853B /* Reachability.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Reachability.m; sourceTree = "<group>"; }; 22E17B880F2233E400D2853B /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = /System/Library/Frameworks/SystemConfiguration.framework; sourceTree = "<absolute>"; }; @@ -137,6 +147,8 @@ 22E17C1D0F22467200D2853B /* LoginViewController.m */, 2218F1330F2FE4110080FB02 /* RepositoriesViewController.h */, 2218F1340F2FE4110080FB02 /* RepositoriesViewController.m */, + 229F5CC80F3DBB3900767944 /* RepoCommitsViewController.h */, + 229F5CC90F3DBB3900767944 /* RepoCommitsViewController.m */, ); name = ViewControllers; path = Classes; @@ -145,6 +157,7 @@ 22FA50100F21349300709123 /* images */ = { isa = PBXGroup; children = ( + 229F5CBD0F3DB4A400767944 /* octocat_small.png */, 22EFCE870F325EFA009F3C3E /* gravatar.png */, 22EFCE7F0F325DFB009F3C3E /* feed.png */, 2294459F0F2CFD4200502D5C /* private.png */, @@ -160,6 +173,8 @@ isa = PBXGroup; children = ( 22FA50DB0F2147DC00709123 /* Models.h */, + 229F5CFE0F3DBE9B00767944 /* Commit.h */, + 229F5CFF0F3DBE9B00767944 /* Commit.m */, 22FA50CC0F21463D00709123 /* Config.h */, 22FA50CD0F21463D00709123 /* Config.m */, 22EFCE1E0F32598F009F3C3E /* DataParser.h */, @@ -215,6 +230,7 @@ 22E17B9E0F223BC800D2853B /* ApplicationError.xib */, 22E17C3A0F22490800D2853B /* Login.xib */, 28AD735F0D9D9599002E5188 /* MainWindow.xib */, + 229F5CD30F3DBBF100767944 /* RepoCommitsView.xib */, 2218F1160F2FE3A00080FB02 /* RepositoriesView.xib */, 2899E55F0DE3E45000AC0155 /* RootViewController.xib */, 8D1107310486CEB800E47090 /* Info.plist */, @@ -295,6 +311,8 @@ 2218F1170F2FE3A00080FB02 /* RepositoriesView.xib in Resources */, 22EFCE800F325DFB009F3C3E /* feed.png in Resources */, 22EFCE880F325EFA009F3C3E /* gravatar.png in Resources */, + 229F5CBE0F3DB4A400767944 /* octocat_small.png in Resources */, + 229F5CD40F3DBBF100767944 /* RepoCommitsView.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -317,6 +335,8 @@ 2218F1350F2FE4110080FB02 /* RepositoriesViewController.m in Sources */, 22EFCE200F32598F009F3C3E /* DataParser.m in Sources */, 22EFCE410F325A3F009F3C3E /* Repository.m in Sources */, + 229F5CCA0F3DBB3900767944 /* RepoCommitsViewController.m in Sources */, + 229F5D000F3DBE9B00767944 /* Commit.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; git-phone.xcodeproj/project.pbxproj 3a62f733542fce20876e0ad28ae92583e819f9c8 Sam Schroeder samuelschroeder@gmail.com http://github.com/sschroed/git-phone/commit/125dfdebc5cc9689b66e4bea116c3aaf93c858dc 125dfdebc5cc9689b66e4bea116c3aaf93c858dc 2009-02-25T08:02:34-08:00 2009-02-25T08:02:34-08:00 initial commits view f40dfc40b21f23173dd2b0f15a0b346c45ae4166 Sam Schroeder samuelschroeder@gmail.com