Classes/DataParser.h Classes/DataParser.m Classes/Repository.h Classes/Repository.m images/feed.png images/gravatar.png @@ -13,13 +13,15 @@ NSString *gitHubUserName; NSString *gitHubToken; NSString *baseURL; - NSMutableArray *repositories; + NSMutableArray *publicRepositories; + NSMutableArray *privateRepositories; } @property (copy) NSString *gitHubUserName; @property (copy) NSString *gitHubToken; @property (copy) NSString *baseURL; -@property (copy) NSMutableArray *repositories; +@property (copy) NSMutableArray *publicRepositories; +@property (copy) NSMutableArray *privateRepositories; + (Config *)instance; - (NSString *)baseAPIURL; Classes/Config.h @@ -14,7 +14,8 @@ @synthesize gitHubUserName; @synthesize gitHubToken; @synthesize baseURL; -@synthesize repositories; +@synthesize publicRepositories; +@synthesize privateRepositories; // Make model a singleton + (Config *)instance @@ -37,7 +38,8 @@ [gitHubUserName release]; [gitHubToken release]; [baseURL release]; - [repositories release]; + [publicRepositories release]; + [privateRepositories release]; [super dealloc]; } Classes/Config.m @@ -7,4 +7,5 @@ // #import "Config.h" +#import "DataParser.h" #import "Repository.h" Classes/Models.h @@ -14,6 +14,8 @@ RootViewController *rootViewController; NSArray *repositories; } + @property (nonatomic, retain) RootViewController *rootViewController; +@property (nonatomic, retain) NSArray *repositories; @end Classes/RepositoriesViewController.h @@ -12,48 +12,17 @@ @implementation RepositoriesViewController @synthesize rootViewController; +@synthesize repositories; -/* -- (id)initWithStyle:(UITableViewStyle)style { - // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. - if (self = [super initWithStyle:style]) { - } - return self; -} -*/ - -/* - (void)viewDidLoad { [super viewDidLoad]; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; + self.title = @"Repositories"; } -*/ - (void)viewWillAppear:(BOOL)animated { - [repositories release]; - repositories = [[[Config instance] repositories] retain]; [super viewWillAppear:animated]; } - -/* -- (void)viewDidAppear:(BOOL)animated { - [super viewDidAppear:animated]; -} -*/ -/* -- (void)viewWillDisappear:(BOOL)animated { - [super viewWillDisappear:animated]; -} -*/ -/* -- (void)viewDidDisappear:(BOOL)animated { - [super viewDidDisappear:animated]; -} -*/ - - (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview Classes/RepositoriesViewController.m @@ -17,9 +17,7 @@ - (void)viewDidLoad { [super viewDidLoad]; - - // Uncomment the following line to display an Edit button in the navigation bar for this view controller. - // self.navigationItem.rightBarButtonItem = self.editButtonItem; + self.title = @"GitHub GitPhone"; } - (void)didReceiveMemoryWarning { @@ -30,13 +28,30 @@ #pragma mark Table view methods - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; + return 3; } // Customize the number of rows in the table view. - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return 2; + + NSInteger rows; + + switch(section) { + case 0: { + rows = 2; + break; + } + case 1: { + rows = 1; + break; + } + case 2: { + rows = 1; + break; + } + } + return rows; } @@ -67,6 +82,23 @@ break; } case 1: { + switch(indexPath.row) { + case 0: { + cell.text = @"News Feed"; + cell.image = [UIImage imageNamed:@"feed.png"]; + break; + } + } + break; + } + case 2: { + switch(indexPath.row) { + case 0: { + cell.text = @"About GitHub GitPhone"; + cell.image = [UIImage imageNamed:@"gravatar.png"]; + break; + } + } break; } } @@ -76,9 +108,31 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { RepositoriesViewController *repositoriesViewController = [[[RepositoriesViewController alloc] initWithNibName:@"RepositoriesView" bundle:nil] autorelease]; - //repositoriesViewController.repositories = [photochecks objectAtIndex:[indexPath row]]; + + switch(indexPath.section) { + case 0: { + switch(indexPath.row) { + case 0: { + [repositoriesViewController.repositories release]; + repositoriesViewController.repositories = [[Config instance] publicRepositories]; + break; + } + case 1: { + [repositoriesViewController.repositories release]; + repositoriesViewController.repositories = [[Config instance] privateRepositories]; + break; + } + } + break; + } + case 1: { + break; + } + } + + repositoriesViewController.rootViewController = self; - //[self.navigationController pushViewController:tableView animated:YES]; + [self.navigationController pushViewController:repositoriesViewController animated:YES]; [tableView deselectRowAtIndexPath:indexPath animated:YES]; } Classes/RootViewController.m @@ -41,20 +41,17 @@ <int key="NSvFlags">274</int> <string key="NSFrame">{{0, 44}, {320, 436}}</string> <reference key="NSSuperview" ref="191373211"/> - <object class="NSColor" key="IBUIBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIClearsContextBeforeDrawing">NO</bool> <bool key="IBUIBouncesZoom">NO</bool> + <int key="IBUIStyle">1</int> <int key="IBUISeparatorStyle">1</int> <int key="IBUISectionIndexMinimumDisplayRowCount">0</int> <bool key="IBUIShowsSelectionImmediatelyOnTouchBegin">YES</bool> <float key="IBUIRowHeight">4.400000e+01</float> - <float key="IBUISectionHeaderHeight">2.200000e+01</float> - <float key="IBUISectionFooterHeight">2.200000e+01</float> + <float key="IBUISectionHeaderHeight">1.000000e+01</float> + <float key="IBUISectionFooterHeight">1.000000e+01</float> </object> <object class="IBUINavigationBar" id="1060136278"> <reference key="NSNextResponder" ref="191373211"/> @@ -65,10 +62,6 @@ <bool key="IBUIClearsContextBeforeDrawing">NO</bool> <object class="NSArray" key="IBUIItems"> <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBUINavigationItem" id="826721001"> - <reference key="IBUINavigationBar" ref="1060136278"/> - <string key="IBUITitle">Repositories</string> - </object> </object> </object> </object> @@ -94,14 +87,6 @@ </object> <int key="connectionID">6</int> </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">navigationItem</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="826721001"/> - </object> - <int key="connectionID">7</int> - </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -140,16 +125,10 @@ <reference key="object" ref="1060136278"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="826721001"/> </object> <reference key="parent" ref="191373211"/> </object> <object class="IBObjectRecord"> - <int key="objectID">4</int> - <reference key="object" ref="826721001"/> - <reference key="parent" ref="1060136278"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">5</int> <reference key="object" ref="777229474"/> <reference key="parent" ref="191373211"/> @@ -165,15 +144,13 @@ <string>1.IBEditorWindowLastContentRect</string> <string>1.IBPluginDependency</string> <string>3.IBPluginDependency</string> - <string>4.IBPluginDependency</string> <string>5.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>RepositoriesViewController</string> <string>UIResponder</string> - <string>{{350, 29}, {320, 480}}</string> - <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>{{315, 64}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -199,7 +176,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">7</int> + <int key="maxID">9</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> RepositoriesView.xib @@ -66,14 +66,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBCocoaTouchOutletConnection" key="connection"> - <string key="label">view</string> - <reference key="source" ref="372490531"/> - <reference key="destination" ref="747164330"/> - </object> - <int key="connectionID">11</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBCocoaTouchOutletConnection" key="connection"> <string key="label">dataSource</string> <reference key="source" ref="747164330"/> <reference key="destination" ref="372490531"/> @@ -88,6 +80,14 @@ </object> <int key="connectionID">13</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchOutletConnection" key="connection"> + <string key="label">view</string> + <reference key="source" ref="372490531"/> + <reference key="destination" ref="747164330"/> + </object> + <int key="connectionID">23</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -131,7 +131,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <string>RootViewController</string> <string>UIResponder</string> - <string>{{271, 71}, {320, 480}}</string> + <string>{{303, 28}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> @@ -155,7 +155,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">15</int> + <int key="maxID">23</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> RootViewController.xib @@ -25,7 +25,10 @@ 22E17C3B0F22490800D2853B /* Login.xib in Resources */ = {isa = PBXBuildFile; fileRef = 22E17C3A0F22490800D2853B /* Login.xib */; }; 22E17C410F224A5700D2853B /* octocat_large.png in Resources */ = {isa = PBXBuildFile; fileRef = 22E17C400F224A5700D2853B /* octocat_large.png */; }; 22E17D0D0F24F08C00D2853B /* Connector.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E17D0C0F24F08C00D2853B /* Connector.m */; }; - 22E17D580F25043800D2853B /* Repository.m in Sources */ = {isa = PBXBuildFile; fileRef = 22E17D570F25043800D2853B /* Repository.m */; }; + 22EFCE200F32598F009F3C3E /* DataParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 22EFCE1F0F32598F009F3C3E /* DataParser.m */; }; + 22EFCE410F325A3F009F3C3E /* Repository.m in Sources */ = {isa = PBXBuildFile; fileRef = 22EFCE400F325A3F009F3C3E /* Repository.m */; }; + 22EFCE800F325DFB009F3C3E /* feed.png in Resources */ = {isa = PBXBuildFile; fileRef = 22EFCE7F0F325DFB009F3C3E /* feed.png */; }; + 22EFCE880F325EFA009F3C3E /* gravatar.png in Resources */ = {isa = PBXBuildFile; fileRef = 22EFCE870F325EFA009F3C3E /* gravatar.png */; }; 22FA50040F212ED300709123 /* Settings.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 22FA50030F212ED300709123 /* Settings.bundle */; }; 22FA502E0F21374300709123 /* octocat.png in Resources */ = {isa = PBXBuildFile; fileRef = 22FA502D0F21374300709123 /* octocat.png */; }; 22FA50CE0F21463D00709123 /* Config.m in Sources */ = {isa = PBXBuildFile; fileRef = 22FA50CD0F21463D00709123 /* Config.m */; }; @@ -61,13 +64,17 @@ 22E17C400F224A5700D2853B /* octocat_large.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = octocat_large.png; sourceTree = "<group>"; }; 22E17D0B0F24F08C00D2853B /* Connector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Connector.h; sourceTree = "<group>"; }; 22E17D0C0F24F08C00D2853B /* Connector.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Connector.m; sourceTree = "<group>"; }; - 22E17D560F25043800D2853B /* Repository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Repository.h; sourceTree = "<group>"; }; - 22E17D570F25043800D2853B /* Repository.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Repository.m; sourceTree = "<group>"; }; + 22EFCE1E0F32598F009F3C3E /* DataParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DataParser.h; sourceTree = "<group>"; }; + 22EFCE1F0F32598F009F3C3E /* DataParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DataParser.m; sourceTree = "<group>"; }; + 22EFCE3F0F325A3F009F3C3E /* Repository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Repository.h; sourceTree = "<group>"; }; + 22EFCE400F325A3F009F3C3E /* Repository.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Repository.m; sourceTree = "<group>"; }; + 22EFCE7F0F325DFB009F3C3E /* feed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = feed.png; sourceTree = "<group>"; }; + 22EFCE870F325EFA009F3C3E /* gravatar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = gravatar.png; sourceTree = "<group>"; }; 22FA50030F212ED300709123 /* Settings.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = Settings.bundle; sourceTree = "<group>"; }; 22FA502D0F21374300709123 /* octocat.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = octocat.png; sourceTree = "<group>"; }; - 22FA50CC0F21463D00709123 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Config.h; path = Classes/Config.h; sourceTree = "<group>"; }; - 22FA50CD0F21463D00709123 /* Config.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Config.m; path = Classes/Config.m; sourceTree = "<group>"; }; - 22FA50DB0F2147DC00709123 /* Models.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Models.h; path = Classes/Models.h; sourceTree = "<group>"; }; + 22FA50CC0F21463D00709123 /* Config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config.h; sourceTree = "<group>"; }; + 22FA50CD0F21463D00709123 /* Config.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Config.m; sourceTree = "<group>"; }; + 22FA50DB0F2147DC00709123 /* Models.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Models.h; sourceTree = "<group>"; }; 2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; }; 2899E55F0DE3E45000AC0155 /* RootViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RootViewController.xib; sourceTree = "<group>"; }; 28A0AAE50D9B0CCF005BE974 /* git_phone_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = git_phone_Prefix.pch; sourceTree = "<group>"; }; @@ -138,6 +145,8 @@ 22FA50100F21349300709123 /* images */ = { isa = PBXGroup; children = ( + 22EFCE870F325EFA009F3C3E /* gravatar.png */, + 22EFCE7F0F325DFB009F3C3E /* feed.png */, 2294459F0F2CFD4200502D5C /* private.png */, 229445A00F2CFD4200502D5C /* public.png */, 22E17C400F224A5700D2853B /* octocat_large.png */, @@ -147,16 +156,18 @@ path = images; sourceTree = "<group>"; }; - 22FA50C60F2144DF00709123 /* Models */ = { + 22FA50C60F2144DF00709123 /* Classes */ = { isa = PBXGroup; children = ( 22FA50DB0F2147DC00709123 /* Models.h */, 22FA50CC0F21463D00709123 /* Config.h */, 22FA50CD0F21463D00709123 /* Config.m */, - 22E17D560F25043800D2853B /* Repository.h */, - 22E17D570F25043800D2853B /* Repository.m */, + 22EFCE1E0F32598F009F3C3E /* DataParser.h */, + 22EFCE1F0F32598F009F3C3E /* DataParser.m */, + 22EFCE3F0F325A3F009F3C3E /* Repository.h */, + 22EFCE400F325A3F009F3C3E /* Repository.m */, ); - name = Models; + path = Classes; sourceTree = "<group>"; }; 22FA50C70F2144F800709123 /* Networking */ = { @@ -176,7 +187,7 @@ isa = PBXGroup; children = ( 22FA50C70F2144F800709123 /* Networking */, - 22FA50C60F2144DF00709123 /* Models */, + 22FA50C60F2144DF00709123 /* Classes */, 22E17B990F223A3400D2853B /* ViewControllers */, 080E96DDFE201D6D7F000001 /* Classes */, 29B97315FDCFA39411CA2CEA /* Other Sources */, @@ -282,6 +293,8 @@ 229445A10F2CFD4200502D5C /* private.png in Resources */, 229445A20F2CFD4200502D5C /* public.png in Resources */, 2218F1170F2FE3A00080FB02 /* RepositoriesView.xib in Resources */, + 22EFCE800F325DFB009F3C3E /* feed.png in Resources */, + 22EFCE880F325EFA009F3C3E /* gravatar.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -301,8 +314,9 @@ 22E17B9D0F223AA600D2853B /* ApplicationErrorViewController.m in Sources */, 22E17C1E0F22467200D2853B /* LoginViewController.m in Sources */, 22E17D0D0F24F08C00D2853B /* Connector.m in Sources */, - 22E17D580F25043800D2853B /* Repository.m in Sources */, 2218F1350F2FE4110080FB02 /* RepositoriesViewController.m in Sources */, + 22EFCE200F32598F009F3C3E /* DataParser.m in Sources */, + 22EFCE410F325A3F009F3C3E /* Repository.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; git-phone.xcodeproj/project.pbxproj Repository.h Repository.m fec48ac3ef5418453ddaf02edea9fa606d05a2d9 Sam Schroeder samuelschroeder@gmail.com http://github.com/sschroed/git-phone/commit/3a62f733542fce20876e0ad28ae92583e819f9c8 3a62f733542fce20876e0ad28ae92583e819f9c8 2009-01-29T14:06:43-08:00 2009-01-29T14:06:43-08:00 pub/private repos working 8e44730ece4088cc8bbe604fbe0e11b11847aff0 Sam Schroeder samuelschroeder@gmail.com