Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: wgarbaya/tabB
base: master
...
head fork: ipodishima/tabB
compare: master
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 11 files changed
  • 0 commit comments
  • 1 contributor
View
BIN  .DS_Store
Binary file not shown
View
BIN  Projet.xcodeproj/project.xcworkspace/xcuserdata/marianpaul.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown
View
86 Projet.xcodeproj/xcuserdata/eleves.xcuserdatad/xcschemes/TabBar.xcscheme
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0440"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
22 Projet.xcodeproj/xcuserdata/eleves.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>SchemeUserState</key>
- <dict>
- <key>TabBar.xcscheme</key>
- <dict>
- <key>orderHint</key>
- <integer>0</integer>
- </dict>
- </dict>
- <key>SuppressBuildableAutocreation</key>
- <dict>
- <key>E03C980A151A86590004D2FD</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- </dict>
-</dict>
-</plist>
View
86 Projet.xcodeproj/xcuserdata/garbayawalid.xcuserdatad/xcschemes/Projet.xcscheme
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0440"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "Projet.app"
- BlueprintName = "Projet"
- ReferencedContainer = "container:Projet.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
22 Projet.xcodeproj/xcuserdata/garbayawalid.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
- <key>SchemeUserState</key>
- <dict>
- <key>Projet.xcscheme</key>
- <dict>
- <key>orderHint</key>
- <integer>0</integer>
- </dict>
- </dict>
- <key>SuppressBuildableAutocreation</key>
- <dict>
- <key>E03C980A151A86590004D2FD</key>
- <dict>
- <key>primary</key>
- <true/>
- </dict>
- </dict>
-</dict>
-</plist>
View
85 Projet.xcodeproj/xcuserdata/marianpaul.xcuserdatad/xcschemes/TabBar.xcscheme
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "TabBar.app"
- BlueprintName = "TabBar"
- ReferencedContainer = "container:TabBar.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- <MacroExpansion>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "TabBar.app"
- BlueprintName = "TabBar"
- ReferencedContainer = "container:TabBar.xcodeproj">
- </BuildableReference>
- </MacroExpansion>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "TabBar.app"
- BlueprintName = "TabBar"
- ReferencedContainer = "container:TabBar.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- <BuildableProductRunnable>
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "E03C980A151A86590004D2FD"
- BuildableName = "TabBar.app"
- BlueprintName = "TabBar"
- ReferencedContainer = "container:TabBar.xcodeproj">
- </BuildableReference>
- </BuildableProductRunnable>
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
2  Projet.xcodeproj/xcuserdata/marianpaul.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -4,7 +4,7 @@
<dict>
<key>SchemeUserState</key>
<dict>
- <key>TabBar.xcscheme</key>
+ <key>Projet.xcscheme</key>
<dict>
<key>orderHint</key>
<integer>0</integer>
View
1  TabBar/DataListViewController.m
@@ -145,6 +145,7 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
ProfileViewController *profileViewController = [[ProfileViewController alloc] initWithNibName:@"ProfileViewController" bundle:nil];
[self.navigationController pushViewController:profileViewController animated:YES];
}
+ break;
case 1: {
YoutubeViewController *youtubeVC = [[YoutubeViewController alloc] initWithNibName:@"YoutubeViewController" bundle:nil];
[self.navigationController pushViewController:youtubeVC animated:YES];
View
1  YoutubeViewController.h
@@ -12,6 +12,7 @@
@class YouTubeVideo;
@interface YoutubeViewController : UIViewController<YouTubeManagerDelegate, LBYouTubePlayerControllerDelegate>{
YouTubeVideo *_currentVideoDisplayed;
+ LBYouTubePlayerViewController *_currentVideoController;
}
@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *activityIndicator;
@property (weak, nonatomic) IBOutlet UILabel *nameLabel;
View
19 YoutubeViewController.m
@@ -39,15 +39,6 @@ - (void)viewDidLoad
[[YouTubeManager shared] setDelegate:self];
[[YouTubeManager shared] loadDataFromOffset:1];
-
- // This is one way to integrate Youtube video in your app.
- // The other is kind of a hack around UIWebView (does not work on simulator though)
- LBYouTubePlayerViewController *c = [[LBYouTubePlayerViewController alloc] initWithYouTubeID:_currentVideoDisplayed.youtubeID];
- c.quality = LBYouTubePlayerQualityLarge;
- c.view.frame = CGRectMake(60.0f, 60.0f, 200.0f, 200.0f);
- c.delegate = self;
- [self.view addSubview:c.view];
-
[super viewDidLoad];
// Do any additional setup after loading the view from its nib.
}
@@ -98,6 +89,16 @@ - (void) youTubeManager:(YouTubeManager *)manager didLoadVideos:(NSArray *)video
[_activityIndicator stopAnimating];
_currentVideoDisplayed = firstVideo;
+
+ // This is one way to integrate Youtube video in your app.
+ // The other is kind of a hack around UIWebView (does not work on simulator though)
+ [_currentVideoController.view removeFromSuperview];
+
+ _currentVideoController = [[LBYouTubePlayerViewController alloc] initWithYouTubeID:_currentVideoDisplayed.youtubeID];
+ _currentVideoController.quality = LBYouTubePlayerQualityLarge;
+ _currentVideoController.view.frame = CGRectMake(60.0f, 60.0f, 200.0f, 200.0f);
+ _currentVideoController.delegate = self;
+ [self.view addSubview:_currentVideoController.view];
}
- (void)viewDidUnload

No commit comments for this range

Something went wrong with that request. Please try again.