Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
a740a2e
First commmit - Storyboard done
Diana71 Oct 12, 2015
54b63f9
Added Alert View, just in case the user forgets to write the destination
Diana71 Oct 12, 2015
f458d69
Added Video Controller
Diana71 Oct 12, 2015
d561c7f
Merge pull request #1 from Diana71/master
Xiulanshi Oct 13, 2015
125c4ff
Added APIManager
Xiulanshi Oct 13, 2015
8101696
Added APIManager and Updated Food and Hotel storyboard
Xiulanshi Oct 13, 2015
98e8c3e
Added Food API
Xiulanshi Oct 13, 2015
a130cb0
Commit
Diana71 Oct 13, 2015
2bdf4a6
added Hotel API
Xiulanshi Oct 13, 2015
22d5530
Added Youtube Pod
Diana71 Oct 13, 2015
3d77543
Just fixed the searchBar
Diana71 Oct 14, 2015
49cf021
Changed VideoController stuff
Diana71 Oct 14, 2015
12e609a
Pass Searchbar text to Food and Hotel
Xiulanshi Oct 14, 2015
b725d96
Added Youtube API working
Diana71 Oct 14, 2015
e1fc3d4
Got the video results showing
Diana71 Oct 14, 2015
90ec2f8
Video Playing
Diana71 Oct 14, 2015
eafbe28
Changed Saved text in SearchBar
Diana71 Oct 14, 2015
5547d68
Added Welcome animation and Games/Traveled files
Diana71 Oct 14, 2015
26a6c90
Fixed UI
Diana71 Oct 14, 2015
184a09f
storyboard changes
arturlan Oct 14, 2015
0ecfe89
10-14
arturlan Oct 14, 2015
f3acda0
Saving user's city, using NSUserDefaults
Diana71 Oct 15, 2015
69c3055
Cleaned up code
Diana71 Oct 15, 2015
d2d0ea3
Added Games files
Diana71 Oct 16, 2015
9b97cdb
Flappy Bird game is working :)
Diana71 Oct 16, 2015
07bcf9b
working Flickr API
arturlan Oct 16, 2015
8ce428e
Added visited add and detail viewcontrollers
Xiulanshi Oct 17, 2015
aa7b4a5
custom cell
arturlan Oct 18, 2015
c0c1b95
flickr
arturlan Oct 18, 2015
52e34a0
Added coredata for visited and update the add and detail viewcontroller
Xiulanshi Oct 18, 2015
ed18b66
added default food and hotel image
Xiulanshi Oct 18, 2015
f97a74d
update default food and hotel image
Xiulanshi Oct 18, 2015
11a0990
changed default food and hotel image
Xiulanshi Oct 18, 2015
131d023
commit
arturlan Oct 18, 2015
6deb137
Merge branch 'master' of https://github.com/Xiulanshi/unit-2-final-pr…
arturlan Oct 18, 2015
264e27d
storyboard
arturlan Oct 18, 2015
6898464
Updated food and hotel viewcontroller added podfile
Xiulanshi Oct 18, 2015
1d24077
new commit
Xiulanshi Oct 18, 2015
221a658
updated search bar
Xiulanshi Oct 18, 2015
819eee1
group foursquare files
Xiulanshi Oct 18, 2015
a9632fd
Added rating stars
Diana71 Oct 19, 2015
d604b59
Fixed Segmented control
Diana71 Oct 19, 2015
6aa9460
new files
Diana71 Oct 19, 2015
9b2406a
Forgot to change initial view
Diana71 Oct 19, 2015
8f701be
Organized storyboard
Diana71 Oct 19, 2015
7e8a2e6
meetup
arturlan Oct 20, 2015
c265c3a
meetup with lat and lng
arturlan Oct 20, 2015
fff8e73
fixed meetup
arturlan Oct 20, 2015
99267fc
Changed welcome UI
Diana71 Oct 20, 2015
51e88dd
Welcome UI done
Diana71 Oct 20, 2015
bb10a2e
Game UI done
Diana71 Oct 20, 2015
8c64bee
Game UI done
Diana71 Oct 20, 2015
40c1b38
Changed game button
Diana71 Oct 20, 2015
df9c601
Games UI last change
Diana71 Oct 20, 2015
44594ca
Visited Cities UI done
Diana71 Oct 21, 2015
33dccee
Demo version
Diana71 Oct 21, 2015
900ab23
working hyperlink
arturlan Oct 21, 2015
ddbf103
10-21
arturlan Oct 21, 2015
e4cfe76
Added AFNetworking Pod
Diana71 Oct 22, 2015
b25b56f
Insta not crashing
Diana71 Oct 22, 2015
15cd493
Added NSAppTransportSecurity, Instagram working
Diana71 Oct 22, 2015
a844870
Instagram done
Diana71 Oct 22, 2015
38e0b51
Added CollectionView
Xiulanshi Oct 22, 2015
6f8358a
fixed merge conflicted
Xiulanshi Oct 22, 2015
be585c6
Prices
Diana71 Oct 22, 2015
65448ba
Price
Diana71 Oct 22, 2015
e9fdd30
ughhhh
Diana71 Oct 22, 2015
6f220e6
merged
Diana71 Oct 22, 2015
234a7d4
Updated Hotel TableViewCell
Xiulanshi Oct 22, 2015
c4d43ac
Added link to Budgetyourtrip
Xiulanshi Oct 22, 2015
2c84798
Clean up the code on Visited
Xiulanshi Oct 22, 2015
8754283
Candy Crush game DONE
Diana71 Oct 22, 2015
babb3b6
merge
Diana71 Oct 22, 2015
3ef13f7
Merge conflict fixed
Diana71 Oct 22, 2015
4d0c3c6
Pass SearchBarText to budgetyourtrip url
Xiulanshi Oct 22, 2015
a3061a7
Got the Meetup api working, using user's input
Diana71 Oct 22, 2015
c4f5a29
Deleted Meetup plus button and stuff
Diana71 Oct 22, 2015
1911a90
Candy changed
Diana71 Oct 22, 2015
1aa353d
Fixed games constraints
Diana71 Oct 22, 2015
d1a1499
meetup
arturlan Oct 22, 2015
1e7ab7f
Dismiss KeyBoard
Xiulanshi Oct 22, 2015
9b38a1e
Change to Endediting
Xiulanshi Oct 22, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Binary file added .DS_Store
Binary file not shown.
Binary file added InControl/.DS_Store
Binary file not shown.
1,035 changes: 1,035 additions & 0 deletions InControl/InControl.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions InControl/InControl.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added InControl/InControl/.DS_Store
Binary file not shown.
15 changes: 15 additions & 0 deletions InControl/InControl/APIManager.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// APIManager.h
// InControl
//
// Created by Xiulan Shi on 10/13/15.
// Copyright © 2015 Diana Elezaj. All rights reserved.
//

