Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Beginning our minor edits and bug fixes, just syncing up

  • Loading branch information...
commit 6224f4b4fac7f28cf15e7f710a8813de561726ca 1 parent e10f273
@xirianlight xirianlight authored
View
22 MappingMashupApp.xcodeproj/project.pbxproj
@@ -23,6 +23,7 @@
8335571916F754C800DB17D5 /* xmark.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571816F754C800DB17D5 /* xmark.png */; };
8335571D16F7579600DB17D5 /* wifiIcon2@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8335571C16F7579600DB17D5 /* wifiIcon2@2x.png */; };
835876D817014080000A74A7 /* circleShine@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 835876D717014080000A74A7 /* circleShine@2x.png */; };
+ 837D9F1F1701F56700565291 /* appIcon114x114.png in Resources */ = {isa = PBXBuildFile; fileRef = 837D9F1E1701F56700565291 /* appIcon114x114.png */; };
83B0D00516FA1A1900C9D8F8 /* BookmarksViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00416FA1A1900C9D8F8 /* BookmarksViewController.m */; };
83B0D00A16FA1A8900C9D8F8 /* HistoryViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 83B0D00916FA1A8900C9D8F8 /* HistoryViewController.m */; };
83BB6B6B16FA0A31003A4506 /* circleMask6464.png in Resources */ = {isa = PBXBuildFile; fileRef = 83BB6B6A16FA0A31003A4506 /* circleMask6464.png */; };
@@ -41,7 +42,6 @@
8F372B1416F244C800302B80 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F372B1316F244C800302B80 /* AppDelegate.m */; };
8F372B1616F244C800302B80 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = 8F372B1516F244C800302B80 /* Default.png */; };
8F372B1816F244C800302B80 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8F372B1716F244C800302B80 /* Default@2x.png */; };
- 8F372B1A16F244C800302B80 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8F372B1916F244C800302B80 /* Default-568h@2x.png */; };
8F372B1D16F244C800302B80 /* MainStoryboard.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8F372B1B16F244C800302B80 /* MainStoryboard.storyboard */; };
8F372B2016F244C800302B80 /* YelpMapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8F372B1F16F244C800302B80 /* YelpMapViewController.m */; };
8F372B3216F24B3900302B80 /* libYelpKit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8F372B2D16F24AC200302B80 /* libYelpKit.a */; };
@@ -103,6 +103,7 @@
8335571816F754C800DB17D5 /* xmark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = xmark.png; sourceTree = "<group>"; };
8335571C16F7579600DB17D5 /* wifiIcon2@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "wifiIcon2@2x.png"; sourceTree = "<group>"; };
835876D717014080000A74A7 /* circleShine@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "circleShine@2x.png"; sourceTree = "<group>"; };
+ 837D9F1E1701F56700565291 /* appIcon114x114.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = appIcon114x114.png; sourceTree = "<group>"; };
83B0D00316FA1A1900C9D8F8 /* BookmarksViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BookmarksViewController.h; sourceTree = "<group>"; };
83B0D00416FA1A1900C9D8F8 /* BookmarksViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BookmarksViewController.m; sourceTree = "<group>"; };
83B0D00816FA1A8900C9D8F8 /* HistoryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HistoryViewController.h; sourceTree = "<group>"; };
@@ -110,7 +111,7 @@
83BB6B6A16FA0A31003A4506 /* circleMask6464.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = circleMask6464.png; sourceTree = "<group>"; };
83BB6B6D16FA0A64003A4506 /* circleMask6464@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "circleMask6464@2x.png"; sourceTree = "<group>"; };
83BB6B6F16FA0B1A003A4506 /* RossScratchpad.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RossScratchpad.h; sourceTree = "<group>"; };
- 83C36E3D1700B8B400C1A147 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
+ 83C36E3D1700B8B400C1A147 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-568h@2x.png"; path = "../Default-568h@2x.png"; sourceTree = "<group>"; };
83D7203616FF964A0012A0B0 /* loadingPage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = loadingPage.png; sourceTree = "<group>"; };
83D97AF316FB859C00B525E2 /* circleMask@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "circleMask@2x.png"; sourceTree = "<group>"; };
83D97AF516FB872000B525E2 /* circleMaskShine@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "circleMaskShine@2x.png"; path = "MappingMashupApp/circleMaskShine@2x.png"; sourceTree = "<group>"; };
@@ -129,7 +130,6 @@
8F372B1316F244C800302B80 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8F372B1516F244C800302B80 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Default.png; sourceTree = "<group>"; };
8F372B1716F244C800302B80 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default@2x.png"; sourceTree = "<group>"; };
- 8F372B1916F244C800302B80 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
8F372B1C16F244C800302B80 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = en; path = en.lproj/MainStoryboard.storyboard; sourceTree = "<group>"; };
8F372B1E16F244C800302B80 /* YelpMapViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = YelpMapViewController.h; sourceTree = "<group>"; };
8F372B1F16F244C800302B80 /* YelpMapViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = YelpMapViewController.m; sourceTree = "<group>"; };
@@ -194,7 +194,6 @@
8F372AF716F244C800302B80 = {
isa = PBXGroup;
children = (
- 83C36E3D1700B8B400C1A147 /* Default-568h@2x.png */,
8F372B0916F244C800302B80 /* MappingMashupApp */,
8F372B0216F244C800302B80 /* Frameworks */,
8F372B0116F244C800302B80 /* Products */,
@@ -249,9 +248,10 @@
8F372B0C16F244C800302B80 /* InfoPlist.strings */,
8F372B0F16F244C800302B80 /* main.m */,
8F372B1116F244C800302B80 /* MappingMashupApp-Prefix.pch */,
+ 837D9F1E1701F56700565291 /* appIcon114x114.png */,
8F372B1516F244C800302B80 /* Default.png */,
+ 83C36E3D1700B8B400C1A147 /* Default-568h@2x.png */,
8F372B1716F244C800302B80 /* Default@2x.png */,
- 8F372B1916F244C800302B80 /* Default-568h@2x.png */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -373,9 +373,9 @@
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
- 8F372AFF16F244C800302B80 /* MappingMashupApp */ = {
+ 8F372AFF16F244C800302B80 /* Wi-Where */ = {
isa = PBXNativeTarget;
- buildConfigurationList = 8F372B2316F244C800302B80 /* Build configuration list for PBXNativeTarget "MappingMashupApp" */;
+ buildConfigurationList = 8F372B2316F244C800302B80 /* Build configuration list for PBXNativeTarget "Wi-Where" */;
buildPhases = (
8F372AFC16F244C800302B80 /* Sources */,
8F372AFD16F244C800302B80 /* Frameworks */,
@@ -386,7 +386,7 @@
dependencies = (
8F372B3116F24B1F00302B80 /* PBXTargetDependency */,
);
- name = MappingMashupApp;
+ name = "Wi-Where";
productName = MappingMashupApp;
productReference = 8F372B0016F244C800302B80 /* MappingMashupApp.app */;
productType = "com.apple.product-type.application";
@@ -418,7 +418,7 @@
);
projectRoot = "";
targets = (
- 8F372AFF16F244C800302B80 /* MappingMashupApp */,
+ 8F372AFF16F244C800302B80 /* Wi-Where */,
);
};
/* End PBXProject section */
@@ -448,7 +448,6 @@
8F372B0E16F244C800302B80 /* InfoPlist.strings in Resources */,
8F372B1616F244C800302B80 /* Default.png in Resources */,
8F372B1816F244C800302B80 /* Default@2x.png in Resources */,
- 8F372B1A16F244C800302B80 /* Default-568h@2x.png in Resources */,
8F372B1D16F244C800302B80 /* MainStoryboard.storyboard in Resources */,
8335571916F754C800DB17D5 /* xmark.png in Resources */,
8335571D16F7579600DB17D5 /* wifiIcon2@2x.png in Resources */,
@@ -467,6 +466,7 @@
830E6BBA170135AE009FBD5B /* appIcon@2x.png in Resources */,
830E6BBB170135AE009FBD5B /* silverBG@2x.png in Resources */,
835876D817014080000A74A7 /* circleShine@2x.png in Resources */,
+ 837D9F1F1701F56700565291 /* appIcon114x114.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -628,7 +628,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
- 8F372B2316F244C800302B80 /* Build configuration list for PBXNativeTarget "MappingMashupApp" */ = {
+ 8F372B2316F244C800302B80 /* Build configuration list for PBXNativeTarget "Wi-Where" */ = {
isa = XCConfigurationList;
buildConfigurations = (
8F372B2416F244C800302B80 /* Debug */,
View
11 MappingMashupApp/APIManager.m
@@ -39,7 +39,14 @@ - (APIManager*)initWithYelpSearch:(NSString*)search andLocation:(CLLocationCoord
//Emily's Yelp Key
//xltTZDS7mgHV7wtu8MkZSg
- yelpAPICall = [NSString stringWithFormat:@"http://api.yelp.com/business_review_search?term=%@&lat=%f&long=%f&radius=%f&limit=%d&ywsid=0mtAebqxwAxzHVOPI_OIyQ", search, latitude, longitude, radius, maxItems];
+ //Paul's Yelp Key
+ //0mtAebqxwAxzHVOPI_OIyQ
+
+ //David's Yelp Key
+ //TROLOLOLOLOLOLO
+
+ //ARC4Random goes in here.
+ yelpAPICall = [NSString stringWithFormat:@"http://api.yelp.com/business_review_search?term=%@&lat=%f&long=%f&radius=%f&limit=%d&ywsid=xltTZDS7mgHV7wtu8MkZSg", search, latitude, longitude, radius, maxItems];
NSLog(@"%@", yelpAPICall);
@@ -77,7 +84,7 @@ - (void)searchYelpThenFlickrForDelegates
//Em's Flickr API Key 90087da25a0e607ed65734c6bbd4bc01dec7b05e
//Ross Flickr API Key 4dcd4b336fc303a2d36023d3c4c1b214
- flickrAPICall = [NSString stringWithFormat:@"http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key=4dcd4b336fc303a2d36023d3c4c1b214&tags=%@&format=json&nojsoncallback=1&lat=%@&lon=%@&radius=0.5&per_page=3&extras=url_sq%%2C+geo", search, latitude, longitude];
+ flickrAPICall = [NSString stringWithFormat:@"http://api.flickr.com/services/rest/?method=flickr.photos.search&api_key=4dcd4b336fc303a2d36023d3c4c1b214&tags=%@&format=json&nojsoncallback=1&lat=%@&lon=%@&radius=0.5&per_page=1&extras=url_sq%%2C+geo", search, latitude, longitude];
NSLog(@"%@", flickrAPICall);
[self searchFlickrWithLatitude:latitude andLongitude:longitude];
View
3  MappingMashupApp/FlickrMapViewController.m
@@ -283,6 +283,7 @@ -(MKAnnotationView*)mapView:(MKMapView*)mapView viewForAnnotation:(id<MKAnnotati
NSData *photoData = [NSData dataWithContentsOfURL:flickrThumbnailURL];
UIImage *photoThumbnailImagePreShine = [UIImage imageWithData:photoData];
UIImage * photoThumbnailImage = [self addImage:photoThumbnailImagePreShine toImage:[UIImage imageNamed:@"CircleShine.png"]];
+ //UIImage * photoThumbnailImage = [self addImage:[UIImage imageNamed:@"CircleShine.png"] toImage:photoThumbnailImagePreShine];
//Now mask the image
dispatch_async(newQueue,^void(void)
@@ -322,7 +323,7 @@ -(MKAnnotationView*)mapView:(MKMapView*)mapView viewForAnnotation:(id<MKAnnotati
annotationView.rightCalloutAccessoryView = detailButton;
- //Maybe stop loading scren here?
+ //Move "add bookmark" notification off-screen
[UIView animateWithDuration:3.5 delay:2.0 options:nil animations:^(void) { loadingOverlay.alpha = 0;} completion:^(BOOL finished){}];
// [UIView animateWithDuration:3.5 animations:^(void) {
// loadingOverlay.alpha = 0;}];
View
2  MappingMashupApp/HistoryViewController.m
@@ -195,7 +195,7 @@ -(void)deleteVenue: (Venue*)venue
NSError *error;
// if (![self.myManagedObjectContext save:&error])
{
- NSLog(@"Delete History item method failed.");
+ NSLog(@"Delete History item method failed: %@", error);
}
}
View
10 MappingMashupApp/MappingMashupApp-Info.plist
@@ -8,6 +8,16 @@
<string>${PRODUCT_NAME}</string>
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
+ <key>CFBundleIcons</key>
+ <dict>
+ <key>CFBundlePrimaryIcon</key>
+ <dict>
+ <key>CFBundleIconFiles</key>
+ <array>
+ <string>appIcon114x114.png</string>
+ </array>
+ </dict>
+ </dict>
<key>CFBundleIdentifier</key>
<string>ThePeanutGallery.${PRODUCT_NAME:rfc1034identifier}</string>
<key>CFBundleInfoDictionaryVersion</key>
View
7 MappingMashupApp/YelpWebPageBrowser.m
@@ -22,8 +22,7 @@ @interface YelpWebPageBrowser ()
}
-- (IBAction)swipeRightAction:(id)sender;
-- (IBAction)swipeLeftAction:(id)sender;
+//Add buttons for left/right here
@end
@@ -88,8 +87,8 @@ - (void)viewDidLoad
// }
// ];
- [UIView animateWithDuration:0.75
- delay:3.0
+ [UIView animateWithDuration:0.0
+ delay:0.0
options: UIViewAnimationCurveEaseIn
animations:^{
popoutView.center = CGPointMake(popoutView.center.x, popoutView.center.y+200);
View
BIN  MappingMashupApp/appIcon114x114.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
20 MappingMashupApp/en.lproj/MainStoryboard.storyboard
@@ -76,7 +76,7 @@
<rect key="frame" x="144" y="320" width="37" height="37"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
</activityIndicatorView>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Experience your surroundings. Tap something interesting and we'll show you where you can get online" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Experience your surroundings. Tap something interesting and we'll show you where you can get online for free." textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="GWX-UP-W0P">
<rect key="frame" x="20" y="365" width="285" height="91"/>
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -127,8 +127,6 @@
<gestureRecognizers/>
<connections>
<outlet property="delegate" destination="qVE-kj-ncM" id="c7l-wu-QlU"/>
- <outletCollection property="gestureRecognizers" destination="wLz-no-EhL" appends="YES" id="nld-nD-XvC"/>
- <outletCollection property="gestureRecognizers" destination="aMq-dz-sRv" appends="YES" id="mHB-oi-SQu"/>
</connections>
</webView>
<view contentMode="scaleToFill" id="JIq-gF-FaR">
@@ -160,18 +158,6 @@
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="UfP-Tc-Lc4" userLabel="First Responder" sceneMemberID="firstResponder"/>
- <swipeGestureRecognizer direction="right" id="wLz-no-EhL">
- <connections>
- <action selector="swipeRightAction:" destination="qVE-kj-ncM" id="Qha-LN-PxN"/>
- <outlet property="delegate" destination="qVE-kj-ncM" id="hdX-ih-QSa"/>
- </connections>
- </swipeGestureRecognizer>
- <swipeGestureRecognizer direction="left" id="aMq-dz-sRv">
- <connections>
- <action selector="swipeLeftAction:" destination="qVE-kj-ncM" id="jQ4-iR-pzU"/>
- <outlet property="delegate" destination="qVE-kj-ncM" id="c2O-QY-ijT"/>
- </connections>
- </swipeGestureRecognizer>
</objects>
<point key="canvasLocation" x="1457" y="725"/>
</scene>
@@ -350,7 +336,6 @@
<class className="FlickrMapViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/FlickrMapViewController.h"/>
<relationships>
- <relationship kind="action" name="backToFlickrMapView:" candidateClass="UIStoryboardSegue"/>
<relationship kind="outlet" name="loadingOverlay" candidateClass="UIView"/>
<relationship kind="outlet" name="mapView" candidateClass="MKMapView"/>
</relationships>
@@ -361,9 +346,6 @@
<relationship kind="outlet" name="historyTableViewOutlet" candidateClass="UITableView"/>
</relationships>
</class>
- <class className="UIStoryboardSegue" superclassName="NSObject">
- <source key="sourceIdentifier" type="project" relativePath="./Classes/UIStoryboardSegue.h"/>
- </class>
<class className="YelpMapViewController" superclassName="UIViewController">
<source key="sourceIdentifier" type="project" relativePath="./Classes/YelpMapViewController.h"/>
<relationships>
View
BIN  appIcon114x114.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Please sign in to comment.
Something went wrong with that request. Please try again.