Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull request, HW not complete yet #28

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Pull request, HW not complete yet #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3aabf3d
Tried
ddistant Sep 26, 2015
552b3ab
Refactored and redone, more to do still
ddistant Sep 29, 2015
09dc57d
Finished HW requirements, technically
ddistant Sep 30, 2015
2fd0fa5
Trying to commit again
ddistant Sep 30, 2015
5d05622
Added map stuff, refactored, added webview
ddistant Oct 3, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added TalkinToTheNet/.DS_Store
View file
Open in desktop
Binary file not shown.
86 changes: 76 additions & 10 deletions TalkinToTheNet/TalkinToTheNet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,50 @@
objects = {

/* Begin PBXBuildFile section */
228221721BB8AC4A008900C2 /* DetailsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 228221711BB8AC4A008900C2 /* DetailsTableViewCell.xib */; settings = {ASSET_TAGS = (); }; };
228221751BBAC25C008900C2 /* MapViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 228221741BBAC25C008900C2 /* MapViewController.m */; settings = {ASSET_TAGS = (); }; };
228221781BBB41A6008900C2 /* InstagramPost.m in Sources */ = {isa = PBXBuildFile; fileRef = 228221771BBB41A6008900C2 /* InstagramPost.m */; settings = {ASSET_TAGS = (); }; };
22D3D28D1BBF3E7D00E4B1A2 /* WebViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22D3D28C1BBF3E7D00E4B1A2 /* WebViewController.m */; settings = {ASSET_TAGS = (); }; };
22D3D28F1BBF5BDF00E4B1A2 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22D3D28E1BBF5BDF00E4B1A2 /* WebKit.framework */; };
22DE3DF11BB0379D00153600 /* APIManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DE3DF01BB0379D00153600 /* APIManager.m */; settings = {ASSET_TAGS = (); }; };
22DE3DF31BB041A200153600 /* MapKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DE3DF21BB041A200153600 /* MapKit.framework */; };
22DE3DF51BB04E4300153600 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 22DE3DF41BB04E4300153600 /* CoreLocation.framework */; };
22DE3DF81BB05AAD00153600 /* SearchViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DE3DF71BB05AAD00153600 /* SearchViewController.m */; settings = {ASSET_TAGS = (); }; };
22DE3E2A1BB4EA9B00153600 /* DetailsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DE3E291BB4EA9B00153600 /* DetailsTableViewController.m */; settings = {ASSET_TAGS = (); }; };
22DE3E2D1BB4EAD900153600 /* DetailsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DE3E2C1BB4EAD900153600 /* DetailsTableViewCell.m */; settings = {ASSET_TAGS = (); }; };
22DE3E321BB581E800153600 /* FourSquareVenueResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 22DE3E311BB581E800153600 /* FourSquareVenueResult.m */; settings = {ASSET_TAGS = (); }; };
8D7DCD4B1BAF859400A92AD2 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7DCD4A1BAF859400A92AD2 /* main.m */; };
8D7DCD4E1BAF859400A92AD2 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7DCD4D1BAF859400A92AD2 /* AppDelegate.m */; };
8D7DCD511BAF859400A92AD2 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D7DCD501BAF859400A92AD2 /* ViewController.m */; };
8D7DCD541BAF859400A92AD2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D7DCD521BAF859400A92AD2 /* Main.storyboard */; };
8D7DCD561BAF859400A92AD2 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D7DCD551BAF859400A92AD2 /* Assets.xcassets */; };
8D7DCD591BAF859400A92AD2 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D7DCD571BAF859400A92AD2 /* LaunchScreen.storyboard */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
228221711BB8AC4A008900C2 /* DetailsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = DetailsTableViewCell.xib; sourceTree = "<group>"; };
228221731BBAC25C008900C2 /* MapViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapViewController.h; sourceTree = "<group>"; };
228221741BBAC25C008900C2 /* MapViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapViewController.m; sourceTree = "<group>"; };
228221761BBB41A6008900C2 /* InstagramPost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstagramPost.h; sourceTree = "<group>"; };
228221771BBB41A6008900C2 /* InstagramPost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstagramPost.m; sourceTree = "<group>"; };
22D3D28B1BBF3E7D00E4B1A2 /* WebViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebViewController.h; sourceTree = "<group>"; };
22D3D28C1BBF3E7D00E4B1A2 /* WebViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebViewController.m; sourceTree = "<group>"; };
22D3D28E1BBF5BDF00E4B1A2 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
22DE3DEF1BB0379D00153600 /* APIManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIManager.h; sourceTree = "<group>"; };
22DE3DF01BB0379D00153600 /* APIManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APIManager.m; sourceTree = "<group>"; };
22DE3DF21BB041A200153600 /* MapKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MapKit.framework; path = System/Library/Frameworks/MapKit.framework; sourceTree = SDKROOT; };
22DE3DF41BB04E4300153600 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
22DE3DF61BB05AAD00153600 /* SearchViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SearchViewController.h; sourceTree = "<group>"; };
22DE3DF71BB05AAD00153600 /* SearchViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SearchViewController.m; sourceTree = "<group>"; };
22DE3E281BB4EA9B00153600 /* DetailsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailsTableViewController.h; sourceTree = "<group>"; };
22DE3E291BB4EA9B00153600 /* DetailsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailsTableViewController.m; sourceTree = "<group>"; };
22DE3E2B1BB4EAD900153600 /* DetailsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailsTableViewCell.h; sourceTree = "<group>"; };
22DE3E2C1BB4EAD900153600 /* DetailsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailsTableViewCell.m; sourceTree = "<group>"; };
22DE3E301BB581E800153600 /* FourSquareVenueResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FourSquareVenueResult.h; sourceTree = "<group>"; };
22DE3E311BB581E800153600 /* FourSquareVenueResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FourSquareVenueResult.m; sourceTree = "<group>"; };
8D7DCD461BAF859400A92AD2 /* TalkinToTheNet.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TalkinToTheNet.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D7DCD4A1BAF859400A92AD2 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8D7DCD4C1BAF859400A92AD2 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
8D7DCD4D1BAF859400A92AD2 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; };
8D7DCD4F1BAF859400A92AD2 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; };
8D7DCD501BAF859400A92AD2 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; };
8D7DCD531BAF859400A92AD2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
8D7DCD551BAF859400A92AD2 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
8D7DCD581BAF859400A92AD2 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
Expand All @@ -33,6 +62,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
22D3D28F1BBF5BDF00E4B1A2 /* WebKit.framework in Frameworks */,
22DE3DF51BB04E4300153600 /* CoreLocation.framework in Frameworks */,
22DE3DF31BB041A200153600 /* MapKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -42,6 +74,9 @@
8D7DCD3D1BAF859400A92AD2 = {
isa = PBXGroup;
children = (
22D3D28E1BBF5BDF00E4B1A2 /* WebKit.framework */,
22DE3DF41BB04E4300153600 /* CoreLocation.framework */,
22DE3DF21BB041A200153600 /* MapKit.framework */,
8D7DCD481BAF859400A92AD2 /* TalkinToTheNet */,
8D7DCD471BAF859400A92AD2 /* Products */,
);
Expand All @@ -60,8 +95,23 @@
children = (
8D7DCD4C1BAF859400A92AD2 /* AppDelegate.h */,
8D7DCD4D1BAF859400A92AD2 /* AppDelegate.m */,
8D7DCD4F1BAF859400A92AD2 /* ViewController.h */,
8D7DCD501BAF859400A92AD2 /* ViewController.m */,
22DE3DEF1BB0379D00153600 /* APIManager.h */,
22DE3DF01BB0379D00153600 /* APIManager.m */,
22DE3DF61BB05AAD00153600 /* SearchViewController.h */,
22DE3DF71BB05AAD00153600 /* SearchViewController.m */,
228221731BBAC25C008900C2 /* MapViewController.h */,
228221741BBAC25C008900C2 /* MapViewController.m */,
22DE3E301BB581E800153600 /* FourSquareVenueResult.h */,
22DE3E311BB581E800153600 /* FourSquareVenueResult.m */,
22DE3E281BB4EA9B00153600 /* DetailsTableViewController.h */,
22DE3E291BB4EA9B00153600 /* DetailsTableViewController.m */,
22D3D28B1BBF3E7D00E4B1A2 /* WebViewController.h */,
22D3D28C1BBF3E7D00E4B1A2 /* WebViewController.m */,
228221761BBB41A6008900C2 /* InstagramPost.h */,
228221771BBB41A6008900C2 /* InstagramPost.m */,
22DE3E2B1BB4EAD900153600 /* DetailsTableViewCell.h */,
22DE3E2C1BB4EAD900153600 /* DetailsTableViewCell.m */,
228221711BB8AC4A008900C2 /* DetailsTableViewCell.xib */,
8D7DCD521BAF859400A92AD2 /* Main.storyboard */,
8D7DCD551BAF859400A92AD2 /* Assets.xcassets */,
8D7DCD571BAF859400A92AD2 /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -110,6 +160,7 @@
TargetAttributes = {
8D7DCD451BAF859400A92AD2 = {
CreatedOnToolsVersion = 7.0;
DevelopmentTeam = N2DCZ2U592;
};
};
};
Expand Down Expand Up @@ -138,6 +189,7 @@
files = (
8D7DCD591BAF859400A92AD2 /* LaunchScreen.storyboard in Resources */,
8D7DCD561BAF859400A92AD2 /* Assets.xcassets in Resources */,
228221721BB8AC4A008900C2 /* DetailsTableViewCell.xib in Resources */,
8D7DCD541BAF859400A92AD2 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -149,8 +201,15 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D7DCD511BAF859400A92AD2 /* ViewController.m in Sources */,
22DE3E2D1BB4EAD900153600 /* DetailsTableViewCell.m in Sources */,
22D3D28D1BBF3E7D00E4B1A2 /* WebViewController.m in Sources */,
22DE3DF11BB0379D00153600 /* APIManager.m in Sources */,
22DE3E2A1BB4EA9B00153600 /* DetailsTableViewController.m in Sources */,
228221751BBAC25C008900C2 /* MapViewController.m in Sources */,
8D7DCD4E1BAF859400A92AD2 /* AppDelegate.m in Sources */,
22DE3DF81BB05AAD00153600 /* SearchViewController.m in Sources */,
22DE3E321BB581E800153600 /* FourSquareVenueResult.m in Sources */,
228221781BBB41A6008900C2 /* InstagramPost.m in Sources */,
8D7DCD4B1BAF859400A92AD2 /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -261,23 +320,29 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
INFOPLIST_FILE = TalkinToTheNet/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.TalkinToTheNet;
PRODUCT_BUNDLE_IDENTIFIER = com.danieldistant.TalkinToTheNet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Debug;
};
8D7DCD5F1BAF859400A92AD2 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
INFOPLIST_FILE = TalkinToTheNet/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.TalkinToTheNet;
PRODUCT_BUNDLE_IDENTIFIER = com.danieldistant.TalkinToTheNet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE = "";
};
name = Release;
};
Expand All @@ -300,6 +365,7 @@
8D7DCD5F1BAF859400A92AD2 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
15 changes: 15 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/APIManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// APIManager.h
// LearnAPIs2
//
// Created by Daniel Distant on 9/20/15.
// Copyright © 2015 ddistant. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface APIManager : NSObject

