images/book_open.png images/comment.png images/email.png images/git-favicon.png images/note.png images/user.png @@ -25,7 +25,9 @@ + (Config *)instance; - (NSString *)baseAPIURL; +- (NSString *)baseAPIURLv2; - (void)rememberCredentials; - (void)forgetCredentials; +- (bool)hasLogin; @end Classes/Config.h @@ -34,6 +34,10 @@ return [NSString stringWithFormat:@"%@/api/v1/json", [[Config instance] baseURL]]; } +- (NSString *)baseAPIURLv2 { + return [NSString stringWithFormat:@"%@/api/v2/json", [[Config instance] baseURL]]; +} + - (void)rememberCredentials { // Save current credentials to the defaults database NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; @@ -48,6 +52,13 @@ [defaults setValue:nil forKey:@"GitHubToken"]; } +- (bool)hasLogin { + NSLog(@"uname: %@", [self gitHubUserName]); + return ([self gitHubUserName] != NULL) + && ([[self gitHubUserName] length] > 0) + && ([self gitHubToken] != NULL) + && ([[self gitHubToken] length] > 0); +} - (void) dealloc { [gitHubUserName release]; Classes/Config.m @@ -13,11 +13,12 @@ @interface RepositoriesViewController : UITableViewController { RootViewController *rootViewController; NSArray *repositories; - - IBOutlet RepositoryTableCellView *masterTableCell; + bool publicFlag; + IBOutlet RepositoryTableCellView *masterTableCell; } @property (nonatomic, retain) RootViewController *rootViewController; @property (nonatomic, retain) NSArray *repositories; +@property(assign, readwrite) bool publicFlag; @end Classes/RepositoriesViewController.h @@ -9,15 +9,25 @@ #import "RepositoriesViewController.h" #import "RepoCommitsViewController.h" +// TODO : split (owned, collaborator, watched) - tabs? @implementation RepositoriesViewController @synthesize rootViewController; @synthesize repositories; +@synthesize publicFlag; - (void)viewDidLoad { - [super viewDidLoad]; + [super viewDidLoad]; self.title = @"Repositories"; + [Repository loadAll]; + if(publicFlag) { + self.repositories = [[Config instance] publicRepositories]; + } else { + self.repositories = [[Config instance] privateRepositories]; + } + NSLog(@"Loaded"); + // get repositories if we don't have them } @@ -37,13 +47,13 @@ } - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; + return 1; } // Customize the number of rows in the table view. - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [repositories count]; + return [repositories count]; } @@ -57,13 +67,13 @@ } // Set up the cell... - cell.repository = (Repository *)[repositories objectAtIndex:[indexPath row]]; + cell.repository = (Repository *)[repositories objectAtIndex:[indexPath row]]; return cell; } - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - RepoCommitsViewController *repoCommitsViewController = [[[RepoCommitsViewController alloc] initWithNibName:@"RepoCommitsView" bundle:nil] autorelease]; + RepoCommitsViewController *repoCommitsViewController = [[[RepoCommitsViewController alloc] initWithNibName:@"RepoCommitsView" bundle:nil] autorelease]; Repository *repository = [repositories objectAtIndex:[indexPath row]]; [repoCommitsViewController.repoCommits release]; @@ -79,7 +89,7 @@ - (void)dealloc { [repositories release]; [rootViewController release]; - [super dealloc]; + [super dealloc]; } Classes/RepositoriesViewController.m @@ -10,12 +10,18 @@ @interface Repository : NSObject { NSString *name; NSString *owner; + NSString *description; + NSNumber *watchers; + NSNumber *forks; NSNumber *privateRepo; NSMutableArray *commits; } @property (nonatomic, retain) NSString *name; @property (nonatomic, retain) NSString *owner; +@property (nonatomic, retain) NSString *description; +@property (nonatomic, retain) NSNumber *watchers; +@property (nonatomic, retain) NSNumber *forks; @property (nonatomic, retain) NSNumber *privateRepo; @property (nonatomic, retain) NSMutableArray *commits; Classes/Repository.h @@ -15,13 +15,16 @@ @synthesize name; @synthesize owner; +@synthesize description; +@synthesize watchers; +@synthesize forks; @synthesize privateRepo; @synthesize commits; + (NSString *)indexURL { - return [NSString stringWithFormat:@"%@/%@", - [[Config instance] baseAPIURL], + return [NSString stringWithFormat:@"%@/repos/show/%@", + [[Config instance] baseAPIURLv2], [[Config instance] gitHubUserName]]; } @@ -41,12 +44,15 @@ NSMutableArray *repositories = [[[NSMutableArray alloc] init] autorelease]; // GitHub JSON: {"user": {"repositories": [{repo1},{repo1}] }} - repositories = [[[resultJSON JSONValue] valueForKey:@"user"] valueForKey:@"repositories"]; + repositories = [[resultJSON JSONValue] valueForKey:@"repositories"]; for (NSDictionary *repository in repositories) { Repository *tempRepo = [[[Repository alloc] init] autorelease]; [tempRepo setName:[repository valueForKey:@"name"]]; [tempRepo setOwner:[repository valueForKey:@"owner"]]; + [tempRepo setDescription:[repository valueForKey:@"description"]]; + [tempRepo setWatchers:[DataParser readInt:[repository valueForKey:@"watchers"]]]; + [tempRepo setForks:[DataParser readInt:[repository valueForKey:@"forks"]]]; [tempRepo setPrivateRepo:[DataParser readInt:[repository valueForKey:@"private"]]]; DevLog2(@"Loaded Repo: %@", [tempRepo name]); Classes/Repository.m @@ -10,6 +10,7 @@ #import "git_phoneAppDelegate.h" #import "RepositoriesViewController.h" #import "AboutViewController.h" +#import "LoginViewController.h" @implementation RootViewController @@ -32,6 +33,20 @@ return 4; } +- (void) authenticate { + // Check if username is set + if ([[Config instance] hasLogin]) { + [self loadLoginView]; + } else { + if (![Connector didAuthenticateUser:[[Config instance] gitHubUserName] withToken:[[Config instance] gitHubToken]]) { + [self loadLoginView]; + } + } +} + +- (bool) isAuthenticated { + return [[Config instance] hasLogin]; +} // Customize the number of rows in the table view. - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { @@ -40,7 +55,11 @@ switch(section) { case 0: { - rows = 2; + if ([self isAuthenticated]) { + rows = 6; + } else { + rows = 1; + } break; } case 1: { @@ -52,7 +71,7 @@ break; } case 3: { - rows = 1; + rows = 2; break; } } @@ -72,16 +91,46 @@ switch(indexPath.section) { case 0: { - switch(indexPath.row) { - case 0: { - cell.text = @"Public Repositories"; - cell.image = [UIImage imageNamed:@"public.png"]; - break; + if ([self isAuthenticated]) { + switch(indexPath.row) { + case 0: { + cell.text = @"Public Repositories"; + cell.image = [UIImage imageNamed:@"public.png"]; + break; + } + case 1: { + cell.text = @"Private Repositories"; + cell.image = [UIImage imageNamed:@"private.png"]; + break; + } + case 2: { + cell.text = @"Commit Comments"; + cell.image = [UIImage imageNamed:@"comment.png"]; + break; + } + case 3: { + cell.text = @"News Feed"; + cell.image = [UIImage imageNamed:@"feed.png"]; + break; + } + case 4: { + cell.text = @"Messages"; + cell.image = [UIImage imageNamed:@"email.png"]; + break; + } + case 5: { + cell.text = @"Your Profile"; + cell.image = [UIImage imageNamed:@"user.png"]; + break; + } } - case 1: { - cell.text = @"Private Repositories"; - cell.image = [UIImage imageNamed:@"private.png"]; - break; + } else { + switch(indexPath.row) { + case 0: { + cell.text = @"Login to GitHub"; + cell.image = [UIImage imageNamed:@"public.png"]; + break; + } } } break; @@ -99,13 +148,13 @@ case 2: { switch(indexPath.row) { case 0: { - cell.text = @"News Feed"; - cell.image = [UIImage imageNamed:@"feed.png"]; + cell.text = @"Search GitHub"; + cell.image = [UIImage imageNamed:@"zoom.png"]; break; } case 1: { - cell.text = @"Search"; - cell.image = [UIImage imageNamed:@"zoom.png"]; + cell.text = @"Browse GitHub"; + cell.image = [UIImage imageNamed:@"book_open.png"]; break; } } @@ -114,6 +163,11 @@ case 3: { switch(indexPath.row) { case 0: { + cell.text = @"Git Reference"; + cell.image = [UIImage imageNamed:@"git-favicon.png"]; + break; + } + case 1: { cell.text = @"About GitHub Mobile"; cell.image = [UIImage imageNamed:@"octocat_small.png"]; break; @@ -130,20 +184,28 @@ switch(indexPath.section) { case 0: { - RepositoriesViewController *repositoriesViewController = [[[RepositoriesViewController alloc] initWithNibName:@"RepositoriesView" bundle:nil] autorelease]; - switch(indexPath.row) { - case 0: { - repositoriesViewController.repositories = [[Config instance] publicRepositories]; - break; - } - case 1: { - repositoriesViewController.repositories = [[Config instance] privateRepositories]; - break; + if ([self isAuthenticated]) { + switch(indexPath.row) { + case 0: { + RepositoriesViewController *repositoriesViewController = [[[RepositoriesViewController alloc] initWithNibName:@"RepositoriesView" bundle:nil] autorelease]; + repositoriesViewController.publicFlag = true; + repositoriesViewController.rootViewController = self; + [self.navigationController pushViewController:repositoriesViewController animated:YES]; + break; + } + case 1: { + RepositoriesViewController *repositoriesViewController = [[[RepositoriesViewController alloc] initWithNibName:@"RepositoriesView" bundle:nil] autorelease]; + repositoriesViewController.publicFlag = false; + repositoriesViewController.rootViewController = self; + [self.navigationController pushViewController:repositoriesViewController animated:YES]; + break; + } } + } else { + // login to github + LoginViewController *loginViewController = [[[LoginViewController alloc] initWithNibName:@"Login" bundle:nil] autorelease]; + [self.navigationController pushViewController:loginViewController animated:YES]; } - repositoriesViewController.rootViewController = self; - [self.navigationController pushViewController:repositoriesViewController animated:YES]; - [tableView deselectRowAtIndexPath:indexPath animated:YES]; break; } case 1: { @@ -170,7 +232,7 @@ } case 3: { switch(indexPath.row) { - case 0: { + case 1: { // ABOUT PAGE AboutViewController *aboutViewController = [[AboutViewController alloc] init]; //aboutViewController.rootViewController = self; @@ -181,6 +243,7 @@ } break; } + [tableView deselectRowAtIndexPath:indexPath animated:YES]; } Classes/RootViewController.m @@ -17,7 +17,6 @@ @property (nonatomic, retain) IBOutlet UIWindow *window; @property (nonatomic, retain) IBOutlet UINavigationController *navigationController; -- (void)authenticate; - (void)showAlert:(NSString *)message withTitle:(NSString *)title; @end Classes/git_phoneAppDelegate.h @@ -10,7 +10,6 @@ #import "RootViewController.h" #import "ConnectivityController.h" #import "ApplicationErrorViewController.h" -#import "LoginViewController.h" @interface git_phoneAppDelegate() - (void) showError:(NSString *)errorMessage; @@ -37,10 +36,6 @@ } [self loadPreferences]; - [self authenticate]; - - //LOAD MAIN APP - [Repository loadAll]; } @@ -54,24 +49,6 @@ [[self window] addSubview:errorController.view]; } -- (void) loadLoginView { - LoginViewController *loginViewController = [[[LoginViewController alloc] initWithNibName:@"Login" bundle:nil] autorelease]; - [window addSubview:[loginViewController view]]; - [navigationController presentModalViewController:loginViewController animated:YES]; - -} -- (void) authenticate { - // Check if username is set - if ([[Config instance] gitHubUserName] == NULL || [[Config instance] gitHubToken] == NULL) { - [self loadLoginView]; - } else { - if (![Connector didAuthenticateUser:[[Config instance] gitHubUserName] withToken:[[Config instance] gitHubToken]]) { - [self showAlert:@"Unable to auto-authenticate using the credentials saved in your settings." withTitle:@"Octocat FAIL"]; - [self loadLoginView]; - } - } -} - - (void) loadPreferences { // read user prefs NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; Classes/git_phoneAppDelegate.m @@ -33,24 +33,22 @@ } - (void)layoutSubviews { - [super layoutSubviews]; - - if ([repository.privateRepo boolValue]) - iconImage.image = [UIImage imageNamed:@"private.png"]; - else - iconImage.image = [UIImage imageNamed:@"public.png"]; - - nameLabel.text = repository.name; - ownerLabel.text = repository.owner; - - Commit *lastCommit = (Commit *)[repository.commits objectAtIndex:0]; - lastCommitMessageLabel.text = lastCommit.message; - lastCommitTimestampLabel.text = @""; - - if (lastCommit) - lastCommitAuthornameLabel.text = [NSString stringWithFormat:@"By: %@", lastCommit.authorName]; - else - lastCommitAuthornameLabel.text = @""; + [super layoutSubviews]; + + if ([repository.privateRepo boolValue]) + iconImage.image = [UIImage imageNamed:@"private.png"]; + else + iconImage.image = [UIImage imageNamed:@"public.png"]; + + nameLabel.text = repository.name; + ownerLabel.text = repository.owner; + + //Commit *lastCommit = (Commit *)[repository.commits objectAtIndex:0]; + // I removed last commit data from here, but didn't yet change the labels + + lastCommitMessageLabel.text = repository.description; + lastCommitAuthornameLabel.text = [NSString stringWithFormat:@"Watchers: %@, Forks: %@", repository.watchers, repository.forks]; + lastCommitTimestampLabel.text = @""; } - (void)dealloc { RepositoryTableCellView.m @@ -45,6 +45,12 @@ 313A61190F74194900A6C9BC /* server.png in Resources */ = {isa = PBXBuildFile; fileRef = 313A61180F74194900A6C9BC /* server.png */; }; 313A61420F741B0300A6C9BC /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 313A61410F741B0300A6C9BC /* AboutViewController.m */; }; 31E9B3890F7436A30072F5C9 /* zoom.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B3880F7436A30072F5C9 /* zoom.png */; }; + 31E9B3EC0F7443EF0072F5C9 /* user.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B3EB0F7443EF0072F5C9 /* user.png */; }; + 31E9B4070F7445D30072F5C9 /* git-favicon.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B4060F7445D30072F5C9 /* git-favicon.png */; }; + 31E9B4130F74479C0072F5C9 /* email.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B4120F74479C0072F5C9 /* email.png */; }; + 31E9B4150F7447A70072F5C9 /* note.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B4140F7447A70072F5C9 /* note.png */; }; + 31E9B4180F7447DC0072F5C9 /* book_open.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B4170F7447DC0072F5C9 /* book_open.png */; }; + 31E9B41B0F7448210072F5C9 /* comment.png in Resources */ = {isa = PBXBuildFile; fileRef = 31E9B41A0F7448210072F5C9 /* comment.png */; }; FA1DE9D10F65755600AC08A7 /* RepositoryTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = FA1DE9D00F65755600AC08A7 /* RepositoryTableCellView.m */; }; FA1DEA2A0F657CEE00AC08A7 /* RepositoryTableCellView.xib in Resources */ = {isa = PBXBuildFile; fileRef = FA1DEA290F657CEE00AC08A7 /* RepositoryTableCellView.xib */; }; /* End PBXBuildFile section */ @@ -105,6 +111,12 @@ 313A61400F741B0300A6C9BC /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; }; 313A61410F741B0300A6C9BC /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; }; 31E9B3880F7436A30072F5C9 /* zoom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = zoom.png; sourceTree = "<group>"; }; + 31E9B3EB0F7443EF0072F5C9 /* user.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = user.png; sourceTree = "<group>"; }; + 31E9B4060F7445D30072F5C9 /* git-favicon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "git-favicon.png"; sourceTree = "<group>"; }; + 31E9B4120F74479C0072F5C9 /* email.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = email.png; sourceTree = "<group>"; }; + 31E9B4140F7447A70072F5C9 /* note.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = note.png; sourceTree = "<group>"; }; + 31E9B4170F7447DC0072F5C9 /* book_open.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = book_open.png; sourceTree = "<group>"; }; + 31E9B41A0F7448210072F5C9 /* comment.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = comment.png; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; FA1DE9CF0F65755600AC08A7 /* RepositoryTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RepositoryTableCellView.h; sourceTree = "<group>"; }; FA1DE9D00F65755600AC08A7 /* RepositoryTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RepositoryTableCellView.m; sourceTree = "<group>"; }; @@ -175,6 +187,12 @@ 22FA50100F21349300709123 /* images */ = { isa = PBXGroup; children = ( + 31E9B41A0F7448210072F5C9 /* comment.png */, + 31E9B4170F7447DC0072F5C9 /* book_open.png */, + 31E9B4140F7447A70072F5C9 /* note.png */, + 31E9B4120F74479C0072F5C9 /* email.png */, + 31E9B4060F7445D30072F5C9 /* git-favicon.png */, + 31E9B3EB0F7443EF0072F5C9 /* user.png */, 31E9B3880F7436A30072F5C9 /* zoom.png */, 313A61180F74194900A6C9BC /* server.png */, 313A61130F74187600A6C9BC /* Default.png */, @@ -351,6 +369,12 @@ 313A61140F74187600A6C9BC /* Default.png in Resources */, 313A61190F74194900A6C9BC /* server.png in Resources */, 31E9B3890F7436A30072F5C9 /* zoom.png in Resources */, + 31E9B3EC0F7443EF0072F5C9 /* user.png in Resources */, + 31E9B4070F7445D30072F5C9 /* git-favicon.png in Resources */, + 31E9B4130F74479C0072F5C9 /* email.png in Resources */, + 31E9B4150F7447A70072F5C9 /* note.png in Resources */, + 31E9B4180F7447DC0072F5C9 /* book_open.png in Resources */, + 31E9B41B0F7448210072F5C9 /* comment.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; git-phone.xcodeproj/project.pbxproj images/Default.png 5b658837a48d3bdfd24e48604d1c28eb70958c8e Scott Chacon schacon@gmail.com http://github.com/schacon/git-phone/commit/c00bed522fee8dc3afddbc8a0397b74da733b22e c00bed522fee8dc3afddbc8a0397b74da733b22e 2009-03-20T16:01:03-07:00 2009-03-20T16:01:03-07:00 I updated the classes to use the new API for pulling repository information, and started tracking watchers and forks for each repo. On the main repo list pages, I'm now showing that info instead of the last commit, since it was confusing to have nothing there until you fetched the commits. I'm thinking of adding last_updated, but I'll have to add that to the api data, since it doesn't seem to be there. Since it was confusing to have the repo cells switch data whether you had looked at the commits or not, I turned off showing the last_commit data at all. I also changed the functionality to only post for data when it's needed, rather than on app load, so people can use the app without actually having a GitHub account typed in. If so, the first block of menu items does not show up - they're all meant to be used with an authenticated account. I also added some extra menu options that I would like to implement in the future. f6d47923d8c13d664f301fb924f29826d9d84dac Scott Chacon schacon@gmail.com