Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

refresh from github2

  • Loading branch information...
commit 33976d4693cccdbcbe769ec81bbd929da7e5bbd8 2 parents fcd87bd + 4e2f7e6
@marturi marturi authored
View
25 Classes/CountryViewController.m
@@ -24,10 +24,8 @@ - (IBAction)globePressed:(id)sender {
- (IBAction) animalsButtonPressed {
-
// don't allow the user to do anything while we are animating
[[UIApplication sharedApplication] beginIgnoringInteractionEvents];
-
self.contentBackground.hidden = NO;
self.contentBackground.alpha = 0;
self.contentScroller.hidden = NO;
@@ -39,6 +37,7 @@ - (IBAction) animalsButtonPressed {
[UIView beginAnimations:@"showContent" context:nil];
[UIView setAnimationDelegate:self];
[UIView setAnimationDidStopSelector:@selector(contentShown)];
+ [UIView setAnimationDidStopSelector:@selector(contentContainerShown)];
[UIView setAnimationDuration:1];
self.contentBackground.alpha = 1;
@@ -76,6 +75,28 @@ - (void) contentShown {
[[UIApplication sharedApplication] endIgnoringInteractionEvents];
}
+- (void) showImage {
+ self.contentScroller.contentSize = CGSizeMake(self.contentScroller.frame.size.width * 2,
+ self.contentScroller.frame.size.height);
+ CGRect secondRect = self.contentScroller.bounds;
+ secondRect.origin.x = secondRect.size.width;
+ UIImageView *imageView = [[[UIImageView alloc] initWithFrame:secondRect] autorelease];
+ imageView.contentMode = UIViewContentModeCenter;
+ imageView.image = [UIImage imageNamed:@"toucan.jpg"];
+ [self.contentScroller addSubview:imageView];
+}
+
+- (void) contentContainerShown {
+
+ //add the first bit of content
+ [self showVideo];
+
+ [self showImage];
+
+ // restore user interaction
+ [[UIApplication sharedApplication] endIgnoringInteractionEvents];
+}
+
- (IBAction)contentOverlayButtonPressed {
self.contentOverlayButton.hidden = YES;
self.contentScroller.hidden = YES;
View
27 Classes/CountryViewController.xib
@@ -98,7 +98,7 @@
</object>
<reference key="IBUINormalTitleShadowColor" ref="314692602"/>
</object>
- <object class="IBUIButton" id="307068236">
+ <object class="IBUIButton" id="386719702">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrameSize">{1024, 748}</string>
@@ -119,7 +119,7 @@
</object>
<reference key="IBUINormalTitleShadowColor" ref="314692602"/>
</object>
- <object class="IBUIImageView" id="871506586">
+ <object class="IBUIImageView" id="663667859">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">-2147483356</int>
<string key="NSFrame">{{187, 187}, {649, 374}}</string>
@@ -131,7 +131,7 @@
<string key="NSResourceName">video_container.png</string>
</object>
</object>
- <object class="IBUIScrollView" id="889395300">
+ <object class="IBUIScrollView" id="400883560">
<reference key="NSNextResponder" ref="766721923"/>
<int key="NSvFlags">-2147483380</int>
<string key="NSFrame">{{196, 196}, {631, 355}}</string>
@@ -139,6 +139,7 @@
<bool key="IBUIClipsSubviews">YES</bool>
<bool key="IBUIMultipleTouchEnabled">YES</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
+ <bool key="IBUIPagingEnabled">YES</bool>
<bool key="IBUIBouncesZoom">NO</bool>
</object>
</object>
@@ -194,7 +195,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">contentBackground</string>
<reference key="source" ref="841351856"/>
- <reference key="destination" ref="871506586"/>
+ <reference key="destination" ref="663667859"/>
</object>
<int key="connectionID">12</int>
</object>
@@ -202,14 +203,14 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">contentScroller</string>
<reference key="source" ref="841351856"/>
- <reference key="destination" ref="889395300"/>
+ <reference key="destination" ref="400883560"/>
</object>
<int key="connectionID">13</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">contentOverlayButtonPressed</string>
- <reference key="source" ref="307068236"/>
+ <reference key="source" ref="386719702"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">7</int>
</object>
@@ -219,7 +220,7 @@
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">contentOverlayButton</string>
<reference key="source" ref="841351856"/>
- <reference key="destination" ref="307068236"/>
+ <reference key="destination" ref="386719702"/>
</object>
<int key="connectionID">17</int>
</object>
@@ -252,9 +253,9 @@
<reference ref="766144627"/>
<reference ref="70448620"/>
<reference ref="458331789"/>
- <reference ref="871506586"/>
- <reference ref="889395300"/>
- <reference ref="307068236"/>
+ <reference ref="663667859"/>
+ <reference ref="400883560"/>
+ <reference ref="386719702"/>
</object>
<reference key="parent" ref="0"/>
</object>
@@ -277,19 +278,19 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">10</int>
- <reference key="object" ref="871506586"/>
+ <reference key="object" ref="663667859"/>
<reference key="parent" ref="766721923"/>
<string key="objectName">contentBackground</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">11</int>
- <reference key="object" ref="889395300"/>
+ <reference key="object" ref="400883560"/>
<reference key="parent" ref="766721923"/>
<string key="objectName">contentScroller</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">15</int>
- <reference key="object" ref="307068236"/>
+ <reference key="object" ref="386719702"/>
<reference key="parent" ref="766721923"/>
<string key="objectName">contentOverlayButton</string>
</object>
View
BIN  Images/toucan.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN  Quermesse_Da_Lua.m4a
Binary file not shown
View
54 WeeAtlas.xcodeproj/marturi.perspectivev3
@@ -231,8 +231,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -273,7 +271,6 @@
<string>35F4C2D3117A4317009823B1</string>
<string>A0E5C670117A351B00E3957C</string>
<string>29B97317FDCFA39411CA2CEA</string>
- <string>A0E5C696117A3CD700E3957C</string>
<string>29B97323FDCFA39411CA2CEA</string>
<string>1C37FBAC04509CD000000102</string>
<string>1CC0EA4004350EF90041110B</string>
@@ -281,7 +278,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>8</integer>
+ <integer>5</integer>
<integer>2</integer>
<integer>1</integer>
<integer>0</integer>
@@ -316,12 +313,14 @@
<key>Dock</key>
<array>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>A0E5C673117A352100E3957C</string>
<key>PBXProjectModuleLabel</key>
- <string>RootViewController.m</string>
+ <string>CountryViewController.h</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@@ -329,24 +328,25 @@
<key>PBXProjectModuleGUID</key>
<string>A0E5C674117A352100E3957C</string>
<key>PBXProjectModuleLabel</key>
- <string>RootViewController.m</string>
+ <string>CountryViewController.h</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>A0DDC307117B247A0055B46D</string>
+ <string>A0479001117B5E7B0068DC41</string>
<key>history</key>
<array>
<string>A0DDC2FC117B247A0055B46D</string>
<string>A0DDC2FD117B247A0055B46D</string>
- <string>A0DDC2FE117B247A0055B46D</string>
- <string>A0DDC2FF117B247A0055B46D</string>
- <string>A0DDC300117B247A0055B46D</string>
- <string>A0DDC301117B247A0055B46D</string>
- <string>A0DDC302117B247A0055B46D</string>
<string>A0DDC303117B247A0055B46D</string>
<string>A0DDC304117B247A0055B46D</string>
<string>A0DDC305117B247A0055B46D</string>
- <string>A0DDC306117B247A0055B46D</string>
+ <string>A0478FFA117B5E7B0068DC41</string>
+ <string>A0478FFB117B5E7B0068DC41</string>
+ <string>A0478FFC117B5E7B0068DC41</string>
+ <string>A0478FFD117B5E7B0068DC41</string>
+ <string>A0478FFE117B5E7B0068DC41</string>
+ <string>A0478FFF117B5E7B0068DC41</string>
+ <string>A0479000117B5E7B0068DC41</string>
</array>
</dict>
<key>SplitCount</key>
@@ -360,18 +360,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{0, 0}, {831, 447}}</string>
+ <string>{{0, 0}, {831, 627}}</string>
<key>RubberWindowFrame</key>
<string>119 103 1077 675 0 0 1280 778 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
- <string>447pt</string>
+ <string>627pt</string>
</dict>
<dict>
<key>Proportion</key>
- <string>182pt</string>
+ <string>2pt</string>
<key>Tabs</key>
<array>
<dict>
@@ -385,7 +385,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
- <string>{{10, 27}, {831, 155}}</string>
+ <string>{{10, 27}, {831, -25}}</string>
<key>RubberWindowFrame</key>
<string>119 103 1077 675 0 0 1280 778 </string>
</dict>
@@ -469,11 +469,11 @@
</array>
<key>TableOfContents</key>
<array>
- <string>A0DDC2F0117B23950055B46D</string>
+ <string>A0478FD1117B4D9C0068DC41</string>
<string>1CA23ED40692098700951B8B</string>
- <string>A0DDC2F1117B23950055B46D</string>
+ <string>A0478FD2117B4D9C0068DC41</string>
<string>A0E5C673117A352100E3957C</string>
- <string>A0DDC2F2117B23950055B46D</string>
+ <string>A0478FD3117B4D9C0068DC41</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@@ -622,14 +622,14 @@
</array>
<key>TableOfContents</key>
<array>
- <string>A0DDC2F3117B23950055B46D</string>
+ <string>A0478FD4117B4D9C0068DC41</string>
<string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string>
- <string>A0DDC2F4117B23950055B46D</string>
- <string>A0DDC2F5117B23950055B46D</string>
- <string>A0DDC2F6117B23950055B46D</string>
- <string>A0DDC2F7117B23950055B46D</string>
- <string>A0E5C673117A352100E3957C</string>
+ <string>A0478FD5117B4D9C0068DC41</string>
+ <string>A0478FD6117B4D9C0068DC41</string>
+ <string>A0478FD7117B4D9C0068DC41</string>
+ <string>A0478FD8117B4D9C0068DC41</string>
+ <string>A0478FD9117B4D9C0068DC41</string>
</array>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
@@ -663,7 +663,7 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>/Users/marturi/Downloads/vickeryj-WeeAtlas-598e096/WeeAtlas.xcodeproj</string>
+ <string>/Users/marturi/Projects/WeeAtlas/WeeAtlas.xcodeproj</string>
</array>
<key>WindowString</key>
<string>119 103 1077 675 0 0 1280 778 </string>
View
4 WeeAtlas.xcodeproj/project.pbxproj
@@ -26,6 +26,7 @@
35F4C5A3117A86CD009823B1 /* video_container.png in Resources */ = {isa = PBXBuildFile; fileRef = 35F4C59E117A86CD009823B1 /* video_container.png */; };
35F4C5D0117AA406009823B1 /* forvo_en_254088.aif in Resources */ = {isa = PBXBuildFile; fileRef = 35F4C5CF117AA406009823B1 /* forvo_en_254088.aif */; };
35F4C6DD117B1A39009823B1 /* youtube_embed.html in Resources */ = {isa = PBXBuildFile; fileRef = 35F4C6DC117B1A39009823B1 /* youtube_embed.html */; };
+ 35F4C718117B5528009823B1 /* toucan.jpg in Resources */ = {isa = PBXBuildFile; fileRef = 35F4C717117B5528009823B1 /* toucan.jpg */; };
A0DBDBC0117A7281009DD2AD /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A0DBDBBF117A7281009DD2AD /* AudioToolbox.framework */; };
A0DBDBE0117A73CD009DD2AD /* CountryProperties.plist in Resources */ = {isa = PBXBuildFile; fileRef = A0DBDBDF117A73CD009DD2AD /* CountryProperties.plist */; };
A0E5C67B117A355100E3957C /* AtlasControl.m in Sources */ = {isa = PBXBuildFile; fileRef = A0E5C67A117A355100E3957C /* AtlasControl.m */; };
@@ -61,6 +62,7 @@
35F4C59E117A86CD009823B1 /* video_container.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = video_container.png; path = Images/video_container.png; sourceTree = "<group>"; };
35F4C5CF117AA406009823B1 /* forvo_en_254088.aif */ = {isa = PBXFileReference; lastKnownFileType = file; path = forvo_en_254088.aif; sourceTree = "<group>"; };
35F4C6DC117B1A39009823B1 /* youtube_embed.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = youtube_embed.html; sourceTree = "<group>"; };
+ 35F4C717117B5528009823B1 /* toucan.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; name = toucan.jpg; path = Images/toucan.jpg; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* WeeAtlas-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "WeeAtlas-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
A0DBDBBF117A7281009DD2AD /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
A0DBDBDF117A73CD009DD2AD /* CountryProperties.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = CountryProperties.plist; sourceTree = "<group>"; };
@@ -194,6 +196,7 @@
A0E5C696117A3CD700E3957C /* Images */ = {
isa = PBXGroup;
children = (
+ 35F4C717117B5528009823B1 /* toucan.jpg */,
35F4C59A117A86CD009823B1 /* brasil_with_shaddow_pressed.png */,
35F4C59B117A86CD009823B1 /* brasil_with_shaddow.png */,
35F4C59C117A86CD009823B1 /* brasil.png */,
@@ -263,6 +266,7 @@
35F4C5A3117A86CD009823B1 /* video_container.png in Resources */,
35F4C5D0117AA406009823B1 /* forvo_en_254088.aif in Resources */,
35F4C6DD117B1A39009823B1 /* youtube_embed.html in Resources */,
+ 35F4C718117B5528009823B1 /* toucan.jpg in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
BIN  forvo_en_254088.mp3
Binary file not shown
Please sign in to comment.
Something went wrong with that request. Please try again.