From 7ed698357f70960a0bf2887d5a2edf6bf44d5647 Mon Sep 17 00:00:00 2001 From: Adrian Cockcroft Date: Wed, 9 Jun 2010 00:07:35 -0700 Subject: [PATCH] =?UTF-8?q?Movie=20view=20layout=20is=20squished=20in=20po?= =?UTF-8?q?rtrait=20mode=20=E2=80=93=20workaround:=20hold=20your=20iPad=20?= =?UTF-8?q?landscape,=20since=20that=20makes=20sense=20for=20watching=20a?= =?UTF-8?q?=20movie=20anyway=E2=80=A6=20WORKAROUND=20=E2=80=93=20view=20ch?= =?UTF-8?q?anged=20to=20only=20show=20landscape=20left=20or=20right?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Home screen top-right menu button is unimplemented, needs to link to search options. WORKAROUND – button links to menu of options, including credits and this wiki There needs to be an Actor page that shows the actor and bio etc, as well as the list of movies they are in. WORKAROUND – button links to Netflix site bio for the actor --- Actors-Info.plist | 2 +- Actors.xcodeproj/acockcroft.mode1v3 | 111 ++++--- Actors.xcodeproj/acockcroft.pbxuser | 493 ++++++++++++++-------------- ActorsViewController.xib | 4 +- Classes/ActorsViewController.m | 28 +- Classes/MovieInfoViewController.m | 6 +- Classes/MoviesViewController.h | 3 + Classes/MoviesViewController.m | 13 +- Classes/MoviesViewController.xib | 69 +++- NetflixViewController.xib | 14 +- 10 files changed, 418 insertions(+), 325 deletions(-) diff --git a/Actors-Info.plist b/Actors-Info.plist index aa2c36e..e3db815 100644 --- a/Actors-Info.plist +++ b/Actors-Info.plist @@ -5,7 +5,7 @@ CFBundleDevelopmentRegion English CFBundleDisplayName - ${PRODUCT_NAME} + Actors - Netflix CFBundleExecutable ${EXECUTABLE_NAME} CFBundleIconFile diff --git a/Actors.xcodeproj/acockcroft.mode1v3 b/Actors.xcodeproj/acockcroft.mode1v3 index 09ad1b6..4404e01 100644 --- a/Actors.xcodeproj/acockcroft.mode1v3 +++ b/Actors.xcodeproj/acockcroft.mode1v3 @@ -265,20 +265,19 @@ 29B97314FDCFA39411CA2CEA 080E96DDFE201D6D7F000001 - 493A4FA9117B7929000C6209 29B97317FDCFA39411CA2CEA 1C37FABC05509CD000000102 PBXSmartGroupTreeModuleOutlineStateSelectionKey - 13 + 11 1 0 PBXSmartGroupTreeModuleOutlineStateVisibleRectKey - {{0, 15}, {212, 656}} + {{0, 12}, {212, 656}} PBXTopSmartGroupGIDs @@ -297,7 +296,7 @@ 212 RubberWindowFrame - 73 59 1207 715 0 0 1280 778 + 60 63 1207 715 0 0 1280 778 Module PBXSmartGroupTreeModule @@ -308,14 +307,12 @@ Dock - BecomeActive - ContentConfiguration PBXProjectModuleGUID 1CE0B20306471E060097A5F4 PBXProjectModuleLabel - MoviesViewController.m + Actors-Info.plist PBXSplitModuleInNavigatorKey Split0 @@ -323,11 +320,11 @@ PBXProjectModuleGUID 1CE0B20406471E060097A5F4 PBXProjectModuleLabel - MoviesViewController.m + Actors-Info.plist _historyCapacity 0 bookmark - 8EBA504D11BAB43500E693CF + 8EE0169011BF7364001229E7 history 8EA6A971117BC9AB00F0822F @@ -347,39 +344,39 @@ 8E29E189118373F7003CE0AF 8E29E18A118373F7003CE0AF 8E29E18C118373F7003CE0AF - 8E29E2511183A0B2003CE0AF 8E29E432118579C2003CE0AF 8E29E433118579C2003CE0AF - 8E29E434118579C2003CE0AF - 8E29E435118579C2003CE0AF - 8E29E436118579C2003CE0AF - 8E29E437118579C2003CE0AF - 8E29E438118579C2003CE0AF - 8E29E439118579C2003CE0AF - 8E29E43A118579C2003CE0AF - 8E29E43B118579C2003CE0AF - 8E29E43C118579C2003CE0AF - 8E29E5651189C99F003CE0AF 8E29E5921189D28A003CE0AF 8E29E5931189D28A003CE0AF 8E29E5981189D28A003CE0AF 8E29E5991189D28A003CE0AF - 8E29E5B61189E500003CE0AF - 8E29E5C41189E5CB003CE0AF 8E29E5ED1189EEA2003CE0AF - 8E29E60C1189F0D2003CE0AF 8E29E66D1197913B003CE0AF 8E29E66E1197913B003CE0AF - 8E29E6E51197E470003CE0AF - 8E29E6E61197E470003CE0AF - 8E29E6FF1197EBEB003CE0AF - 8EA6390E11ACABF500D53BC9 - 8EA6390F11ACABF500D53BC9 - 8EA6391011ACABF500D53BC9 - 8EA6391111ACABF500D53BC9 8EA6391211ACABF500D53BC9 8EA6391311ACABF500D53BC9 - 8EA6393511B4ED7C00D53BC9 + 8EE0162D11BF5F51001229E7 + 8EE0164F11BF6621001229E7 + 8EE0165211BF6621001229E7 + 8EE0165711BF6784001229E7 + 8EE0165F11BF67DE001229E7 + 8EE0166611BF68BB001229E7 + 8EE0166711BF68BB001229E7 + 8EE0166811BF68BB001229E7 + 8EE0166911BF68BB001229E7 + 8EE0166A11BF68BB001229E7 + 8EE0168411BF7364001229E7 + 8EE0168511BF7364001229E7 + 8EE0168611BF7364001229E7 + 8EE0168711BF7364001229E7 + 8EE0168811BF7364001229E7 + 8EE0168911BF7364001229E7 + 8EE0168A11BF7364001229E7 + 8EE0168B11BF7364001229E7 + 8EE0168C11BF7364001229E7 + 8EE0168D11BF7364001229E7 + 8EE0168E11BF7364001229E7 + 8EE0168F11BF7364001229E7 SplitCount @@ -393,7 +390,7 @@ Frame {{0, 0}, {973, 669}} RubberWindowFrame - 73 59 1207 715 0 0 1280 778 + 60 63 1207 715 0 0 1280 778 Module PBXNavigatorGroup @@ -413,7 +410,7 @@ Frame {{0, 674}, {973, 0}} RubberWindowFrame - 73 59 1207 715 0 0 1280 778 + 60 63 1207 715 0 0 1280 778 Module XCDetailModule @@ -437,9 +434,9 @@ TableOfContents - 8EBA504311BAB40400E693CF + 8EE015CC11BF57A1001229E7 1CE0B1FE06471DED0097A5F4 - 8EBA504411BAB40400E693CF + 8EE015CD11BF57A1001229E7 1CE0B20306471E060097A5F4 1CE0B20506471E060097A5F4 @@ -577,13 +574,15 @@ 5 WindowOrderList - 1C78EAAD065D492600B07095 + 8EE0169111BF7364001229E7 + 8EE0169211BF7364001229E7 1CD10A99069EF8BA00B06720 8EA6A957117BB82100F0822F + 1C78EAAD065D492600B07095 /Users/acockcroft/Personal/actors/Actors-for-Netflix-on-iPad/Actors.xcodeproj WindowString - 73 59 1207 715 0 0 1280 778 + 60 63 1207 715 0 0 1280 778 WindowToolsV3 @@ -604,7 +603,7 @@ PBXProjectModuleGUID 1CD0528F0623707200166675 PBXProjectModuleLabel - + MoviesViewController.m StatusBarVisibility @@ -621,6 +620,8 @@ 222pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -660,7 +661,7 @@ TableOfContents 8EA6A957117BB82100F0822F - 8EBA504511BAB40400E693CF + 8EE015CE11BF57A1001229E7 1CD0528F0623707200166675 XCMainBuildResultsModuleGUID @@ -704,8 +705,8 @@ yes sizes - {{0, 0}, {420, 283}} - {{420, 0}, {502, 283}} + {{0, 0}, {420, 285}} + {{420, 0}, {502, 285}} VerticalSplitView @@ -720,8 +721,8 @@ yes sizes - {{0, 0}, {922, 283}} - {{0, 283}, {922, 255}} + {{0, 0}, {922, 285}} + {{0, 285}, {922, 253}} @@ -754,7 +755,7 @@ 272 Frame - {{420, 0}, {502, 283}} + {{420, 0}, {502, 285}} RubberWindowFrame 267 122 922 579 0 0 1280 778 @@ -782,13 +783,13 @@ TableOfContents 1CD10A99069EF8BA00B06720 - 8EBA504611BAB40400E693CF + 8EE015CF11BF57A1001229E7 1C162984064C10D400B95A72 - 8EBA504711BAB40400E693CF - 8EBA504811BAB40400E693CF - 8EBA504911BAB40400E693CF - 8EBA504A11BAB40400E693CF - 8EBA504B11BAB40400E693CF + 8EE015D011BF57A1001229E7 + 8EE015D111BF57A1001229E7 + 8EE015D211BF57A1001229E7 + 8EE015D311BF57A1001229E7 + 8EE015D411BF57A1001229E7 ToolbarConfiguration xcode.toolbar.config.debugV3 @@ -915,6 +916,8 @@ Dock + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -927,7 +930,7 @@ Frame {{0, 0}, {777, 545}} RubberWindowFrame - 414 171 777 586 0 0 1280 778 + 739 192 777 586 0 0 1280 778 Module PBXDebugCLIModule @@ -950,17 +953,17 @@ TableOfContents 1C78EAAD065D492600B07095 - 8EBA504C11BAB40400E693CF + 8EE015D511BF57A1001229E7 1C78EAAC065D492600B07095 ToolbarConfiguration xcode.toolbar.config.consoleV3 WindowString - 414 171 777 586 0 0 1280 778 + 739 192 777 586 0 0 1280 778 WindowToolGUID 1C78EAAD065D492600B07095 WindowToolIsVisible - + Identifier diff --git a/Actors.xcodeproj/acockcroft.pbxuser b/Actors.xcodeproj/acockcroft.pbxuser index f6f0fcd..40858db 100644 --- a/Actors.xcodeproj/acockcroft.pbxuser +++ b/Actors.xcodeproj/acockcroft.pbxuser @@ -2,7 +2,7 @@ { 1D3623240D0F684500981E51 /* ActorsAppDelegate.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {693, 563}}"; + sepNavIntBoundsRect = "{{0, 0}, {912, 637}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 466}"; }; @@ -23,21 +23,21 @@ 28D7ACF60DDB3853001CB0EB /* ActorsViewController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {912, 637}}"; - sepNavSelRange = "{726, 0}"; + sepNavSelRange = "{835, 20}"; sepNavVisRange = "{0, 882}"; }; }; 28D7ACF70DDB3853001CB0EB /* ActorsViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {943, 2262}}"; - sepNavSelRange = "{3138, 0}"; - sepNavVisRange = "{0, 1230}"; + sepNavIntBoundsRect = "{{0, 0}, {2413, 2431}}"; + sepNavSelRange = "{277, 34}"; + sepNavVisRange = "{0, 1279}"; }; }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Debug; + activeBuildConfigurationName = Release; activeExecutable = 8EA6A946117BB7F300F0822F /* Actors */; - activeSDKPreference = iphonesimulator3.2; + activeSDKPreference = iphoneos3.2; activeTarget = 1D6058900D05DD3D006BFB54 /* Actors */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* Actors */, @@ -46,13 +46,13 @@ 8E29E23411839C5E003CE0AF /* MovieInfoViewController.m:218 */, 8E29E24B1183A00C003CE0AF /* MovieInfoViewController.m:233 */, 8E29E2561183A1DF003CE0AF /* MovieInfoViewController.m:252 */, - 8E29E2601183A510003CE0AF /* MoviesViewController.m:126 */, - 8E29E57A1189CE5C003CE0AF /* ActorsViewController.m:57 */, - 8E29E5C71189E5EC003CE0AF /* ActorsViewController.m:105 */, - 8E29E5D61189EAC2003CE0AF /* MoviesViewController.m:54 */, - 8E29E6081189F0CB003CE0AF /* ActorsViewController.m:109 */, - 8E29E66111978DAA003CE0AF /* MoviesViewController.m:78 */, - 8E29E6A21197D27D003CE0AF /* MoviesViewController.m:101 */, + 8E29E2601183A510003CE0AF /* MoviesViewController.m:129 */, + 8E29E57A1189CE5C003CE0AF /* ActorsViewController.m:58 */, + 8E29E5C71189E5EC003CE0AF /* ActorsViewController.m:107 */, + 8E29E5D61189EAC2003CE0AF /* MoviesViewController.m:57 */, + 8E29E6081189F0CB003CE0AF /* ActorsViewController.m:111 */, + 8E29E66111978DAA003CE0AF /* MoviesViewController.m:81 */, + 8E29E6A21197D27D003CE0AF /* MoviesViewController.m:104 */, ); codeSenseManager = 8EA6A954117BB81200F0822F /* Code sense */; executables = ( @@ -81,8 +81,8 @@ PBXFileDataSource_Target_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 297448432; - PBXWorkspaceStateSaveDate = 297448432; + PBXPerProjectTemplateStateSaveDate = 297752280; + PBXWorkspaceStateSaveDate = 297752280; }; perUserProjectItems = { 8E29E16611836C4A003CE0AF /* PBXTextBookmark */ = 8E29E16611836C4A003CE0AF /* PBXTextBookmark */; @@ -97,45 +97,45 @@ 8E29E189118373F7003CE0AF /* PBXTextBookmark */ = 8E29E189118373F7003CE0AF /* PBXTextBookmark */; 8E29E18A118373F7003CE0AF /* PBXTextBookmark */ = 8E29E18A118373F7003CE0AF /* PBXTextBookmark */; 8E29E18C118373F7003CE0AF /* PBXTextBookmark */ = 8E29E18C118373F7003CE0AF /* PBXTextBookmark */; - 8E29E2511183A0B2003CE0AF /* PBXTextBookmark */ = 8E29E2511183A0B2003CE0AF /* PBXTextBookmark */; 8E29E432118579C2003CE0AF /* PBXTextBookmark */ = 8E29E432118579C2003CE0AF /* PBXTextBookmark */; 8E29E433118579C2003CE0AF /* PBXTextBookmark */ = 8E29E433118579C2003CE0AF /* PBXTextBookmark */; - 8E29E434118579C2003CE0AF /* PBXBookmark */ = 8E29E434118579C2003CE0AF /* PBXBookmark */; - 8E29E435118579C2003CE0AF /* PBXBookmark */ = 8E29E435118579C2003CE0AF /* PBXBookmark */; - 8E29E436118579C2003CE0AF /* PBXBookmark */ = 8E29E436118579C2003CE0AF /* PBXBookmark */; - 8E29E437118579C2003CE0AF /* PBXBookmark */ = 8E29E437118579C2003CE0AF /* PBXBookmark */; - 8E29E438118579C2003CE0AF /* PBXBookmark */ = 8E29E438118579C2003CE0AF /* PBXBookmark */; - 8E29E439118579C2003CE0AF /* PBXBookmark */ = 8E29E439118579C2003CE0AF /* PBXBookmark */; - 8E29E43A118579C2003CE0AF /* PBXBookmark */ = 8E29E43A118579C2003CE0AF /* PBXBookmark */; - 8E29E43B118579C2003CE0AF /* PBXBookmark */ = 8E29E43B118579C2003CE0AF /* PBXBookmark */; - 8E29E43C118579C2003CE0AF /* PBXTextBookmark */ = 8E29E43C118579C2003CE0AF /* PBXTextBookmark */; - 8E29E5651189C99F003CE0AF /* PBXTextBookmark */ = 8E29E5651189C99F003CE0AF /* PBXTextBookmark */; 8E29E5921189D28A003CE0AF /* PBXTextBookmark */ = 8E29E5921189D28A003CE0AF /* PBXTextBookmark */; 8E29E5931189D28A003CE0AF /* PBXTextBookmark */ = 8E29E5931189D28A003CE0AF /* PBXTextBookmark */; 8E29E5981189D28A003CE0AF /* PBXTextBookmark */ = 8E29E5981189D28A003CE0AF /* PBXTextBookmark */; 8E29E5991189D28A003CE0AF /* PBXTextBookmark */ = 8E29E5991189D28A003CE0AF /* PBXTextBookmark */; - 8E29E5B61189E500003CE0AF /* PBXBookmark */ = 8E29E5B61189E500003CE0AF /* PBXBookmark */; - 8E29E5C41189E5CB003CE0AF /* PlistBookmark */ = 8E29E5C41189E5CB003CE0AF /* PlistBookmark */; 8E29E5ED1189EEA2003CE0AF /* PBXTextBookmark */ = 8E29E5ED1189EEA2003CE0AF /* PBXTextBookmark */; - 8E29E60C1189F0D2003CE0AF /* PBXTextBookmark */ = 8E29E60C1189F0D2003CE0AF /* PBXTextBookmark */; 8E29E66D1197913B003CE0AF /* PBXTextBookmark */ = 8E29E66D1197913B003CE0AF /* PBXTextBookmark */; 8E29E66E1197913B003CE0AF /* PBXTextBookmark */ = 8E29E66E1197913B003CE0AF /* PBXTextBookmark */; - 8E29E6E51197E470003CE0AF /* PBXTextBookmark */ = 8E29E6E51197E470003CE0AF /* PBXTextBookmark */; - 8E29E6E61197E470003CE0AF /* PBXTextBookmark */ = 8E29E6E61197E470003CE0AF /* PBXTextBookmark */; - 8E29E6FF1197EBEB003CE0AF /* PBXTextBookmark */ = 8E29E6FF1197EBEB003CE0AF /* PBXTextBookmark */; - 8EA6390E11ACABF500D53BC9 /* PBXTextBookmark */ = 8EA6390E11ACABF500D53BC9 /* PBXTextBookmark */; - 8EA6390F11ACABF500D53BC9 /* PBXTextBookmark */ = 8EA6390F11ACABF500D53BC9 /* PBXTextBookmark */; - 8EA6391011ACABF500D53BC9 /* PBXTextBookmark */ = 8EA6391011ACABF500D53BC9 /* PBXTextBookmark */; - 8EA6391111ACABF500D53BC9 /* PBXTextBookmark */ = 8EA6391111ACABF500D53BC9 /* PBXTextBookmark */; 8EA6391211ACABF500D53BC9 /* PBXTextBookmark */ = 8EA6391211ACABF500D53BC9 /* PBXTextBookmark */; 8EA6391311ACABF500D53BC9 /* PBXTextBookmark */ = 8EA6391311ACABF500D53BC9 /* PBXTextBookmark */; - 8EA6393511B4ED7C00D53BC9 /* PBXTextBookmark */ = 8EA6393511B4ED7C00D53BC9 /* PBXTextBookmark */; 8EA6A971117BC9AB00F0822F /* PBXTextBookmark */ = 8EA6A971117BC9AB00F0822F /* PBXTextBookmark */; 8EA6A978117BC9AB00F0822F /* PBXTextBookmark */ = 8EA6A978117BC9AB00F0822F /* PBXTextBookmark */; 8EA6A979117BC9AB00F0822F /* PBXTextBookmark */ = 8EA6A979117BC9AB00F0822F /* PBXTextBookmark */; 8EA6A97A117BC9AB00F0822F /* PBXTextBookmark */ = 8EA6A97A117BC9AB00F0822F /* PBXTextBookmark */; 8EA6A97B117BC9AB00F0822F /* PBXTextBookmark */ = 8EA6A97B117BC9AB00F0822F /* PBXTextBookmark */; - 8EBA504D11BAB43500E693CF /* PBXTextBookmark */ = 8EBA504D11BAB43500E693CF /* PBXTextBookmark */; + 8EE0162D11BF5F51001229E7 /* PBXTextBookmark */ = 8EE0162D11BF5F51001229E7 /* PBXTextBookmark */; + 8EE0164F11BF6621001229E7 /* PBXTextBookmark */ = 8EE0164F11BF6621001229E7 /* PBXTextBookmark */; + 8EE0165211BF6621001229E7 /* PBXTextBookmark */ = 8EE0165211BF6621001229E7 /* PBXTextBookmark */; + 8EE0165711BF6784001229E7 /* PBXTextBookmark */ = 8EE0165711BF6784001229E7 /* PBXTextBookmark */; + 8EE0165F11BF67DE001229E7 /* PBXTextBookmark */ = 8EE0165F11BF67DE001229E7 /* PBXTextBookmark */; + 8EE0166611BF68BB001229E7 /* PBXTextBookmark */ = 8EE0166611BF68BB001229E7 /* PBXTextBookmark */; + 8EE0166711BF68BB001229E7 /* PBXTextBookmark */ = 8EE0166711BF68BB001229E7 /* PBXTextBookmark */; + 8EE0166811BF68BB001229E7 /* PBXTextBookmark */ = 8EE0166811BF68BB001229E7 /* PBXTextBookmark */; + 8EE0166911BF68BB001229E7 /* PBXTextBookmark */ = 8EE0166911BF68BB001229E7 /* PBXTextBookmark */; + 8EE0166A11BF68BB001229E7 /* PBXTextBookmark */ = 8EE0166A11BF68BB001229E7 /* PBXTextBookmark */; + 8EE0168411BF7364001229E7 /* PBXTextBookmark */ = 8EE0168411BF7364001229E7 /* PBXTextBookmark */; + 8EE0168511BF7364001229E7 /* PBXBookmark */ = 8EE0168511BF7364001229E7 /* PBXBookmark */; + 8EE0168611BF7364001229E7 /* PBXBookmark */ = 8EE0168611BF7364001229E7 /* PBXBookmark */; + 8EE0168711BF7364001229E7 /* PBXBookmark */ = 8EE0168711BF7364001229E7 /* PBXBookmark */; + 8EE0168811BF7364001229E7 /* PBXBookmark */ = 8EE0168811BF7364001229E7 /* PBXBookmark */; + 8EE0168911BF7364001229E7 /* PBXBookmark */ = 8EE0168911BF7364001229E7 /* PBXBookmark */; + 8EE0168A11BF7364001229E7 /* PBXBookmark */ = 8EE0168A11BF7364001229E7 /* PBXBookmark */; + 8EE0168B11BF7364001229E7 /* PBXBookmark */ = 8EE0168B11BF7364001229E7 /* PBXBookmark */; + 8EE0168C11BF7364001229E7 /* PBXBookmark */ = 8EE0168C11BF7364001229E7 /* PBXBookmark */; + 8EE0168D11BF7364001229E7 /* PBXBookmark */ = 8EE0168D11BF7364001229E7 /* PBXBookmark */; + 8EE0168E11BF7364001229E7 /* PBXTextBookmark */ = 8EE0168E11BF7364001229E7 /* PBXTextBookmark */; + 8EE0168F11BF7364001229E7 /* PlistBookmark */ = 8EE0168F11BF7364001229E7 /* PlistBookmark */; + 8EE0169011BF7364001229E7 /* PlistBookmark */ = 8EE0169011BF7364001229E7 /* PlistBookmark */; }; sourceControlManager = 8EA6A953117BB81200F0822F /* Source Control */; userBuildSettings = { @@ -178,16 +178,16 @@ }; 4902E079117A694F006931A4 /* MoviesViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {912, 637}}"; - sepNavSelRange = "{728, 0}"; - sepNavVisRange = "{0, 977}"; + sepNavIntBoundsRect = "{{0, 0}, {912, 663}}"; + sepNavSelRange = "{985, 0}"; + sepNavVisRange = "{0, 1102}"; }; }; 4902E07A117A694F006931A4 /* MoviesViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1370, 5018}}"; - sepNavSelRange = "{2536, 0}"; - sepNavVisRange = "{1223, 2553}"; + sepNavIntBoundsRect = "{{0, 0}, {1202, 5564}}"; + sepNavSelRange = "{6509, 0}"; + sepNavVisRange = "{6863, 442}"; sepNavWindowFrame = "{{206, -44}, {1092, 689}}"; }; }; @@ -319,23 +319,23 @@ }; 493A509A117B8685000C6209 /* Actor.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {719, 565}}"; + sepNavIntBoundsRect = "{{0, 0}, {912, 637}}"; sepNavSelRange = "{0, 0}"; sepNavVisRange = "{0, 334}"; }; }; 493A509B117B8685000C6209 /* Actor.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {912, 589}}"; + sepNavIntBoundsRect = "{{0, 0}, {912, 637}}"; sepNavSelRange = "{168, 0}"; sepNavVisRange = "{0, 328}"; }; }; 493A5239117B9AB8000C6209 /* Actors.json */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {992, 12701}}"; + sepNavIntBoundsRect = "{{0, 0}, {992, 12714}}"; sepNavSelRange = "{0, 0}"; - sepNavVisRange = "{41849, 2039}"; + sepNavVisRange = "{41832, 2056}"; }; }; 499335CB117A74E2003BF4CE /* CellLoading.h */ = { @@ -356,14 +356,19 @@ uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {912, 832}}"; sepNavSelRange = "{1693, 0}"; - sepNavVisRange = "{258, 1591}"; + sepNavVisRange = "{257, 1593}"; }; }; 4993364B117A803F003BF4CE /* MovieInfoViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1146, 4342}}"; - sepNavSelRange = "{3677, 0}"; - sepNavVisRange = "{6824, 1543}"; + sepNavIntBoundsRect = "{{0, 0}, {1146, 4264}}"; + sepNavSelRange = "{9305, 0}"; + sepNavVisRange = "{0, 1260}"; + }; + }; + 8D1107310486CEB800E47090 /* Actors-Info.plist */ = { + uiCtxt = { + sepNavWindowFrame = "{{15, 84}, {1092, 689}}"; }; }; 8E29E16611836C4A003CE0AF /* PBXTextBookmark */ = { @@ -522,16 +527,6 @@ originalNumberOfMultipleMatches = 1; state = 2; }; - 8E29E2511183A0B2003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 493A509A117B8685000C6209 /* Actor.h */; - name = "Actor.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 334; - vrLoc = 0; - }; 8E29E2561183A1DF003CE0AF /* MovieInfoViewController.m:252 */ = { isa = PBXFileBreakpoint; actions = ( @@ -550,7 +545,7 @@ originalNumberOfMultipleMatches = 1; state = 2; }; - 8E29E2601183A510003CE0AF /* MoviesViewController.m:126 */ = { + 8E29E2601183A510003CE0AF /* MoviesViewController.m:129 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -562,7 +557,7 @@ functionName = "-setActor:"; hitCount = 0; ignoreCount = 0; - lineNumber = 126; + lineNumber = 129; location = Actors; modificationTime = 295162648.659739; originalNumberOfMultipleMatches = 1; @@ -570,7 +565,7 @@ }; 8E29E28911850673003CE0AF /* NetflixViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {912, 612}}"; + sepNavIntBoundsRect = "{{0, 0}, {912, 637}}"; sepNavSelRange = "{577, 0}"; sepNavVisRange = "{0, 585}"; }; @@ -578,8 +573,8 @@ 8E29E28A11850673003CE0AF /* NetflixViewController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {1048, 1157}}"; - sepNavSelRange = "{1659, 52}"; - sepNavVisRange = "{855, 1515}"; + sepNavSelRange = "{1564, 0}"; + sepNavVisRange = "{0, 1303}"; }; }; 8E29E432118579C2003CE0AF /* PBXTextBookmark */ = { @@ -602,48 +597,6 @@ vrLen = 1225; vrLoc = 0; }; - 8E29E434118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 8E29E34C118548DB003CE0AF /* deliveredByNetflix.png */; - }; - 8E29E435118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 4923AC79117BA38F004926DE /* InstantWatch.png */; - }; - 8E29E436118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 493A4F33117AE34B000C6209 /* Chevron.png */; - }; - 8E29E437118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 493A4E48117AD825000C6209 /* ActorButtonBG.png */; - }; - 8E29E438118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 499335B3117A7338003BF4CE /* ExampleImage.jpg */; - }; - 8E29E439118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 499335AF117A71F0003BF4CE /* BoxOverlay.png */; - }; - 8E29E43A118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 4902E055117A67C8006931A4 /* ApplicationBG.png */; - }; - 8E29E43B118579C2003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 4902E046117A63E3006931A4 /* ActorBG.png */; - }; - 8E29E43C118579C2003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 493A5239117B9AB8000C6209 /* Actors.json */; - name = "Actors.json: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 2039; - vrLoc = 41849; - }; 8E29E4541185816F003CE0AF /* NetflixShopperId.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {912, 612}}"; @@ -658,17 +611,7 @@ sepNavVisRange = "{195, 1617}"; }; }; - 8E29E5651189C99F003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623240D0F684500981E51 /* ActorsAppDelegate.h */; - name = "ActorsAppDelegate.h: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 466; - vrLoc = 0; - }; - 8E29E57A1189CE5C003CE0AF /* ActorsViewController.m:57 */ = { + 8E29E57A1189CE5C003CE0AF /* ActorsViewController.m:58 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -680,7 +623,7 @@ functionName = "-viewDidLoad"; hitCount = 0; ignoreCount = 0; - lineNumber = 57; + lineNumber = 58; location = Actors; modificationTime = 295162648.659946; originalNumberOfMultipleMatches = 1; @@ -726,23 +669,7 @@ vrLen = 289; vrLoc = 0; }; - 8E29E5B61189E500003CE0AF /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 49D6CA2F117BABC3007D835C /* Icon.png */; - }; - 8E29E5C41189E5CB003CE0AF /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Actors-Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - CFBundleIdentifier, - ); - name = "/Users/acockcroft/Personal/actors/Actors/Actors-Info.plist"; - rLen = 0; - rLoc = 9223372036854775808; - }; - 8E29E5C71189E5EC003CE0AF /* ActorsViewController.m:105 */ = { + 8E29E5C71189E5EC003CE0AF /* ActorsViewController.m:107 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -754,13 +681,13 @@ functionName = "-gridView:didSelectItemAtIndex:"; hitCount = 0; ignoreCount = 0; - lineNumber = 105; + lineNumber = 107; location = Actors; modificationTime = 295162648.6601501; originalNumberOfMultipleMatches = 1; state = 2; }; - 8E29E5D61189EAC2003CE0AF /* MoviesViewController.m:54 */ = { + 8E29E5D61189EAC2003CE0AF /* MoviesViewController.m:57 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -772,7 +699,7 @@ functionName = "-requestActorPage"; hitCount = 0; ignoreCount = 0; - lineNumber = 54; + lineNumber = 57; location = Actors; modificationTime = 295162648.660422; originalNumberOfMultipleMatches = 1; @@ -788,7 +715,7 @@ vrLen = 663; vrLoc = 0; }; - 8E29E6081189F0CB003CE0AF /* ActorsViewController.m:109 */ = { + 8E29E6081189F0CB003CE0AF /* ActorsViewController.m:111 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -800,23 +727,13 @@ functionName = "-gridView:didSelectItemAtIndex:"; hitCount = 0; ignoreCount = 0; - lineNumber = 109; + lineNumber = 111; location = Actors; modificationTime = 295162648.66053; originalNumberOfMultipleMatches = 1; state = 2; }; - 8E29E60C1189F0D2003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 493A509B117B8685000C6209 /* Actor.m */; - name = "Actor.m: 14"; - rLen = 0; - rLoc = 168; - rType = 0; - vrLen = 328; - vrLoc = 0; - }; - 8E29E66111978DAA003CE0AF /* MoviesViewController.m:78 */ = { + 8E29E66111978DAA003CE0AF /* MoviesViewController.m:81 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -828,7 +745,7 @@ functionName = "-requestFinished:"; hitCount = 0; ignoreCount = 0; - lineNumber = 78; + lineNumber = 81; location = Actors; modificationTime = 295162648.660625; originalNumberOfMultipleMatches = 1; @@ -854,7 +771,7 @@ vrLen = 907; vrLoc = 0; }; - 8E29E6A21197D27D003CE0AF /* MoviesViewController.m:101 */ = { + 8E29E6A21197D27D003CE0AF /* MoviesViewController.m:104 */ = { isa = PBXFileBreakpoint; actions = ( ); @@ -866,82 +783,12 @@ functionName = "-requestFinished:"; hitCount = 0; ignoreCount = 0; - lineNumber = 101; + lineNumber = 104; location = Actors; modificationTime = 295162648.660729; originalNumberOfMultipleMatches = 1; state = 1; }; - 8E29E6E51197E470003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E29E28A11850673003CE0AF /* NetflixViewController.m */; - name = "NetflixViewController.m: 60"; - rLen = 52; - rLoc = 1659; - rType = 0; - vrLen = 1515; - vrLoc = 855; - }; - 8E29E6E61197E470003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 8E29E28911850673003CE0AF /* NetflixViewController.h */; - name = "NetflixViewController.h: 23"; - rLen = 0; - rLoc = 577; - rType = 0; - vrLen = 585; - vrLoc = 0; - }; - 8E29E6FF1197EBEB003CE0AF /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4993364A117A803F003BF4CE /* MovieInfoViewController.h */; - name = "MovieInfoViewController.h: 57"; - rLen = 0; - rLoc = 1693; - rType = 0; - vrLen = 1591; - vrLoc = 258; - }; - 8EA6390E11ACABF500D53BC9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 28D7ACF70DDB3853001CB0EB /* ActorsViewController.m */; - name = "ActorsViewController.m: 109"; - rLen = 0; - rLoc = 3138; - rType = 0; - vrLen = 1230; - vrLoc = 0; - }; - 8EA6390F11ACABF500D53BC9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 28D7ACF60DDB3853001CB0EB /* ActorsViewController.h */; - name = "ActorsViewController.h: 30"; - rLen = 0; - rLoc = 726; - rType = 0; - vrLen = 882; - vrLoc = 0; - }; - 8EA6391011ACABF500D53BC9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4902E079117A694F006931A4 /* MoviesViewController.h */; - name = "MoviesViewController.h: 36"; - rLen = 0; - rLoc = 728; - rType = 0; - vrLen = 977; - vrLoc = 0; - }; - 8EA6391111ACABF500D53BC9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4993364B117A803F003BF4CE /* MovieInfoViewController.m */; - name = "MovieInfoViewController.m: 113"; - rLen = 0; - rLoc = 3677; - rType = 0; - vrLen = 1543; - vrLoc = 6824; - }; 8EA6391211ACABF500D53BC9 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 8E29E4551185816F003CE0AF /* NetflixShopperId.m */; @@ -962,16 +809,6 @@ vrLen = 959; vrLoc = 535; }; - 8EA6393511B4ED7C00D53BC9 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 4902E07A117A694F006931A4 /* MoviesViewController.m */; - name = "MoviesViewController.m: 89"; - rLen = 0; - rLoc = 2536; - rType = 0; - vrLen = 2553; - vrLoc = 1223; - }; 8EA6A946117BB7F300F0822F /* Actors */ = { isa = PBXExecutable; activeArgIndices = ( @@ -1068,14 +905,184 @@ vrLen = 1112; vrLoc = 290; }; - 8EBA504D11BAB43500E693CF /* PBXTextBookmark */ = { + 8EE0162D11BF5F51001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E29E28911850673003CE0AF /* NetflixViewController.h */; + name = "NetflixViewController.h: 23"; + rLen = 0; + rLoc = 577; + rType = 0; + vrLen = 585; + vrLoc = 0; + }; + 8EE0164F11BF6621001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 8E29E28A11850673003CE0AF /* NetflixViewController.m */; + name = "NetflixViewController.m: 56"; + rLen = 0; + rLoc = 1564; + rType = 0; + vrLen = 1303; + vrLoc = 0; + }; + 8EE0165211BF6621001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF70DDB3853001CB0EB /* ActorsViewController.m */; + name = "ActorsViewController.m: 15"; + rLen = 34; + rLoc = 277; + rType = 0; + vrLen = 1279; + vrLoc = 0; + }; + 8EE0165711BF6784001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623240D0F684500981E51 /* ActorsAppDelegate.h */; + name = "ActorsAppDelegate.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 466; + vrLoc = 0; + }; + 8EE0165F11BF67DE001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 28D7ACF60DDB3853001CB0EB /* ActorsViewController.h */; + name = "ActorsViewController.h: 33"; + rLen = 20; + rLoc = 835; + rType = 0; + vrLen = 882; + vrLoc = 0; + }; + 8EE0166611BF68BB001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4902E079117A694F006931A4 /* MoviesViewController.h */; + name = "MoviesViewController.h: 43"; + rLen = 0; + rLoc = 985; + rType = 0; + vrLen = 1102; + vrLoc = 0; + }; + 8EE0166711BF68BB001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 493A509B117B8685000C6209 /* Actor.m */; + name = "Actor.m: 14"; + rLen = 0; + rLoc = 168; + rType = 0; + vrLen = 328; + vrLoc = 0; + }; + 8EE0166811BF68BB001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 493A509A117B8685000C6209 /* Actor.h */; + name = "Actor.h: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 334; + vrLoc = 0; + }; + 8EE0166911BF68BB001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4993364A117A803F003BF4CE /* MovieInfoViewController.h */; + name = "MovieInfoViewController.h: 57"; + rLen = 0; + rLoc = 1693; + rType = 0; + vrLen = 1593; + vrLoc = 257; + }; + 8EE0166A11BF68BB001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 4993364B117A803F003BF4CE /* MovieInfoViewController.m */; + name = "MovieInfoViewController.m: 275"; + rLen = 0; + rLoc = 9305; + rType = 0; + vrLen = 1260; + vrLoc = 0; + }; + 8EE0168411BF7364001229E7 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 4902E07A117A694F006931A4 /* MoviesViewController.m */; - name = "MoviesViewController.m: 89"; + name = "MoviesViewController.m: 199"; rLen = 0; - rLoc = 2536; + rLoc = 6465; rType = 0; - vrLen = 2553; - vrLoc = 1223; + vrLen = 1316; + vrLoc = 6121; + }; + 8EE0168511BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 8E29E34C118548DB003CE0AF /* deliveredByNetflix.png */; + }; + 8EE0168611BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 49D6CA2F117BABC3007D835C /* Icon.png */; + }; + 8EE0168711BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 4923AC79117BA38F004926DE /* InstantWatch.png */; + }; + 8EE0168811BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 493A4F33117AE34B000C6209 /* Chevron.png */; + }; + 8EE0168911BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 493A4E48117AD825000C6209 /* ActorButtonBG.png */; + }; + 8EE0168A11BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 499335B3117A7338003BF4CE /* ExampleImage.jpg */; + }; + 8EE0168B11BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 499335AF117A71F0003BF4CE /* BoxOverlay.png */; + }; + 8EE0168C11BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 4902E055117A67C8006931A4 /* ApplicationBG.png */; + }; + 8EE0168D11BF7364001229E7 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 4902E046117A63E3006931A4 /* ActorBG.png */; + }; + 8EE0168E11BF7364001229E7 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 493A5239117B9AB8000C6209 /* Actors.json */; + name = "Actors.json: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2056; + vrLoc = 41832; + }; + 8EE0168F11BF7364001229E7 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Actors-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleIdentifier, + ); + name = "/Users/acockcroft/Personal/actors/Actors-for-Netflix-on-iPad/Actors-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; + }; + 8EE0169011BF7364001229E7 /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Actors-Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleExecutable, + ); + name = "/Users/acockcroft/Personal/actors/Actors-for-Netflix-on-iPad/Actors-Info.plist"; + rLen = 0; + rLoc = 9223372036854775807; }; } diff --git a/ActorsViewController.xib b/ActorsViewController.xib index 9082f46..98208a1 100644 --- a/ActorsViewController.xib +++ b/ActorsViewController.xib @@ -86,7 +86,7 @@ YES - Actors + Actors for Netflix Delivered by Netflix IBIPadFramework @@ -292,7 +292,7 @@ AQGridView com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{-77, 4}, {1039, 752}} + {{0, 4}, {1039, 752}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin diff --git a/Classes/ActorsViewController.m b/Classes/ActorsViewController.m index e11f042..6a1bde6 100644 --- a/Classes/ActorsViewController.m +++ b/Classes/ActorsViewController.m @@ -35,6 +35,7 @@ - (void)viewWillAppear:(BOOL)animated; NSInteger alphaSortPerson(id p1, id p2, void *context) { + // Try to sort by last name, excluding the Jr. that occurs in places Actor *a1 = p1; Actor *a2 = p2; NSString *n1 = [[[a1.name stringByReplacingOccurrencesOfString:@" Jr." withString:@""] @@ -68,6 +69,7 @@ - (void)viewDidLoad; [muta addObject:actor]; } + // not very elegant but it works NSRange sortRange; sortRange.location = 0; sortRange.length = [muta count]; @@ -125,16 +127,36 @@ - (IBAction)netflix - (IBAction)search { - UIActionSheet *actionAlert = [[UIActionSheet alloc] initWithTitle:@"Not yet implemented" + UIActionSheet *actionAlert = [[UIActionSheet alloc] initWithTitle:@"Menu" delegate:self - cancelButtonTitle:@"Cancel" + cancelButtonTitle:nil destructiveButtonTitle:nil - otherButtonTitles:nil]; + otherButtonTitles:@"Credits", @"Help Wiki at GitHub", nil]; [actionAlert showInView:[self view]]; [actionAlert release]; } - (void)actionSheet:(UIActionSheet *)actionSheetView clickedButtonAtIndex:(NSInteger)alertButtonIndex { + switch (alertButtonIndex) { + case 0: { // Credits popup + UIActionSheet *actionAlert = [[UIActionSheet alloc] initWithTitle:@"Credits\n\nThanks to Netflix for the API and the Movies\nthe iPadDevCamp for Inspiration\nAndrew Pouliot for most of the code\nKirsten Jones for OData and the queries\nJim Dovey for AQGridView\nAdrian Cockcroft for product concept, debug and final production\n\n" + delegate:self + cancelButtonTitle:nil + destructiveButtonTitle:nil + otherButtonTitles:nil]; + [actionAlert showInView:[self view]]; + [actionAlert release]; + break; + } + case 1: { // Visit the Help Wiki + NetflixViewController *web = [[NetflixViewController alloc] initWithUrlString:@"http://wiki.github.com/adrianco/Actors-for-Netflix-on-iPad/"]; + web.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; + [self presentModalViewController:web animated:YES]; + break; + } + default: + break; + } return; } diff --git a/Classes/MovieInfoViewController.m b/Classes/MovieInfoViewController.m index 7a0ac1e..022d306 100644 --- a/Classes/MovieInfoViewController.m +++ b/Classes/MovieInfoViewController.m @@ -272,9 +272,11 @@ - (void)actorsDidLoad:(ASIHTTPRequest *)inRequest; } - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Overriden to allow any orientation. - return YES; + // Override to allow any orientation. + // return YES; // this view needs fixing for portrait, but movies play better landscape as well + return (interfaceOrientation == UIInterfaceOrientationLandscapeLeft || + interfaceOrientation == UIInterfaceOrientationLandscapeRight); } diff --git a/Classes/MoviesViewController.h b/Classes/MoviesViewController.h index c135ed7..0106c3f 100644 --- a/Classes/MoviesViewController.h +++ b/Classes/MoviesViewController.h @@ -25,6 +25,7 @@ Actor *actor; UINavigationBar *navBar; + UIBarButtonItem *netflixButton; NSArray *movies; @@ -32,12 +33,14 @@ } @property (retain) IBOutlet UINavigationBar *navBar; +@property (nonatomic, retain) IBOutlet UIBarButtonItem *netflixButton; @property (retain) Actor *actor; @property (copy) NSArray *movies; @property (retain) AQGridView *gridView; @property (retain) ASINetworkQueue *networkQueue; - (IBAction)back; +- (IBAction)netflix; // forward definitions to make code more readable - (void)requestActorPage; diff --git a/Classes/MoviesViewController.m b/Classes/MoviesViewController.m index 75af7b5..00deba5 100644 --- a/Classes/MoviesViewController.m +++ b/Classes/MoviesViewController.m @@ -12,6 +12,7 @@ #import "Movie.h" #import "MovieCell.h" #import "MovieInfoViewController.h" +#import "NetflixViewController.h" #import "CJSONDeserializer.h" #import "Actor.h" @@ -22,6 +23,7 @@ @implementation MoviesViewController @synthesize movies; @synthesize gridView; @synthesize networkQueue; +@synthesize netflixButton; - (void)viewDidLoad; @@ -32,6 +34,7 @@ - (void)viewDidLoad; gridView.rightContentInset = 60.f; navBar.topItem.title = self.title; + navBar.topItem.rightBarButtonItem.title = [NSString stringWithFormat:@"%@ - Delivered by Netflix", actor.name]; } - (void)setActor:(Actor *)value @@ -42,7 +45,7 @@ - (void)setActor:(Actor *)value self.title = [NSString stringWithFormat:@"Movies with %@", actor.name]; navBar.topItem.title = self.title; - + navBar.topItem.rightBarButtonItem.title = [NSString stringWithFormat:@"%@ - Delivered by Netflix", actor.name]; page = 0; [self requestActorPage]; // get the first page of 20 movies [gridView reloadData]; @@ -191,6 +194,14 @@ - (IBAction)back; [self dismissModalViewControllerAnimated:YES]; } +- (IBAction)netflix +{ + //NSLog(@"Actor ident %@", actor.identifier); + NetflixViewController *web = [[NetflixViewController alloc] initWithUrlString:[NSString stringWithFormat:@"http://www.netflix.com/RoleDisplay/%@", actor.identifier]]; + web.modalTransitionStyle = UIModalTransitionStyleCrossDissolve; + [self presentModalViewController:web animated:YES]; +} + - (NSUInteger) numberOfItemsInGridView: (AQGridView *) gridView; { return movies.count; diff --git a/Classes/MoviesViewController.xib b/Classes/MoviesViewController.xib index db083c4..567bd89 100644 --- a/Classes/MoviesViewController.xib +++ b/Classes/MoviesViewController.xib @@ -12,6 +12,7 @@ YES + YES @@ -37,7 +38,7 @@ IBIPadFramework - + 292 YES @@ -90,12 +91,19 @@ 1 + + Delivered by Netflix + IBIPadFramework + 1 + + IBIPadFramework {1024, 748} + 3 MQA @@ -116,14 +124,6 @@ YES - - - view - - - - 3 - back @@ -164,6 +164,30 @@ 13 + + + view + + + + 15 + + + + netflixButton + + + + 16 + + + + netflix + + + + 17 + @@ -221,6 +245,7 @@ YES + @@ -229,6 +254,11 @@ + + 14 + + + @@ -237,6 +267,7 @@ YES -1.CustomClassName -2.CustomClassName + 14.IBPluginDependency 2.IBEditorWindowLastContentRect 2.IBPluginDependency 4.IBPluginDependency @@ -250,7 +281,8 @@ YES MoviesViewController UIResponder - {{236, 17}, {1024, 768}} + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {{29, -234}, {1039, 752}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin AQGridView @@ -276,7 +308,7 @@ - 13 + 17 @@ -320,8 +352,17 @@ MoviesViewController UIViewController - back - id + YES + + YES + back + netflix + + + YES + id + id + YES @@ -329,11 +370,13 @@ YES gridView navBar + netflixButton YES AQGridView UINavigationBar + UIBarButtonItem diff --git a/NetflixViewController.xib b/NetflixViewController.xib index f32f850..4fc6974 100644 --- a/NetflixViewController.xib +++ b/NetflixViewController.xib @@ -12,6 +12,7 @@ YES + YES @@ -37,7 +38,7 @@ IBIPadFramework - + 274 YES @@ -52,7 +53,7 @@ YES - Netflix + Actors for Netflix Back IBIPadFramework @@ -60,7 +61,7 @@ - Free Trial + Netflix Free Trial IBIPadFramework 1 @@ -72,7 +73,7 @@ 274 - {{0, 44}, {768, 916}} + {{0, 44}, {768, 960}} 1 @@ -82,7 +83,8 @@ YES - {768, 960} + {768, 1004} + 3 MQA @@ -233,7 +235,7 @@ NetflixViewController UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{540, -37}, {635, 685}} + {{497, 4}, {783, 752}} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin