Skip to content

Assessment done! #16

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

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

Assessment done! #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6de1c44
Finished with extrextra features
Diana71 Feb 20, 2016
a64c2de
added stuff
Diana71 Feb 20, 2016
74f6b76
Click on cell to see the location
Diana71 Feb 20, 2016
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 FixaDaApp/.DS_Store
View file
Open in desktop
Binary file not shown.
12 changes: 12 additions & 0 deletions FixaDaApp/FixaDaApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/* Begin PBXBuildFile section */
79510F25E25C142657CE2DC4 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C1C5BEFC8D1D1F43B84295A /* libPods.a */; };
84624E5D1C79071D004B6077 /* MapTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 84624E5C1C79071D004B6077 /* MapTableViewCell.m */; };
84624E5F1C79081E004B6077 /* MapTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 84624E5E1C79081D004B6077 /* MapTableViewCell.xib */; };
8D4F05B61C710A8E003B3131 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D4F05B51C710A8E003B3131 /* main.m */; };
8D4F05B91C710A8E003B3131 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D4F05B81C710A8E003B3131 /* AppDelegate.m */; };
8D4F05BC1C710A8E003B3131 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D4F05BB1C710A8E003B3131 /* ViewController.m */; };
Expand All @@ -22,6 +24,9 @@
/* Begin PBXFileReference section */
51DA72322BD0057FB2DF45ED /* Pods.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.debug.xcconfig; path = "Pods/Target Support Files/Pods/Pods.debug.xcconfig"; sourceTree = "<group>"; };
5C1C5BEFC8D1D1F43B84295A /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
84624E5B1C79071D004B6077 /* MapTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapTableViewCell.h; sourceTree = "<group>"; };
84624E5C1C79071D004B6077 /* MapTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MapTableViewCell.m; sourceTree = "<group>"; };
84624E5E1C79081D004B6077 /* MapTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MapTableViewCell.xib; sourceTree = "<group>"; };
8D4F05B11C710A8E003B3131 /* FixaDaApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FixaDaApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
8D4F05B51C710A8E003B3131 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
8D4F05B71C710A8E003B3131 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -89,6 +94,9 @@
8D4F05B81C710A8E003B3131 /* AppDelegate.m */,
8D4F05BA1C710A8E003B3131 /* ViewController.h */,
8D4F05BB1C710A8E003B3131 /* ViewController.m */,
84624E5B1C79071D004B6077 /* MapTableViewCell.h */,
84624E5C1C79071D004B6077 /* MapTableViewCell.m */,
84624E5E1C79081D004B6077 /* MapTableViewCell.xib */,
8DB9ED8E1C722B12003A03E0 /* FoursquareAPIManager.h */,
8DB9ED8F1C722B13003A03E0 /* FoursquareAPIManager.m */,
8D4F05BD1C710A8E003B3131 /* Main.storyboard */,
Expand Down Expand Up @@ -178,6 +186,7 @@
files = (
8D4F05C41C710A8E003B3131 /* LaunchScreen.storyboard in Resources */,
8D4F05C11C710A8E003B3131 /* Assets.xcassets in Resources */,
84624E5F1C79081E004B6077 /* MapTableViewCell.xib in Resources */,
8D4F05BF1C710A8E003B3131 /* Main.storyboard in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -237,6 +246,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
84624E5D1C79071D004B6077 /* MapTableViewCell.m in Sources */,
8D4F05BC1C710A8E003B3131 /* ViewController.m in Sources */,
8D4F05B91C710A8E003B3131 /* AppDelegate.m in Sources */,
8D4F05B61C710A8E003B3131 /* main.m in Sources */,
Expand Down Expand Up @@ -352,6 +362,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = FixaDaApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.FixaDaApp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand All @@ -364,6 +375,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = FixaDaApp/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = com.mikekavouras.FixaDaApp;
PRODUCT_NAME = "$(TARGET_NAME)";
Expand Down
6 changes: 6 additions & 0 deletions FixaDaApp/FixaDaApp/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 FixaDaApp/FixaDaApp/Assets.xcassets/phoneIcon.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" : "phoneIcon.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Binary file added FixaDaApp/FixaDaApp/Assets.xcassets/phoneIcon.imageset/phoneIcon.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.
60 changes: 53 additions & 7 deletions FixaDaApp/FixaDaApp/Base.lproj/Main.storyboard
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="9060" systemVersion="14F27" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="BYZ-38-t0r">
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9530"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9051"/>
<capability name="Constraints to layout margins" minToolsVersion="6.0"/>
<capability name="Constraints with non-1.0 multipliers" minToolsVersion="5.1"/>
</dependencies>
<scenes>
Expand All @@ -19,21 +20,22 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<mapView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" mapType="standard" showsUserLocation="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QhC-Y4-i8h">
<rect key="frame" x="0.0" y="0.0" width="600" height="100"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="240"/>
</mapView>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="BMq-V3-f2f">
<rect key="frame" x="0.0" y="100" width="600" height="500"/>
<rect key="frame" x="0.0" y="240" width="600" height="360"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
<color key="sectionIndexBackgroundColor" red="1" green="0.90196078430000004" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<prototypes>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" textLabel="4Wd-lS-p0j" style="IBUITableViewCellStyleDefault" id="5cm-8d-a5a">
<rect key="frame" x="0.0" y="28" width="600" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="5cm-8d-a5a" id="cpW-0e-B2H">
<rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
<rect key="frame" x="0.0" y="0.0" width="600" height="43"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4Wd-lS-p0j">
<rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
<rect key="frame" x="15" y="0.0" width="570" height="43"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
Expand All @@ -44,22 +46,66 @@
</tableViewCell>
</prototypes>
</tableView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="HO8-Sw-zsd">
<rect key="frame" x="540" y="170" width="30" height="30"/>
<color key="backgroundColor" red="0.93391199820000004" green="0.93391199820000004" blue="0.93391199820000004" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="CTH-Dp-nx0"/>
<constraint firstAttribute="height" constant="30" id="uMy-dZ-Deh"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="27"/>
<state key="normal" title="+">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="zoomInButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="2ce-CY-pAh"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Txa-tO-teJ">
<rect key="frame" x="540" y="200" width="30" height="30"/>
<color key="backgroundColor" red="0.93391199818754622" green="0.93391199818754622" blue="0.93391199818754622" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="YhU-2c-QVV"/>
<constraint firstAttribute="height" constant="30" id="ZEN-JC-7L0"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="27"/>
<state key="normal" title="-">
<color key="titleColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="zoomOutButtonPressed:" destination="BYZ-38-t0r" eventType="touchUpInside" id="iG4-J5-L7R"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
<color key="backgroundColor" red="1" green="0.90196078431372551" blue="0.59999999999999998" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstItem="BMq-V3-f2f" firstAttribute="top" secondItem="Txa-tO-teJ" secondAttribute="bottom" constant="10" id="0sD-cO-daq"/>
<constraint firstItem="BMq-V3-f2f" firstAttribute="top" secondItem="QhC-Y4-i8h" secondAttribute="bottom" id="829-uy-XA8"/>
<constraint firstItem="QhC-Y4-i8h" firstAttribute="height" secondItem="BMq-V3-f2f" secondAttribute="height" multiplier="0.2" id="DcL-ga-xdl"/>
<constraint firstAttribute="trailing" secondItem="BMq-V3-f2f" secondAttribute="trailing" id="Ddx-sp-gAW"/>
<constraint firstItem="QhC-Y4-i8h" firstAttribute="height" secondItem="8bC-Xf-vdC" secondAttribute="height" multiplier="0.4" id="GDI-jo-Q1n"/>
<constraint firstItem="Txa-tO-teJ" firstAttribute="top" secondItem="HO8-Sw-zsd" secondAttribute="bottom" id="Hh0-Xi-fuY"/>
<constraint firstItem="BMq-V3-f2f" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="PGd-F5-XwA"/>
<constraint firstItem="QhC-Y4-i8h" firstAttribute="leading" secondItem="8bC-Xf-vdC" secondAttribute="leading" id="PS4-bX-CJK"/>
<constraint firstItem="BMq-V3-f2f" firstAttribute="top" secondItem="QhC-Y4-i8h" secondAttribute="bottom" id="Qew-zz-x2s"/>
<constraint firstAttribute="trailingMargin" secondItem="Txa-tO-teJ" secondAttribute="trailing" constant="10" id="bZH-HY-aUR"/>
<constraint firstAttribute="trailing" secondItem="QhC-Y4-i8h" secondAttribute="trailing" id="mbZ-IW-xGJ"/>
<constraint firstAttribute="trailingMargin" secondItem="HO8-Sw-zsd" secondAttribute="trailing" constant="10" id="sUt-Ol-2hp"/>
<constraint firstItem="QhC-Y4-i8h" firstAttribute="top" secondItem="8bC-Xf-vdC" secondAttribute="top" id="sq5-GT-TWp"/>
<constraint firstItem="wfy-db-euE" firstAttribute="top" secondItem="BMq-V3-f2f" secondAttribute="bottom" id="vLg-lx-GXH"/>
</constraints>
<variation key="default">
<mask key="constraints">
<exclude reference="DcL-ga-xdl"/>
<exclude reference="829-uy-XA8"/>
</mask>
</variation>
</view>
<connections>
<outlet property="mapView" destination="QhC-Y4-i8h" id="SMQ-g7-itJ"/>
<outlet property="tableView" destination="BMq-V3-f2f" id="AqN-lY-b3z"/>
<outlet property="zoomInButton" destination="HO8-Sw-zsd" id="ys3-nS-ACm"/>
<outlet property="zoomOutButton" destination="Txa-tO-teJ" id="6KR-cn-y6H"/>
</connections>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="dkx-z0-nzr" sceneMemberID="firstResponder"/>
Expand Down
5 changes: 4 additions & 1 deletion FixaDaApp/FixaDaApp/FoursquareAPIManager.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,10 @@ + (void)findSomething:(NSString *)query
progress:nil
success:^(NSURLSessionTask *task, id responseObject)
{

NSDictionary *response = [responseObject objectForKey:@"response"];
NSMutableArray *venues = [response objectForKey:@"venues"];
completion(venues);

} failure:^(NSURLSessionTask *operation, NSError *error)
{
NSLog(@"Error: %@", error);
Expand Down
17 changes: 17 additions & 0 deletions FixaDaApp/FixaDaApp/MapTableViewCell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// MapTableViewCell.h
// FixaDaApp
//
// Created by Diana Elezaj on 2/20/16.
// Copyright © 2016 Michael Kavouras. All rights reserved.
//

#import <UIKit/UIKit.h>

@interface MapTableViewCell : UITableViewCell
@property (weak, nonatomic) IBOutlet UILabel *title;
@property (weak, nonatomic) IBOutlet UIButton *phoneNumber;
@property (weak, nonatomic) IBOutlet UILabel *anyoneHereLabel;


@end
28 changes: 28 additions & 0 deletions FixaDaApp/FixaDaApp/MapTableViewCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
//
// MapTableViewCell.m
// FixaDaApp
//
// Created by Diana Elezaj on 2/20/16.
// Copyright © 2016 Michael Kavouras. All rights reserved.
//

#import "MapTableViewCell.h"

@implementation MapTableViewCell

- (void)awakeFromNib {
// Initialization code
}
- (IBAction)phoneNumberClicked:(UIButton *)sender {
NSString *cleanedString = [[self.phoneNumber.titleLabel.text componentsSeparatedByCharactersInSet:[[NSCharacterSet characterSetWithCharactersInString:@"0123456789-+()"] invertedSet]] componentsJoinedByString:@""];
NSURL *url = [NSURL URLWithString:[NSString stringWithFormat:@"telprompt://%@", cleanedString]];
[[UIApplication sharedApplication] openURL:url];
}

- (void)setSelected:(BOOL)selected animated:(BOOL)animated {
[super setSelected:selected animated:animated];

// Configure the view for the selected state
}

@end
Loading