Assets/ChatIcon.png @@ -13,11 +13,9 @@ @implementation ChattyViewController --(id) initWithChattyId:(int)chatIdNum -{ - chatId = chatIdNum; +- (id)initWithChattyId:(int)aChatId { + chatId = aChatId; self = [self initWithNibName:@"ChattyViewController" bundle:[NSBundle mainBundle]]; - //[super init]; return self; } Classes/ChattyViewController.m @@ -30,16 +30,15 @@ } */ -- (id)initWithNewsPost:(NewsPost*)post -{ - self = [self initWithRequest: [NSURLRequest requestWithURL:[NSURL URLWithString:post.link]]]; +- (id)initWithNewsPost:(NewsPost*)post { + self = [self initWithRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:post.link]]]; self.title = post.title; thePost = post; return self; } - (void)viewDidLoad { - if( thePost ){ + if (thePost) { //remove dragondrop and add chat [dragonDropButton setEnabled:NO]; self.navigationItem.rightBarButtonItem = chatButton; @@ -66,13 +65,12 @@ [super dealloc]; } -- (IBAction)chat:(id)sender -{ +- (IBAction)chat:(id)sender { //need thePost - link - NSString* link = [thePost link]; - NSArray* comps = [link componentsSeparatedByString:@"/"]; + NSString *link = [thePost link]; + NSArray *comps = [link componentsSeparatedByString:@"/"]; int story = [[comps objectAtIndex:([comps count]-1)] intValue]; - if( chattyView ) [chattyView release]; + if (chattyView) [chattyView release]; chattyView = [[ChattyViewController alloc] initWithChattyId:story]; //else [chattyView updateWithStoryId:story]; [[self navigationController] pushViewController:chattyView animated:YES]; Classes/ExternalWebViewController.m @@ -10,67 +10,52 @@ @implementation JFNewsPostCell --(id) initWithFrame:(CGRect)rect reuseIdentifier:(NSString*)string -{ - title = [[UILabel alloc] init]; + +- (id)initWithFrame:(CGRect)rect reuseIdentifier:(NSString*)string { + title = [[UILabel alloc] init]; description = [[UILabel alloc] init]; - date = [[UILabel alloc] init]; + date = [[UILabel alloc] init]; [super initWithFrame:rect reuseIdentifier:string]; return self; } --(void)setColor:(int)col -{ - color = col; + +- (void)setColor:(int)aColor { + color = aColor; } --(void)buildCellForPost:(NewsPost*)post -{ - UIView* cv = self.contentView; - //cv.frame = CGRectMake( 0,0,320, 100); - if( color ) cv.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.05]; - else cv.backgroundColor = [UIColor clearColor]; - - - CGRect frame = CGRectMake(5, 5, 310, 12); - - //date - //title = [[UILabel alloc] initWithFrame:frame]; - [date setFrame:frame]; - [date setTextColor:[UIColor colorWithRed:.94 green:.18 blue:.04 alpha:1]]; - [date setBackgroundColor:[UIColor clearColor]]; - [date setFont:[UIFont systemFontOfSize:10]]; - [date setNumberOfLines:1]; - [date setText: [post date]]; - [cv addSubview:date]; - - frame = CGRectMake(10, 18, 295, 40); - //title = [[UILabel alloc] initWithFrame:frame]; - [title setFrame:frame]; - [title setTextColor:[UIColor whiteColor]]; - [title setBackgroundColor:[UIColor clearColor]]; - [title setFont:[UIFont systemFontOfSize:16]]; - [title setNumberOfLines:2]; - [title setText: [post title]]; - [cv addSubview:title]; + +- (void)buildCellForPost:(NewsPost *)post { + UIView* cell = self.contentView; + if (color) cell.backgroundColor = [UIColor colorWithWhite:1.0 alpha:0.05]; + else cell.backgroundColor = [UIColor clearColor]; - //description preview - frame = CGRectMake(10, 45, 310, 40); - //title = [[UILabel alloc] initWithFrame:frame]; - [description setFrame:frame]; - [description setTextColor:[UIColor grayColor]]; - [description setBackgroundColor:[UIColor clearColor]]; - [description setFont:[UIFont systemFontOfSize:12]]; - [description setNumberOfLines:1]; - [description setText: [post description]]; - [cv addSubview:description]; + date.frame = CGRectMake(5, 5, 310, 12); + date.textColor = [UIColor colorWithWhite:0.39 alpha:1.0]; + date.backgroundColor = [UIColor clearColor]; + date.font = [UIFont systemFontOfSize:10]; + date.text = [post date]; + date.textAlignment = UITextAlignmentRight; + [cell addSubview:date]; - //placement + title.frame = CGRectMake(10, 18, 295, 40); + title.textColor = [UIColor whiteColor]; + title.backgroundColor = [UIColor clearColor]; + title.font = [UIFont systemFontOfSize:16]; + title.text = [post title]; + title.numberOfLines = 2; + [cell addSubview:title]; - //self.backgroundView.backgroundColor = [UIColor blackColor]; - //self.text = @"testing"; + /* + description.frame = CGRectMake(10, 37, 310, 48); + description.textColor = [UIColor colorWithWhite:0.75 alpha:1.0]; + description.backgroundColor = [UIColor clearColor]; + description.font = [UIFont systemFontOfSize:12]; + description.text = [post description]; + [cell addSubview:description]; + */ } --(void) dealloc -{ + +-(void) dealloc { [title release]; [date release]; [description release]; Classes/NewsAdditions/JFNewsPostCell.m @@ -11,9 +11,10 @@ #import "JFNewsPostCell.h" @interface RSSReader : NSObject { - CXMLDocument* feed; - NSMutableArray* newsPosts; + CXMLDocument *feed; + NSMutableArray *newsPosts; } -(NSArray*)getNewsPosts; + @end Classes/NewsAdditions/RSSReader.h @@ -12,8 +12,8 @@ @implementation RSSReader NSString* shackURL = @"http://feed.shacknews.com/shackfeed.xml"; --(id)init -{ + +- (id)init { NSURLRequest* chRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:shackURL] cachePolicy: NSURLRequestReloadIgnoringCacheData timeoutInterval:10]; NSError* theError; NSData* response = [NSURLConnection sendSynchronousRequest:chRequest returningResponse:nil error:&theError]; @@ -22,50 +22,43 @@ NSString* shackURL = @"http://feed.shacknews.com/shackfeed.xml"; return self; } --(NSArray*)getNewsPosts -{ +- (NSArray*)getNewsPosts { //before we do anything let's release the data - if(newsPosts != nil ){ - [newsPosts release]; - } + if (newsPosts != nil) [newsPosts release]; newsPosts = [[NSMutableArray alloc] init]; - CXMLElement* root = [feed rootElement]; //NSLog(@"root:%@, childCount: %i", [root XMLString], [root childCount]); NSArray* items = [root elementsForName:@"item"]; int i,j; NewsPost* post; - if( [items count] > 0 ){ - for( i = 0; i < [items count]; i++ ){ + if ([items count] > 0){ + for (i = 0; i < [items count]; i++) { CXMLElement* parent = [items objectAtIndex:i]; post = [[NewsPost alloc] init]; - post.link=[[(CXMLElement*)parent attributeForName:(@"about")] stringValue]; + post.link = [[(CXMLElement*)parent attributeForName:(@"about")] stringValue]; NSArray* children = [parent children]; - for( j = 0; j < [children count]; j++ ){ + for(j = 0; j < [children count]; j++) { CXMLNode* temp = [children objectAtIndex:j]; - if( [[temp name] isEqualToString:@"title"] ){ + if ([[temp name] isEqualToString:@"title"]) { post.title = [temp stringValue]; } - else if( [[temp name] isEqualToString:@"description"] ){ + else if ([[temp name] isEqualToString:@"description"]) { post.description = [temp stringValue]; } - else if( [[temp name] isEqualToString:@"date"] ){ + else if ([[temp name] isEqualToString:@"date"]){ NSDateFormatter* format = [[NSDateFormatter alloc] initWithDateFormat:@"%Y-%m-%dT%H:%M%z" allowNaturalLanguage:NO]; NSDate* date = [format dateFromString:[temp stringValue]]; [format release]; format = [[NSDateFormatter alloc] initWithDateFormat:@"%b %d, %Y %I:%M %p" allowNaturalLanguage:NO]; - //NSLog( @"%f", [date timeIntervalSince1970]); - //NSLog(@"%@", [format stringFromDate:date] ); post.date = [format stringFromDate:date]; [format release]; } } [newsPosts addObject:post]; [post release]; - } + } } - //items = [root nodesForXPath:@"RDF/item" error:nil]; return newsPosts; } @end Classes/NewsAdditions/RSSReader.m @@ -22,50 +22,40 @@ posts = [theReader getNewsPosts]; //hop to LC.x - if([[NSUserDefaults standardUserDefaults] boolForKey:@"lc_startup"]){ + if ([[[NSUserDefaults standardUserDefaults] stringForKey:@"startup_destination"] isEqualToString:@"chatty"]){ [self latestChatty:self]; } - //NSLog(@"posts count %i", [posts count] ); } - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { return 1; } -- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath -{ - return 80.0; +- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath { + return 76.0; } - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - //NSLog(@"posts count %i", [posts count] ); return [posts count]; } -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - //NSLog(@"wtf?"); - static NSString *MyIdentifier = @"NPIdentifer"; - - JFNewsPostCell* cell = (JFNewsPostCell*)[tableView dequeueReusableCellWithIdentifier:MyIdentifier]; +- (UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { + JFNewsPostCell* cell = (JFNewsPostCell*)[tableView dequeueReusableCellWithIdentifier:@"storyCell"]; if (cell == nil) { - cell = [[[JFNewsPostCell alloc] initWithFrame:CGRectMake( 0,0,320, 200) reuseIdentifier:MyIdentifier] autorelease]; + cell = [[[JFNewsPostCell alloc] initWithFrame:CGRectMake(0, 0, 320, 200) reuseIdentifier:@"storyCell"] autorelease]; } // Set up the cell //NSLog(@"setting up with title: %@", [[posts objectAtIndex:indexPath.row] title] ); //cell.text = [[posts objectAtIndex:indexPath.row] title]; - [cell setColor:indexPath.row%2]; + [cell setColor:indexPath.row % 2]; [cell buildCellForPost:[posts objectAtIndex:indexPath.row]]; return cell; } - - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Navigation logic - //ok here we go - //if( postView ) [postView release]; + - (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { postView = [[ExternalWebViewController alloc] initWithNewsPost:[posts objectAtIndex:indexPath.row]]; - //else [postView updateForPost:[posts objectAtIndex:indexPath.row]]; [[self navigationController] pushViewController:postView animated:YES]; [postView release]; [tableView deselectRowAtIndexPath:indexPath animated:YES]; @@ -150,17 +140,18 @@ [super dealloc]; } --(IBAction) refresh:(id)sender -{ - NSLog(@"sup."); +- (IBAction)refresh:(id)sender { + NSLog(@"Refreshing..."); + [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:YES]; posts = [theReader getNewsPosts]; + [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:NO]; [tableView reloadData]; + NSLog(@"Done."); } --(IBAction)latestChatty:(id)sender -{ - if( !chattyView ) chattyView = [[ChattyViewController alloc] initWithChattyId:0]; - if( sender == self ) [[self navigationController] pushViewController:chattyView animated:NO]; +- (IBAction)latestChatty:(id)sender { + if (!chattyView) chattyView = [[ChattyViewController alloc] initWithChattyId:0]; + if (sender == self) [[self navigationController] pushViewController:chattyView animated:NO]; else [[self navigationController] pushViewController:chattyView animated:YES]; [chattyView release]; } Classes/NewsAdditions/RootViewController.m @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">352.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="3"/> + <integer value="1"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -116,7 +116,10 @@ </object> </object> <object class="IBUIBarButtonItem" id="362026655"> - <string key="IBUITitle">Chat</string> + <object class="NSCustomResource" key="IBUIImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">ChatIcon.png</string> + </object> <int key="IBUIStyle">1</int> </object> </object> @@ -403,7 +406,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">30</int> + <int key="maxID">33</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> ExternalWebViewController.xib @@ -40,6 +40,7 @@ FA3D725A0E43FCC0002998D3 /* CXMLNode_PrivateExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3D72510E43FCC0002998D3 /* CXMLNode_PrivateExtensions.m */; }; FA3D725B0E43FCC0002998D3 /* CXMLNode_XPathExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3D72530E43FCC0002998D3 /* CXMLNode_XPathExtensions.m */; }; FA3D725C0E43FCC0002998D3 /* CXMLNode.m in Sources */ = {isa = PBXBuildFile; fileRef = FA3D72550E43FCC0002998D3 /* CXMLNode.m */; }; + FA4156FF0E653F1D00E59903 /* ChatIcon.png in Resources */ = {isa = PBXBuildFile; fileRef = FA4156FE0E653F1D00E59903 /* ChatIcon.png */; }; FA461BC10E4255B500E3654D /* Feed.m in Sources */ = {isa = PBXBuildFile; fileRef = FA461BBE0E4255B500E3654D /* Feed.m */; }; FA461BC20E4255B500E3654D /* Post.m in Sources */ = {isa = PBXBuildFile; fileRef = FA461BC00E4255B500E3654D /* Post.m */; }; FA461BC80E42561900E3654D /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FA461BC70E42561900E3654D /* DetailViewController.m */; }; @@ -109,6 +110,7 @@ FA3D72540E43FCC0002998D3 /* CXMLNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CXMLNode.h; path = TouchXML/CXMLNode.h; sourceTree = "<group>"; }; FA3D72550E43FCC0002998D3 /* CXMLNode.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CXMLNode.m; path = TouchXML/CXMLNode.m; sourceTree = "<group>"; }; FA3D72560E43FCC0002998D3 /* TouchXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TouchXML.h; path = TouchXML/TouchXML.h; sourceTree = "<group>"; }; + FA4156FE0E653F1D00E59903 /* ChatIcon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = ChatIcon.png; path = Assets/ChatIcon.png; sourceTree = "<group>"; }; FA461BBD0E4255B500E3654D /* Feed.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Feed.h; sourceTree = "<group>"; }; FA461BBE0E4255B500E3654D /* Feed.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Feed.m; sourceTree = "<group>"; }; FA461BBF0E4255B500E3654D /* Post.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Post.h; sourceTree = "<group>"; }; @@ -224,14 +226,6 @@ 59F766220E65001A0022FE0C /* NewsAdditions */ = { isa = PBXGroup; children = ( - 59F7662A0E6500970022FE0C /* JFNewsPostCell.h */, - 59F7662B0E6500970022FE0C /* NewsPost.m */, - 59F7662C0E6500970022FE0C /* JFNewsPostCell.m */, - 59F7662D0E6500970022FE0C /* RSSReader.h */, - 59F7662E0E6500970022FE0C /* RootViewController.m */, - 59F7662F0E6500970022FE0C /* RSSReader.m */, - 59F766310E6500970022FE0C /* RootViewController.h */, - 59F766320E6500970022FE0C /* NewsPost.h */, ); name = NewsAdditions; sourceTree = "<group>"; @@ -239,6 +233,8 @@ FA02CB450E44F81B0013981F /* Views */ = { isa = PBXGroup; children = ( + 59F7662A0E6500970022FE0C /* JFNewsPostCell.h */, + 59F7662C0E6500970022FE0C /* JFNewsPostCell.m */, FA02CB460E44F8400013981F /* RootPostCellView.h */, FA02CB470E44F8400013981F /* RootPostCellView.m */, ); @@ -248,6 +244,7 @@ FA346BE30E4FDF6800B1DF5A /* Images */ = { isa = PBXGroup; children = ( + FA4156FE0E653F1D00E59903 /* ChatIcon.png */, FA2E59620E5EAD1700937274 /* DragonDrop.png */, FA346C7F0E500DB100B1DF5A /* NavButtonTags.png */, FA346C100E4FFDB500B1DF5A /* ButtonSend.png */, @@ -295,6 +292,10 @@ FA461BC00E4255B500E3654D /* Post.m */, FA8EBF840E6343D2009B657C /* Image.h */, FA8EBF850E6343D2009B657C /* Image.m */, + 59F7662D0E6500970022FE0C /* RSSReader.h */, + 59F7662F0E6500970022FE0C /* RSSReader.m */, + 59F766320E6500970022FE0C /* NewsPost.h */, + 59F7662B0E6500970022FE0C /* NewsPost.m */, ); name = Models; sourceTree = "<group>"; @@ -304,6 +305,8 @@ children = ( 1D3623240D0F684500981E51 /* LatestChattyAppDelegate.h */, 1D3623250D0F684500981E51 /* LatestChattyAppDelegate.m */, + 59F766310E6500970022FE0C /* RootViewController.h */, + 59F7662E0E6500970022FE0C /* RootViewController.m */, 28C286DF0D94DF7D0034E888 /* ChattyViewController.h */, 28C286E00D94DF7D0034E888 /* ChattyViewController.m */, FA461BC60E42561900E3654D /* DetailViewController.h */, @@ -409,6 +412,7 @@ FA346C800E500DB100B1DF5A /* NavButtonTags.png in Resources */, FA2E59630E5EAD1700937274 /* DragonDrop.png in Resources */, 59F7663B0E6501020022FE0C /* RootViewController.xib in Resources */, + FA4156FF0E653F1D00E59903 /* ChatIcon.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; LatestChatty.xcodeproj/project.pbxproj @@ -58,10 +58,13 @@ <object class="IBUIViewController" id="619226028"> <object class="IBUINavigationItem" key="IBUINavigationItem" id="394667715"> <reference key="IBUINavigationBar"/> - <string key="IBUITitle">ShackNews</string> + <string key="IBUITitle">Stories</string> <object class="IBUIBarButtonItem" key="IBUIRightBarButtonItem" id="177403625"> - <string key="IBUITitle">LatestChatty</string> - <int key="IBUIStyle">1</int> + <object class="NSCustomResource" key="IBUIImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">ChatIcon.png</string> + </object> + <int key="IBUIStyle">2</int> </object> </object> <reference key="IBUIParentViewController" ref="701001926"/> MainWindow.xib @@ -189,7 +189,7 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>{{413, 223}, {320, 460}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> - <string>{{1484, -34}, {350, 419}}</string> + <string>{{601, -34}, {350, 419}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> @@ -213,7 +213,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">25</int> + <int key="maxID">26</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -240,7 +240,7 @@ </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> - <string key="minorKey">Classes/NewsStuff/RootViewController.h</string> + <string key="minorKey">Classes/NewsAdditions/RootViewController.h</string> </object> </object> <object class="IBPartialClassDescription"> RootViewController.xib @@ -57,14 +57,24 @@ <string>PSGroupSpecifier</string> </dict> <dict> - <key>Title</key> - <string>LC.x on Startup</string> + <key>Values</key> + <array> + <string>chatty</string> + <string>stories</string> + </array> + <key>Titles</key> + <array> + <string>Latest Chatty</string> + <string>News Stories</string> + </array> <key>Type</key> - <string>PSToggleSwitchSpecifier</string> + <string>PSMultiValueSpecifier</string> + <key>Title</key> + <string>Destination</string> <key>Key</key> - <string>lc_startup</string> + <string>startup_destination</string> <key>DefaultValue</key> - <false/> + <string>stories</string> </dict> <dict> <key>Title</key> Settings.bundle/Root.plist 45572b45b667c4d0ab9e4ba4d91482e6d6bfc656 Alex Wayne alex@beautifulpixel.com http://github.com/Squeegy/latest-chatty/commit/fca0eb8a67ad12ebe474d6f4e6bf4945add17270 fca0eb8a67ad12ebe474d6f4e6bf4945add17270 2008-08-27T01:46:26-07:00 2008-08-27T01:46:26-07:00 Polished up Yanks story browser features. a39de89a3899d50f7235d4fda6400d07d44a1ce6 Alex Wayne alex@beautifulpixel.com