Permalink
Browse files

Added slide menu, Facebook connectivity (needs work)

  • Loading branch information...
1 parent 4dc171c commit 012eb3e9730f7d4a64876efd48598fc30d58b70a @fqassem fqassem committed Jun 18, 2012
View
0 .gitignore 100644 → 100755
No changes.
View
@@ -7,6 +7,10 @@
objects = {
/* Begin PBXBuildFile section */
+ CE6DACA5158CE7AC0030158A /* SlideMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6DACA4158CE7AC0030158A /* SlideMenu.m */; };
+ CE6E5A15158EB0E300752FE5 /* FBDialog.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CE6E5A08158EB0E300752FE5 /* FBDialog.bundle */; };
+ CE6E5A16158EB0E300752FE5 /* libfacebook_ios_sdk.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6E5A0E158EB0E300752FE5 /* libfacebook_ios_sdk.a */; };
+ CE6E5A6B158EC95B00752FE5 /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CE6E5A6A158EC95B00752FE5 /* libxml2.dylib */; };
DD0E2C2C157EC2B700F3AAF9 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0E2C2B157EC2B700F3AAF9 /* UIKit.framework */; };
DD0E2C2E157EC2B700F3AAF9 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0E2C2D157EC2B700F3AAF9 /* Foundation.framework */; };
DD0E2C30157EC2B700F3AAF9 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0E2C2F157EC2B700F3AAF9 /* CoreGraphics.framework */; };
@@ -24,6 +28,7 @@
DD0E2C6A157EC95000F3AAF9 /* ARViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = DD0E2C69157EC95000F3AAF9 /* ARViewController.m */; };
DD0E2C6C157ECA1900F3AAF9 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD0E2C6B157ECA1900F3AAF9 /* AVFoundation.framework */; };
DD0E2C6F157ECBB200F3AAF9 /* brooks_hall_1936.jpg in Resources */ = {isa = PBXBuildFile; fileRef = DD0E2C6E157ECBB200F3AAF9 /* brooks_hall_1936.jpg */; };
+ DD34EA2115894FFC00740B4C /* Picture.m in Sources */ = {isa = PBXBuildFile; fileRef = DD34EA2015894FFC00740B4C /* Picture.m */; };
DD79FF24158188C2001597D0 /* CLLocation+HeadingFromLocation.m in Sources */ = {isa = PBXBuildFile; fileRef = DD79FF23158188C2001597D0 /* CLLocation+HeadingFromLocation.m */; };
DD847ADA157FD2C100855FEA /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD847AD9157FD2C100855FEA /* CoreLocation.framework */; };
DDAC61971587BB2300D2E484 /* data.plist in Resources */ = {isa = PBXBuildFile; fileRef = DDAC61961587BB2300D2E484 /* data.plist */; };
@@ -32,6 +37,24 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
+ CE6DACA3158CE7AC0030158A /* SlideMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SlideMenu.h; sourceTree = "<group>"; };
+ CE6DACA4158CE7AC0030158A /* SlideMenu.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SlideMenu.m; sourceTree = "<group>"; };
+ CE6E5A06158EB0E300752FE5 /* Facebook.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Facebook.h; sourceTree = "<group>"; };
+ CE6E5A07158EB0E300752FE5 /* FBConnect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBConnect.h; sourceTree = "<group>"; };
+ CE6E5A08158EB0E300752FE5 /* FBDialog.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = FBDialog.bundle; sourceTree = "<group>"; };
+ CE6E5A09158EB0E300752FE5 /* FBDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBDialog.h; sourceTree = "<group>"; };
+ CE6E5A0A158EB0E300752FE5 /* FBFrictionlessRequestSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBFrictionlessRequestSettings.h; sourceTree = "<group>"; };
+ CE6E5A0B158EB0E300752FE5 /* FBLoginDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBLoginDialog.h; sourceTree = "<group>"; };
+ CE6E5A0C158EB0E300752FE5 /* FBRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FBRequest.h; sourceTree = "<group>"; };
+ CE6E5A0D158EB0E300752FE5 /* JSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSON.h; sourceTree = "<group>"; };
+ CE6E5A0E158EB0E300752FE5 /* libfacebook_ios_sdk.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libfacebook_ios_sdk.a; sourceTree = "<group>"; };
+ CE6E5A0F158EB0E300752FE5 /* NSObject+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSObject+SBJSON.h"; sourceTree = "<group>"; };
+ CE6E5A10158EB0E300752FE5 /* NSString+SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+SBJSON.h"; sourceTree = "<group>"; };
+ CE6E5A11158EB0E300752FE5 /* SBJSON.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJSON.h; sourceTree = "<group>"; };
+ CE6E5A12158EB0E300752FE5 /* SBJsonBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonBase.h; sourceTree = "<group>"; };
+ CE6E5A13158EB0E300752FE5 /* SBJsonParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonParser.h; sourceTree = "<group>"; };
+ CE6E5A14158EB0E300752FE5 /* SBJsonWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SBJsonWriter.h; sourceTree = "<group>"; };
+ CE6E5A6A158EC95B00752FE5 /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
DD0E2C27157EC2B700F3AAF9 /* ar-project.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ar-project.app"; sourceTree = BUILT_PRODUCTS_DIR; };
DD0E2C2B157EC2B700F3AAF9 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
DD0E2C2D157EC2B700F3AAF9 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -54,6 +77,8 @@
DD0E2C69157EC95000F3AAF9 /* ARViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ARViewController.m; sourceTree = "<group>"; };
DD0E2C6B157ECA1900F3AAF9 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
DD0E2C6E157ECBB200F3AAF9 /* brooks_hall_1936.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = brooks_hall_1936.jpg; sourceTree = "<group>"; };
+ DD34EA1F15894FFC00740B4C /* Picture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Picture.h; sourceTree = "<group>"; };
+ DD34EA2015894FFC00740B4C /* Picture.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Picture.m; sourceTree = "<group>"; };
DD79FF22158188C2001597D0 /* CLLocation+HeadingFromLocation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocation+HeadingFromLocation.h"; sourceTree = "<group>"; };
DD79FF23158188C2001597D0 /* CLLocation+HeadingFromLocation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CLLocation+HeadingFromLocation.m"; sourceTree = "<group>"; };
DD847AD9157FD2C100855FEA /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -68,21 +93,47 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
+ CE6E5A6B158EC95B00752FE5 /* libxml2.dylib in Frameworks */,
DDD116FB1587C3F900490B53 /* MapKit.framework in Frameworks */,
DD847ADA157FD2C100855FEA /* CoreLocation.framework in Frameworks */,
DD0E2C6C157ECA1900F3AAF9 /* AVFoundation.framework in Frameworks */,
DD0E2C2C157EC2B700F3AAF9 /* UIKit.framework in Frameworks */,
DD0E2C2E157EC2B700F3AAF9 /* Foundation.framework in Frameworks */,
DD0E2C30157EC2B700F3AAF9 /* CoreGraphics.framework in Frameworks */,
+ CE6E5A16158EB0E300752FE5 /* libfacebook_ios_sdk.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
+ CE6E5A05158EB0E300752FE5 /* facebook-ios-sdk */ = {
+ isa = PBXGroup;
+ children = (
+ CE6E5A06158EB0E300752FE5 /* Facebook.h */,
+ CE6E5A07158EB0E300752FE5 /* FBConnect.h */,
+ CE6E5A08158EB0E300752FE5 /* FBDialog.bundle */,
+ CE6E5A09158EB0E300752FE5 /* FBDialog.h */,
+ CE6E5A0A158EB0E300752FE5 /* FBFrictionlessRequestSettings.h */,
+ CE6E5A0B158EB0E300752FE5 /* FBLoginDialog.h */,
+ CE6E5A0C158EB0E300752FE5 /* FBRequest.h */,
+ CE6E5A0D158EB0E300752FE5 /* JSON.h */,
+ CE6E5A0E158EB0E300752FE5 /* libfacebook_ios_sdk.a */,
+ CE6E5A0F158EB0E300752FE5 /* NSObject+SBJSON.h */,
+ CE6E5A10158EB0E300752FE5 /* NSString+SBJSON.h */,
+ CE6E5A11158EB0E300752FE5 /* SBJSON.h */,
+ CE6E5A12158EB0E300752FE5 /* SBJsonBase.h */,
+ CE6E5A13158EB0E300752FE5 /* SBJsonParser.h */,
+ CE6E5A14158EB0E300752FE5 /* SBJsonWriter.h */,
+ );
+ name = "facebook-ios-sdk";
+ path = "../../../facebook-ios-sdk/lib/facebook-ios-sdk";
+ sourceTree = "<group>";
+ };
DD0E2C1C157EC2B600F3AAF9 = {
isa = PBXGroup;
children = (
+ CE6E5A6A158EC95B00752FE5 /* libxml2.dylib */,
DD0E2C31157EC2B700F3AAF9 /* ar-project */,
DD0E2C2A157EC2B700F3AAF9 /* Frameworks */,
DD0E2C28157EC2B700F3AAF9 /* Products */,
@@ -113,18 +164,23 @@
DD0E2C31157EC2B700F3AAF9 /* ar-project */ = {
isa = PBXGroup;
children = (
+ CE6E5A05158EB0E300752FE5 /* facebook-ios-sdk */,
DD0E2C62157EC51500F3AAF9 /* assets */,
DD0E2C3A157EC2B700F3AAF9 /* AppDelegate.h */,
DD0E2C3B157EC2B700F3AAF9 /* AppDelegate.m */,
+ DD79FF22158188C2001597D0 /* CLLocation+HeadingFromLocation.h */,
+ DD79FF23158188C2001597D0 /* CLLocation+HeadingFromLocation.m */,
DD0E2C3D157EC2B700F3AAF9 /* MainStoryboard_iPhone.storyboard */,
DD0E2C40157EC2B700F3AAF9 /* MainStoryboard_iPad.storyboard */,
+ CE6DACA3158CE7AC0030158A /* SlideMenu.h */,
+ CE6DACA4158CE7AC0030158A /* SlideMenu.m */,
DD0E2C68157EC95000F3AAF9 /* ARViewController.h */,
DD0E2C69157EC95000F3AAF9 /* ARViewController.m */,
- DD0E2C32157EC2B700F3AAF9 /* Supporting Files */,
- DD79FF22158188C2001597D0 /* CLLocation+HeadingFromLocation.h */,
- DD79FF23158188C2001597D0 /* CLLocation+HeadingFromLocation.m */,
DDAC61991587C02600D2E484 /* MapViewController.h */,
DDAC619A1587C02600D2E484 /* MapViewController.m */,
+ DD34EA1F15894FFC00740B4C /* Picture.h */,
+ DD34EA2015894FFC00740B4C /* Picture.m */,
+ DD0E2C32157EC2B700F3AAF9 /* Supporting Files */,
);
path = "ar-project";
sourceTree = "<group>";
@@ -232,6 +288,7 @@
DD0E2C61157EC50900F3AAF9 /* tab_list@2x.png in Resources */,
DD0E2C6F157ECBB200F3AAF9 /* brooks_hall_1936.jpg in Resources */,
DDAC61971587BB2300D2E484 /* data.plist in Resources */,
+ CE6E5A15158EB0E300752FE5 /* FBDialog.bundle in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -247,6 +304,8 @@
DD0E2C6A157EC95000F3AAF9 /* ARViewController.m in Sources */,
DD79FF24158188C2001597D0 /* CLLocation+HeadingFromLocation.m in Sources */,
DDAC619B1587C02600D2E484 /* MapViewController.m in Sources */,
+ DD34EA2115894FFC00740B4C /* Picture.m in Sources */,
+ CE6DACA5158CE7AC0030158A /* SlideMenu.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -300,6 +359,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(SDKROOT)/usr/include/libxml2",
+ "\n$(SDKROOT)/usr/include/libxml2",
+ );
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
@@ -319,6 +382,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ HEADER_SEARCH_PATHS = (
+ "$(SDKROOT)/usr/include/libxml2",
+ "\n$(SDKROOT)/usr/include/libxml2",
+ );
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
@@ -330,21 +397,48 @@
DD0E2C54157EC2B700F3AAF9 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ar-project/ar-project-Prefix.pch";
INFOPLIST_FILE = "ar-project/ar-project-Info.plist";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/facebook-ios-sdk.build/Release-iphoneos/facebook-ios-sdk.build/Objects-normal/armv6\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/facebook-ios-sdk.build/Release-iphoneos/facebook-ios-sdk.build/Objects-normal/armv7\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/Release-iphoneos\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/Release-iphonesimulator\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/lib/facebook-ios-sdk\"",
+ "\"$(SRCROOT)/../../facebook-ios-sdk/lib/facebook-ios-sdk\"",
+ "\"$(SRCROOT)/../bengottlieb-Twitter-OAuth-iPhone-d26af5a/Twitter+OAuth/Libraries & Headers\"",
+ );
PRODUCT_NAME = "$(TARGET_NAME)";
+ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
WRAPPER_EXTENSION = app;
};
name = Debug;
};
DD0E2C55157EC2B700F3AAF9 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ CODE_SIGN_IDENTITY = "";
+ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ar-project/ar-project-Prefix.pch";
INFOPLIST_FILE = "ar-project/ar-project-Info.plist";
+ LIBRARY_SEARCH_PATHS = (
+ "$(inherited)",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/facebook-ios-sdk.build/Release-iphoneos/facebook-ios-sdk.build/Objects-normal/armv6\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/facebook-ios-sdk.build/Release-iphoneos/facebook-ios-sdk.build/Objects-normal/armv7\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/Release-iphoneos\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/build/Release-iphonesimulator\"",
+ "\"$(SRCROOT)/../facebook-ios-sdk/lib/facebook-ios-sdk\"",
+ "\"$(SRCROOT)/../../facebook-ios-sdk/lib/facebook-ios-sdk\"",
+ "\"$(SRCROOT)/../bengottlieb-Twitter-OAuth-iPhone-d26af5a/Twitter+OAuth/Libraries & Headers\"",
+ );
PRODUCT_NAME = "$(TARGET_NAME)";
+ "PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
+ VALIDATE_PRODUCT = NO;
WRAPPER_EXTENSION = app;
};
name = Release;
View
Binary file not shown.
View
44 ar-project/ARViewController.h 100644 → 100755
@@ -10,38 +10,52 @@
#import <CoreLocation/CoreLocation.h>
#import <UIKit/UIKit.h>
-#import "CLLocation+HeadingFromLocation.h"
+#import "AppDelegate.h"
+#import "Picture.h"
+#import "SlideMenu.h"
-@interface ARViewController : UIViewController <CLLocationManagerDelegate> {
+
+
+@interface ARViewController : UIViewController <CLLocationManagerDelegate>
+{
AVCaptureSession *captureSession;
- UIView* cameraView;
- UIImageView* imageView;
- UISlider* slider;
+ UIView *cameraView;
+ UIView *radarView;
+ NSMutableArray *radarViews;
+ NSMutableArray *pictures;
+ UIImageView *imageView;
+ UISlider *slider;
+ SlideMenu* slideMenu;
CLLocationManager *locationManager;
- UILabel *headingLabel;
- UILabel *bearingLabel;
-
CLLocation *location;
CLHeading *heading;
+ // Temporary
+ UILabel *headingLabel;
+ UILabel *coordinatesLabel;
UIView *point0;
- UIView *point1;
- UIView *point2;
}
@property (nonatomic, retain) IBOutlet UIView *cameraView;
-@property (nonatomic, retain) IBOutlet UIImageView* imageView;
-@property (nonatomic, retain) IBOutlet UISlider* slider;
+@property (nonatomic, retain) IBOutlet UIView *radarView;
+@property (nonatomic, retain) IBOutlet UIImageView *imageView;
+@property (nonatomic, retain) IBOutlet UISlider *slider;
+@property (nonatomic, retain) IBOutlet SlideMenu *slideMenu;
+
+@property (nonatomic, retain) CLLocation *location;
+@property (nonatomic, retain) CLHeading *heading;
+
+// Temporary
@property (nonatomic, retain) IBOutlet UILabel *headingLabel;
-@property (nonatomic, retain) IBOutlet UILabel *bearingLabel;
+@property (nonatomic, retain) IBOutlet UILabel *coordinatesLabel;
@property (nonatomic, retain) IBOutlet UIView *point0;
-@property (nonatomic, retain) IBOutlet UIView *point1;
-@property (nonatomic, retain) IBOutlet UIView *point2;
-(IBAction) sliderChanged:(id)sender;
+-(IBAction) captureView:(id)sender;
- (void)initCamera;
+-(void)touchMenu;
@end
Oops, something went wrong.

0 comments on commit 012eb3e

Please sign in to comment.