From 5c0e1597bd05ae886cfc71cd3570e00c531e7cbf Mon Sep 17 00:00:00 2001
From: Teddy Wing
Date: Tue, 8 May 2012 18:31:19 -0400
Subject: Default "no-content" view: if no video is selected, show this view so
 that the user knows they have to select a video, and so they know how to use
 the app. Once the user has selected a video, this 'help view' gets hidden so
 they can preview their video in the playerView.

---
 TODO                                          |   8 +-
 Video Tuneup.xcodeproj/project.pbxproj        |   4 +
 Video Tuneup/Classes/AssetsViewController.m   |   1 +
 Video Tuneup/ViewController.h                 |   2 +
 Video Tuneup/ViewController.m                 |  17 ++-
 Video Tuneup/en.lproj/ViewController_iPad.xib | 143 ++++++++++++++++++++++++--
 Video Tuneup/interface/noisy tile.png         | Bin 0 -> 15014 bytes
 7 files changed, 162 insertions(+), 13 deletions(-)
 create mode 100644 Video Tuneup/interface/noisy tile.png

diff --git a/TODO b/TODO
index 60bd346..e318587 100644
--- a/TODO
+++ b/TODO
@@ -14,7 +14,7 @@
   v Video popup should disappear when a video is selected
   * Local mixing should happen when a song is selected
   * Create better buttons from 'demo' stuff
-  * Instructional NO-CONTENT view
-    * show when no video selected
-    * when video selected: hide; show player view
-    * write up text
+  v Instructional NO-CONTENT view
+    v show when no video selected
+    v when video selected: hide; show player view
+    v write up text
diff --git a/Video Tuneup.xcodeproj/project.pbxproj b/Video Tuneup.xcodeproj/project.pbxproj
index 85ab174..765b1ba 100644
--- a/Video Tuneup.xcodeproj/project.pbxproj	
+++ b/Video Tuneup.xcodeproj/project.pbxproj	
@@ -16,6 +16,7 @@
 		D115C7331559A00A008BEA8D /* mix icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D115C72E1559A00A008BEA8D /* mix icon.png */; };
 		D115C7341559A00A008BEA8D /* toolbar.png in Resources */ = {isa = PBXBuildFile; fileRef = D115C72F1559A00A008BEA8D /* toolbar.png */; };
 		D115C7351559A00A008BEA8D /* video icon.png in Resources */ = {isa = PBXBuildFile; fileRef = D115C7301559A00A008BEA8D /* video icon.png */; };
+		D14D0E351559C51400DC6034 /* noisy tile.png in Resources */ = {isa = PBXBuildFile; fileRef = D14D0E341559C51400DC6034 /* noisy tile.png */; };
 		D19C74771547289A006E4122 /* AssetsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D19C74761547289A006E4122 /* AssetsViewController.m */; };
 		D1A3079F1548F71C00FA4A94 /* WebserviceCommunicator.m in Sources */ = {isa = PBXBuildFile; fileRef = D1A3079E1548F71C00FA4A94 /* WebserviceCommunicator.m */; };
 		D3531C9C1523B7BB00E286B8 /* SimpleEditor.m in Sources */ = {isa = PBXBuildFile; fileRef = D3531C9B1523B7BB00E286B8 /* SimpleEditor.m */; };
