summaryrefslogtreecommitdiffstats
path: root/Classes
diff options
context:
space:
mode:
Diffstat (limited to 'Classes')
-rw-r--r--Classes/PhotoViewController.m3
-rw-r--r--Classes/PicCast.pngbin29647 -> 60435 bytes
-rw-r--r--Classes/PicCastAppDelegate.m1
-rw-r--r--Classes/PicDumpViewController.h22
-rw-r--r--Classes/PicDumpViewController.m273
-rw-r--r--Classes/TopicsViewController.h6
-rw-r--r--Classes/TopicsViewController.m45
7 files changed, 23 insertions, 327 deletions
diff --git a/Classes/PhotoViewController.m b/Classes/PhotoViewController.m
index 5999626..fb8931b 100644
--- a/Classes/PhotoViewController.m
+++ b/Classes/PhotoViewController.m
@@ -23,7 +23,8 @@
}
- (void)viewWillDisappear:(BOOL)animated {
- self.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+ //self.navigationController.navigationBar.barStyle = UIBarStyleDefault;
+ self.navigationController.navigationBar.tintColor = [UIColor colorWithRed:24/255.0 green:45/255.0 blue:64/255.0 alpha:1.0];
}
- (void)setPhotoList:(NSArray *)list {
diff --git a/Classes/PicCast.png b/Classes/PicCast.png
index 4c6ba76..4b028fd 100644
--- a/Classes/PicCast.png
+++ b/Classes/PicCast.png
Binary files differ
diff --git a/Classes/PicCastAppDelegate.m b/Classes/PicCastAppDelegate.m
index 0bd0798..3091f4a 100644
--- a/Classes/PicCastAppDelegate.m
+++ b/Classes/PicCastAppDelegate.m
@@ -8,7 +8,6 @@
#import "PicCastAppDelegate.h"
#import <Three20Network/TTURLRequestQueue.h>
-#import <iAd/iAD.h>
@implementation PicCastAppDelegate
diff --git a/Classes/PicDumpViewController.h b/Classes/PicDumpViewController.h
deleted file mode 100644
index 4716538..0000000
--- a/Classes/PicDumpViewController.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// PicDumpViewController.h
-// acidcow
-//
-// Created by Matthew Handler on 4/16/11.
-// Copyright 2011 Earl Industries. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-#import "Topic.h"
-//@class Topic;
-
-@interface PicDumpViewController : UIViewController <NSURLProtocolClient> {
- NSMutableData *_acidcowPage;
- NSDateFormatter *dateFormatter;
- Topic *topic;
-}
-
-@property (nonatomic, retain) Topic *topic;
-@property (nonatomic, readonly, retain) NSDateFormatter *dateFormatter;
-
-@end
diff --git a/Classes/PicDumpViewController.m b/Classes/PicDumpViewController.m
deleted file mode 100644
index 436534e..0000000
--- a/Classes/PicDumpViewController.m
+++ /dev/null
@@ -1,273 +0,0 @@
-//
-// PicDumpViewController.m
-// acidcow
-//
-// Created by Matthew Handler on 4/16/11.
-// Copyright 2011 Earl Industries. All rights reserved.
-//
-
-#import "PicDumpViewController.h"
-#import "PhotoViewController.h"
-
-@implementation PicDumpViewController
-
-@synthesize topic, dateFormatter;
-
-- (NSDateFormatter *)dateFormatter {
- if (dateFormatter == nil) {
- dateFormatter = [[NSDateFormatter alloc] init];
- [dateFormatter setDateStyle:NSDateFormatterMediumStyle];
- [dateFormatter setTimeStyle:NSDateFormatterNoStyle];
- }
- return dateFormatter;
-}
-
-//- (Topic *)topic {
-// NSLog(@"%@", topic.guid);
-// return topic;
-//}
-
--(void)setTopic:(Topic *)t {
- topic = t;
- [self loadImages];
- NSLog(@"%@", topic.guid);
-}
-
-#pragma mark -
-#pragma mark View lifecycle
-
-- (void)viewDidLoad {
-// UIBarButtonItem *doneItem = [[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self action:@selector(dismissModalViewControllerAnimated:)] autorelease];
-// self.navigationItem.rightBarButtonItem = doneItem;
- [super viewDidLoad];
-
- _acidcowPage = [[NSMutableData data] retain];
-
- [self loadImages];
- // Uncomment the following line to display an Edit button in the navigation bar for this view controller.
- // self.navigationItem.rightBarButtonItem = self.editButtonItem;
-}
-
-
-- (void)viewWillAppear:(BOOL)animated {
- self.title = topic.title;
- self.navigationController.navigationBar.barStyle = UIBarStyleDefault;
- //[self.tableView reloadData];
-
- [super viewWillAppear:animated];
-}
-
-
-- (void)viewDidAppear:(BOOL)animated {
- //[self becomeFirstResponder];
- [super viewDidAppear:animated];
-}
-
-/*
-- (void)viewWillDisappear:(BOOL)animated {
- [super viewWillDisappear:animated];
-}
-*/
-/*
-- (void)viewDidDisappear:(BOOL)animated {
- [super viewDidDisappear:animated];
-}
-*/
-/*
-// Override to allow orientations other than the default portrait orientation.
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation {
- // Return YES for supported orientations.
- return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-*/
-
-#pragma mark -
-#pragma mark URL Connection Stuff
-- (void)loadImages {
-
- NSURLRequest *theRequest=[NSURLRequest requestWithURL:[NSURL URLWithString:topic.guid]
- cachePolicy:NSURLRequestUseProtocolCachePolicy
- timeoutInterval:3600.0];
-
- if ([NSURLConnection connectionWithRequest:theRequest delegate:self]) {
- [_acidcowPage setLength:0];
- } else {
- //[MBProgressHUD hideHUDForView:self.view animated:YES];
- //[WerdMergeAppDelegate prompt:@"Error" withMessage:@"No internet connection" andButtonTitle:@"shucks" withDelegate:self];
- }
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
- [_acidcowPage setLength:0];
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
- [_acidcowPage appendData:data];
-}
-
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
-
- //[_receivedData release];
-
- //[MBProgressHUD hideHUDForView:self.view animated:YES];
- //[WerdMergeAppDelegate prompt:@"Error" withMessage:[error localizedDescription] andButtonTitle:@"Aww man..." withDelegate:self];
- //[[error userInfo] objectForKey:NSURLErrorFailingURLStringErrorKey]);
-
-}
-
-- (void)connectionDidFinishLoading:(NSURLConnection *)connection {
- NSString *html = [[[NSString alloc] initWithData:_acidcowPage encoding:NSUTF8StringEncoding] autorelease];
-
- NSRegularExpression* regex = [NSRegularExpression regularExpressionWithPattern:@"http://acidcow\\.com/pics[^ \"]+\\.(jpg|png|jpeg|gif)"
- options:NSRegularExpressionCaseInsensitive
- error:nil];
- NSArray *results = [regex matchesInString:html options:0 range:NSMakeRange(0, [html length])];
- NSMutableArray *strings = [[NSMutableArray alloc] initWithCapacity:[results count]];
- for (NSTextCheckingResult *obj in results) {
- [strings addObject:[html substringWithRange:[obj range]]];
-
- //NSLog(@"found: %@", [html substringWithRange:[obj range]]);
- }
-
- PhotoViewController *photoView = [[[PhotoViewController alloc] init] autorelease];
- photoView.photoList = strings;
- [self.navigationController pushViewController:photoView animated:YES];
-// [self.view addSubview:(UIView *)photoView];
-
-// if ([results count] > 0) {
-// NSString *title = [currentString substringWithRange:[[results objectAtIndex:0] range]];
-// currentTopic.title = title;
-// }
-
- //[_tableData removeAllObjects];
- //[_tableData addObjectsFromArray:[[json JSONValue] objectForKey:@"results"]];
- //[json release];
-
-// if ([_tableData count] > 0) {
-// [tableView reloadData];
-// [tableView scrollToRowAtIndexPath:[NSIndexPath indexPathForRow:0 inSection:0] atScrollPosition:UITableViewScrollPositionTop animated:NO];
-// self.tableView.allowsSelection = YES;
-// self.tableView.scrollEnabled = YES;
-// }
-// else {
-// [WerdMergeAppDelegate prompt:@"No Results" withMessage:@"Sorry, that word isn't in our dictionary" andButtonTitle:@"Alright" withDelegate:self];
-// }
-//
-// [MBProgressHUD hideHUDForView:self.view animated:YES];
-
- //[_receivedData release];
-}
-
-
-#pragma mark -
-#pragma mark Table view data source
-
-//- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView {
-// // Return the number of sections.
-// return <#number of sections#>;
-//}
-//
-//
-//- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
-// // Return the number of rows in the section.
-// return <#number of rows in section#>;
-//}
-
-
-// Customize the appearance of table view cells.
-- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
-
- static NSString *CellIdentifier = @"Cell";
-
- UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:CellIdentifier];
- if (cell == nil) {
- cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier] autorelease];
- }
-
- // Configure the cell...
-
- return cell;
-}
-
-
-/*
-// Override to support conditional editing of the table view.
-- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath {
- // Return NO if you do not want the specified item to be editable.
- return YES;
-}
-*/
-
-
-/*
-// Override to support editing the table view.
-- (void)tableView:(UITableView *)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath *)indexPath {
-
- if (editingStyle == UITableViewCellEditingStyleDelete) {
- // Delete the row from the data source.
- [tableView deleteRowsAtIndexPaths:[NSArray arrayWithObject:indexPath] withRowAnimation:UITableViewRowAnimationFade];
- }
- else if (editingStyle == UITableViewCellEditingStyleInsert) {
- // Create a new instance of the appropriate class, insert it into the array, and add a new row to the table view.
- }
-}
-*/
-
-
-/*
-// Override to support rearranging the table view.
-- (void)tableView:(UITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
-}
-*/
-
-
-/*
-// Override to support conditional rearranging of the table view.
-- (BOOL)tableView:(UITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
- // Return NO if you do not want the item to be re-orderable.
- return YES;
-}
-*/
-
-
-#pragma mark -
-#pragma mark Table view delegate
-
-- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
- // Navigation logic may go here. Create and push another view controller.
- /*
- <#DetailViewController#> *detailViewController = [[<#DetailViewController#> alloc] initWithNibName:@"<#Nib name#>" bundle:nil];
- // ...
- // Pass the selected object to the new view controller.
- [self.navigationController pushViewController:detailViewController animated:YES];
- [detailViewController release];
- */
-}
-
-
-#pragma mark -
-#pragma mark Memory management
-
-- (void)didReceiveMemoryWarning {
- // Releases the view if it doesn't have a superview.
- [super didReceiveMemoryWarning];
-
- // Relinquish ownership any cached data, images, etc. that aren't in use.
-}
-
-- (void)viewDidUnload {
- // Relinquish ownership of anything that can be recreated in viewDidLoad or on demand.
- // For example: self.myOutlet = nil;
-}
-
-
-- (void)dealloc {
- [_acidcowPage release];
- [topic release];
- [dateFormatter release];
- [super dealloc];
-}
-
-
-@end
-
diff --git a/Classes/TopicsViewController.h b/Classes/TopicsViewController.h
index 58acc43..c63635f 100644
--- a/Classes/TopicsViewController.h
+++ b/Classes/TopicsViewController.h
@@ -9,13 +9,13 @@
#import <UIKit/UIKit.h>
#import "XMLParser.h"
#import "HJObjManager.h"
-#import "PicDumpViewController.h"
+//#import "PicDumpViewController.h"
#import "PhotoViewController.h"
@interface TopicsViewController : UITableViewController <XMLParserDelegate>{
UINavigationController *topicsNavigationController;
NSMutableArray *topics;
- PicDumpViewController *picDumpViewController;
+// PicDumpViewController *picDumpViewController;
PhotoViewController *photoViewController;
XMLParser *parser;
HJObjManager* objMan;
@@ -24,7 +24,7 @@
@property (nonatomic, retain, readonly) UINavigationController *topicsNavigationController;
@property (nonatomic, retain) PhotoViewController *photoViewController;
@property (nonatomic, retain) NSMutableArray *topics;
-@property (nonatomic, retain, readonly) PicDumpViewController *picDumpViewController;
+//@property (nonatomic, retain, readonly) PicDumpViewController *picDumpViewController;
@property (nonatomic, retain) XMLParser *parser;
// Called by the ParserChoiceViewController based on the selected parser type.
diff --git a/Classes/TopicsViewController.m b/Classes/TopicsViewController.m
index ab07416..2dfc8c6 100644
--- a/Classes/TopicsViewController.m
+++ b/Classes/TopicsViewController.m
@@ -49,19 +49,19 @@
[self startParsing];
}
-- (UINavigationController *)topicsNavigationController {
- if (topicsNavigationController == nil) {
- topicsNavigationController = [[UINavigationController alloc] initWithRootViewController:self.picDumpViewController];
- }
- return topicsNavigationController;
-}
-
-- (PicDumpViewController *)picDumpViewController {
- if (picDumpViewController == nil) {
- picDumpViewController = [[PicDumpViewController alloc] initWithNibName:@"PicDumpViewController" bundle:nil];
- }
- return picDumpViewController;
-}
+//- (UINavigationController *)topicsNavigationController {
+// if (topicsNavigationController == nil) {
+// topicsNavigationController = [[UINavigationController alloc] initWithRootViewController:self.picDumpViewController];
+// }
+// return topicsNavigationController;
+//}
+//
+//- (PicDumpViewController *)picDumpViewController {
+// if (picDumpViewController == nil) {
+// picDumpViewController = [[PicDumpViewController alloc] initWithNibName:@"PicDumpViewController" bundle:nil];
+// }
+// return picDumpViewController;
+//}
- (PhotoViewController *)photoViewController {
if (photoViewController == nil) {
@@ -70,16 +70,6 @@
return photoViewController;
}
-//- (id)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier {
-//
-// self = [super initWithStyle:style reuseIdentifier:reuseIdentifier];
-// if (self) {
-// // Initialization code.
-// }
-// return self;
-//}
-
-
- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];
@@ -98,7 +88,7 @@
NSLog(@"startParsing");
//self.navigationItem.rightBarButtonItem.enabled = NO;
// Reset the title
- self.title = NSLocalizedString(@"Getting Recent Picdumps...", @"Loading");
+ //self.title = NSLocalizedString(@"Getting Recent Picdumps...", @"Loading");
// Allocate the array for song storage, or empty the results of previous parses
if (topics == nil) {
self.topics = [NSMutableArray array];
@@ -202,7 +192,7 @@
#pragma mark <iTunesRSSParserDelegate> Implementation
- (void)parserDidEndParsingData:(XMLParser *)parser {
- self.title = [NSString stringWithFormat:NSLocalizedString(@"Recent Picdumps (%d)", @"Recent"), [topics count]];
+ //self.title = [NSString stringWithFormat:NSLocalizedString(@"Recent Picdumps (%d)", @"Recent"), [topics count]];
[self.tableView reloadData];
//self.navigationItem.rightBarButtonItem.enabled = YES;
self.parser = nil;
@@ -210,13 +200,14 @@
- (void)parser:(XMLParser *)parser didParseTopics:(NSArray *)parsedTopics {
[topics addObjectsFromArray:parsedTopics];
- // Three scroll view properties are checked to keep the user interface smooth during parse. When new objects are delivered
+
+ // Three scroll view properties are checked to keep the user interface smooth during parse. When new objects are delivered
// by the parser, the table view is reloaded to display them. If the table is reloaded while
// the user is scrolling, this can result in eratic behavior. dragging, tracking, and decelerating can be checked
// for this purpose. When the parser finishes, reloadData will be called in parserDidEndParsingData:, guaranteeing
// that all data will ultimately be displayed even if reloadData is not called in this method because of user interaction.
if (!self.tableView.dragging && !self.tableView.tracking && !self.tableView.decelerating) {
- self.title = [NSString stringWithFormat:NSLocalizedString(@"Recent Picdumps (%d)", @"Recent"), [topics count]];
+ //self.title = [NSString stringWithFormat:NSLocalizedString(@"Recent Picdumps (%d)", @"Recent"), [topics count]];
[self.tableView reloadData];
}
}