you can now send messages to FB and 4sq when you tweet; reorganized t…

…he abstract/base class heirarchy; some small designy things git-svn-id: http://literalshore.com/svn/kickball/trunk@722 73bdbd85-dd75-0410-9d14-8527f93b1508
Gorlochs · May 5, 2010 · c43b2d5 · c43b2d5
1 parent c7ce050
commit c43b2d5
Show file tree

Hide file tree

Showing 34 changed files with 1,711 additions and 454 deletions.
diff --git a/Classes/AbstractFacebookViewController.h b/Classes/AbstractFacebookViewController.h
@@ -8,10 +8,10 @@
 
 #import <UIKit/UIKit.h>
 #import "FBConnect/FBConnect.h"
-#import "KBFoursquareViewController.h"
+#import "KBTwitterViewController.h"
 
 
-@interface AbstractFacebookViewController : KBFoursquareViewController <FBDialogDelegate, FBSessionDelegate, FBRequestDelegate>  {
+@interface AbstractFacebookViewController : KBTwitterViewController <FBDialogDelegate, FBSessionDelegate, FBRequestDelegate>  {
     FBSession* _session;
 }
 

diff --git a/Classes/AbstractFacebookViewController.m b/Classes/AbstractFacebookViewController.m
@@ -33,8 +33,15 @@ - (void)viewDidLoad {
         _session = [[FBSession sessionForApplication:kApiKey secret:kApiSecret delegate:self] retain];
     }
     NSLog(@"FB session: %@", _session);
-    headerNibName = HEADER_NIB_FOURSQUARE;
+    //headerNibName = HEADER_NIB_FOURSQUARE;
     [super viewDidLoad];
+
+    if (!self.hideHeader) {
+        NSArray* nibViews =  [[NSBundle mainBundle] loadNibNamed:HEADER_NIB_FOURSQUARE owner:self options:nil];
+        FoursquareHeaderView *headerView = [nibViews objectAtIndex:0];
+        [self.view addSubview:headerView];
+    }
+
     [_session resume];
 
     // this is a hack. the abstract facebook vc has to inherit from the 4sq vc, which f's everything up

diff --git a/Classes/FoursquareAPI/FSVenue.h b/Classes/FoursquareAPI/FSVenue.h
@@ -35,6 +35,9 @@
     NSString * addressWithCrossstreet;
     FSCategory *primaryCategory;
     NSInteger distanceFromUser;
+
+    CLLocationCoordinate2D location;
+    CLLocation *fullLocation;
 } 
 
 @property (nonatomic, retain) NSString * name;
@@ -61,5 +64,6 @@
 @property (nonatomic, retain) NSString * addressWithCrossstreet;
 @property (nonatomic, retain) FSCategory *primaryCategory;
 @property (nonatomic, readonly) CLLocationCoordinate2D location;
+@property (nonatomic, readonly) CLLocation *fullLocation;
 
 @end
diff --git a/Classes/FoursquareAPI/FSVenue.m b/Classes/FoursquareAPI/FSVenue.m
@@ -47,6 +47,15 @@ - (CLLocationCoordinate2D) location
 	return loc;	
 }
 
+- (CLLocation*) fullLocation {
+    CLLocation *loc = nil;
+	if (geolat && geolong)
+	{
+		loc = [[[CLLocation alloc] initWithLatitude:[geolat doubleValue] longitude:[geolong doubleValue]] autorelease];
+	}
+	return loc;	
+}
+
 - (void) encodeWithCoder: (NSCoder *)coder { 
     [coder encodeObject: name forKey:@"name"]; 
     [coder encodeObject: geolat forKey:@"geolat"]; 

diff --git a/Classes/KBBaseViewController.h b/Classes/KBBaseViewController.h
@@ -16,6 +16,7 @@
 #import "Utilities.h"
 #import "EGORefreshTableHeaderView.h"
 #import "FooterTabView.h"
+#import "FoursquareHeaderView.h"
 
 #define HEADER_NIB_TWITTER      @"TwitterHeaderView"
 #define HEADER_NIB_FOURSQUARE   @"FoursquareHeaderView"

diff --git a/Classes/KBBaseViewController.m b/Classes/KBBaseViewController.m
@@ -18,7 +18,6 @@
 #import "KBWebViewController.h"
 #import "KBShoutViewController.h"
 #import "ASIFormDataRequest.h"
-#import "FoursquareHeaderView.h"
 
 #define PROGRESS_BAR_TIMER_LENGTH 30.0
 
@@ -53,11 +52,11 @@ - (void) viewDidLoad {
     [appDelegate.pushNotificationUserId addObserver:self forKeyPath:@"pushUserId" options:0 context:nil];
 
     // v1.1
-    if (!self.hideHeader && headerNibName) {
-        NSArray* nibViews =  [[NSBundle mainBundle] loadNibNamed:headerNibName owner:self options:nil];
-        FoursquareHeaderView *headerView = [nibViews objectAtIndex:0];
-        [self.view addSubview:headerView];
-    }
+//    if (!self.hideHeader && headerNibName) {
+//        NSArray* nibViews =  [[NSBundle mainBundle] loadNibNamed:headerNibName owner:self options:nil];
+//        FoursquareHeaderView *headerView = [nibViews objectAtIndex:0];
+//        [self.view addSubview:headerView];
+//    }
     if (!self.hideFooter) {
         NSArray* nibViews =  [[NSBundle mainBundle] loadNibNamed:@"FooterTabView" owner:self options:nil];
         footerTabView = [nibViews objectAtIndex:0];

diff --git a/Classes/KBCheckinModalViewController.h b/Classes/KBCheckinModalViewController.h
@@ -25,11 +25,9 @@
     IBOutlet UIButton *checkinButton;
     IBOutlet UITextField *checkinTextField;
 
-    XAuthTwitterEngine *twitterEngine;
     BOOL isReadyToClose;
 }
 
-@property (nonatomic, retain) XAuthTwitterEngine *twitterEngine;
 @property (nonatomic, retain) NSString *venueId;
 
 - (IBAction) shout;

diff --git a/Classes/KBCheckinModalViewController.m b/Classes/KBCheckinModalViewController.m
@@ -21,7 +21,6 @@
 @implementation KBCheckinModalViewController
 
 @synthesize venueId;
-@synthesize twitterEngine;
 
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {

diff --git a/Classes/KBCreateTweetViewController.h b/Classes/KBCreateTweetViewController.h
@@ -7,10 +7,10 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "KBTwitterViewController.h"
+#import "AbstractFacebookViewController.h"
 
 
-@interface KBCreateTweetViewController : KBTwitterViewController <UITextViewDelegate, MGTwitterEngineDelegate> {
+@interface KBCreateTweetViewController : AbstractFacebookViewController <UITextViewDelegate, MGTwitterEngineDelegate> {
     IBOutlet UITextView *tweetTextView;
     IBOutlet UILabel *characterCountLabel;
     IBOutlet UIButton *sendTweet;

diff --git a/Classes/KBCreateTweetViewController.m b/Classes/KBCreateTweetViewController.m
@@ -8,6 +8,8 @@
 
 #import "KBCreateTweetViewController.h"
 #import "KBLocationManager.h"
+#import "FoursquareAPI.h"
+
 
 @implementation KBCreateTweetViewController
 
@@ -52,6 +54,34 @@ - (void) submitTweet {
             [twitterEngine sendUpdate:tweetTextView.text];
         }
     }
+
+    if (isFacebookOn) {
+        NSLog(@"facebook  is on and the status will be updated (hopefully)");
+        NSDictionary *params = [NSDictionary dictionaryWithObjectsAndKeys:tweetTextView.text, @"status", nil];
+        [[FBRequest requestWithDelegate:self] call:@"facebook.status.set" params:params dataParam:nil];
+    }
+
+    if (isFoursquareOn) {
+        [[FoursquareAPI sharedInstance] doCheckinAtVenueWithId:nil 
+                                                      andShout:tweetTextView.text 
+                                                       offGrid:NO
+                                                     toTwitter:NO
+                                                    toFacebook:NO 
+                                                    withTarget:self 
+                                                     andAction:@selector(shoutResponseReceived:withResponseString:)];
+    }
+
+}
+
+- (void)shoutResponseReceived:(NSURL *)inURL withResponseString:(NSString *)inString {
+
+}
+
+- (void)request:(FBRequest*)request didLoad:(id)result {
+    if ([request.method isEqualToString:@"facebook.status.set"]) {
+        NSDictionary* info = result;
+        NSLog(@"facebook status updated: %@", info);
+    }
 }
 
 - (void) cancelCreate {

diff --git a/Classes/KBFoursquareViewController.m b/Classes/KBFoursquareViewController.m
@@ -20,11 +20,17 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
 
 - (void)viewDidLoad {
 
-    headerNibName = HEADER_NIB_FOURSQUARE;
+    ///headerNibName = HEADER_NIB_FOURSQUARE;
     footerType = KBFooterTypeFoursquare;
 
     [super viewDidLoad];
 
+    if (!self.hideHeader) {
+        NSArray* nibViews =  [[NSBundle mainBundle] loadNibNamed:HEADER_NIB_FOURSQUARE owner:self options:nil];
+        FoursquareHeaderView *headerView = [nibViews objectAtIndex:0];
+        [self.view addSubview:headerView];
+    }
+
     CGRect frame = homeBackView.frame;
     frame.origin = CGPointMake(0, 0);
     homeBackView.frame = frame;

diff --git a/Classes/KBLocationManager.h b/Classes/KBLocationManager.h
@@ -38,4 +38,6 @@
 - (BOOL) locationServicesEnabled;
 + (void) stopAllUpdates:(NSString *)state;
 
+- (CLLocationDistance) distanceFromCoordinate:(CLLocation*)coordinate;
+
 @end
diff --git a/Classes/KBLocationManager.m b/Classes/KBLocationManager.m
@@ -89,6 +89,11 @@ -(void)dealloc {
 	[super dealloc];
 }
 
+- (CLLocationDistance) distanceFromCoordinate:(CLLocation*)coordinate {
+    CLLocation *currentLocation = [[CLLocation alloc] initWithLatitude:latitude longitude:longitude];
+    return [currentLocation getDistanceFrom:coordinate];
+}
+
 - (void) stopAllUpdates:(NSString *)state {
 	[self stopUpdates];
 }

diff --git a/Classes/KBShoutViewController.h b/Classes/KBShoutViewController.h
@@ -28,12 +28,9 @@
     IBOutlet UIButton *foursquareButton;
     IBOutlet UIButton *checkinButton;
     IBOutlet UITextField *shoutTextField;
-
-    XAuthTwitterEngine *twitterEngine;
     BOOL isReadyToClose;
 }
 
-@property (nonatomic, retain) XAuthTwitterEngine *twitterEngine;
 @property (nonatomic, retain) NSString *venueId;
 @property (nonatomic) BOOL isCheckin;
 

diff --git a/Classes/KBShoutViewController.m b/Classes/KBShoutViewController.m
@@ -22,7 +22,6 @@ @implementation KBShoutViewController
 
 @synthesize venueId;
 @synthesize isCheckin;
-@synthesize twitterEngine;
 
 // Implement viewDidLoad to do additional setup after loading the view, typically from a nib.
 - (void)viewDidLoad {

diff --git a/Classes/KBTweetListViewController.xib b/Classes/KBTweetListViewController.xib
@@ -12,8 +12,6 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="16"/>
-			<integer value="8"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -39,7 +37,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="286422906">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -69,12 +67,11 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
 				<reference key="IBUIBackgroundColor" ref="206962023"/>
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUITableViewCell" id="157955609">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -117,7 +114,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 44}</string>
-				<reference key="NSSuperview"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">1</int>
 					<bytes key="NSRGB">MSAxIDEAA</bytes>
@@ -378,11 +374,11 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>centerHeaderButton</string>
 							<string>directMessageButton</string>
 							<string>mentionsButton</string>
 							<string>searchButton</string>
 							<string>timelineButton</string>
+							<string>twitterCenterHeaderButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>

diff --git a/Classes/KBTwitterSearchViewController.xib b/Classes/KBTwitterSearchViewController.xib
@@ -12,7 +12,6 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="1"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +37,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">274</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -134,7 +133,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -428,11 +426,11 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>centerHeaderButton</string>
 							<string>directMessageButton</string>
 							<string>mentionsButton</string>
 							<string>searchButton</string>
 							<string>timelineButton</string>
+							<string>twitterCenterHeaderButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>

diff --git a/Classes/KBTwitterUserListViewController.xib b/Classes/KBTwitterUserListViewController.xib
@@ -12,7 +12,6 @@
 		</object>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
-			<integer value="8"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -38,7 +37,7 @@
 				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
 			</object>
 			<object class="IBUIView" id="845122041">
-				<reference key="NSNextResponder"/>
+				<nil key="NSNextResponder"/>
 				<int key="NSvFlags">292</int>
 				<object class="NSMutableArray" key="NSSubviews">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -66,7 +65,6 @@
 					</object>
 				</object>
 				<string key="NSFrameSize">{320, 460}</string>
-				<reference key="NSSuperview"/>
 				<object class="NSColor" key="IBUIBackgroundColor">
 					<int key="NSColorSpace">3</int>
 					<bytes key="NSWhite">MQA</bytes>
@@ -300,11 +298,11 @@
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>centerHeaderButton</string>
 							<string>directMessageButton</string>
 							<string>mentionsButton</string>
 							<string>searchButton</string>
 							<string>timelineButton</string>
+							<string>twitterCenterHeaderButton</string>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>

diff --git a/Classes/KBTwitterViewController.h b/Classes/KBTwitterViewController.h
@@ -7,17 +7,17 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "KBBaseViewController.h"
+#import "KBFoursquareViewController.h"
 #import "XAuthTwitterEngine.h"
 #import "KBTwitterManager.h"
 
 
-@interface KBTwitterViewController : KBBaseViewController {
+@interface KBTwitterViewController : KBFoursquareViewController {
     IBOutlet UIButton *timelineButton;
     IBOutlet UIButton *mentionsButton;
     IBOutlet UIButton *directMessageButton;
     IBOutlet UIButton *searchButton;
-    IBOutlet UIButton *centerHeaderButton;
+    IBOutlet UIButton *twitterCenterHeaderButton;
 
     XAuthTwitterEngine *twitterEngine;
 }