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

Jump to bottom

hw #21

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

hw #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
b6621a6
error with saving the phrase fro m the cell
bereket6725 Sep 25, 2015
5a77cdb
data in JSONObjectWithData is nill
bereket6725 Sep 25, 2015
2866a73
not getting JSON still
bereket6725 Sep 25, 2015
4b8c137
Fixed one problem but still no JSON
bereket6725 Sep 26, 2015
95bd26d
fixed JSON
bereket6725 Sep 26, 2015
8196168
Wrong JSON data
bereket6725 Sep 26, 2015
850a363
seems like im getting the right JSON
bereket6725 Sep 26, 2015
3002003
now only getting 1 JSON for WaveHill which is good but then it throws…
bereket6725 Sep 26, 2015
6168baa
figured out lines 70-72 are throwing the error but not sure why
bereket6725 Sep 26, 2015
8295bf5
figured out why I have multiple JSONS
bereket6725 Sep 26, 2015
b0e4553
Changed Rockefeller to Madame Tussauds, I needed more specificty in t…
bereket6725 Sep 26, 2015
28a9b4c
some changes
bereket6725 Sep 26, 2015
729f489
using instagram instead
bereket6725 Sep 26, 2015
01141f6
address stored
bereket6725 Sep 26, 2015
94b6004
Label change broke
bereket6725 Sep 26, 2015
897705f
think the label situation will be figured out soon. When its in the A…
bereket6725 Sep 26, 2015
a718f01
label issue fixed. Also removed map section because there was not eno…
bereket6725 Sep 26, 2015
60f3ec5
working through instagram
bereket6725 Sep 26, 2015
03e35f6
fixed an error
bereket6725 Sep 26, 2015
a6028c7
missing code but still has an error
bereket6725 Sep 26, 2015
3e39598
added comments
bereket6725 Sep 26, 2015
f12664c
made one change
bereket6725 Sep 26, 2015
8f43e79
commented out all instagram stuff
bereket6725 Sep 26, 2015
7fbc420
modeling some of the code for the instagram feature from mikes Table …
bereket6725 Sep 26, 2015
5b43b7b
data parameter is nil is the error, getting a bit closer as to why th…
bereket6725 Sep 26, 2015
1878976
the issue is that JSON is not being produced
bereket6725 Sep 26, 2015
cebf9f7
did it mike
bereket6725 Sep 30, 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
35 changes: 27 additions & 8 deletions TalkinToTheNet/TalkinToTheNet.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,32 @@
/* Begin PBXBuildFile section */
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 */; };
AB665E611BB67FA000DE3C50 /* InstagramPost.m in Sources */ = {isa = PBXBuildFile; fileRef = AB665E601BB67FA000DE3C50 /* InstagramPost.m */; settings = {ASSET_TAGS = (); }; };
AB6E6E5D1BB4B10300756BD8 /* ListOfLocationsTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB6E6E5C1BB4B10300756BD8 /* ListOfLocationsTableViewController.m */; settings = {ASSET_TAGS = (); }; };
AB6E6E601BB4B12200756BD8 /* DetailLocationViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = AB6E6E5F1BB4B12200756BD8 /* DetailLocationViewController.m */; settings = {ASSET_TAGS = (); }; };
AB6E6E631BB4BA7000756BD8 /* API Manager.m in Sources */ = {isa = PBXBuildFile; fileRef = AB6E6E621BB4BA7000756BD8 /* API Manager.m */; settings = {ASSET_TAGS = (); }; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
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>"; };
8D7DCD5A1BAF859400A92AD2 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
AB665E5F1BB67FA000DE3C50 /* InstagramPost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InstagramPost.h; sourceTree = "<group>"; };
AB665E601BB67FA000DE3C50 /* InstagramPost.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = InstagramPost.m; sourceTree = "<group>"; };
AB6E6E5B1BB4B10300756BD8 /* ListOfLocationsTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ListOfLocationsTableViewController.h; sourceTree = "<group>"; };
AB6E6E5C1BB4B10300756BD8 /* ListOfLocationsTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ListOfLocationsTableViewController.m; sourceTree = "<group>"; };
AB6E6E5E1BB4B12200756BD8 /* DetailLocationViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetailLocationViewController.h; sourceTree = "<group>"; };
AB6E6E5F1BB4B12200756BD8 /* DetailLocationViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DetailLocationViewController.m; sourceTree = "<group>"; };
AB6E6E611BB4BA7000756BD8 /* API Manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "API Manager.h"; sourceTree = "<group>"; };
AB6E6E621BB4BA7000756BD8 /* API Manager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "API Manager.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -60,8 +69,14 @@
children = (
8D7DCD4C1BAF859400A92AD2 /* AppDelegate.h */,
8D7DCD4D1BAF859400A92AD2 /* AppDelegate.m */,
8D7DCD4F1BAF859400A92AD2 /* ViewController.h */,
8D7DCD501BAF859400A92AD2 /* ViewController.m */,
AB6E6E611BB4BA7000756BD8 /* API Manager.h */,
AB6E6E621BB4BA7000756BD8 /* API Manager.m */,
AB6E6E5B1BB4B10300756BD8 /* ListOfLocationsTableViewController.h */,
AB6E6E5C1BB4B10300756BD8 /* ListOfLocationsTableViewController.m */,
AB6E6E5E1BB4B12200756BD8 /* DetailLocationViewController.h */,
AB6E6E5F1BB4B12200756BD8 /* DetailLocationViewController.m */,
AB665E5F1BB67FA000DE3C50 /* InstagramPost.h */,
AB665E601BB67FA000DE3C50 /* InstagramPost.m */,
8D7DCD521BAF859400A92AD2 /* Main.storyboard */,
8D7DCD551BAF859400A92AD2 /* Assets.xcassets */,
8D7DCD571BAF859400A92AD2 /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -149,8 +164,11 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
8D7DCD511BAF859400A92AD2 /* ViewController.m in Sources */,
AB6E6E631BB4BA7000756BD8 /* API Manager.m in Sources */,
AB6E6E601BB4B12200756BD8 /* DetailLocationViewController.m in Sources */,
AB6E6E5D1BB4B10300756BD8 /* ListOfLocationsTableViewController.m in Sources */,
8D7DCD4E1BAF859400A92AD2 /* AppDelegate.m in Sources */,
AB665E611BB67FA000DE3C50 /* InstagramPost.m in Sources */,
8D7DCD4B1BAF859400A92AD2 /* main.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -262,7 +280,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = TalkinToTheNet/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.TalkinToTheNet;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -274,7 +292,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = TalkinToTheNet/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.4;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.TalkinToTheNet;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -300,6 +318,7 @@
8D7DCD5F1BAF859400A92AD2 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
Expand Down
18 changes: 18 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/API Manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
//
// API Manager.h
// TalkinToTheNet
//
// Created by Bereket on 9/24/15.
// Copyright © 2015 Mike Kavouras. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface API_Manager : NSObject

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



@end
32 changes: 32 additions & 0 deletions TalkinToTheNet/TalkinToTheNet/API Manager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
//
// API Manager.m
// TalkinToTheNet
//
// Created by Bereket on 9/24/15.
// Copyright © 2015 Mike Kavouras. All rights reserved.
//

#import "API Manager.h"

@implementation API_Manager



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

NSURLSession *session = [NSURLSession sharedSession];

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

dispatch_async(dispatch_get_main_queue(), ^{
completionBlock(data, response, error);
});
}];

[task resume];

}


@end
5 changes: 3 additions & 2 deletions TalkinToTheNet/TalkinToTheNet/Base.lproj/LaunchScreen.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8150" systemVersion="15A204g" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="8191" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" initialViewController="01J-lp-oVM">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8122"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="8154"/>
</dependencies>
<scenes>
<!--View Controller-->
Expand Down
Loading