@@ -69,6 +70,7 @@
 		D115C72E1559A00A008BEA8D /* mix icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mix icon.png"; sourceTree = "<group>"; };
 		D115C72F1559A00A008BEA8D /* toolbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = toolbar.png; sourceTree = "<group>"; };
 		D115C7301559A00A008BEA8D /* video icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "video icon.png"; sourceTree = "<group>"; };
+		D14D0E341559C51400DC6034 /* noisy tile.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "noisy tile.png"; sourceTree = "<group>"; };
 		D19C74751547289A006E4122 /* AssetsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AssetsViewController.h; path = Classes/AssetsViewController.h; sourceTree = "<group>"; };
 		D19C74761547289A006E4122 /* AssetsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AssetsViewController.m; path = Classes/AssetsViewController.m; sourceTree = "<group>"; };
 		D1A3079D1548F71C00FA4A94 /* WebserviceCommunicator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebserviceCommunicator.h; path = Classes/WebserviceCommunicator.h; sourceTree = "<group>"; };
@@ -156,6 +158,7 @@
 		D115C72B1559A00A008BEA8D /* interface */ = {
 			isa = PBXGroup;
 			children = (
+				D14D0E341559C51400DC6034 /* noisy tile.png */,
 				D115C72C1559A00A008BEA8D /* audio icon.png */,
 				D115C72D1559A00A008BEA8D /* export button.png */,
 				D115C72E1559A00A008BEA8D /* mix icon.png */,
@@ -377,6 +380,7 @@
 				D115C7331559A00A008BEA8D /* mix icon.png in Resources */,
 				D115C7341559A00A008BEA8D /* toolbar.png in Resources */,
 				D115C7351559A00A008BEA8D /* video icon.png in Resources */,
+				D14D0E351559C51400DC6034 /* noisy tile.png in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/Video Tuneup/Classes/AssetsViewController.m b/Video Tuneup/Classes/AssetsViewController.m
index 44fb565..fa55089 100644
--- a/Video Tuneup/Classes/AssetsViewController.m	
+++ b/Video Tuneup/Classes/AssetsViewController.m	
@@ -185,6 +185,7 @@
             NSLog(@"AssetURL %@", [assetURLs valueForKey:assetURLKey]);
             [_viewController loadAssetFromFile:[assetURLs valueForKey:assetURLKey]];
             [[_viewController mediaLibraryPopover] dismissPopoverAnimated:YES]; // Dismiss the popover view
+            [_viewController toggleHelpView]; // remove the default help view if it's there.
         }
     }
 
diff --git a/Video Tuneup/ViewController.h b/Video Tuneup/ViewController.h
index 2a6b09e..4568955 100644
--- a/Video Tuneup/ViewController.h	
+++ b/Video Tuneup/ViewController.h	
@@ -25,6 +25,7 @@
     id mTimeObserver;
 }
 
+@property (nonatomic, retain) IBOutlet UIView *defaultHelpView;
 @property (nonatomic, retain) AVPlayer *player;
 @property (nonatomic, retain) SimpleEditor *editor;
 @property (retain) AVPlayerItem *playerItem;
@@ -43,6 +44,7 @@
 @property (nonatomic, retain) IBOutlet UIButton *internetRequestButton;
 
 
+- (void)toggleHelpView;
 - (void)hideCameraRollText;
 - (IBAction)loadDefaultAssetFromFile:sender;
 - (IBAction)loadAssetFromFile:(NSURL *)fileURL;
diff --git a/Video Tuneup/ViewController.m b/Video Tuneup/ViewController.m
index 1e6f981..41925b9 100644
--- a/Video Tuneup/ViewController.m	
+++ b/Video Tuneup/ViewController.m	
@@ -20,7 +20,7 @@ static const NSString *ItemStatusContext;
 @implementation ViewController
 
 @synthesize player, playerItem, playerView, playButton, pauseButton, rewindButton, editor, videoNavBar, exportStatus,
-mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton;
+mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton, defaultHelpView;
 
 @synthesize internetRequestButton;
 
@@ -497,6 +497,8 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton;
     [super viewDidLoad];
 
     self.view.backgroundColor = [[UIColor alloc] initWithPatternImage:[UIImage imageNamed:@"hixs_pattern_evolution.png"]];
+    
+    [defaultHelpView setBackgroundColor:[[UIColor alloc] initWithPatternImage:[UIImage imageNamed:@"noisy tile.png"]]];
 
 
     NSLog(@"viewDidLoad");
@@ -551,4 +553,17 @@ mScrubber, mediaLibraryButton, mediaLibraryPopover, exportButton;
     }
 }
 
+- (void)toggleHelpView {
+    if (! [defaultHelpView isHidden]) {
+        [playerView setHidden:NO];
+        [videoNavBar setHidden:NO];
+        [defaultHelpView setHidden:YES];
+    }
+    else {
+        [defaultHelpView setHidden:NO];
+        [playerView setHidden:YES];
+        [videoNavBar setHidden:YES];
+    }
+}
+
 @end
diff --git a/Video Tuneup/en.lproj/ViewController_iPad.xib b/Video Tuneup/en.lproj/ViewController_iPad.xib
index b816a00..4c8f2b1 100644
--- a/Video Tuneup/en.lproj/ViewController_iPad.xib	
+++ b/Video Tuneup/en.lproj/ViewController_iPad.xib	
@@ -42,11 +42,11 @@
 				<array class="NSMutableArray" key="NSSubviews">
 					<object class="IBUIView" id="1061865793">
 						<reference key="NSNextResponder" ref="766721923"/>
-						<int key="NSvFlags">279</int>
+						<int key="NSvFlags">-2147483369</int>
 						<string key="NSFrame">{{0, 129}, {1024, 575}}</string>
 						<reference key="NSSuperview" ref="766721923"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView" ref="229949743"/>
+						<reference key="NSNextKeyView" ref="772814573"/>
 						<object class="NSColor" key="IBUIBackgroundColor" id="347621421">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MCAwIDAAA</bytes>
@@ -58,7 +58,7 @@
 					</object>
 					<object class="IBUIToolbar" id="812339394">
 						<reference key="NSNextResponder" ref="766721923"/>
-						<int key="NSvFlags">266</int>
+						<int key="NSvFlags">-2147483382</int>
 						<array class="NSMutableArray" key="NSSubviews">
 							<object class="IBUISlider" id="119532371">
 								<reference key="NSNextResponder" ref="812339394"/>
@@ -117,6 +117,100 @@
 							</object>
 						</array>
 					</object>
+					<object class="IBUIView" id="772814573">
+						<reference key="NSNextResponder" ref="766721923"/>
+						<int key="NSvFlags">274</int>
+						<array class="NSMutableArray" key="NSSubviews">
+							<object class="IBUILabel" id="292974481">
+								<reference key="NSNextResponder" ref="772814573"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{20, 149}, {984, 89}}</string>
+								<reference key="NSSuperview" ref="772814573"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="292214286"/>
+								<object class="NSColor" key="IBUIBackgroundColor" id="6929607">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MCAwAA</bytes>
+								</object>
+								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<string key="IBUIText">No video selected</string>
+								<object class="NSColor" key="IBUITextColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC4zODQzODcwNDY4IDAuNDk3MDQ0OTk0MiAwLjY0MTMwNDM0NzggMC42NQA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<object class="NSColor" key="IBUIShadowColor" id="804940373">
+									<int key="NSColorSpace">3</int>
+									<bytes key="NSWhite">MQA</bytes>
+								</object>
+								<string key="IBUIShadowOffset">{0, 1}</string>
+								<int key="IBUIBaselineAdjustment">1</int>
+								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUITextAlignment">1</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">2</int>
+									<double key="pointSize">60</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica-Bold</string>
+									<double key="NSSize">60</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+							<object class="IBUILabel" id="292214286">
+								<reference key="NSNextResponder" ref="772814573"/>
+								<int key="NSvFlags">292</int>
+								<string key="NSFrame">{{399, 255}, {226, 170}}</string>
+								<reference key="NSSuperview" ref="772814573"/>
+								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView" ref="229949743"/>
+								<reference key="IBUIBackgroundColor" ref="6929607"/>
+								<bool key="IBUIOpaque">NO</bool>
+								<bool key="IBUIClipsSubviews">YES</bool>
+								<int key="IBUIContentMode">7</int>
+								<bool key="IBUIUserInteractionEnabled">NO</bool>
+								<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+								<string type="base64-UTF8" key="IBUIText">SG93IGl0IHdvcmtzOgogICAxLiBQaWNrIGEgdmlkZW8KICAgMi4gUGljayBhIHNvbmcKICAgMy4gTWl4
+CiAgIDQuIEV4cG9ydA</string>
+								<object class="NSColor" key="IBUITextColor">
+									<int key="NSColorSpace">1</int>
+									<bytes key="NSRGB">MC40MTMwNTU2Nzc5IDAuNDcyODM1MjM2NyAwLjY1MjE3MzkxMyAwLjcAA</bytes>
+								</object>
+								<nil key="IBUIHighlightedColor"/>
+								<reference key="IBUIShadowColor" ref="804940373"/>
+								<string key="IBUIShadowOffset">{0, 1}</string>
+								<int key="IBUIBaselineAdjustment">1</int>
+								<float key="IBUIMinimumFontSize">10</float>
+								<int key="IBUINumberOfLines">5</int>
+								<object class="IBUIFontDescription" key="IBUIFontDescription">
+									<int key="type">1</int>
+									<double key="pointSize">26</double>
+								</object>
+								<object class="NSFont" key="IBUIFont">
+									<string key="NSName">Helvetica</string>
+									<double key="NSSize">26</double>
+									<int key="NSfFlags">16</int>
+								</object>
+							</object>
+						</array>
+						<string key="NSFrame">{{0, 129}, {1024, 620}}</string>
+						<reference key="NSSuperview" ref="766721923"/>
+						<reference key="NSWindow"/>
+						<reference key="NSNextKeyView" ref="292974481"/>
+						<object class="NSColor" key="IBUIBackgroundColor">
+							<int key="NSColorSpace">3</int>
+							<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+						</object>
+						<bool key="IBUIUserInteractionEnabled">NO</bool>
+						<object class="IBUIAccessibilityConfiguration" key="IBUIAccessibilityConfiguration">
+							<integer value="256" key="IBUIAccessibilityTraits"/>
+						</object>
+						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+					</object>
 					<object class="IBUILabel" id="425377558">
 						<reference key="NSNextResponder" ref="766721923"/>
 						<int key="NSvFlags">271</int>
@@ -171,10 +265,7 @@
 						<string key="targetRuntimeIdentifier">IBIPadFramework</string>
 						<int key="IBUIContentHorizontalAlignment">0</int>
 						<int key="IBUIContentVerticalAlignment">0</int>
-						<object class="NSColor" key="IBUIHighlightedTitleColor" id="804940373">
-							<int key="NSColorSpace">3</int>
-							<bytes key="NSWhite">MQA</bytes>
-						</object>
+						<reference key="IBUIHighlightedTitleColor" ref="804940373"/>
 						<object class="NSColor" key="IBUINormalTitleColor">
 							<int key="NSColorSpace">1</int>
 							<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
@@ -437,6 +528,14 @@
 					</object>
 					<int key="connectionID">42</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">defaultHelpView</string>
+						<reference key="source" ref="841351856"/>
+						<reference key="destination" ref="772814573"/>
+					</object>
+					<int key="connectionID">88</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBCocoaTouchEventConnection" key="connection">
 						<string key="label">loadDefaultAssetFromFile:</string>
@@ -578,6 +677,7 @@
 							<reference ref="761978491"/>
 							<reference ref="1061865793"/>
 							<reference ref="812339394"/>
+							<reference ref="772814573"/>
 						</array>
 						<reference key="parent" ref="0"/>
 					</object>
@@ -683,6 +783,25 @@
 						<reference key="object" ref="1042807396"/>
 						<reference key="parent" ref="812339394"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">83</int>
+						<reference key="object" ref="772814573"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="292974481"/>
+							<reference ref="292214286"/>
+						</array>
+						<reference key="parent" ref="766721923"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">86</int>
+						<reference key="object" ref="292214286"/>
+						<reference key="parent" ref="772814573"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">87</int>
+						<reference key="object" ref="292974481"/>
+						<reference key="parent" ref="772814573"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -710,12 +829,15 @@
 				<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="74.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 				<string key="75.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="87.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
 			</dictionary>
 			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">80</int>
+			<int key="maxID">88</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -785,6 +907,7 @@
 						</object>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="defaultHelpView">UIView</string>
 						<string key="exportButton">UIButton</string>
 						<string key="exportStatus">UILabel</string>
 						<string key="internetRequestButton">UIButton</string>
@@ -797,6 +920,10 @@
 						<string key="videoNavBar">UIToolbar</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="defaultHelpView">
+							<string key="name">defaultHelpView</string>
+							<string key="candidateClassName">UIView</string>
+						</object>
 						<object class="IBToOneOutletInfo" key="exportButton">
 							<string key="name">exportButton</string>
 							<string key="candidateClassName">UIButton</string>
diff --git a/Video Tuneup/interface/noisy tile.png b/Video Tuneup/interface/noisy tile.png
new file mode 100644
index 0000000..d45db0a
Binary files /dev/null and b/Video Tuneup/interface/noisy tile.png differ
-- 
cgit v1.2.3