diff --git a/5by5Browser.xcodeproj/project.pbxproj b/5by5Browser.xcodeproj/project.pbxproj index 8f6b285..d5fe9de 100644 --- a/5by5Browser.xcodeproj/project.pbxproj +++ b/5by5Browser.xcodeproj/project.pbxproj @@ -9,8 +9,8 @@ /* Begin PBXBuildFile section */ 7B043E87149D6984004B52E8 /* back.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E83149D6984004B52E8 /* back.png */; }; 7B043E88149D6984004B52E8 /* back@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E84149D6984004B52E8 /* back@2x.png */; }; - 7B043E89149D6984004B52E8 /* forw.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E85149D6984004B52E8 /* forw.png */; }; - 7B043E8A149D6984004B52E8 /* forw@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E86149D6984004B52E8 /* forw@2x.png */; }; + 7B043E89149D6984004B52E8 /* forward.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E85149D6984004B52E8 /* forward.png */; }; + 7B043E8A149D6984004B52E8 /* forward@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E86149D6984004B52E8 /* forward@2x.png */; }; 7B043E8E149D6FA0004B52E8 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E8C149D6FA0004B52E8 /* icon.png */; }; 7B043E8F149D6FA0004B52E8 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7B043E8D149D6FA0004B52E8 /* icon@2x.png */; }; 7B1A6ECF149D140600FC5105 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7B1A6ECE149D140600FC5105 /* UIKit.framework */; }; @@ -62,8 +62,8 @@ /* Begin PBXFileReference section */ 7B043E83149D6984004B52E8 /* back.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = back.png; sourceTree = ""; }; 7B043E84149D6984004B52E8 /* back@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "back@2x.png"; sourceTree = ""; }; - 7B043E85149D6984004B52E8 /* forw.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forw.png; sourceTree = ""; }; - 7B043E86149D6984004B52E8 /* forw@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "forw@2x.png"; sourceTree = ""; }; + 7B043E85149D6984004B52E8 /* forward.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = forward.png; sourceTree = ""; }; + 7B043E86149D6984004B52E8 /* forward@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "forward@2x.png"; sourceTree = ""; }; 7B043E8C149D6FA0004B52E8 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = icon.png; sourceTree = ""; }; 7B043E8D149D6FA0004B52E8 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon@2x.png"; sourceTree = ""; }; 7B1A6ECA149D140600FC5105 /* 5by5Browser.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = 5by5Browser.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -204,8 +204,8 @@ 7B043E8D149D6FA0004B52E8 /* icon@2x.png */, 7B043E83149D6984004B52E8 /* back.png */, 7B043E84149D6984004B52E8 /* back@2x.png */, - 7B043E85149D6984004B52E8 /* forw.png */, - 7B043E86149D6984004B52E8 /* forw@2x.png */, + 7B043E85149D6984004B52E8 /* forward.png */, + 7B043E86149D6984004B52E8 /* forward@2x.png */, 7B1A6ED6149D140600FC5105 /* 5by5Browser-Info.plist */, 7B1A6ED7149D140600FC5105 /* InfoPlist.strings */, 7B1A6EDA149D140600FC5105 /* main.m */, @@ -347,8 +347,8 @@ 7B868952149D5C6F00F3A2C6 /* ShowViewController_iPhone.xib in Resources */, 7B043E87149D6984004B52E8 /* back.png in Resources */, 7B043E88149D6984004B52E8 /* back@2x.png in Resources */, - 7B043E89149D6984004B52E8 /* forw.png in Resources */, - 7B043E8A149D6984004B52E8 /* forw@2x.png in Resources */, + 7B043E89149D6984004B52E8 /* forward.png in Resources */, + 7B043E8A149D6984004B52E8 /* forward@2x.png in Resources */, 7B043E8E149D6FA0004B52E8 /* icon.png in Resources */, 7B043E8F149D6FA0004B52E8 /* icon@2x.png in Resources */, ); diff --git a/5by5Browser.xcodeproj/project.xcworkspace/xcuserdata/sjs.xcuserdatad/UserInterfaceState.xcuserstate b/5by5Browser.xcodeproj/project.xcworkspace/xcuserdata/sjs.xcuserdatad/UserInterfaceState.xcuserstate index 686b48d..156a4e8 100644 Binary files a/5by5Browser.xcodeproj/project.xcworkspace/xcuserdata/sjs.xcuserdatad/UserInterfaceState.xcuserstate and b/5by5Browser.xcodeproj/project.xcworkspace/xcuserdata/sjs.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/5by5Browser/SSAppDelegate.m b/5by5Browser/SSAppDelegate.m index bec0a9d..60bbed7 100644 --- a/5by5Browser/SSAppDelegate.m +++ b/5by5Browser/SSAppDelegate.m @@ -9,6 +9,7 @@ #import "SSAppDelegate.h" #import "SSMasterViewController.h" #import "SSDetailViewController.h" +#import "ShowViewController.h" #import "FiveByFive.h" #import "Show.h" @@ -33,7 +34,13 @@ // Override point for customization after application launch. if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { SSMasterViewController *masterViewController = [[SSMasterViewController alloc] initWithNibName:@"SSMasterViewController_iPhone" bundle:nil]; + ShowViewController *showViewController = [[ShowViewController alloc] initWithNibName: @"ShowViewController_iPhone" bundle: nil]; + SSDetailViewController *detailViewController = [[SSDetailViewController alloc] initWithNibName:@"SSDetailViewController_iPhone" bundle:nil]; + masterViewController.fiveByFive = fiveByFive; + masterViewController.showViewController = showViewController; + showViewController.detailViewController = detailViewController; + self.navigationController = [[UINavigationController alloc] initWithRootViewController:masterViewController]; [self.navigationController.navigationBar setTintColor: [UIColor colorWithWhite: 0.3 alpha: 1.0]]; self.window.rootViewController = self.navigationController; @@ -41,17 +48,22 @@ SSMasterViewController *masterViewController = [[SSMasterViewController alloc] initWithNibName:@"SSMasterViewController_iPad" bundle:nil]; UINavigationController *masterNavigationController = [[UINavigationController alloc] initWithRootViewController:masterViewController]; [masterNavigationController.navigationBar setTintColor: [UIColor colorWithWhite: 0.3 alpha: 1.0]]; - + + ShowViewController *showViewController = [[ShowViewController alloc] initWithNibName: @"ShowViewController_iPad" bundle: nil]; + SSDetailViewController *detailViewController = [[SSDetailViewController alloc] initWithNibName:@"SSDetailViewController_iPad" bundle:nil]; UINavigationController *detailNavigationController = [[UINavigationController alloc] initWithRootViewController:detailViewController]; [detailNavigationController.navigationBar setTintColor: [UIColor colorWithWhite: 0.3 alpha: 1.0]]; - + masterViewController.fiveByFive = fiveByFive; - + masterViewController.showViewController = showViewController; + showViewController.detailViewController = detailViewController; + [detailNavigationController setNavigationBarHidden: YES]; + self.splitViewController = [[UISplitViewController alloc] init]; self.splitViewController.delegate = detailViewController; self.splitViewController.viewControllers = [NSArray arrayWithObjects:masterNavigationController, detailNavigationController, nil]; - + self.window.rootViewController = self.splitViewController; } [self.window makeKeyAndVisible]; diff --git a/5by5Browser/SSDetailViewController.h b/5by5Browser/SSDetailViewController.h index 2464b0b..2d5d6ac 100644 --- a/5by5Browser/SSDetailViewController.h +++ b/5by5Browser/SSDetailViewController.h @@ -12,7 +12,6 @@ @interface SSDetailViewController : UIViewController @property (strong, nonatomic) Episode *episode; -@property (strong, nonatomic) IBOutlet UILabel *detailDescriptionLabel; @property (strong, nonatomic) IBOutlet UIWebView *webView; @property (strong, nonatomic) IBOutlet UIToolbar *toolbar; @property (strong, nonatomic) IBOutlet UIBarButtonItem *backButton; diff --git a/5by5Browser/SSDetailViewController.m b/5by5Browser/SSDetailViewController.m index 233afc4..75da914 100644 --- a/5by5Browser/SSDetailViewController.m +++ b/5by5Browser/SSDetailViewController.m @@ -12,14 +12,16 @@ #import "UIAlertView+marshmallows.h" @interface SSDetailViewController () +{ + UIBarButtonItem *_showsButton; +} @property (strong, nonatomic) UIPopoverController *masterPopoverController; -- (void)configureView; +- (void) configureView; @end @implementation SSDetailViewController @synthesize episode = _episode; -@synthesize detailDescriptionLabel = _detailDescriptionLabel; @synthesize webView = _webView; @synthesize toolbar = _toolbar; @synthesize backButton = _backButton; @@ -48,15 +50,24 @@ { if (self.episode) { self.title = self.episode.name; - self.detailDescriptionLabel.text = self.episode.name; - [self goHome: nil]; } + else { + self.title = @"5by5"; + } + [self goHome: nil]; } - (void)viewDidLoad { [super viewDidLoad]; [self configureView]; + + if (_showsButton) { + NSMutableArray *items = [[self.toolbar items] mutableCopy]; + [items insertObject: _showsButton atIndex: 0]; + [self.toolbar setItems: items animated: YES]; + _showsButton = nil; + } } - (void)viewDidUnload @@ -68,8 +79,6 @@ [self setToolbar:nil]; [self setLoadingView:nil]; [super viewDidUnload]; - // Release any retained subviews of the main view. - self.detailDescriptionLabel = nil; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation @@ -99,7 +108,12 @@ - (IBAction) goHome: (id)sender { - [self.webView loadRequest: [NSURLRequest requestWithURL: self.episode.url]]; + if (self.episode) { + [self.webView loadRequest: [NSURLRequest requestWithURL: self.episode.url]]; + } + else { + [self.webView loadRequest: [NSURLRequest requestWithURL: [NSURL URLWithString: @"http://5by5.tv"]]]; + } } - (IBAction) sendToInstapaper: (id)sender @@ -129,17 +143,30 @@ #pragma mark - Split view -- (void)splitViewController:(UISplitViewController *)splitController willHideViewController:(UIViewController *)viewController withBarButtonItem:(UIBarButtonItem *)barButtonItem forPopoverController:(UIPopoverController *)popoverController +- (void) splitViewController: (UISplitViewController *)splitController + willHideViewController: (UIViewController *)viewController + withBarButtonItem: (UIBarButtonItem *)barButtonItem + forPopoverController: (UIPopoverController *)popoverController { - barButtonItem.title = @"Shows"; - [self.navigationItem setLeftBarButtonItem:barButtonItem animated:YES]; + if (self.toolbar) { + NSMutableArray *items = [[self.toolbar items] mutableCopy]; + [items insertObject: barButtonItem atIndex: 0]; + [self.toolbar setItems: items animated: YES]; + } + else { + _showsButton = barButtonItem; + } self.masterPopoverController = popoverController; } -- (void)splitViewController:(UISplitViewController *)splitController willShowViewController:(UIViewController *)viewController invalidatingBarButtonItem:(UIBarButtonItem *)barButtonItem +- (void) splitViewController: (UISplitViewController *)splitController + willShowViewController: (UIViewController *)viewController + invalidatingBarButtonItem: (UIBarButtonItem *)barButtonItem { // Called when the view is shown again in the split view, invalidating the button and popover controller. - [self.navigationItem setLeftBarButtonItem:nil animated:YES]; + NSMutableArray *items = [[self.toolbar items] mutableCopy]; + [items removeObject: barButtonItem]; + [self.toolbar setItems: items animated: YES]; self.masterPopoverController = nil; } diff --git a/5by5Browser/SSMasterViewController.h b/5by5Browser/SSMasterViewController.h index 27646ec..e4d98be 100644 --- a/5by5Browser/SSMasterViewController.h +++ b/5by5Browser/SSMasterViewController.h @@ -7,11 +7,13 @@ // #import +#import "ShowViewController.h" #import "FiveByFive.h" #import "Show.h" @interface SSMasterViewController : UITableViewController @property (nonatomic, retain) FiveByFive *fiveByFive; +@property (nonatomic, retain) ShowViewController *showViewController; @end diff --git a/5by5Browser/SSMasterViewController.m b/5by5Browser/SSMasterViewController.m index 6ade02b..4ee6da3 100644 --- a/5by5Browser/SSMasterViewController.m +++ b/5by5Browser/SSMasterViewController.m @@ -7,37 +7,25 @@ // #import "SSMasterViewController.h" -#import "ShowViewController.h" #import "Show.h" @implementation SSMasterViewController +@synthesize showViewController = _showViewController; @synthesize fiveByFive = _fiveByFive; - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { - self.title = @"5by5 Shows"; + self.title = @"Shows"; if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { - self.clearsSelectionOnViewWillAppear = NO; self.contentSizeForViewInPopover = CGSizeMake(320.0, 600.0); } } return self; } -- (void)viewDidLoad -{ - [super viewDidLoad]; -} - -- (void)viewDidUnload -{ - [super viewDidUnload]; - // Release any retained subviews of the main view. -} - - (void) viewWillAppear: (BOOL)animated { [super viewWillAppear: animated]; @@ -45,12 +33,7 @@ for (int i = 0; i < [self tableView: self.tableView numberOfRowsInSection: 0]; ++i) { UITableViewCell *cell = [self.tableView cellForRowAtIndexPath: [NSIndexPath indexPathForRow: i inSection: 0]]; cell.accessoryView = nil; - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - } - else { - cell.accessoryType = UITableViewCellAccessoryNone; - } + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; } } @@ -91,12 +74,7 @@ cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleDefault reuseIdentifier:CellIdentifier]; } - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { - cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; - } - else { - cell.accessoryType = UITableViewCellAccessoryNone; - } + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; Show *show = [self.fiveByFive.shows objectAtIndex: indexPath.row]; show.delegate = self; @@ -114,15 +92,8 @@ - (void) gotEpisodesForShow: (Show *)show { - ShowViewController *vc; - if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { - vc = [[ShowViewController alloc] initWithNibName: @"ShowViewController_iPhone" bundle: nil]; - } - else { - vc = [[ShowViewController alloc] initWithNibName: @"ShowViewController_iPad" bundle: nil]; - } - vc.show = show; - [self.navigationController pushViewController: vc animated:YES]; + self.showViewController.show = show; + [self.navigationController pushViewController: self.showViewController animated: YES]; } @end diff --git a/5by5Browser/Show.m b/5by5Browser/Show.m index 0b738c2..3dfb145 100644 --- a/5by5Browser/Show.m +++ b/5by5Browser/Show.m @@ -68,18 +68,17 @@ - (void) feedParserDidStart: (MWFeedParser *)parser { - NSLog(@"feed parser started"); +// NSLog(@"feed parser started"); } - (void) feedParser: (MWFeedParser *)parser didParseFeedInfo: (MWFeedInfo *)info { - NSLog(@"feed info: %@", info); +// NSLog(@"feed info: %@", info); } - (void) feedParser: (MWFeedParser *)parser didParseFeedItem: (MWFeedItem *)item { - NSLog(@"feed item: %@", item); - NSLog(@"show name: %@", self.name); +// NSLog(@"feed item: %@", item); [self addEpisode: [Episode episodeWithShow: self name: item.title number: @"" url: [NSURL URLWithString: item.link]]]; } diff --git a/5by5Browser/ShowViewController.m b/5by5Browser/ShowViewController.m index 3b1ae96..7162e3b 100644 --- a/5by5Browser/ShowViewController.m +++ b/5by5Browser/ShowViewController.m @@ -23,7 +23,9 @@ { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { - // Custom initialization + if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPad) { + self.contentSizeForViewInPopover = CGSizeMake(320.0, 600.0); + } } return self; } @@ -31,26 +33,30 @@ - (void)viewDidLoad { [super viewDidLoad]; - // Do any additional setup after loading the view from its nib. + if (self.show) { + [self configureView]; + } } -- (void)viewDidUnload +- (void) configureView { - [super viewDidUnload]; - // Release any retained subviews of the main view. - // e.g. self.myOutlet = nil; + self.title = self.show.name; + [self.tableView reloadData]; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - return (interfaceOrientation == UIInterfaceOrientationPortrait); + if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { + return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown); + } else { + return YES; + } } - (void) setShow: (Show *)show { _show = show; - self.title = self.show.name; - [self.tableView reloadData]; + [self configureView]; } #pragma mark - Table View @@ -87,14 +93,9 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { Episode *episode = [self.show.episodes objectAtIndex: indexPath.row]; + self.detailViewController.episode = episode; if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { - if (!self.detailViewController) { - self.detailViewController = [[SSDetailViewController alloc] initWithNibName: @"SSDetailViewController_iPhone" bundle: nil]; - } - self.detailViewController.episode = episode; [self.navigationController pushViewController: self.detailViewController animated:YES]; - } else { - self.detailViewController.episode = episode; } } diff --git a/5by5Browser/en.lproj/SSDetailViewController_iPad.xib b/5by5Browser/en.lproj/SSDetailViewController_iPad.xib index e9ffe27..59df2b2 100644 --- a/5by5Browser/en.lproj/SSDetailViewController_iPad.xib +++ b/5by5Browser/en.lproj/SSDetailViewController_iPad.xib @@ -11,9 +11,12 @@ 1145 - IBProxyObject - IBUIView IBUIWebView + IBUIBarButtonItem + IBUIToolbar + IBUIActivityIndicatorView + IBUIView + IBProxyObject com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -35,13 +38,91 @@ 274 + + + 290 + {768, 44} + + + + _NS:371 + NO + NO + IBIPadFramework + + + IBIPadFramework + + 5 + + + NO + + NSImage + back.png + + IBIPadFramework + + + + IBIPadFramework + 17 + + 6 + + + Home + IBIPadFramework + 1 + + + 1 + MC4zMjE1Njg2Mjc1IDAgMAA + + + + IBIPadFramework + 17 + + 6 + + + NO + + NSImage + forward.png + + IBIPadFramework + + + + IBIPadFramework + + 5 + + + Instapaper + IBIPadFramework + 1 + + + 1 + MC4zMjE1Njg2Mjc1IDAgMAA + + + + + 3 + MC4zMzMzMzMzMzMzAA + + 274 - {768, 1004} + {{0, 44}, {768, 960}} - + _NS:693 1 @@ -51,11 +132,41 @@ 1 YES + + + 274 + + + + 301 + {{366, 439}, {37, 37}} + + + + _NS:1030 + NO + IBIPadFramework + NO + YES + 0 + + + {{0, 44}, {768, 960}} + + + + _NS:196 + + 1 + MCAwIDAgMC42AA + + IBIPadFramework + {{0, 20}, {768, 1004}} - + 3 MQA @@ -85,6 +196,46 @@ 69 + + + loadingView + + + + 83 + + + + backButton + + + + 99 + + + + forwardButton + + + + 100 + + + + instapaperButton + + + + 101 + + + + toolbar + + + + 102 + delegate @@ -93,6 +244,38 @@ 68 + + + sendToInstapaper: + + + + 104 + + + + goHome: + + + + 103 + + + + goForward + + + + 105 + + + + goBack + + + + 106 + @@ -117,7 +300,9 @@ 8 + + @@ -126,6 +311,77 @@ + + 70 + + + + + + Loading View + + + 78 + + + + + 89 + + + + + + + + + + + + + + + 95 + + + Bar Button Item - Back + + + 94 + + + Bar Button Item - Forward + + + 93 + + + + + 92 + + + + + 91 + + + + + 90 + + + + + 96 + + + + + 98 + + + @@ -134,27 +390,77 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 69 + 107 SSDetailViewController UIViewController + + id + id + + + + goHome: + id + + + sendToInstapaper: + id + + - UILabel + UIBarButtonItem + UIBarButtonItem + UIBarButtonItem + UIView + UIBarButtonItem + UIToolbar UIWebView - - detailDescriptionLabel - UILabel + + backButton + UIBarButtonItem + + + forwardButton + UIBarButtonItem + + + instapaperButton + UIBarButtonItem + + + loadingView + UIView + + + showsButton + UIBarButtonItem + + + toolbar + UIToolbar webView @@ -172,6 +478,10 @@ IBIPadFramework YES 3 + + {15, 18} + {15, 18} + 1145 diff --git a/5by5Browser/en.lproj/SSDetailViewController_iPhone.xib b/5by5Browser/en.lproj/SSDetailViewController_iPhone.xib index 716bd44..fa9c1f2 100644 --- a/5by5Browser/en.lproj/SSDetailViewController_iPhone.xib +++ b/5by5Browser/en.lproj/SSDetailViewController_iPhone.xib @@ -44,7 +44,7 @@ {320, 416} - + _NS:693 1 @@ -110,7 +110,7 @@ NO NSImage - forw.png + forward.png IBCocoaTouchFramework @@ -121,15 +121,15 @@ MC4zMzMzMzMzMzMzAA - + 274 - - + + 301 {{142, 189}, {37, 37}} - + _NS:1030 @@ -143,7 +143,7 @@ {320, 416} - + _NS:196 1 @@ -221,7 +221,7 @@ loadingView - + 28 @@ -279,7 +279,7 @@ - + @@ -347,16 +347,17 @@ 26 - + - + + Loading View 27 - - + + @@ -404,7 +405,6 @@ UIBarButtonItem - UILabel UIBarButtonItem UIBarButtonItem UIView @@ -416,10 +416,6 @@ backButton UIBarButtonItem - - detailDescriptionLabel - UILabel - forwardButton UIBarButtonItem @@ -454,7 +450,7 @@ 3 {15, 18} - {15, 18} + {15, 18} 1145 diff --git a/5by5Browser/forw.png b/5by5Browser/forward.png similarity index 100% rename from 5by5Browser/forw.png rename to 5by5Browser/forward.png diff --git a/5by5Browser/forw@2x.png b/5by5Browser/forward@2x.png similarity index 100% rename from 5by5Browser/forw@2x.png rename to 5by5Browser/forward@2x.png