+(void)GETRequestWithURL:(NSURL *)URL completionHandler:(void(^)(NSData *, NSURLResponse *, NSError *))completionHandler;

@end
30 changes: 30 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/APIManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
//
// APIManager.m
// LearnAPIs2
//
// Created by Daniel Distant on 9/20/15.
// Copyright © 2015 ddistant. All rights reserved.
//

#import "APIManager.h"

@implementation APIManager

+ (void)GETRequestWithURL:(NSURL *)URL completionHandler:(void(^)(NSData *, NSURLResponse *, NSError *))completionHandler {

NSURLSession *session = [NSURLSession sharedSession];

NSURLSessionDataTask *task = [session dataTaskWithURL:URL completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {

dispatch_async(dispatch_get_main_queue(), ^{

completionHandler(data, response,error);
});

}];

[task resume];

}

@end
6 changes: 6 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/Assets.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
21 changes: 21 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/Assets.xcassets/foursquare logo.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "foursquare logo.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added ...Net/TalkinToTheNet/Assets.xcassets/foursquare logo.imageset/foursquare logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/Assets.xcassets/nearMeLogo.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "nearMeLogo.jpeg",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added TalkinToTheNet/TalkinToTheNet/Assets.xcassets/nearMeLogo.imageset/nearMeLogo.jpeg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading