#314 removing Facebook login form the app

This commit is contained in:
Patrick Santana 2013-07-11 15:07:21 +02:00
parent f7e389667c
commit fd3d76bdf3
23 changed files with 118 additions and 1349 deletions

View file

@ -52,9 +52,7 @@
#import "GoogleConversionPing.h" #import "GoogleConversionPing.h"
@interface AppDelegate : UIResponder <UIApplicationDelegate, FBRequestDelegate, @interface AppDelegate : UIResponder <UIApplicationDelegate>{
FBDialogDelegate,
FBSessionDelegate>{
@private @private
NSManagedObjectContext *managedObjectContext; NSManagedObjectContext *managedObjectContext;
@ -65,9 +63,6 @@ FBSessionDelegate>{
Reachability* internetReachable; Reachability* internetReachable;
Reachability* hostReachable; Reachability* hostReachable;
// facebook sdk
Facebook *facebook;
@public @public
BOOL internetActive, hostActive; BOOL internetActive, hostActive;
} }
@ -87,9 +82,6 @@ FBSessionDelegate>{
@property (nonatomic) BOOL internetActive; @property (nonatomic) BOOL internetActive;
@property (nonatomic) BOOL hostActive; @property (nonatomic) BOOL hostActive;
// for facebook single sign in
@property (nonatomic, strong) Facebook *facebook;
//google analytics //google analytics
@property(nonatomic, strong) id<GAITracker> tracker; @property(nonatomic, strong) id<GAITracker> tracker;

View file

@ -37,7 +37,6 @@ static const NSInteger kGANDispatchPeriodSec = 10;
@synthesize internetActive = _internetActive; @synthesize internetActive = _internetActive;
@synthesize hostActive = _hostActive; @synthesize hostActive = _hostActive;
@synthesize facebook = _facebook;
@synthesize centerController = _viewController; @synthesize centerController = _viewController;
@synthesize menuController = _menuController; @synthesize menuController = _menuController;
@ -77,9 +76,6 @@ static const NSInteger kGANDispatchPeriodSec = 10;
deckController.leftLedge = 490.0; deckController.leftLedge = 490.0;
} }
// FACEBOOK
self.facebook = [[Facebook alloc] initWithAppId:kPrivateFacebookAppId andDelegate:self];
//ShareKit //ShareKit
DefaultSHKConfigurator *configurator = [[PhotoSHKConfigurator alloc] init]; DefaultSHKConfigurator *configurator = [[PhotoSHKConfigurator alloc] init];
[SHKConfiguration sharedInstanceWithConfigurator:configurator]; [SHKConfiguration sharedInstanceWithConfigurator:configurator];
@ -182,8 +178,7 @@ static const NSInteger kGANDispatchPeriodSec = 10;
[auth startOAuthProcedure:url]; [auth startOAuthProcedure:url];
} }
}else if ([[url scheme] hasPrefix:@"fb"]){ }else if ([[url scheme] hasPrefix:@"fb"]){
[SHKFacebook handleOpenURL:url]; return [SHKFacebook handleOpenURL:url];
return [self.facebook handleOpenURL:url];
} }
return YES; return YES;
@ -241,162 +236,6 @@ static const NSInteger kGANDispatchPeriodSec = 10;
} }
} }
#pragma mark - Facebook API Calls
/**
* Make a Graph API Call to get information about the current logged in user.
*/
- (void)apiFQLIMe {
// Using the "pic" picture since this currently has a maximum width of 100 pixels
// and since the minimum profile picture size is 180 pixels wide we should be able
// to get a 100 pixel wide version of the profile picture
NSMutableDictionary *params = [NSMutableDictionary dictionaryWithObjectsAndKeys:
@"SELECT username,email FROM user WHERE uid=me()", @"query",
nil];
[self.facebook requestWithMethodName:@"fql.query"
andParams:params
andHttpMethod:@"POST"
andDelegate:self];
}
/*
* Called when the user has logged in successfully.
*/
- (void)fbDidLogin {
NSLog(@"fbDidLogin");
[self storeAuthData:[self.facebook accessToken] expiresAt:[self.facebook expirationDate]];
[self apiFQLIMe];
}
- (void)storeAuthData:(NSString *)accessToken expiresAt:(NSDate *)expiresAt {
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[defaults setObject:accessToken forKey:@"FBAccessTokenKey"];
[defaults setObject:expiresAt forKey:@"FBExpirationDateKey"];
[defaults synchronize];
}
-(void)fbDidExtendToken:(NSString *)accessToken expiresAt:(NSDate *)expiresAt {
NSLog(@"token extended");
[self storeAuthData:accessToken expiresAt:expiresAt];
}
/**
* Called when the user canceled the authorization dialog.
*/
-(void)fbDidNotLogin:(BOOL)cancelled {
NSLog(@"Couldn't login");
}
/**
* Called when the request logout has succeeded.
*/
- (void)fbDidLogout {
NSLog(@"fbDidLogout");
// Remove saved authorization information if it exists and it is
// ok to clear it (logout, session invalid, app unauthorized)
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
[defaults removeObjectForKey:@"FBAccessTokenKey"];
[defaults removeObjectForKey:@"FBExpirationDateKey"];
[defaults removeObjectForKey:@"FBAccessTokenKey"];
[defaults removeObjectForKey:@"FBExpirationDateKey"];
[defaults synchronize];
}
/**
* Called when the session has expired.
*/
- (void)fbSessionInvalidated {
NSLog(@"fbSessionInvalidated");
UIAlertView *alertView = [[UIAlertView alloc]
initWithTitle:@"Auth Exception"
message:@"Your session has expired."
delegate:nil
cancelButtonTitle:@"OK"
otherButtonTitles:nil,
nil];
[alertView show];
[self fbDidLogout];
}
#pragma mark - FBRequestDelegate Methods
/**
* Called when the Facebook API request has returned a response.
*
* This callback gives you access to the raw response. It's called before
* (void)request:(FBRequest *)request didLoad:(id)result,
* which is passed the parsed response object.
*/
- (void)request:(FBRequest *)request didReceiveResponse:(NSURLResponse *)response {
NSLog(@"received response = %@",response);
}
/**
* Called when a request returns and its response has been parsed into
* an object.
*
* The resulting object may be a dictionary, an array or a string, depending
* on the format of the API response. If you need access to the raw response,
* use:
*
* (void)request:(FBRequest *)request
* didReceiveResponse:(NSURLResponse *)response
*/
- (void)request:(FBRequest *)request didLoad:(id)result
{
if ([result isKindOfClass:[NSArray class]]) {
result = [result objectAtIndex:0];
}
// This callback can be a result of getting the user's basic
// information or getting the user's permissions.
if ([result objectForKey:@"email"]) {
// If basic information callback, set the UI objects to
// display this.
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
#ifdef DEVELOPMENT_ENABLED
NSLog(@"Email: %@", [result objectForKey:@"email"]);
NSLog(@"Username: %@", [result objectForKey:@"username"]);
#endif
[defaults setObject:[result objectForKey:@"email"] forKey:kFacebookUserConnectedEmail];
[defaults setObject:[result objectForKey:@"username"] forKey:kFacebookUserConnectedUsername];
[defaults synchronize];
// notify the screen that user is logged
[[NSNotificationCenter defaultCenter] postNotificationName:kFacebookUserConnected object:nil ];
}
}
/**
* Called when an error prevents the Facebook API request from completing
* successfully.
*/
- (void)request:(FBRequest *)request didFailWithError:(NSError *)error {
NSLog(@"Err message: %@", [[error userInfo] objectForKey:@"error_msg"]);
NSLog(@"Err code: %d", [error code]);
}
- (void)saveContext
{
NSError *error = nil;
NSManagedObjectContext *localManagedObjectContext = self.managedObjectContext;
if (localManagedObjectContext != nil) {
if ([localManagedObjectContext hasChanges] && ![localManagedObjectContext save:&error]) {
// Replace this implementation with code to handle the error appropriately.
// abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
abort();
}
}
}
#pragma mark - Core Data stack #pragma mark - Core Data stack
// Returns the managed object context for the application. // Returns the managed object context for the application.
@ -498,6 +337,20 @@ static const NSInteger kGANDispatchPeriodSec = 10;
return _persistentStoreCoordinator; return _persistentStoreCoordinator;
} }
- (void)saveContext
{
NSError *error = nil;
NSManagedObjectContext *localManagedObjectContext = self.managedObjectContext;
if (localManagedObjectContext != nil) {
if ([localManagedObjectContext hasChanges] && ![localManagedObjectContext save:&error]) {
// Replace this implementation with code to handle the error appropriately.
// abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
abort();
}
}
}
#pragma mark - Application's Documents directory #pragma mark - Application's Documents directory
// Returns the URL to the application's Documents directory. // Returns the URL to the application's Documents directory.