#import <Foundation/Foundation.h>

@interface APIManager : NSObject

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

@end
26 changes: 26 additions & 0 deletions InControl/InControl/APIManager.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
//
// APIManager.m
// InControl
//
// Created by Xiulan Shi on 10/13/15.
// Copyright © 2015 Diana Elezaj. All rights reserved.
//

#import "APIManager.h"

@implementation APIManager

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

NSURLSession *session = [NSURLSession sharedSession];
NSURLSessionDataTask *dataTask = [session dataTaskWithURL:URL completionHandler:^(NSData *data, NSURLResponse *response, NSError *error) {
dispatch_async(dispatch_get_main_queue(), ^{
completionHandler(data, response, error);
});
}];

[dataTask resume];

}

@end
15 changes: 15 additions & 0 deletions InControl/InControl/AddVisitedViewController.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// AddVisitedViewController.h
// InControl
//
// Created by Xiulan Shi on 10/16/15.
// Copyright © 2015 Diana Elezaj. All rights reserved.
//

#import <UIKit/UIKit.h>
#import "City.h"

@interface AddVisitedViewController : UIViewController

@property (nonatomic) City *city;
@end
186 changes: 186 additions & 0 deletions InControl/InControl/AddVisitedViewController.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,186 @@
//
// AddVisitedViewController.m
// InControl
//
// Created by Xiulan Shi on 10/16/15.
// Copyright © 2015 Diana Elezaj. All rights reserved.
//

#import <CoreData/CoreData.h>
#import "AppDelegate.h"
#import "City.h"
#import "AddVisitedViewController.h"
#import "Photo.h"
#import "Photo+CoreDataProperties.h"

@interface AddVisitedViewController () <UITextFieldDelegate>
@property (weak, nonatomic) IBOutlet UITextField *cityTextField;
@property (weak, nonatomic) IBOutlet UITextField *impressionTextField;
@property (weak, nonatomic) IBOutlet UIImageView *imageView;
@property (weak, nonatomic) IBOutlet UIButton *rate1Button;
@property (weak, nonatomic) IBOutlet UIButton *rate2Button;
@property (weak, nonatomic) IBOutlet UIButton *rate3Button;
@property (weak, nonatomic) IBOutlet UIButton *rate4Button;
@property (weak, nonatomic) IBOutlet UIButton *rate5Button;
@property (nonatomic) NSNumber *rateSelected;
@property (nonatomic) UIImage *whiteStarBackground;
@property (nonatomic) UIImage *yellowStarBackground;


@property (nonatomic) UIImagePickerController *picker;
@property (nonatomic) UIImagePickerController *picker2;
@property (nonatomic) UIImage *image;

@property (nonatomic) NSMutableArray *photos;

@property (nonatomic) Photo *photo;

@end

@implementation AddVisitedViewController

