From 1ca6b44223cf5524ade8d5630bc8bd998a4eafa1 Mon Sep 17 00:00:00 2001 From: trailblazr Date: Wed, 5 Dec 2012 02:06:44 +0100 Subject: [PATCH] added testurls Signed-off-by: trailblazr --- barfbag/AppDelegate.m | 13 ++++++- barfbag/EventsViewController.m | 1 + barfbag/GenericTabBarController.m | 14 +++++--- barfbag/GenericTableViewController.m | 1 - barfbag/VideoStreamsViewController.m | 13 +++++-- barfbag/barfbag-Info.plist | 53 ++++++++++++++-------------- html/streams.html | 14 ++++++-- 7 files changed, 71 insertions(+), 38 deletions(-) diff --git a/barfbag/AppDelegate.m b/barfbag/AppDelegate.m index 3910282..e20b873 100644 --- a/barfbag/AppDelegate.m +++ b/barfbag/AppDelegate.m @@ -74,6 +74,14 @@ - (void) alertWithTag:(NSInteger)tag title:(NSString*)title andMessage:(NSString [alert release]; } +- (void) configureAppearance { + if( ![[UINavigationBar class] respondsToSelector:@selector(appearance)] ) return; + + // MPAVController + // MPAVController *proxyMpavController = [MPAVController appearance]; + +} + #pragma mark - BarfBagParserDelegate - (void) barfBagParser:(BarfBagParser*)parser parsedConferences:(NSArray *)conferencesArray { @@ -230,7 +238,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( self.window = [[[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]] autorelease]; self.themeColor = [self randomColor]; - + + // CONFIGURE CUSTOM UI APPEARANCE + [self configureAppearance]; + // SETUP ROOT CONTROLLER NSMutableArray *viewControllers = [NSMutableArray array]; if ([[UIDevice currentDevice] userInterfaceIdiom] == UIUserInterfaceIdiomPhone) { diff --git a/barfbag/EventsViewController.m b/barfbag/EventsViewController.m index d753e53..5b787f7 100644 --- a/barfbag/EventsViewController.m +++ b/barfbag/EventsViewController.m @@ -164,6 +164,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N cell = [[[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:CellIdentifier] autorelease]; cell.textLabel.backgroundColor = kCOLOR_CLEAR; cell.detailTextLabel.backgroundColor = kCOLOR_CLEAR; + cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator; } // Configure the cell... diff --git a/barfbag/GenericTabBarController.m b/barfbag/GenericTabBarController.m index 572c3dc..61d0aec 100644 --- a/barfbag/GenericTabBarController.m +++ b/barfbag/GenericTabBarController.m @@ -11,8 +11,7 @@ @implementation GenericTabBarController -- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil -{ +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; if (self) { // Custom initialization @@ -27,12 +26,19 @@ - (void)viewDidLoad { self.tabBar.selectedImageTintColor = [self themeColor]; } -- (void)didReceiveMemoryWarning -{ +- (void)didReceiveMemoryWarning { [super didReceiveMemoryWarning]; // Dispose of any resources that can be recreated. } +- (BOOL) shouldAutorotate { + return YES; +} + +- (BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation { + return YES; +} + - (AppDelegate*) appDelegate { return (AppDelegate*)[UIApplication sharedApplication].delegate; } diff --git a/barfbag/GenericTableViewController.m b/barfbag/GenericTableViewController.m index 82e7eb2..0a1ecd4 100644 --- a/barfbag/GenericTableViewController.m +++ b/barfbag/GenericTableViewController.m @@ -136,5 +136,4 @@ - (UIColor*) darkColor { return [UIColor colorWithHue:hue saturation:0.5 brightness:0.7 alpha:1.0]; } - @end diff --git a/barfbag/VideoStreamsViewController.m b/barfbag/VideoStreamsViewController.m index 4128bc6..9dddd72 100644 --- a/barfbag/VideoStreamsViewController.m +++ b/barfbag/VideoStreamsViewController.m @@ -62,16 +62,23 @@ - (void) webViewDidStartLoad:(UIWebView *)webView { } - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error { + [self hideActivityIndicator]; + BOOL shouldShowAlert = NO; NSString *errorString = nil; if( error ) { + NSInteger errorCode = [error code]; + if( errorCode != 204 ) { // KNOWN ERRORS WHICH ARE NONE + shouldShowAlert = YES; + } errorString = [NSString stringWithFormat:@"\n\n%@", error]; } else { errorString = @""; } - NSString *message = [NSString stringWithFormat:@"Videostreams could not be loaded successfully.%@", errorString]; - [self alertWithTag:0 title:@"Problem" andMessage:message]; + if( shouldShowAlert ) { + NSString *message = [NSString stringWithFormat:@"Videostreams could not be loaded successfully.%@", errorString]; + [self alertWithTag:0 title:@"Problem" andMessage:message]; + } } - @end diff --git a/barfbag/barfbag-Info.plist b/barfbag/barfbag-Info.plist index 9e34504..a37ba92 100644 --- a/barfbag/barfbag-Info.plist +++ b/barfbag/barfbag-Info.plist @@ -8,30 +8,6 @@ ${PRODUCT_NAME} CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIdentifier - com.noxymo.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - LSRequiresIPhoneOS - - UIAppFonts - - SourceCodePro-Black.ttf - SourceCodePro-Bold.ttf - SourceCodePro-ExtraLight.ttf - SourceCodePro-Light.ttf - SourceCodePro-Semibold.ttf - CFBundleIconFile Icon_57.png CFBundleIcons @@ -54,12 +30,36 @@ - UINewsstandBindingType - UINewsstandBindingTypeMagazine UINewsstandBindingEdge UINewsstandBindingEdgeLeft + UINewsstandBindingType + UINewsstandBindingTypeMagazine + CFBundleIdentifier + com.noxymo.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1.0 + LSRequiresIPhoneOS + + UIAppFonts + + SourceCodePro-Black.ttf + SourceCodePro-Bold.ttf + SourceCodePro-ExtraLight.ttf + SourceCodePro-Light.ttf + SourceCodePro-Semibold.ttf + UIRequiredDeviceCapabilities armv7 @@ -79,6 +79,7 @@ UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + UIInterfaceOrientationPortraitUpsideDown UISupportedInterfaceOrientations~ipad diff --git a/html/streams.html b/html/streams.html index c5dee57..9d3c527 100644 --- a/html/streams.html +++ b/html/streams.html @@ -20,13 +20,21 @@ -

Streams from 29C3

+

Streams from 29C3

- +

Test Streams / H.264 @ 30Hz

+