View file

@ -44,10 +44,8 @@
- (void) startOAuthProcedure:(NSURL*) url; - (void) startOAuthProcedure:(NSURL*) url;
// for login // for login
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email;
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd; + (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd;
+ (Account *) signIn:(NSString*) email password:(NSString*) pwd; + (Account *) signIn:(NSString*) email password:(NSString*) pwd;
+ (BOOL) checkUserFacebookEmail:(NSString*) email;
+ (NSString *) recoverPassword:(NSString *) email; + (NSString *) recoverPassword:(NSString *) email;
+ (void) sendToServerReceipt:(NSData *) receipt forUser:(NSString *) email; + (void) sendToServerReceipt:(NSData *) receipt forUser:(NSString *) email;

View file

@ -280,11 +280,6 @@
[alert showAlertOnTop]; [alert showAlertOnTop];
} }
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email
{
return [PrivateAuthenticationService createNewAccountWithUser:user email:email];
}
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd + (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd
{ {
return [PrivateAuthenticationService createNewAccountWithUser:user email:email password:pwd]; return [PrivateAuthenticationService createNewAccountWithUser:user email:email password:pwd];
@ -296,11 +291,6 @@
return [PrivateAuthenticationService signIn:email password:pwd]; return [PrivateAuthenticationService signIn:email password:pwd];
} }
+ (BOOL) checkUserFacebookEmail:(NSString*) email
{
return [PrivateAuthenticationService checkUserFacebookEmail:email];
}
+ (NSString *) recoverPassword:(NSString *) email + (NSString *) recoverPassword:(NSString *) email
{ {
return [PrivateAuthenticationService recoverPassword:email]; return [PrivateAuthenticationService recoverPassword:email];

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -42,7 +42,6 @@
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 189}, {285, 40}}</string> <string key="NSFrame">{{18, 189}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="207019938"/> <reference key="NSNextKeyView" ref="207019938"/>
<string key="NSReuseIdentifierKey">_NS:567</string> <string key="NSReuseIdentifierKey">_NS:567</string>
<bool key="IBUIAutoresizesSubviews">NO</bool> <bool key="IBUIAutoresizesSubviews">NO</bool>
@ -59,7 +58,6 @@
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<string key="NSFrame">{{28, 189}, {265, 40}}</string> <string key="NSFrame">{{28, 189}, {265, 40}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="519461955"/> <reference key="NSNextKeyView" ref="519461955"/>
<string key="NSReuseIdentifierKey">_NS:304</string> <string key="NSReuseIdentifierKey">_NS:304</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
@ -100,7 +98,6 @@
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 237}, {285, 40}}</string> <string key="NSFrame">{{18, 237}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:225</string> <string key="NSReuseIdentifierKey">_NS:225</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">4</int> <int key="IBUIContentMode">4</int>
@ -138,7 +135,6 @@
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{40, 28}, {240, 128}}</string> <string key="NSFrame">{{40, 28}, {240, 128}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="97581516"/> <reference key="NSNextKeyView" ref="97581516"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">1</int> <int key="IBUIContentMode">1</int>
@ -152,7 +148,6 @@
</array> </array>
<string key="NSFrame">{{0, 20}, {320, 548}}</string> <string key="NSFrame">{{0, 20}, {320, 548}}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="760947815"/> <reference key="NSNextKeyView" ref="760947815"/>
<object class="NSColor" key="IBUIBackgroundColor"> <object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">2</int> <int key="NSColorSpace">2</int>
@ -292,51 +287,7 @@
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">26</int> <int key="maxID">26</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes"/>
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">AuthenticationViewController</string>
<string key="superclassName">GAITrackedViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">login:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">login:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">login:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="backgroundServerUrl">UIImageView</string>
<string key="serverURL">UITextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="backgroundServerUrl">
<string key="name">backgroundServerUrl</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="serverURL">
<string key="name">serverURL</string>
<string key="candidateClassName">UITextField</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/AuthenticationViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">GAITrackedViewController</string>
<string key="superclassName">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/GAITrackedViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

View file

@ -61,11 +61,6 @@ extern NSString * const kValidateNotAllowedLocation;
extern NSString * const kSyncShowUploadedPhotos; extern NSString * const kSyncShowUploadedPhotos;
// Facebook
extern NSString * const kFacebookUserConnected;
extern NSString * const kFacebookUserConnectedEmail;
extern NSString * const kFacebookUserConnectedUsername;
// For profile // For profile
extern NSString * const kProfileAccountType; extern NSString * const kProfileAccountType;
extern NSString * const kProfileLimitRemaining; extern NSString * const kProfileLimitRemaining;

View file

@ -97,14 +97,6 @@ NSString * const kValidateNotAllowedLocation=@"validate_not_allowed_location";
NSString * const kSyncShowUploadedPhotos=@"sync_show_uploaded_photos"; NSString * const kSyncShowUploadedPhotos=@"sync_show_uploaded_photos";
/*
* Facebook
*/
NSString * const kFacebookUserConnected=@"facebook_user_connected";
NSString * const kFacebookUserConnectedEmail=@"facebook_user_connected_email";
NSString * const kFacebookUserConnectedUsername=@"facebook_user_connected_username";
// For profile // For profile
NSString * const kProfileAccountType=@"profile_account_type"; NSString * const kProfileAccountType=@"profile_account_type";
NSString * const kProfileLimitRemaining=@"profile_limit_remaining"; NSString * const kProfileLimitRemaining=@"profile_limit_remaining";

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

View file

@ -34,7 +34,6 @@
@property (nonatomic, weak) IBOutlet UIImageView *backgroundEmail; @property (nonatomic, weak) IBOutlet UIImageView *backgroundEmail;
@property (nonatomic, weak) IBOutlet UIImageView *backgroundPassword; @property (nonatomic, weak) IBOutlet UIImageView *backgroundPassword;
// message for Create account with email // message for Create account with email
@property (nonatomic, weak) IBOutlet UILabel *createAccountLabelEnter; @property (nonatomic, weak) IBOutlet UILabel *createAccountLabelEnter;
@property (nonatomic, weak) IBOutlet UILabel *createAccountLabelYourUsername; @property (nonatomic, weak) IBOutlet UILabel *createAccountLabelYourUsername;
@ -42,12 +41,5 @@
@property (nonatomic, weak) IBOutlet UILabel *createAccountLabelOpenPhoto; @property (nonatomic, weak) IBOutlet UILabel *createAccountLabelOpenPhoto;
// message for create account with facebook
@property (nonatomic, weak) IBOutlet UILabel *facebookCreateAccountCreate;
@property (nonatomic, weak) IBOutlet UILabel *facebookCreateAccountUsername;
@property (nonatomic, weak) IBOutlet UILabel *facebookCreateAccountOpenPhoto;
- (IBAction)createAccount:(id)sender; - (IBAction)createAccount:(id)sender;
- (void) setFacebookCreateAccount;
@end @end

View file

@ -23,21 +23,13 @@
@interface LoginCreateAccountViewController () @interface LoginCreateAccountViewController ()
-(void) createAccountUsername:(NSString*) username withEmail:(NSString *) email andPassword:(NSString*) password; -(void) createAccountUsername:(NSString*) username withEmail:(NSString *) email andPassword:(NSString*) password;
-(void) createFacebookAccountForUsername:(NSString*) username andEmail:(NSString *) email;
// control if is a creation of account using facebook
@property (nonatomic) BOOL isFacebookCreationAccount;
// for creation account, there are too many fields, we need to put the view up. This is a control for that. // for creation account, there are too many fields, we need to put the view up. This is a control for that.
@property (nonatomic) BOOL isViewUp; @property (nonatomic) BOOL isViewUp;
@end @end
@implementation LoginCreateAccountViewController @implementation LoginCreateAccountViewController
@synthesize facebookCreateAccountCreate;
@synthesize facebookCreateAccountUsername;
@synthesize facebookCreateAccountOpenPhoto;
@synthesize username=_username; @synthesize username=_username;
@synthesize email=_email; @synthesize email=_email;
@synthesize password=_passoword; @synthesize password=_passoword;
@ -51,7 +43,6 @@
@synthesize createAccountLabelForYour; @synthesize createAccountLabelForYour;
@synthesize createAccountLabelOpenPhoto; @synthesize createAccountLabelOpenPhoto;
@synthesize isFacebookCreationAccount=_isFacebookCreationAccount;
@synthesize isViewUp = _isViewUp; @synthesize isViewUp = _isViewUp;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
@ -59,7 +50,6 @@
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) { if (self) {
// Custom initialization // Custom initialization
self.isFacebookCreationAccount = NO;
self.title=@"Create Account"; self.title=@"Create Account";
self.isViewUp = NO; self.isViewUp = NO;
} }
@ -72,33 +62,10 @@
[self.navigationController setNavigationBarHidden:NO animated:YES]; [self.navigationController setNavigationBarHidden:NO animated:YES];
self.trackedViewName = @"Create Account Screen"; self.trackedViewName = @"Create Account Screen";
if (self.isFacebookCreationAccount){
self.email.hidden = YES;
self.password.hidden = YES;
self.backgroundEmail.hidden = YES;
self.backgroundPassword.hidden = YES;
self.createAccountLabelEnter.hidden = YES;
self.createAccountLabelEnter.hidden = YES;
self.createAccountLabelYourUsername.hidden = YES;
self.createAccountLabelForYour.hidden = YES;
self.createAccountLabelOpenPhoto.hidden = YES;
self.facebookCreateAccountCreate.hidden=NO;
self.facebookCreateAccountUsername.hidden=NO;
self.facebookCreateAccountOpenPhoto.hidden=NO;
// move button
[self.buttonCreateAccount setCenter:CGPointMake([self.buttonCreateAccount center].x, [self.buttonCreateAccount center].y - 90)];
}else{
self.createAccountLabelEnter.hidden = NO; self.createAccountLabelEnter.hidden = NO;
self.createAccountLabelYourUsername.hidden = NO; self.createAccountLabelYourUsername.hidden = NO;
self.createAccountLabelForYour.hidden = NO; self.createAccountLabelForYour.hidden = NO;
self.createAccountLabelOpenPhoto.hidden = NO; self.createAccountLabelOpenPhoto.hidden = NO;
self.facebookCreateAccountCreate.hidden=YES;
self.facebookCreateAccountUsername.hidden=YES;
self.facebookCreateAccountOpenPhoto.hidden=YES;
}
} }
- (void) viewWillAppear:(BOOL)animated - (void) viewWillAppear:(BOOL)animated
@ -126,12 +93,6 @@
return (interfaceOrientation == UIInterfaceOrientationPortrait); return (interfaceOrientation == UIInterfaceOrientationPortrait);
} }
- (void) setFacebookCreateAccount
{
self.isFacebookCreationAccount = YES;
self.title=@"Facebook Login";
}
- (IBAction)createAccount:(id)sender - (IBAction)createAccount:(id)sender
{ {
@ -155,22 +116,6 @@
[alert showAlert]; [alert showAlert];
}else{ }else{
if (self.isFacebookCreationAccount){
// user is authenticated via facebook
// create the account with username and email
if (self.username.text == nil || [[self.username.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length ] == 0){
//show message
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Please, set your username.",nil)];
[alert showAlert];
return;
}
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *facebookEmail = [defaults valueForKey:kFacebookUserConnectedEmail];
// create account
[self createFacebookAccountForUsername:self.username.text andEmail:facebookEmail];
}else{
// user is creating account using email // user is creating account using email
// check for email, username and password // check for email, username and password
if (self.username.text == nil || [[self.username.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length ] == 0){ if (self.username.text == nil || [[self.username.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length ] == 0){
@ -197,15 +142,13 @@
// create account // create account
[self createAccountUsername:self.username.text withEmail:self.email.text andPassword:self.password.text]; [self createAccountUsername:self.username.text withEmail:self.email.text andPassword:self.password.text];
} }
}
} }
- (void)textFieldDidBeginEditing:(UITextField *)textField - (void)textFieldDidBeginEditing:(UITextField *)textField
{ {
if (![DisplayUtilities isIPad]){ if (![DisplayUtilities isIPad]){
if (!self.isFacebookCreationAccount && self.isViewUp == NO){ if (self.isViewUp == NO){
self.isViewUp = YES; self.isViewUp = YES;
[UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationCurveEaseOut animations:^{ [UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationCurveEaseOut animations:^{
[self moveFieldsUpOrDown:-1]; [self moveFieldsUpOrDown:-1];
@ -242,13 +185,6 @@
// Action if user clicks in DONE in the keyboard // Action if user clicks in DONE in the keyboard
- (BOOL)textFieldShouldReturn:(UITextField *)textField { - (BOOL)textFieldShouldReturn:(UITextField *)textField {
if (self.isFacebookCreationAccount){
if (textField == self.username){
[textField resignFirstResponder];
[self createAccount:nil];
}
return YES;
}else{
if (textField == self.username){ if (textField == self.username){
[self.email becomeFirstResponder]; [self.email becomeFirstResponder];
return NO; return NO;
@ -260,7 +196,6 @@
[self createAccount:nil]; [self createAccount:nil];
return YES; return YES;
} }
}
} }
- (void)viewDidUnload - (void)viewDidUnload
@ -277,9 +212,7 @@
[self setCreateAccountLabelYourUsername:nil]; [self setCreateAccountLabelYourUsername:nil];
[self setCreateAccountLabelForYour:nil]; [self setCreateAccountLabelForYour:nil];
[self setCreateAccountLabelOpenPhoto:nil]; [self setCreateAccountLabelOpenPhoto:nil];
[self setFacebookCreateAccountCreate:nil];
[self setFacebookCreateAccountUsername:nil];
[self setFacebookCreateAccountOpenPhoto:nil];
[super viewDidUnload]; [super viewDidUnload];
} }
@ -321,40 +254,4 @@
}); });
dispatch_release(queue); dispatch_release(queue);
} }
-(void) createFacebookAccountForUsername:(NSString*) username andEmail:(NSString *) email;
{
// display
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.navigationController.view animated:YES];
hud.labelText = NSLocalizedString(@"Creating Account",@"");
dispatch_queue_t queue = dispatch_queue_create("create_account_with_facebook", NULL);
dispatch_async(queue, ^{
@try{
// gcd tcreate facebook user
Account *account = [AuthenticationService createNewAccountWithUser:username email:email];
// save the details of account and remove the progress
dispatch_async(dispatch_get_main_queue(), ^{
// save data to the user information
[account saveToStandardUserDefaults];
// send notification to the system that it can shows the screen:
[[NSNotificationCenter defaultCenter] postNotificationName:kNotificationLoginAuthorize object:nil ];
[MBProgressHUD hideHUDForView:self.navigationController.view animated:YES];
});
}@catch (NSException* e) {
dispatch_async(dispatch_get_main_queue(), ^{
[MBProgressHUD hideHUDForView:self.navigationController.view animated:YES];
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:[e description]];
[alert showAlert];
});
}
});
dispatch_release(queue);
}
@end @end

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -111,7 +111,6 @@
<int key="NSvFlags">-2147483358</int> <int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{62, 67}, {59, 21}}</string> <string key="NSFrame">{{62, 67}, {59, 21}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="395278955"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIClipsSubviews">YES</bool>
@ -150,72 +149,6 @@
<reference key="IBUIFont" ref="810786475"/> <reference key="IBUIFont" ref="810786475"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool> <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object> </object>
<object class="IBUILabel" id="395278955">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{65, 52}, {45, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="775192624"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Create</string>
<reference key="IBUITextColor" ref="473668620"/>
<reference key="IBUIHighlightedColor" ref="643317479"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="456477974"/>
<reference key="IBUIFont" ref="810786475"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="775192624">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{65, 52}, {227, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="917322183"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">a username for your</string>
<reference key="IBUITextColor" ref="473668620"/>
<reference key="IBUIHighlightedColor" ref="643317479"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="3388624"/>
<reference key="IBUIFont" ref="798741278"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="917322183">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{93, 67}, {134, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="1057593413"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Trovebox account</string>
<reference key="IBUITextColor" ref="473668620"/>
<reference key="IBUIHighlightedColor" ref="643317479"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="456477974"/>
<reference key="IBUIFont" ref="810786475"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIImageView" id="978163938"> <object class="IBUIImageView" id="978163938">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
@ -396,6 +329,7 @@
</array> </array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string> <string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSNextKeyView" ref="660569929"/>
<object class="NSColor" key="IBUIBackgroundColor"> <object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">2</int> <int key="NSColorSpace">2</int>
<bytes key="NSRGB">MC4yNjY2NjY2ODA2IDAuMTYwNzg0MzE5IDAuMTAxOTYwNzkzMQA</bytes> <bytes key="NSRGB">MC4yNjY2NjY2ODA2IDAuMTYwNzg0MzE5IDAuMTAxOTYwNzkzMQA</bytes>
@ -494,30 +428,6 @@
</object> </object>
<int key="connectionID">37</int> <int key="connectionID">37</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookCreateAccountCreate</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="395278955"/>
</object>
<int key="connectionID">44</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookCreateAccountUsername</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="775192624"/>
</object>
<int key="connectionID">45</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookCreateAccountOpenPhoto</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="917322183"/>
</object>
<int key="connectionID">46</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection"> <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">createAccountLabelOpenPhoto</string> <string key="label">createAccountLabelOpenPhoto</string>
@ -582,9 +492,6 @@
<reference ref="637986296"/> <reference ref="637986296"/>
<reference ref="562981982"/> <reference ref="562981982"/>
<reference ref="1057593413"/> <reference ref="1057593413"/>
<reference ref="395278955"/>
<reference ref="917322183"/>
<reference ref="775192624"/>
<reference ref="243415977"/> <reference ref="243415977"/>
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
@ -662,24 +569,6 @@
<reference key="parent" ref="191373211"/> <reference key="parent" ref="191373211"/>
<string key="objectName">Create Account message 3-D</string> <string key="objectName">Create Account message 3-D</string>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">39</int>
<reference key="object" ref="917322183"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Facebook Create Account message 3</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="395278955"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Facebook Create Account message 1</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">40</int>
<reference key="object" ref="775192624"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Facebook Create Account message 2</string>
</object>
</array> </array>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties"> <dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -696,9 +585,6 @@
<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -111,7 +111,6 @@
<int key="NSvFlags">-2147483358</int> <int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{62, 67}, {59, 21}}</string> <string key="NSFrame">{{62, 67}, {59, 21}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="395278955"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool> <bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIClipsSubviews">YES</bool>
@ -150,72 +149,6 @@
<reference key="IBUIFont" ref="810786475"/> <reference key="IBUIFont" ref="810786475"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool> <bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object> </object>
<object class="IBUILabel" id="395278955">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{65, 52}, {45, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="775192624"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Create</string>
<reference key="IBUITextColor" ref="473668620"/>
<reference key="IBUIHighlightedColor" ref="643317479"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="456477974"/>
<reference key="IBUIFont" ref="810786475"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="775192624">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{65, 52}, {227, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="917322183"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">a username for your</string>
<reference key="IBUITextColor" ref="473668620"/>
<reference key="IBUIHighlightedColor" ref="643317479"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="3388624"/>
<reference key="IBUIFont" ref="798741278"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="917322183">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">-2147483358</int>
<string key="NSFrame">{{93, 67}, {134, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="1057593413"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Trovebox account</string>
<reference key="IBUITextColor" ref="473668620"/>
<reference key="IBUIHighlightedColor" ref="643317479"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="456477974"/>
<reference key="IBUIFont" ref="810786475"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIImageView" id="978163938"> <object class="IBUIImageView" id="978163938">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
@ -511,30 +444,6 @@
</object> </object>
<int key="connectionID">37</int> <int key="connectionID">37</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookCreateAccountCreate</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="395278955"/>
</object>
<int key="connectionID">44</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookCreateAccountUsername</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="775192624"/>
</object>
<int key="connectionID">45</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">facebookCreateAccountOpenPhoto</string>
<reference key="source" ref="372490531"/>
<reference key="destination" ref="917322183"/>
</object>
<int key="connectionID">46</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection"> <object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">createAccountLabelOpenPhoto</string> <string key="label">createAccountLabelOpenPhoto</string>
@ -600,9 +509,6 @@
<reference ref="637986296"/> <reference ref="637986296"/>
<reference ref="562981982"/> <reference ref="562981982"/>
<reference ref="1057593413"/> <reference ref="1057593413"/>
<reference ref="395278955"/>
<reference ref="917322183"/>
<reference ref="775192624"/>
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
</object> </object>
@ -679,24 +585,6 @@
<reference key="parent" ref="191373211"/> <reference key="parent" ref="191373211"/>
<string key="objectName">Create Account message 3-D</string> <string key="objectName">Create Account message 3-D</string>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">39</int>
<reference key="object" ref="917322183"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Facebook Create Account message 3</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="395278955"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Facebook Create Account message 1</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">40</int>
<reference key="object" ref="775192624"/>
<reference key="parent" ref="191373211"/>
<string key="objectName">Facebook Create Account message 2</string>
</object>
</array> </array>
</object> </object>
<dictionary class="NSMutableDictionary" key="flattenedProperties"> <dictionary class="NSMutableDictionary" key="flattenedProperties">
@ -713,9 +601,6 @@
<string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="31.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="33.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="34.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>

View file

@ -28,7 +28,6 @@
@interface LoginViewController : GAITrackedViewController @interface LoginViewController : GAITrackedViewController
- (IBAction)connectUsingFacebook:(id)sender;
- (IBAction)signUpWithEmail:(id)sender; - (IBAction)signUpWithEmail:(id)sender;
- (IBAction)signInWithEmail:(id)sender; - (IBAction)signInWithEmail:(id)sender;

View file

@ -30,11 +30,6 @@
{ {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) { if (self) {
// notification user connect via facebook
[[NSNotificationCenter defaultCenter] addObserver:self
selector:@selector(eventHandler:)
name:kFacebookUserConnected
object:nil ];
//register to listen for to remove the login screen. //register to listen for to remove the login screen.
[[NSNotificationCenter defaultCenter] addObserver:self [[NSNotificationCenter defaultCenter] addObserver:self
@ -74,13 +69,6 @@
return (interfaceOrientation == UIInterfaceOrientationPortrait); return (interfaceOrientation == UIInterfaceOrientationPortrait);
} }
- (IBAction)connectUsingFacebook:(id)sender {
if (![[SharedAppDelegate facebook] isSessionValid]) {
[[SharedAppDelegate facebook] authorize:[[NSArray alloc] initWithObjects:@"email", nil]];
}else{
[self checkUser];
}
}
- (IBAction)signUpWithEmail:(id)sender { - (IBAction)signUpWithEmail:(id)sender {
LoginCreateAccountViewController *controller = [[LoginCreateAccountViewController alloc] initWithNibName:[DisplayUtilities getCorrectNibName:@"LoginCreateAccountViewController"] bundle:nil] ; LoginCreateAccountViewController *controller = [[LoginCreateAccountViewController alloc] initWithNibName:[DisplayUtilities getCorrectNibName:@"LoginCreateAccountViewController"] bundle:nil] ;
[self.navigationController pushViewController:controller animated:YES]; [self.navigationController pushViewController:controller animated:YES];
@ -94,69 +82,12 @@
//event handler when event occurs //event handler when event occurs
-(void)eventHandler: (NSNotification *) notification -(void)eventHandler: (NSNotification *) notification
{ {
if ([notification.name isEqualToString:kFacebookUserConnected]){ if ([notification.name isEqualToString:kNotificationLoginAuthorize]){
[self checkUser];
}else if ([notification.name isEqualToString:kNotificationLoginAuthorize]){
// we don't need the screen anymore // we don't need the screen anymore
[self dismissModalViewControllerAnimated:YES]; [self dismissModalViewControllerAnimated:YES];
} }
} }
- (void) checkUser{
if ( [SharedAppDelegate internetActive] == NO ){
// problem with internet, show message to user
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Please check your internet connection",@"")];
[alert showAlert];
return;
}
// get user email and check if it exists on OpenPhoto
// display
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
NSString *email = [defaults valueForKey:kFacebookUserConnectedEmail];
MBProgressHUD *hud = [MBProgressHUD showHUDAddedTo:self.navigationController.view animated:YES];
hud.labelText = NSLocalizedString(@"Checking",@"Check User in the Login");
// do it in a queue
dispatch_queue_t checkingEmailFacebook = dispatch_queue_create("checking_email_facebook", NULL);
dispatch_async(checkingEmailFacebook, ^{
@try{
BOOL hasAccount = [AuthenticationService checkUserFacebookEmail:email];
if (hasAccount){
// just log in
Account *account = [AuthenticationService signIn:email password:nil];
dispatch_async(dispatch_get_main_queue(), ^{
// save the details of account and remove the progress
[account saveToStandardUserDefaults];
// send notification to the system that it can shows the screen:
[[NSNotificationCenter defaultCenter] postNotificationName:kNotificationLoginAuthorize object:nil ];
[MBProgressHUD hideHUDForView:self.navigationController.view animated:YES];
});
}else{
dispatch_async(dispatch_get_main_queue(), ^{
// open LoginCreateAccountViewController
[MBProgressHUD hideHUDForView:self.navigationController.view animated:YES];
LoginCreateAccountViewController *controller = [[LoginCreateAccountViewController alloc] init];
[controller setFacebookCreateAccount];
[self.navigationController pushViewController:controller animated:YES];
});
}
}@catch (NSException* e) {
dispatch_async(dispatch_get_main_queue(), ^{
[MBProgressHUD hideHUDForView:self.navigationController.view animated:YES];
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:[e description] duration:5000];
[alert showAlertOnTop];
});
}
});
dispatch_release(checkingEmailFacebook);
}
- (void)dealloc - (void)dealloc
{ {
[[NSNotificationCenter defaultCenter] removeObserver:self]; [[NSNotificationCenter defaultCenter] removeObserver:self];

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -14,7 +14,6 @@
<string>IBProxyObject</string> <string>IBProxyObject</string>
<string>IBUIButton</string> <string>IBUIButton</string>
<string>IBUIImageView</string> <string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUIView</string> <string>IBUIView</string>
</array> </array>
<array key="IBDocument.PluginDependencies"> <array key="IBDocument.PluginDependencies">
@ -37,15 +36,13 @@
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int> <int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="978540245"> <object class="IBUIButton" id="421100602">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 216}, {285, 40}}</string> <string key="NSFrame">{{18, 364}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/> <reference key="NSNextKeyView" ref="325553815"/>
<reference key="NSNextKeyView" ref="654172874"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">4</int> <int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int> <int key="IBUIContentHorizontalAlignment">0</int>
@ -64,162 +61,23 @@
</object> </object>
<object class="NSCustomResource" key="IBUINormalImage"> <object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">login-facebook.png</string> <string key="NSResourceName">login-signup.png</string>
</object> </object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="607569910"> <object class="IBUIFontDescription" key="IBUIFontDescription" id="607569910">
<int key="type">2</int> <int key="type">2</int>
<double key="pointSize">15</double> <double key="pointSize">15</double>
</object> </object>
<object class="NSFont" key="IBUIFont" id="166118728"> <object class="NSFont" key="IBUIFont" id="776257352">
<string key="NSName">Helvetica-Bold</string> <string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double> <double key="NSSize">15</double>
<int key="NSfFlags">16</int> <int key="NSfFlags">16</int>
</object> </object>
</object> </object>
<object class="IBUILabel" id="521212844">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{141, 254}, {162, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="421100602"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">with a single tap</string>
<object class="NSColor" key="IBUITextColor" id="912309521">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="820284566">
<string key="name">HelveticaNeue</string>
<string key="family">Helvetica Neue</string>
<int key="traits">0</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="454457300">
<string key="NSName">HelveticaNeue-Medium</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="111373768">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{104, 254}, {17, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="512302010"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">or</string>
<reference key="IBUITextColor" ref="912309521"/>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="820284566"/>
<reference key="IBUIFont" ref="454457300"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="654172874">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{49, 255}, {56, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="111373768"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Sign up</string>
<reference key="IBUITextColor" ref="912309521"/>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="401406912">
<string key="name">HelveticaNeue-Bold</string>
<string key="family">Helvetica Neue</string>
<int key="traits">2</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="617623128">
<string key="NSName">HelveticaNeue-Bold</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="512302010">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{115, 255}, {57, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="521212844"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">sign in</string>
<reference key="IBUITextColor" ref="912309521"/>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="401406912"/>
<reference key="IBUIFont" ref="617623128"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIButton" id="421100602">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 364}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="325553815"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="825828828"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="254755017"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">login-signup.png</string>
</object>
<reference key="IBUIFontDescription" ref="607569910"/>
<reference key="IBUIFont" ref="166118728"/>
</object>
<object class="IBUIButton" id="325553815"> <object class="IBUIButton" id="325553815">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 412}, {285, 40}}</string> <string key="NSFrame">{{18, 412}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">4</int> <int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
@ -236,15 +94,14 @@
<string key="NSResourceName">login-login-with.png</string> <string key="NSResourceName">login-login-with.png</string>
</object> </object>
<reference key="IBUIFontDescription" ref="607569910"/> <reference key="IBUIFontDescription" ref="607569910"/>
<reference key="IBUIFont" ref="166118728"/> <reference key="IBUIFont" ref="776257352"/>
</object> </object>
<object class="IBUIImageView" id="303886877"> <object class="IBUIImageView" id="303886877">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{62, 72}, {197, 98}}</string> <string key="NSFrame">{{62, 72}, {197, 98}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSWindow"/> <reference key="NSNextKeyView"/>
<reference key="NSNextKeyView" ref="978540245"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">1</int> <int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool> <bool key="IBUIUserInteractionEnabled">NO</bool>
@ -257,7 +114,6 @@
</array> </array>
<string key="NSFrame">{{0, 20}, {320, 460}}</string> <string key="NSFrame">{{0, 20}, {320, 460}}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="303886877"/> <reference key="NSNextKeyView" ref="303886877"/>
<object class="NSColor" key="IBUIBackgroundColor"> <object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">2</int> <int key="NSColorSpace">2</int>
@ -277,15 +133,6 @@
</object> </object>
<int key="connectionID">3</int> <int key="connectionID">3</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">connectUsingFacebook:</string>
<reference key="source" ref="978540245"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">12</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection"> <object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">signUpWithEmail:</string> <string key="label">signUpWithEmail:</string>
@ -317,13 +164,8 @@
<int key="objectID">1</int> <int key="objectID">1</int>
<reference key="object" ref="191373211"/> <reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="654172874"/>
<reference ref="111373768"/>
<reference ref="512302010"/>
<reference ref="521212844"/>
<reference ref="421100602"/> <reference ref="421100602"/>
<reference ref="325553815"/> <reference ref="325553815"/>
<reference ref="978540245"/>
<reference ref="303886877"/> <reference ref="303886877"/>
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
@ -339,16 +181,6 @@
<reference key="object" ref="975951072"/> <reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="978540245"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="521212844"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">18</int> <int key="objectID">18</int>
<reference key="object" ref="421100602"/> <reference key="object" ref="421100602"/>
@ -359,21 +191,6 @@
<reference key="object" ref="325553815"/> <reference key="object" ref="325553815"/>
<reference key="parent" ref="191373211"/> <reference key="parent" ref="191373211"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="654172874"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">24</int>
<reference key="object" ref="512302010"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">25</int>
<reference key="object" ref="111373768"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">26</int> <int key="objectID">26</int>
<reference key="object" ref="303886877"/> <reference key="object" ref="303886877"/>
@ -387,14 +204,9 @@
<string key="-2.CustomClassName">UIResponder</string> <string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
@ -402,51 +214,12 @@
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">26</int> <int key="maxID">26</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes"/>
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">GAITrackedViewController</string>
<string key="superclassName">UIViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/GAITrackedViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">LoginViewController</string>
<string key="superclassName">GAITrackedViewController</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="connectUsingFacebook:">id</string>
<string key="signInWithEmail:">id</string>
<string key="signUpWithEmail:">id</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="connectUsingFacebook:">
<string key="name">connectUsingFacebook:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="signInWithEmail:">
<string key="name">signInWithEmail:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="signUpWithEmail:">
<string key="name">signUpWithEmail:</string>
<string key="candidateClassName">id</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/LoginViewController.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int> <int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="login-facebook.png">{281, 37}</string>
<string key="login-login-with.png">{282, 37}</string> <string key="login-login-with.png">{282, 37}</string>
<string key="login-signup.png">{282, 37}</string> <string key="login-signup.png">{282, 37}</string>
<string key="trovebox-logo-ipad.png">{840, 222}</string> <string key="trovebox-logo-ipad.png">{840, 222}</string>

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -14,7 +14,6 @@
<string>IBProxyObject</string> <string>IBProxyObject</string>
<string>IBUIButton</string> <string>IBUIButton</string>
<string>IBUIImageView</string> <string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUIView</string> <string>IBUIView</string>
</array> </array>
<array key="IBDocument.PluginDependencies"> <array key="IBDocument.PluginDependencies">
@ -37,14 +36,13 @@
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">274</int> <int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="978540245"> <object class="IBUIButton" id="421100602">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 216}, {285, 40}}</string> <string key="NSFrame">{{18, 419}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="654172874"/> <reference key="NSNextKeyView" ref="325553815"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">4</int> <int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string> <string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int> <int key="IBUIContentHorizontalAlignment">0</int>
@ -63,151 +61,18 @@
</object> </object>
<object class="NSCustomResource" key="IBUINormalImage"> <object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">login-facebook.png</string> <string key="NSResourceName">login-signup.png</string>
</object> </object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="607569910"> <object class="IBUIFontDescription" key="IBUIFontDescription" id="607569910">
<int key="type">2</int> <int key="type">2</int>
<double key="pointSize">15</double> <double key="pointSize">15</double>
</object> </object>
<object class="NSFont" key="IBUIFont" id="166118728"> <object class="NSFont" key="IBUIFont" id="994284689">
<string key="NSName">Helvetica-Bold</string> <string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double> <double key="NSSize">15</double>
<int key="NSfFlags">16</int> <int key="NSfFlags">16</int>
</object> </object>
</object> </object>
<object class="IBUILabel" id="521212844">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{141, 254}, {162, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="421100602"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">with a single tap</string>
<object class="NSColor" key="IBUITextColor" id="912309521">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="820284566">
<string key="name">HelveticaNeue</string>
<string key="family">Helvetica Neue</string>
<int key="traits">0</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="454457300">
<string key="NSName">HelveticaNeue-Medium</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="111373768">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{104, 254}, {17, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="512302010"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">or</string>
<reference key="IBUITextColor" ref="912309521"/>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="820284566"/>
<reference key="IBUIFont" ref="454457300"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="654172874">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{49, 255}, {56, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="111373768"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">Sign up</string>
<reference key="IBUITextColor" ref="912309521"/>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="401406912">
<string key="name">HelveticaNeue-Bold</string>
<string key="family">Helvetica Neue</string>
<int key="traits">2</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="617623128">
<string key="NSName">HelveticaNeue-Bold</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="512302010">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{115, 255}, {57, 21}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="521212844"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<string key="IBUIText">sign in</string>
<reference key="IBUITextColor" ref="912309521"/>
<reference key="IBUIHighlightedColor" ref="825828828"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="401406912"/>
<reference key="IBUIFont" ref="617623128"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIButton" id="421100602">
<reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{18, 419}, {285, 40}}</string>
<reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="325553815"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="825828828"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="254755017"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">login-signup.png</string>
</object>
<reference key="IBUIFontDescription" ref="607569910"/>
<reference key="IBUIFont" ref="166118728"/>
</object>
<object class="IBUIButton" id="325553815"> <object class="IBUIButton" id="325553815">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
@ -229,14 +94,14 @@
<string key="NSResourceName">login-login-with.png</string> <string key="NSResourceName">login-login-with.png</string>
</object> </object>
<reference key="IBUIFontDescription" ref="607569910"/> <reference key="IBUIFontDescription" ref="607569910"/>
<reference key="IBUIFont" ref="166118728"/> <reference key="IBUIFont" ref="994284689"/>
</object> </object>
<object class="IBUIImageView" id="986683671"> <object class="IBUIImageView" id="986683671">
<reference key="NSNextResponder" ref="191373211"/> <reference key="NSNextResponder" ref="191373211"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{48, 68}, {224, 101}}</string> <string key="NSFrame">{{48, 68}, {224, 101}}</string>
<reference key="NSSuperview" ref="191373211"/> <reference key="NSSuperview" ref="191373211"/>
<reference key="NSNextKeyView" ref="978540245"/> <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">1</int> <int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool> <bool key="IBUIUserInteractionEnabled">NO</bool>
@ -286,15 +151,6 @@
</object> </object>
<int key="connectionID">3</int> <int key="connectionID">3</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">connectUsingFacebook:</string>
<reference key="source" ref="978540245"/>
<reference key="destination" ref="372490531"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">12</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection"> <object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">signUpWithEmail:</string> <string key="label">signUpWithEmail:</string>
@ -326,13 +182,8 @@
<int key="objectID">1</int> <int key="objectID">1</int>
<reference key="object" ref="191373211"/> <reference key="object" ref="191373211"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="654172874"/>
<reference ref="111373768"/>
<reference ref="512302010"/>
<reference ref="521212844"/>
<reference ref="421100602"/> <reference ref="421100602"/>
<reference ref="325553815"/> <reference ref="325553815"/>
<reference ref="978540245"/>
<reference ref="986683671"/> <reference ref="986683671"/>
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
@ -348,16 +199,6 @@
<reference key="object" ref="975951072"/> <reference key="object" ref="975951072"/>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="978540245"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">17</int>
<reference key="object" ref="521212844"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">18</int> <int key="objectID">18</int>
<reference key="object" ref="421100602"/> <reference key="object" ref="421100602"/>
@ -368,21 +209,6 @@
<reference key="object" ref="325553815"/> <reference key="object" ref="325553815"/>
<reference key="parent" ref="191373211"/> <reference key="parent" ref="191373211"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="654172874"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">24</int>
<reference key="object" ref="512302010"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">25</int>
<reference key="object" ref="111373768"/>
<reference key="parent" ref="191373211"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">26</int> <int key="objectID">26</int>
<reference key="object" ref="986683671"/> <reference key="object" ref="986683671"/>
@ -396,14 +222,9 @@
<string key="-2.CustomClassName">UIResponder</string> <string key="-2.CustomClassName">UIResponder</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="26.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
@ -417,7 +238,6 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="login-facebook.png">{281, 37}</string>
<string key="login-login-with.png">{282, 37}</string> <string key="login-login-with.png">{282, 37}</string>
<string key="login-signup.png">{282, 37}</string> <string key="login-signup.png">{282, 37}</string>
<string key="trovebox-logo-ipad.png">{840, 222}</string> <string key="trovebox-logo-ipad.png">{840, 222}</string>

View file

@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1552</int> <int key="IBDocument.SystemTarget">1552</int>
<string key="IBDocument.SystemVersion">12D78</string> <string key="IBDocument.SystemVersion">12E55</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.37</string> <string key="IBDocument.AppKitVersion">1187.39</string>
<string key="IBDocument.HIToolboxVersion">626.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
@ -14,7 +14,6 @@
<string>IBProxyObject</string> <string>IBProxyObject</string>
<string>IBUIButton</string> <string>IBUIButton</string>
<string>IBUIImageView</string> <string>IBUIImageView</string>
<string>IBUILabel</string>
<string>IBUIView</string> <string>IBUIView</string>
</array> </array>
<array key="IBDocument.PluginDependencies"> <array key="IBDocument.PluginDependencies">
@ -37,14 +36,12 @@
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">292</int> <int key="NSvFlags">292</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="IBUIButton" id="852977528"> <object class="IBUIButton" id="446049266">
<reference key="NSNextResponder" ref="786396739"/> <reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{241, 460}, {285, 40}}</string> <string key="NSFrame">{{241, 602}, {285, 40}}</string>
<reference key="NSSuperview" ref="786396739"/> <reference key="NSSuperview" ref="786396739"/>
<reference key="NSNextKeyView" ref="324875956"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<int key="IBUIContentMode">4</int> <int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string> <string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int> <int key="IBUIContentHorizontalAlignment">0</int>
@ -63,150 +60,18 @@
</object> </object>
<object class="NSCustomResource" key="IBUINormalImage"> <object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string> <string key="NSClassName">NSImage</string>
<string key="NSResourceName">login-facebook.png</string> <string key="NSResourceName">login-login-with.png</string>
</object> </object>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="899524038"> <object class="IBUIFontDescription" key="IBUIFontDescription" id="899524038">
<int key="type">2</int> <int key="type">2</int>
<double key="pointSize">15</double> <double key="pointSize">15</double>
</object> </object>
<object class="NSFont" key="IBUIFont" id="247146081"> <object class="NSFont" key="IBUIFont" id="27816843">
<string key="NSName">Helvetica-Bold</string> <string key="NSName">Helvetica-Bold</string>
<double key="NSSize">15</double> <double key="NSSize">15</double>
<int key="NSfFlags">16</int> <int key="NSfFlags">16</int>
</object> </object>
</object> </object>
<object class="IBUILabel" id="589293380">
<reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{369, 507}, {162, 21}}</string>
<reference key="NSSuperview" ref="786396739"/>
<reference key="NSNextKeyView" ref="70326448"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">with a single tap</string>
<object class="NSColor" key="IBUITextColor" id="995506861">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<reference key="IBUIHighlightedColor" ref="422078943"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="261561913">
<string key="name">HelveticaNeue</string>
<string key="family">Helvetica Neue</string>
<int key="traits">0</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="522606835">
<string key="NSName">HelveticaNeue-Medium</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="928999585">
<reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{329, 507}, {17, 21}}</string>
<reference key="NSSuperview" ref="786396739"/>
<reference key="NSNextKeyView" ref="822027164"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">or</string>
<reference key="IBUITextColor" ref="995506861"/>
<reference key="IBUIHighlightedColor" ref="422078943"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="261561913"/>
<reference key="IBUIFont" ref="522606835"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIButton" id="446049266">
<reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{241, 602}, {285, 40}}</string>
<reference key="NSSuperview" ref="786396739"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">4</int>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<int key="IBUIContentHorizontalAlignment">0</int>
<int key="IBUIContentVerticalAlignment">0</int>
<reference key="IBUIHighlightedTitleColor" ref="422078943"/>
<object class="NSColor" key="IBUINormalTitleColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA</bytes>
</object>
<reference key="IBUINormalTitleShadowColor" ref="423135633"/>
<object class="NSCustomResource" key="IBUINormalImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">login-login-with.png</string>
</object>
<reference key="IBUIFontDescription" ref="899524038"/>
<reference key="IBUIFont" ref="247146081"/>
</object>
<object class="IBUILabel" id="324875956">
<reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{273, 508}, {56, 21}}</string>
<reference key="NSSuperview" ref="786396739"/>
<reference key="NSNextKeyView" ref="928999585"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">Sign up</string>
<reference key="IBUITextColor" ref="995506861"/>
<reference key="IBUIHighlightedColor" ref="422078943"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<object class="IBUIFontDescription" key="IBUIFontDescription" id="478621976">
<string key="name">HelveticaNeue-Bold</string>
<string key="family">Helvetica Neue</string>
<int key="traits">2</int>
<double key="pointSize">14</double>
</object>
<object class="NSFont" key="IBUIFont" id="135402145">
<string key="NSName">HelveticaNeue-Bold</string>
<double key="NSSize">14</double>
<int key="NSfFlags">16</int>
</object>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUILabel" id="822027164">
<reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int>
<string key="NSFrame">{{343, 508}, {57, 21}}</string>
<reference key="NSSuperview" ref="786396739"/>
<reference key="NSNextKeyView" ref="589293380"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
<int key="IBUIContentMode">7</int>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<string key="IBUIText">sign in</string>
<reference key="IBUITextColor" ref="995506861"/>
<reference key="IBUIHighlightedColor" ref="422078943"/>
<int key="IBUIBaselineAdjustment">0</int>
<float key="IBUIMinimumFontSize">10</float>
<int key="IBUITextAlignment">1</int>
<reference key="IBUIFontDescription" ref="478621976"/>
<reference key="IBUIFont" ref="135402145"/>
<bool key="IBUIAdjustsFontSizeToFit">NO</bool>
</object>
<object class="IBUIButton" id="70326448"> <object class="IBUIButton" id="70326448">
<reference key="NSNextResponder" ref="786396739"/> <reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
@ -229,14 +94,14 @@
<string key="NSResourceName">login-signup.png</string> <string key="NSResourceName">login-signup.png</string>
</object> </object>
<reference key="IBUIFontDescription" ref="899524038"/> <reference key="IBUIFontDescription" ref="899524038"/>
<reference key="IBUIFont" ref="247146081"/> <reference key="IBUIFont" ref="27816843"/>
</object> </object>
<object class="IBUIImageView" id="908594300"> <object class="IBUIImageView" id="908594300">
<reference key="NSNextResponder" ref="786396739"/> <reference key="NSNextResponder" ref="786396739"/>
<int key="NSvFlags">290</int> <int key="NSvFlags">290</int>
<string key="NSFrame">{{208, 206}, {352, 91}}</string> <string key="NSFrame">{{208, 206}, {352, 91}}</string>
<reference key="NSSuperview" ref="786396739"/> <reference key="NSSuperview" ref="786396739"/>
<reference key="NSNextKeyView" ref="852977528"/> <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="IBUIContentMode">1</int> <int key="IBUIContentMode">1</int>
<bool key="IBUIUserInteractionEnabled">NO</bool> <bool key="IBUIUserInteractionEnabled">NO</bool>
@ -303,15 +168,6 @@
</object> </object>
<int key="connectionID">45</int> <int key="connectionID">45</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchEventConnection" key="connection">
<string key="label">connectUsingFacebook:</string>
<reference key="source" ref="852977528"/>
<reference key="destination" ref="841351856"/>
<int key="IBEventType">7</int>
</object>
<int key="connectionID">43</int>
</object>
</array> </array>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects"> <array key="orderedObjects">
@ -336,51 +192,17 @@
<int key="objectID">2</int> <int key="objectID">2</int>
<reference key="object" ref="786396739"/> <reference key="object" ref="786396739"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="852977528"/>
<reference ref="70326448"/> <reference ref="70326448"/>
<reference ref="446049266"/> <reference ref="446049266"/>
<reference ref="324875956"/>
<reference ref="928999585"/>
<reference ref="822027164"/>
<reference ref="589293380"/>
<reference ref="908594300"/> <reference ref="908594300"/>
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">9</int>
<reference key="object" ref="852977528"/>
<reference key="parent" ref="786396739"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">8</int>
<reference key="object" ref="589293380"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="786396739"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="928999585"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="786396739"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">6</int> <int key="objectID">6</int>
<reference key="object" ref="446049266"/> <reference key="object" ref="446049266"/>
<reference key="parent" ref="786396739"/> <reference key="parent" ref="786396739"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="324875956"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="786396739"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">4</int>
<reference key="object" ref="822027164"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="786396739"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">3</int> <int key="objectID">3</int>
<reference key="object" ref="70326448"/> <reference key="object" ref="70326448"/>
@ -401,13 +223,8 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="42.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string key="6.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
@ -421,7 +238,6 @@
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int> <int key="IBDocument.defaultPropertyAccessControl">3</int>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="login-facebook.png">{281, 37}</string>
<string key="login-login-with.png">{282, 37}</string> <string key="login-login-with.png">{282, 37}</string>
<string key="login-signup.png">{282, 37}</string> <string key="login-signup.png">{282, 37}</string>
<string key="trovebox-logo-ipad.png">{840, 222}</string> <string key="trovebox-logo-ipad.png">{840, 222}</string>

View file

@ -24,7 +24,6 @@
@interface PrivateAuthenticationService : NSObject @interface PrivateAuthenticationService : NSObject
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email;
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd; + (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd;
+ (BOOL) checkUserFacebookEmail:(NSString*) email; + (BOOL) checkUserFacebookEmail:(NSString*) email;
+ (Account *) signIn:(NSString*) email password:(NSString*) pwd; + (Account *) signIn:(NSString*) email password:(NSString*) pwd;

View file

@ -22,7 +22,6 @@
@interface PrivateConstants : NSObject @interface PrivateConstants : NSObject
extern NSString * const kPrivateFacebookAppId;
extern NSInteger const kPrivateappStoreID; extern NSInteger const kPrivateappStoreID;
extern NSString * const kPrivateapplicationBundleID; extern NSString * const kPrivateapplicationBundleID;
extern NSString * const kPrivateapplicationName; extern NSString * const kPrivateapplicationName;

View file

@ -22,8 +22,6 @@
@implementation PrivateConstants @implementation PrivateConstants
NSString * const kPrivateFacebookAppId=@"";
NSInteger const kPrivateappStoreID=511845345; NSInteger const kPrivateappStoreID=511845345;
NSString * const kPrivateapplicationBundleID=@"me.OpenPhoto.ios"; NSString * const kPrivateapplicationBundleID=@"me.OpenPhoto.ios";
NSString * const kPrivateapplicationName=@"Trovebox"; NSString * const kPrivateapplicationName=@"Trovebox";

View file

@ -176,6 +176,9 @@
if (error){ if (error){
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Couldn't download the image",@"message when couldn't download the image in the profile screen") duration:5000]; PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Couldn't download the image",@"message when couldn't download the image in the profile screen") duration:5000];
[alert showAlert]; [alert showAlert];
#ifdef DEVELOPMENT_ENABLED
NSLog(@"URL failed to load %@", [result objectForKey:@"photoUrl"]);
#endif
}else{ }else{
// Begin a new image that will be the new image with the rounded corners // Begin a new image that will be the new image with the rounded corners
// (here with the size of an UIImageView) // (here with the size of an UIImageView)