- (void)viewDidLoad {
[super viewDidLoad];

if (!self.photos) {
self.photos = [NSMutableArray new];
}

self.whiteStarBackground = [UIImage imageNamed:@"WhiteStar"];
self.yellowStarBackground = [UIImage imageNamed:@"YellowStar"];
self.rateSelected = @1;

[self setupNavigationBar];

AppDelegate *delegate = [UIApplication sharedApplication].delegate;

self.city = [NSEntityDescription insertNewObjectForEntityForName:@"City" inManagedObjectContext:delegate.managedObjectContext];

}

-(void)viewWillAppear:(BOOL)animated {
[super viewWillAppear:YES ];
self.view.backgroundColor = [UIColor colorWithPatternImage:[UIImage imageNamed:@"cc"]];

}

- (void)setupNavigationBar {

self.navigationItem.title = @"Create New Visited City";

self.navigationItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemCancel target:self action:@selector(cancel)];

self.navigationItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave target:self action:@selector(save)];
}

- (void)cancel {
AppDelegate *delegate = [UIApplication sharedApplication].delegate;
[delegate.managedObjectContext deleteObject:self.city];
[self dismissViewControllerAnimated:YES completion:nil];
}

- (void)save {
self.city.name = self.cityTextField.text;
// [self.cityTextField resignFirstResponder];

NSNumberFormatter *f = [[NSNumberFormatter alloc] init];
f.numberStyle = NSNumberFormatterDecimalStyle;
self.city.rate = self.rateSelected;

self.city.impression = self.impressionTextField.text;
// [self.impressionTextField resignFirstResponder];

self.city.photos = [NSOrderedSet orderedSetWithArray:self.photos];

AppDelegate *delegate = [UIApplication sharedApplication].delegate;
[delegate.managedObjectContext save:nil];

[self dismissViewControllerAnimated:YES completion:nil];

}

- (IBAction)chooseExistingButtonTapped:(id)sender {

self.picker2 = [[UIImagePickerController alloc] init];
self.picker2.delegate = self;
[self.picker2 setSourceType:UIImagePickerControllerSourceTypePhotoLibrary];
[self presentViewController:self.picker2 animated:YES completion:NULL];
[self.view endEditing:YES];

}

- (IBAction)takePhotoButtonTapped:(id)sender {

self.picker = [[UIImagePickerController alloc] init];
self.picker.delegate = self;
[self.picker setSourceType:UIImagePickerControllerSourceTypeCamera];
[self presentViewController:self.picker animated:YES completion:NULL];
[self.view endEditing:YES];
}

- (void)imagePickerController:(UIImagePickerController *)picker didFinishPickingMediaWithInfo:(NSDictionary *)info{

AppDelegate *delegate = [UIApplication sharedApplication].delegate;
Photo *newPhoto = [NSEntityDescription insertNewObjectForEntityForName:@"Photo" inManagedObjectContext:delegate.managedObjectContext];


self.image = [info objectForKey:UIImagePickerControllerOriginalImage];
[self.imageView setImage:self.image];
newPhoto.imageData = UIImagePNGRepresentation (self.image);
[self.photos addObject:newPhoto];

[self dismissViewControllerAnimated:YES completion:NULL];
}

- (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
[self dismissViewControllerAnimated:YES completion:NULL];
}



- (IBAction)rate1Selected:(UIButton *)sender {
self.rateSelected = @1;
[self.rate1Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate2Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
[self.rate3Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
[self.rate4Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
[self.rate5Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
}
- (IBAction)rate2Selected:(UIButton *)sender {
self.rateSelected = @2;
[self.rate1Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate2Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate3Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
[self.rate4Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
[self.rate5Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
}
- (IBAction)rate3Selected:(UIButton *)sender {
self.rateSelected = @3;
[self.rate1Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate2Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate3Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate4Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
[self.rate5Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
}
- (IBAction)rate4Selected:(UIButton *)sender {
self.rateSelected = @4;
[self.rate1Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate2Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate3Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate4Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate5Button setBackgroundImage:self.whiteStarBackground forState:UIControlStateNormal];
}
- (IBAction)rate5Selected:(UIButton *)sender {
self.rateSelected = @5;
[self.rate1Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate2Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate3Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate4Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
[self.rate5Button setBackgroundImage:self.yellowStarBackground forState:UIControlStateNormal];
}





@end
25 changes: 25 additions & 0 deletions InControl/InControl/AppDelegate.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
//
// AppDelegate.h
// InControl
//
// Created by Diana Elezaj on 10/11/15.
// Copyright © 2015 Diana Elezaj. All rights reserved.
//

#import <UIKit/UIKit.h>
#import <CoreData/CoreData.h>

@interface AppDelegate : UIResponder <UIApplicationDelegate>

@property (strong, nonatomic) UIWindow *window;

@property (readonly, strong, nonatomic) NSManagedObjectContext *managedObjectContext;
@property (readonly, strong, nonatomic) NSManagedObjectModel *managedObjectModel;
@property (readonly, strong, nonatomic) NSPersistentStoreCoordinator *persistentStoreCoordinator;

- (void)saveContext;
- (NSURL *)applicationDocumentsDirectory;


@end

Loading