From 901729c7eefcc10f27f306fff6170e80fa653ebe Mon Sep 17 00:00:00 2001 From: matt handler Date: Thu, 21 Apr 2011 19:54:47 -0400 Subject: lots of display images, titlebars are badass, defaultstyle changing the button though --- Classes/PhotoViewController.m | 4 +- Classes/TopicsViewController.h | 3 +- Classes/TopicsViewController.m | 23 ++- Default@2x.png | Bin 0 -> 100970 bytes Images/backgroundGradient.png | Bin 0 -> 50920 bytes Images/backgroundGradient@2x.png | Bin 0 -> 92060 bytes Images/titleBarBackground.png | Bin 8841 -> 8836 bytes Images/titleBarBackground@2x.png | Bin 0 -> 22549 bytes Images/titleBarBackgroundBlack.png | Bin 0 -> 7756 bytes Images/titleBarBackgroundBlack@2x.png | Bin 0 -> 19656 bytes MainWindow.xib | 34 +++- PicCast.xcodeproj/handler.mode1v3 | 22 ++- PicCast.xcodeproj/handler.pbxuser | 335 +++++++++++++++++++++++++++++++--- PicCast.xcodeproj/project.pbxproj | 24 +++ TopicsView.xib | 109 ++++++++--- 15 files changed, 473 insertions(+), 81 deletions(-) create mode 100644 Default@2x.png create mode 100644 Images/backgroundGradient.png create mode 100644 Images/backgroundGradient@2x.png create mode 100644 Images/titleBarBackground@2x.png create mode 100644 Images/titleBarBackgroundBlack.png create mode 100644 Images/titleBarBackgroundBlack@2x.png diff --git a/Classes/PhotoViewController.m b/Classes/PhotoViewController.m index fb8931b..5a34670 100644 --- a/Classes/PhotoViewController.m +++ b/Classes/PhotoViewController.m @@ -23,8 +23,8 @@ } - (void)viewWillDisappear:(BOOL)animated { - //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]; + 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/TopicsViewController.h b/Classes/TopicsViewController.h index 631a5d0..fac4e7d 100644 --- a/Classes/TopicsViewController.h +++ b/Classes/TopicsViewController.h @@ -13,7 +13,7 @@ #import "SourcesEditViewController.h" #import "PhotoViewController.h" -@interface TopicsViewController : UITableViewController { +@interface TopicsViewController : UIViewController { UINavigationController *topicsNavigationController; NSMutableArray *topics; // PicDumpViewController *picDumpViewController; @@ -24,6 +24,7 @@ - (IBAction)showSources:(id)sender; +@property (nonatomic, retain) IBOutlet UITableView *tableView; @property (nonatomic, retain, readonly) UINavigationController *topicsNavigationController; @property (nonatomic, retain) PhotoViewController *photoViewController; @property (nonatomic, retain) NSMutableArray *topics; diff --git a/Classes/TopicsViewController.m b/Classes/TopicsViewController.m index 9969962..aa9ab85 100644 --- a/Classes/TopicsViewController.m +++ b/Classes/TopicsViewController.m @@ -20,19 +20,22 @@ @implementation UINavigationBar (CustomImage) - (void)drawRect:(CGRect)rect { -// NSLog(@"titlebar"); -// if (self.barStyle == UIBarStyleDefault) { + //NSLog(@"titlebar: %@", self.barStyle); + if (self.barStyle == UIBarStyleDefault) { UIImage *image = [UIImage imageNamed: @"titleBarBackground.png"]; [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; -// } -// else + } + else { + UIImage *image = [UIImage imageNamed: @"titleBarBackgroundBlack.png"]; + [image drawInRect:CGRectMake(0, 0, self.frame.size.width, self.frame.size.height)]; + } //[super drawRect:rect]; } @end @implementation TopicsViewController -@synthesize topics, parser; +@synthesize topics, parser, tableView; - (void)viewDidLoad { [super viewDidLoad]; @@ -81,6 +84,11 @@ // return picDumpViewController; //} +- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { + // Return the number of rows in the section. + return [topics count]; +} + - (void) sourcesEditViewControllerDidFinish:(SourcesEditViewController *)controller { [self dismissModalViewControllerAnimated:YES]; @@ -136,11 +144,6 @@ [parser start]; } - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [topics count]; -} - //- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath //{ // return 100; diff --git a/Default@2x.png b/Default@2x.png new file mode 100644 index 0000000..e2487e3 Binary files /dev/null and b/Default@2x.png differ diff --git a/Images/backgroundGradient.png b/Images/backgroundGradient.png new file mode 100644 index 0000000..70c81a0 Binary files /dev/null and b/Images/backgroundGradient.png differ diff --git a/Images/backgroundGradient@2x.png b/Images/backgroundGradient@2x.png new file mode 100644 index 0000000..d98cb6e Binary files /dev/null and b/Images/backgroundGradient@2x.png differ diff --git a/Images/titleBarBackground.png b/Images/titleBarBackground.png index 7aa6638..2508b66 100644 Binary files a/Images/titleBarBackground.png and b/Images/titleBarBackground.png differ diff --git a/Images/titleBarBackground@2x.png b/Images/titleBarBackground@2x.png new file mode 100644 index 0000000..5fe481e Binary files /dev/null and b/Images/titleBarBackground@2x.png differ diff --git a/Images/titleBarBackgroundBlack.png b/Images/titleBarBackgroundBlack.png new file mode 100644 index 0000000..d459981 Binary files /dev/null and b/Images/titleBarBackgroundBlack.png differ diff --git a/Images/titleBarBackgroundBlack@2x.png b/Images/titleBarBackgroundBlack@2x.png new file mode 100644 index 0000000..be7eaaf Binary files /dev/null and b/Images/titleBarBackgroundBlack@2x.png differ diff --git a/MainWindow.xib b/MainWindow.xib index d6d157e..828bef8 100644 --- a/MainWindow.xib +++ b/MainWindow.xib @@ -12,7 +12,7 @@ YES - + YES @@ -66,7 +66,7 @@ NO - Cast + PicCasts NSImage PicCastTabBarIcons.feeds.30.png @@ -75,6 +75,7 @@ + TopicsView 1 @@ -103,7 +104,7 @@ - PicCast + PicCasts IBCocoaTouchFramework 1 @@ -508,7 +509,7 @@ TopicsViewController - UITableViewController + UIViewController showSources: id @@ -520,6 +521,17 @@ id + + tableView + UITableView + + + tableView + + tableView + UITableView + + IBProjectSource Classes/TopicsViewController.h @@ -691,6 +703,14 @@ NSObject + + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + UISearchBar UIView @@ -732,11 +752,11 @@ - UITableViewController - UIViewController + UITableView + UIScrollView IBFrameworkSource - UIKit.framework/Headers/UITableViewController.h + UIKit.framework/Headers/UITableView.h diff --git a/PicCast.xcodeproj/handler.mode1v3 b/PicCast.xcodeproj/handler.mode1v3 index 0e086f3..7e6ac94 100644 --- a/PicCast.xcodeproj/handler.mode1v3 +++ b/PicCast.xcodeproj/handler.mode1v3 @@ -216,7 +216,7 @@ _historyCapacity 0 bookmark - 4EBFCB681360EA21005AC5CC + 4EBFCBD51360FA86005AC5CC history 4EBFCB311360E198005AC5CC @@ -313,8 +313,8 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 19 - 2 + 20 + 3 0 @@ -368,7 +368,7 @@ _historyCapacity 0 bookmark - 4EBFCB671360EA21005AC5CC + 4EBFCBD41360FA86005AC5CC history 4E68286F1359595F001EB808 @@ -387,17 +387,17 @@ 4ECFB6E1135F58D2007FAB8D 4ECFB724135F80A7007FAB8D 4ECFB73A135F8619007FAB8D - 4ECFB7C5135FC2FB007FAB8D - 4ECFB863135FD61C007FAB8D - 4ECFB8C4135FDE26007FAB8D 4ECFB8D8135FE005007FAB8D 4ECFB8DE135FE058007FAB8D 4ECFB8F2135FE28C007FAB8D 4ECFB8F3135FE28C007FAB8D - 4EBFCAEB1360D166005AC5CC 4EBFCB481360E786005AC5CC 4EBFCB601360E9E1005AC5CC - 4EBFCB611360E9E1005AC5CC + 4EBFCB791360F428005AC5CC + 4EBFCB7A1360F428005AC5CC + 4EBFCBD11360FA86005AC5CC + 4EBFCBD21360FA86005AC5CC + 4EBFCBD31360FA86005AC5CC SplitCount @@ -625,7 +625,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + TopicsViewController.m StatusBarVisibility @@ -642,6 +642,8 @@ 262pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID diff --git a/PicCast.xcodeproj/handler.pbxuser b/PicCast.xcodeproj/handler.pbxuser index d2b0f47..d64b5c5 100644 --- a/PicCast.xcodeproj/handler.pbxuser +++ b/PicCast.xcodeproj/handler.pbxuser @@ -35,9 +35,9 @@ }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Release; + activeBuildConfigurationName = Debug; activeExecutable = 4E6827B513593BAE001EB808 /* acidcow */; - activeSDKPreference = iphoneos4.2; + activeSDKPreference = iphonesimulator4.2; activeTarget = 1D6058900D05DD3D006BFB54 /* PicCast */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* PicCast */, @@ -132,6 +132,30 @@ 4EBFCB631360E9E1005AC5CC /* PlistBookmark */ = 4EBFCB631360E9E1005AC5CC /* PlistBookmark */; 4EBFCB671360EA21005AC5CC /* PBXTextBookmark */ = 4EBFCB671360EA21005AC5CC /* PBXTextBookmark */; 4EBFCB681360EA21005AC5CC /* PlistBookmark */ = 4EBFCB681360EA21005AC5CC /* PlistBookmark */; + 4EBFCB741360F40E005AC5CC /* XCBuildMessageTextBookmark */ = 4EBFCB741360F40E005AC5CC /* XCBuildMessageTextBookmark */; + 4EBFCB751360F40E005AC5CC /* PBXTextBookmark */ = 4EBFCB751360F40E005AC5CC /* PBXTextBookmark */; + 4EBFCB781360F428005AC5CC /* PBXTextBookmark */ = 4EBFCB781360F428005AC5CC /* PBXTextBookmark */; + 4EBFCB791360F428005AC5CC /* PBXTextBookmark */ = 4EBFCB791360F428005AC5CC /* PBXTextBookmark */; + 4EBFCB7A1360F428005AC5CC /* PBXTextBookmark */ = 4EBFCB7A1360F428005AC5CC /* PBXTextBookmark */; + 4EBFCB7B1360F428005AC5CC /* PBXTextBookmark */ = 4EBFCB7B1360F428005AC5CC /* PBXTextBookmark */; + 4EBFCB7C1360F428005AC5CC /* PBXTextBookmark */ = 4EBFCB7C1360F428005AC5CC /* PBXTextBookmark */; + 4EBFCB7D1360F428005AC5CC /* PlistBookmark */ = 4EBFCB7D1360F428005AC5CC /* PlistBookmark */; + 4EBFCB8B1360F5C9005AC5CC /* PBXTextBookmark */ = 4EBFCB8B1360F5C9005AC5CC /* PBXTextBookmark */; + 4EBFCB8C1360F5C9005AC5CC /* PlistBookmark */ = 4EBFCB8C1360F5C9005AC5CC /* PlistBookmark */; + 4EBFCBA31360F629005AC5CC /* PBXTextBookmark */ = 4EBFCBA31360F629005AC5CC /* PBXTextBookmark */; + 4EBFCBA41360F629005AC5CC /* PlistBookmark */ = 4EBFCBA41360F629005AC5CC /* PlistBookmark */; + 4EBFCBC01360F9A9005AC5CC /* PBXTextBookmark */ = 4EBFCBC01360F9A9005AC5CC /* PBXTextBookmark */; + 4EBFCBC11360F9A9005AC5CC /* PBXTextBookmark */ = 4EBFCBC11360F9A9005AC5CC /* PBXTextBookmark */; + 4EBFCBC21360F9A9005AC5CC /* PlistBookmark */ = 4EBFCBC21360F9A9005AC5CC /* PlistBookmark */; + 4EBFCBC61360FA03005AC5CC /* PBXTextBookmark */ = 4EBFCBC61360FA03005AC5CC /* PBXTextBookmark */; + 4EBFCBC71360FA03005AC5CC /* PlistBookmark */ = 4EBFCBC71360FA03005AC5CC /* PlistBookmark */; + 4EBFCBCC1360FA4B005AC5CC /* PBXTextBookmark */ = 4EBFCBCC1360FA4B005AC5CC /* PBXTextBookmark */; + 4EBFCBCD1360FA4B005AC5CC /* PlistBookmark */ = 4EBFCBCD1360FA4B005AC5CC /* PlistBookmark */; + 4EBFCBD11360FA86005AC5CC /* PBXTextBookmark */ = 4EBFCBD11360FA86005AC5CC /* PBXTextBookmark */; + 4EBFCBD21360FA86005AC5CC /* PBXTextBookmark */ = 4EBFCBD21360FA86005AC5CC /* PBXTextBookmark */; + 4EBFCBD31360FA86005AC5CC /* PBXTextBookmark */ = 4EBFCBD31360FA86005AC5CC /* PBXTextBookmark */; + 4EBFCBD41360FA86005AC5CC /* PBXTextBookmark */ = 4EBFCBD41360FA86005AC5CC /* PBXTextBookmark */; + 4EBFCBD51360FA86005AC5CC /* PlistBookmark */ = 4EBFCBD51360FA86005AC5CC /* PlistBookmark */; 4ECFB6E1135F58D2007FAB8D = 4ECFB6E1135F58D2007FAB8D /* PBXTextBookmark */; 4ECFB724135F80A7007FAB8D = 4ECFB724135F80A7007FAB8D /* PBXBookmark */; 4ECFB73A135F8619007FAB8D = 4ECFB73A135F8619007FAB8D /* PBXTextBookmark */; @@ -217,18 +241,18 @@ }; 4E6827E713594115001EB808 /* TopicsViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 600}}"; - sepNavSelRange = "{687, 0}"; - sepNavVisRange = "{0, 1164}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 494}}"; + sepNavSelRange = "{781, 0}"; + sepNavVisRange = "{0, 1239}"; sepNavWindowFrame = "{{15, 323}, {1196, 550}}"; }; }; 4E6827E813594115001EB808 /* TopicsViewController.m */ = { uiCtxt = { - sepNavFolds = "{\n c = (\n {\n l = \"number of sections\";\n r = \"{10569, 22}\";\n s = 1;\n },\n {\n l = \"number of rows in section\";\n r = \"{10760, 29}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{12926, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{12977, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{13027, 12}\";\n s = 1;\n }\n );\n r = \"{0, 13833}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {1272, 5187}}"; - sepNavSelRange = "{2231, 0}"; - sepNavVisRange = "{1156, 1540}"; + sepNavFolds = "{\n c = (\n {\n l = \"number of sections\";\n r = \"{10816, 22}\";\n s = 1;\n },\n {\n l = \"number of rows in section\";\n r = \"{11007, 29}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{13173, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{13224, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{13274, 12}\";\n s = 1;\n }\n );\n r = \"{0, 14080}\";\n s = 0;\n}"; + sepNavIntBoundsRect = "{{0, 0}, {1272, 5369}}"; + sepNavSelRange = "{606, 0}"; + sepNavVisRange = "{403, 1210}"; sepNavWindowFrame = "{{15, 323}, {1196, 550}}"; }; }; @@ -338,9 +362,9 @@ }; 4EA95FD4135CE959009243EE /* PhotoViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {901, 2210}}"; - sepNavSelRange = "{653, 0}"; - sepNavVisRange = "{242, 603}"; + sepNavIntBoundsRect = "{{0, 0}, {915, 2132}}"; + sepNavSelRange = "{532, 0}"; + sepNavVisRange = "{147, 698}"; }; }; 4EA96020135CF43B009243EE /* PBXTextBookmark */ = { @@ -388,7 +412,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 24"; rLen = 0; - rLoc = 792; + rLoc = 972; rType = 0; vrLen = 1845; vrLoc = 30; @@ -438,7 +462,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 27"; rLen = 0; - rLoc = 792; + rLoc = 972; rType = 0; vrLen = 830; vrLoc = 30; @@ -486,7 +510,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 29"; rLen = 0; - rLoc = 770; + rLoc = 950; rType = 0; vrLen = 831; vrLoc = 42; @@ -534,7 +558,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 26"; rLen = 0; - rLoc = 671; + rLoc = 688; rType = 0; vrLen = 841; vrLoc = 30; @@ -566,7 +590,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 25"; rLen = 48; - rLoc = 612; + rLoc = 629; rType = 0; vrLen = 840; vrLoc = 30; @@ -576,7 +600,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 41"; rLen = 0; - rLoc = 975; + rLoc = 1166; rType = 0; vrLen = 1590; vrLoc = 443; @@ -598,7 +622,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 25"; rLen = 50; - rLoc = 612; + rLoc = 629; rType = 0; vrLen = 1457; vrLoc = 491; @@ -650,7 +674,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 25"; rLen = 50; - rLoc = 612; + rLoc = 629; rType = 0; vrLen = 1457; vrLoc = 491; @@ -660,7 +684,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 62"; rLen = 0; - rLoc = 2199; + rLoc = 2390; rType = 0; vrLen = 1707; vrLoc = 942; @@ -682,7 +706,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 62"; rLen = 0; - rLoc = 2199; + rLoc = 2390; rType = 0; vrLen = 1540; vrLoc = 1156; @@ -699,6 +723,259 @@ rLen = 0; rLoc = 9223372036854775807; }; + 4EBFCB741360F40E005AC5CC /* XCBuildMessageTextBookmark */ = { + isa = PBXTextBookmark; + comments = "Redefinition of '-[TopicsViewController tableView:numberOfRowsInSection:]'"; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + fallbackIsa = XCBuildMessageTextBookmark; + rLen = 0; + rLoc = 144; + rType = 1; + }; + 4EBFCB751360F40E005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 145"; + rLen = 0; + rLoc = 5200; + rType = 0; + vrLen = 661; + vrLoc = 3145; + }; + 4EBFCB781360F428005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */; + name = "SourcesEditViewController.m: 81"; + rLen = 156; + rLoc = 1931; + rType = 0; + vrLen = 984; + vrLoc = 3; + }; + 4EBFCB791360F428005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ECFB7D4135FC4B0007FAB8D /* SourcesEditViewController.h */; + name = "SourcesEditViewController.h: 18"; + rLen = 62; + rLoc = 439; + rType = 0; + vrLen = 680; + vrLoc = 0; + }; + 4EBFCB7A1360F428005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E713594115001EB808 /* TopicsViewController.h */; + name = "TopicsViewController.h: 27"; + rLen = 0; + rLoc = 781; + rType = 0; + vrLen = 1239; + vrLoc = 0; + }; + 4EBFCB7B1360F428005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 35"; + rLen = 0; + rLoc = 1059; + rType = 0; + vrLen = 1558; + vrLoc = 525; + }; + 4EBFCB7C1360F428005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 142"; + rLen = 0; + rLoc = 5200; + rType = 0; + vrLen = 1125; + vrLoc = 4589; + }; + 4EBFCB7D1360F428005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 4EBFCB8B1360F5C9005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 86"; + rLen = 0; + rLoc = 3323; + rType = 0; + vrLen = 1077; + vrLoc = 2978; + }; + 4EBFCB8C1360F5C9005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 4EBFCBA31360F629005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 89"; + rLen = 0; + rLoc = 3385; + rType = 0; + vrLen = 1005; + vrLoc = 3118; + }; + 4EBFCBA41360F629005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 4EBFCBC01360F9A9005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 89"; + rLen = 0; + rLoc = 3385; + rType = 0; + vrLen = 1005; + vrLoc = 3118; + }; + 4EBFCBC11360F9A9005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 29"; + rLen = 0; + rLoc = 846; + rType = 0; + vrLen = 1217; + vrLoc = 443; + }; + 4EBFCBC21360F9A9005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 4EBFCBC61360FA03005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 23"; + rLen = 0; + rLoc = 564; + rType = 0; + vrLen = 1234; + vrLoc = 443; + }; + 4EBFCBC71360FA03005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 4EBFCBCC1360FA4B005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 24"; + rLen = 0; + rLoc = 606; + rType = 0; + vrLen = 1301; + vrLoc = 443; + }; + 4EBFCBCD1360FA4B005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 4EBFCBD11360FA86005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */; + name = "SourcesEditViewController.m: 81"; + rLen = 156; + rLoc = 1931; + rType = 0; + vrLen = 894; + vrLoc = 93; + }; + 4EBFCBD21360FA86005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4EA95FD4135CE959009243EE /* PhotoViewController.m */; + name = "PhotoViewController.m: 27"; + rLen = 0; + rLoc = 532; + rType = 0; + vrLen = 698; + vrLoc = 147; + }; + 4EBFCBD31360FA86005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 24"; + rLen = 0; + rLoc = 606; + rType = 0; + vrLen = 1096; + vrLoc = 403; + }; + 4EBFCBD41360FA86005AC5CC /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; + name = "TopicsViewController.m: 24"; + rLen = 0; + rLoc = 606; + rType = 0; + vrLen = 1210; + vrLoc = 403; + }; + 4EBFCBD51360FA86005AC5CC /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* PicCast-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/handler/Documents/code/xCode/PicCast/PicCast-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; 4ECFB6E1135F58D2007FAB8D /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4E6829F113597AF1001EB808 /* AsyncImageView.m */; @@ -735,17 +1012,17 @@ }; 4ECFB7D4135FC4B0007FAB8D /* SourcesEditViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {903, 600}}"; - sepNavSelRange = "{303, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 444}}"; + sepNavSelRange = "{439, 62}"; sepNavVisRange = "{0, 680}"; }; }; 4ECFB7D5135FC4B0007FAB8D /* SourcesEditViewController.m */ = { uiCtxt = { sepNavFolds = "{\n c = (\n {\n l = DetailViewController;\n r = \"{4775, 24}\";\n s = 1;\n },\n {\n l = DetailViewController;\n r = \"{4826, 24}\";\n s = 1;\n },\n {\n l = \"Nib name\";\n r = \"{4876, 12}\";\n s = 1;\n }\n );\n r = \"{0, 5577}\";\n s = 0;\n}"; - sepNavIntBoundsRect = "{{0, 0}, {1048, 2444}}"; - sepNavSelRange = "{5046, 0}"; - sepNavVisRange = "{3963, 1504}"; + sepNavIntBoundsRect = "{{0, 0}, {903, 2639}}"; + sepNavSelRange = "{1931, 156}"; + sepNavVisRange = "{93, 894}"; }; }; 4ECFB7D9135FC76F007FAB8D /* PBXTextBookmark */ = { @@ -777,7 +1054,7 @@ fRef = 4E6827E713594115001EB808 /* TopicsViewController.h */; name = "TopicsViewController.h: 25"; rLen = 0; - rLoc = 687; + rLoc = 705; rType = 0; vrLen = 1164; vrLoc = 0; @@ -787,7 +1064,7 @@ fRef = 4E6827E813594115001EB808 /* TopicsViewController.m */; name = "TopicsViewController.m: 28"; rLen = 33; - rLoc = 942; + rLoc = 1133; rType = 0; vrLen = 1819; vrLoc = 45; diff --git a/PicCast.xcodeproj/project.pbxproj b/PicCast.xcodeproj/project.pbxproj index 25cbf2c..e615bb9 100644 --- a/PicCast.xcodeproj/project.pbxproj +++ b/PicCast.xcodeproj/project.pbxproj @@ -37,6 +37,12 @@ 4EBFCAD51360D12C005AC5CC /* titleBarBackground.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCAD41360D12C005AC5CC /* titleBarBackground.png */; }; 4EBFCB0B1360DDB5005AC5CC /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCB0A1360DDB5005AC5CC /* Default.png */; }; 4EBFCB261360E0D2005AC5CC /* PicCast.512.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCB251360E0D2005AC5CC /* PicCast.512.png */; }; + 4EBFCBAD1360F8FE005AC5CC /* titleBarBackgroundBlack@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBA81360F8FE005AC5CC /* titleBarBackgroundBlack@2x.png */; }; + 4EBFCBAE1360F8FE005AC5CC /* titleBarBackgroundBlack.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBA91360F8FE005AC5CC /* titleBarBackgroundBlack.png */; }; + 4EBFCBAF1360F8FE005AC5CC /* titleBarBackground@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBAA1360F8FE005AC5CC /* titleBarBackground@2x.png */; }; + 4EBFCBB01360F8FE005AC5CC /* backgroundGradient@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBAB1360F8FE005AC5CC /* backgroundGradient@2x.png */; }; + 4EBFCBB11360F8FE005AC5CC /* backgroundGradient.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBAC1360F8FE005AC5CC /* backgroundGradient.png */; }; + 4EBFCBBD1360F90A005AC5CC /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 4EBFCBBC1360F90A005AC5CC /* Default@2x.png */; }; 4ECFB6D2135F5807007FAB8D /* AcidCowFeedburnerParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 4ECFB6D0135F5807007FAB8D /* AcidCowFeedburnerParser.m */; }; 4ECFB6E9135F6FDB007FAB8D /* PicCast.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFB6E8135F6FDB007FAB8D /* PicCast.png */; }; 4ECFB758135F8869007FAB8D /* PicCastTabBarIcons.category.30.png in Resources */ = {isa = PBXBuildFile; fileRef = 4ECFB752135F8869007FAB8D /* PicCastTabBarIcons.category.30.png */; }; @@ -254,6 +260,12 @@ 4EBFCAD41360D12C005AC5CC /* titleBarBackground.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = titleBarBackground.png; sourceTree = ""; }; 4EBFCB0A1360DDB5005AC5CC /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = ""; }; 4EBFCB251360E0D2005AC5CC /* PicCast.512.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PicCast.512.png; sourceTree = SOURCE_ROOT; }; + 4EBFCBA81360F8FE005AC5CC /* titleBarBackgroundBlack@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titleBarBackgroundBlack@2x.png"; sourceTree = ""; }; + 4EBFCBA91360F8FE005AC5CC /* titleBarBackgroundBlack.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = titleBarBackgroundBlack.png; sourceTree = ""; }; + 4EBFCBAA1360F8FE005AC5CC /* titleBarBackground@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "titleBarBackground@2x.png"; sourceTree = ""; }; + 4EBFCBAB1360F8FE005AC5CC /* backgroundGradient@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "backgroundGradient@2x.png"; sourceTree = ""; }; + 4EBFCBAC1360F8FE005AC5CC /* backgroundGradient.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = backgroundGradient.png; sourceTree = ""; }; + 4EBFCBBC1360F90A005AC5CC /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = ""; }; 4ECFB6D0135F5807007FAB8D /* AcidCowFeedburnerParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AcidCowFeedburnerParser.m; sourceTree = ""; }; 4ECFB6D1135F5807007FAB8D /* AcidCowFeedburnerParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AcidCowFeedburnerParser.h; sourceTree = ""; }; 4ECFB6E8135F6FDB007FAB8D /* PicCast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = PicCast.png; sourceTree = ""; }; @@ -354,6 +366,7 @@ 29B97314FDCFA39411CA2CEA /* PicCast */ = { isa = PBXGroup; children = ( + 4EBFCBBC1360F90A005AC5CC /* Default@2x.png */, 4EBFCB0A1360DDB5005AC5CC /* Default.png */, 080E96DDFE201D6D7F000001 /* Classes */, 4ECFB751135F8869007FAB8D /* Images */, @@ -496,6 +509,11 @@ 4ECFB751135F8869007FAB8D /* Images */ = { isa = PBXGroup; children = ( + 4EBFCBA81360F8FE005AC5CC /* titleBarBackgroundBlack@2x.png */, + 4EBFCBA91360F8FE005AC5CC /* titleBarBackgroundBlack.png */, + 4EBFCBAA1360F8FE005AC5CC /* titleBarBackground@2x.png */, + 4EBFCBAB1360F8FE005AC5CC /* backgroundGradient@2x.png */, + 4EBFCBAC1360F8FE005AC5CC /* backgroundGradient.png */, 4EBFCB251360E0D2005AC5CC /* PicCast.512.png */, 4EBFCAD41360D12C005AC5CC /* titleBarBackground.png */, 4ECFB752135F8869007FAB8D /* PicCastTabBarIcons.category.30.png */, @@ -753,6 +771,12 @@ 4EBFCAD51360D12C005AC5CC /* titleBarBackground.png in Resources */, 4EBFCB0B1360DDB5005AC5CC /* Default.png in Resources */, 4EBFCB261360E0D2005AC5CC /* PicCast.512.png in Resources */, + 4EBFCBAD1360F8FE005AC5CC /* titleBarBackgroundBlack@2x.png in Resources */, + 4EBFCBAE1360F8FE005AC5CC /* titleBarBackgroundBlack.png in Resources */, + 4EBFCBAF1360F8FE005AC5CC /* titleBarBackground@2x.png in Resources */, + 4EBFCBB01360F8FE005AC5CC /* backgroundGradient@2x.png in Resources */, + 4EBFCBB11360F8FE005AC5CC /* backgroundGradient.png in Resources */, + 4EBFCBBD1360F90A005AC5CC /* Default@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/TopicsView.xib b/TopicsView.xib index a3b943f..ca3d1fd 100644 --- a/TopicsView.xib +++ b/TopicsView.xib @@ -42,10 +42,22 @@ 274 YES + + + 292 + {320, 480} + + NO + IBCocoaTouchFramework + + NSImage + backgroundGradient.png + + 274 - {320, 319} + {320, 431} 3 @@ -61,27 +73,46 @@ 22 - {320, 367} + {320, 431} - - - NO - - IBCocoaTouchFramework YES + + + tableView + + + + 15 + view - 3 + 16 + + + + delegate + + + + 18 + + + + dataSource + + + + 19 @@ -99,6 +130,7 @@ YES + @@ -121,6 +153,11 @@ + + 20 + + + @@ -133,17 +170,19 @@ 1.IBPluginDependency 12.IBPluginDependency 12.IBViewBoundsToFrameTransform + 20.IBPluginDependency + 20.IBViewBoundsToFrameTransform YES TopicsViewController UIResponder - {{480, 355}, {320, 480}} + {{480, 404}, {320, 431}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw8+AAA - + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + @@ -162,14 +201,36 @@ - 14 + 20 YES TopicsViewController - UITableViewController + UIViewController + + showSources: + id + + + showSources: + + showSources: + id + + + + tableView + UITableView + + + tableView + + tableView + UITableView + + IBProjectSource Classes/TopicsViewController.h @@ -283,6 +344,14 @@ UIKit.framework/Headers/UIResponder.h + + UIImageView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIImageView.h + + UIResponder NSObject @@ -320,14 +389,6 @@ UIKit.framework/Headers/UITableView.h - - UITableViewController - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITableViewController.h - - UIView @@ -401,6 +462,10 @@ YES PicCast.xcodeproj 3 + + backgroundGradient.png + {320, 480} + 132 -- cgit v1.2.3