yetangitu/photo-ios
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

#332: removed create account from mobile

Browse source
This commit is contained in:
Patrick Santana 2013-10-25 16:36:24 -02:00
parent 7c80009425
commit dd1a9f6a1b
13 changed files with 5 additions and 562 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Photo/AuthenticationService.h
View file

@ -44,7 +44,6 @@
- (void) startOAuthProcedure:(NSURL*) url;
// for login
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd;
// returns a list of Account
+ (NSArray *) signIn:(NSString*) email password:(NSString*) pwd;
+ (NSString *) recoverPassword:(NSString *) email;

6
Photo/AuthenticationService.m
View file

@ -294,12 +294,6 @@
[alert showAlertOnTop];
}
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd
{
return [PrivateAuthenticationService createNewAccountWithUser:user email:email password:pwd];
}
+ (NSArray *) signIn:(NSString*) email password:(NSString*) pwd
{
return [PrivateAuthenticationService signIn:email password:pwd];

39
Photo/LoginCreateAccountViewController.h
View file

@ -1,39 +0,0 @@
//
// LoginCreateAccountViewController.h
// Trovebox
//
// Created by Patrick Santana on 02/05/12.
// Copyright 2013 Trovebox
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#import "AuthenticationService.h"
#import "Account.h"
#import "MBProgressHUD.h"
@interface LoginCreateAccountViewController : GAITrackedViewController<UITextFieldDelegate>
@property (nonatomic, weak) IBOutlet UITextField *username;
@property (nonatomic, weak) IBOutlet UITextField *email;
@property (nonatomic, weak) IBOutlet UITextField *password;
@property (nonatomic, weak) IBOutlet UIButton *buttonCreateAccount;
@property (nonatomic, weak) IBOutlet UIImageView *backgroundUsername;
@property (nonatomic, weak) IBOutlet UIImageView *backgroundEmail;
@property (nonatomic, weak) IBOutlet UIImageView *backgroundPassword;
// label
@property (nonatomic, weak) IBOutlet UILabel *createAccountLabel;
- (IBAction)createAccount:(id)sender;
@end

246
Photo/LoginCreateAccountViewController.m
View file

@ -1,246 +0,0 @@
//
// LoginCreateAccountViewController.m
// Trovebox
//
// Created by Patrick Santana on 02/05/12.
// Copyright 2013 Trovebox
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
//
#import "LoginCreateAccountViewController.h"
@interface LoginCreateAccountViewController ()
-(void) createAccountUsername:(NSString*) username withEmail:(NSString *) email andPassword:(NSString*) password;
// 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;
@end
@implementation LoginCreateAccountViewController
@synthesize username=_username;
@synthesize email=_email;
@synthesize password=_passoword;
@synthesize buttonCreateAccount;
@synthesize backgroundUsername;
@synthesize backgroundEmail;
@synthesize backgroundPassword;
@synthesize createAccountLabel;
@synthesize isViewUp = _isViewUp;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) {
// Custom initialization
self.title=@"Create Account";
self.isViewUp = NO;
}
return self;
}
- (void)viewDidLoad
{
[super viewDidLoad];
[self.navigationController setNavigationBarHidden:NO animated:YES];
self.screenName = @"Create Account Screen";
self.createAccountLabel.hidden = NO;
}
- (void) viewWillAppear:(BOOL)animated
{
// if ipad, lets centralize fields
if([DisplayUtilities isIPad]){
self.email.center=self.backgroundEmail.center;
self.password.center=self.backgroundPassword.center;
self.username.center=self.backgroundUsername.center;
}
}
- (BOOL) shouldAutorotate
{
return YES;
}
- (NSUInteger) supportedInterfaceOrientations
{
return UIInterfaceOrientationMaskPortrait;
}
- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
{
return (interfaceOrientation == UIInterfaceOrientationPortrait);
}
- (IBAction)createAccount:(id)sender
{
// in the case of iphone 5 or ipad we don't need to move the screen
if (![DisplayUtilities isIPad] && ![DisplayUtilities is4InchRetina]){
if ( self.isViewUp == YES){
[UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationCurveEaseOut animations:^{
[self moveFieldsUpOrDown:+1];
}completion:^(BOOL finished){
self.isViewUp = NO;
}];
}}
// no keyboard
[self.username resignFirstResponder];
[self.email resignFirstResponder];
[self.password resignFirstResponder];
if ( [SharedAppDelegate internetActive] == NO ){
// problem with internet, show message to user
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Please check your internet connection",@"")];
[alert showAlert];
}else{
// user is creating account using email
// check for email, username and password
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.",@"Creation account where user needs to set the username")];
[alert showAlert];
return;
}
if (self.email.text == nil || [[self.email.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length ] == 0){
//show message
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Please, set your email.",@"Creation account where user needs to set the email")];
[alert showAlert];
return;
}
if (self.password.text == nil || [[self.password.text stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] length ] == 0){
//show message
PhotoAlertView *alert = [[PhotoAlertView alloc] initWithMessage:NSLocalizedString(@"Please, set your password",@"")];
[alert showAlert];
return;
}
// create account
[self createAccountUsername:self.username.text withEmail:self.email.text andPassword:self.password.text];
}
}
- (void)textFieldDidBeginEditing:(UITextField *)textField
{
if (![DisplayUtilities isIPad] && ![DisplayUtilities is4InchRetina]){
if (self.isViewUp == NO){
self.isViewUp = YES;
[UIView animateWithDuration:0.1 delay:0 options:UIViewAnimationCurveEaseOut animations:^{
[self moveFieldsUpOrDown:-1];
}completion:^(BOOL finished){
}];
}}
}
// direction should be -1 for go up or +1 to go down.
-(void) moveFieldsUpOrDown:(int) direction
{
if (direction != -1 && direction != +1){
// we don't allow others values
return;
}
// move up or down everything because we don't have space enough
[self.createAccountLabel setCenter:CGPointMake([self.createAccountLabel center].x, [self.createAccountLabel center].y + (35 * direction))];
[self.username setCenter:CGPointMake([self.username center].x, [self.username center].y + (35 * direction))];
[self.email setCenter:CGPointMake([self.email center].x, [self.email center].y + (35 * direction))];
[self.password setCenter:CGPointMake([self.password center].x, [self.password center].y + (35 * direction))];
[self.buttonCreateAccount setCenter:CGPointMake([self.buttonCreateAccount center].x, [self.buttonCreateAccount center].y + (35 * direction))];
[self.backgroundUsername setCenter:CGPointMake([self.backgroundUsername center].x, [self.backgroundUsername center].y + (35 * direction))];
[self.backgroundEmail setCenter:CGPointMake([self.backgroundEmail center].x, [self.backgroundEmail center].y + (35 * direction))];
[self.backgroundPassword setCenter:CGPointMake([self.backgroundPassword center].x, [self.backgroundPassword center].y + (35 * direction))];
}
// Action if user clicks in DONE in the keyboard
- (BOOL)textFieldShouldReturn:(UITextField *)textField {
if (textField == self.username){
[self.email becomeFirstResponder];
return NO;
}if (textField == self.email){
[self.password becomeFirstResponder];
return NO;
}else{
[textField resignFirstResponder];
[self createAccount:nil];
return YES;
}
}
- (void)viewDidUnload
{
[self setUsername:nil];
[self setEmail:nil];
[self setPassword:nil];
[self setButtonCreateAccount:nil];
[self setBackgroundUsername:nil];
[self setBackgroundEmail:nil];
[self setBackgroundPassword:nil];
[self setCreateAccountLabel:nil];
[super viewDidUnload];
}
////
//// Private methods
////
-(void) createAccountUsername:(NSString*) username withEmail:(NSString *) email andPassword:(NSString*) password
{
// 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_user_pwd", NULL);
dispatch_async(queue, ^{
@try{
// gcd to sign in
Account *account = [AuthenticationService createNewAccountWithUser:username email:email password:password];
// 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 ];
[[NSNotificationCenter defaultCenter] postNotificationName:kNotificationNeededsUpdate 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];
});
}
});
}
@end

96
Photo/LoginCreateAccountViewController.xib
View file

@ -1,96 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LoginCreateAccountViewController">
<connections>
<outlet property="backgroundEmail" destination="14" id="27"/>
<outlet property="backgroundPassword" destination="16" id="28"/>
<outlet property="backgroundUsername" destination="7" id="26"/>
<outlet property="buttonCreateAccount" destination="6" id="25"/>
<outlet property="createAccountLabel" destination="30" id="xbj-MW-H7P"/>
<outlet property="email" destination="15" id="20"/>
<outlet property="password" destination="17" id="21"/>
<outlet property="username" destination="5" id="19"/>
<outlet property="view" destination="1" id="3"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="1">
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter an username, email and password for your Trovebox account" textAlignment="center" lineBreakMode="characterWrap" numberOfLines="2" minimumFontSize="10" adjustsFontSizeToFit="NO" id="30" userLabel="Create Account message 1">
<rect key="frame" x="12" y="59" width="288" height="67"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="center" image="login-field-background.png" id="7" userLabel="Image View - username">
<rect key="frame" x="15" y="124" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="username" minimumFontSize="13" clearButtonMode="always" id="5">
<rect key="frame" x="24" y="124" width="265" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
<connections>
<outlet property="delegate" destination="-1" id="50"/>
</connections>
</textField>
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="center" image="login-field-background.png" id="14" userLabel="Image View - email">
<rect key="frame" x="15" y="163" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="email" minimumFontSize="13" clearButtonMode="always" id="15">
<rect key="frame" x="24" y="163" width="265" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
<connections>
<outlet property="delegate" destination="-1" id="48"/>
</connections>
</textField>
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="center" image="login-field-background.png" id="16" userLabel="Image View - password">
<rect key="frame" x="15" y="201" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="password" minimumFontSize="13" clearButtonMode="always" id="17">
<rect key="frame" x="24" y="201" width="265" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" enablesReturnKeyAutomatically="YES" secureTextEntry="YES"/>
<connections>
<outlet property="delegate" destination="-1" id="49"/>
</connections>
</textField>
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6">
<rect key="frame" x="15" y="259" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="login-create-account.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="createAccount:" destination="-1" eventType="touchUpInside" id="18"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="0.26666668059999998" green="0.16078431900000001" blue="0.1019607931" alpha="1" colorSpace="deviceRGB"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
</view>
</objects>
<resources>
<image name="login-create-account.png" width="282" height="37"/>
<image name="login-field-background.png" width="282" height="38"/>
</resources>
</document>

97
Photo/LoginCreateAccountViewController5.xib
View file

@ -1,97 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="LoginCreateAccountViewController">
<connections>
<outlet property="backgroundEmail" destination="14" id="27"/>
<outlet property="backgroundPassword" destination="16" id="28"/>
<outlet property="backgroundUsername" destination="7" id="26"/>
<outlet property="buttonCreateAccount" destination="6" id="25"/>
<outlet property="createAccountLabel" destination="wCc-3D-CZD" id="YK1-6v-1GW"/>
<outlet property="email" destination="15" id="20"/>
<outlet property="password" destination="17" id="21"/>
<outlet property="username" destination="5" id="19"/>
<outlet property="view" destination="1" id="3"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="1">
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="center" image="login-field-background.png" id="7" userLabel="Image View - username">
<rect key="frame" x="15" y="133" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="username" minimumFontSize="13" clearButtonMode="always" id="5">
<rect key="frame" x="24" y="133" width="265" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
<connections>
<outlet property="delegate" destination="-1" id="50"/>
</connections>
</textField>
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="center" image="login-field-background.png" id="14" userLabel="Image View - email">
<rect key="frame" x="15" y="172" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="email" minimumFontSize="13" clearButtonMode="always" id="15">
<rect key="frame" x="23" y="172" width="265" height="40"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" keyboardType="emailAddress" returnKeyType="next" enablesReturnKeyAutomatically="YES"/>
<connections>
<outlet property="delegate" destination="-1" id="48"/>
</connections>
</textField>
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="center" image="login-field-background.png" id="16" userLabel="Image View - password">
<rect key="frame" x="15" y="210" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
</imageView>
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="password" minimumFontSize="13" clearButtonMode="always" id="17">
<rect key="frame" x="24" y="210" width="265" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<textInputTraits key="textInputTraits" autocorrectionType="no" returnKeyType="done" enablesReturnKeyAutomatically="YES" secureTextEntry="YES"/>
<connections>
<outlet property="delegate" destination="-1" id="49"/>
</connections>
</textField>
<button opaque="NO" contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="6">
<rect key="frame" x="15" y="268" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="login-create-account.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="createAccount:" destination="-1" eventType="touchUpInside" id="18"/>
</connections>
</button>
<label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" text="Enter an username, email and password for your Trovebox account" textAlignment="center" lineBreakMode="characterWrap" numberOfLines="2" minimumFontSize="10" adjustsFontSizeToFit="NO" id="wCc-3D-CZD" userLabel="Create Account message 1">
<rect key="frame" x="16" y="71" width="288" height="67"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
<color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
<color key="highlightedColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</label>
</subviews>
<color key="backgroundColor" red="0.26666668059999998" green="0.16078431900000001" blue="0.1019607931" alpha="1" colorSpace="deviceRGB"/>
<simulatedStatusBarMetrics key="simulatedStatusBarMetrics"/>
<simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
</view>
</objects>
<resources>
<image name="login-create-account.png" width="282" height="37"/>
<image name="login-field-background.png" width="282" height="38"/>
</resources>
</document>

2
Photo/LoginViewController.h
View file

@ -19,14 +19,12 @@
//
#import "LoginConnectViewController.h"
#import "LoginCreateAccountViewController.h"
#import "AuthenticationService.h"
#import "Account.h"
#import "MBProgressHUD.h"
@interface LoginViewController : GAITrackedViewController
- (IBAction)signUpWithEmail:(id)sender;
- (IBAction)signInWithEmail:(id)sender;
@end

6
Photo/LoginViewController.m
View file

@ -77,12 +77,6 @@
return (interfaceOrientation == UIInterfaceOrientationPortrait);
}
- (IBAction)signUpWithEmail:(id)sender {
LoginCreateAccountViewController *controller = [[LoginCreateAccountViewController alloc] initWithNibName:[DisplayUtilities getCorrectNibName:@"LoginCreateAccountViewController"] bundle:nil];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
[self.navigationController pushViewController:controller animated:YES];
}
- (IBAction)signInWithEmail:(id)sender {
LoginConnectViewController *controller = [[LoginConnectViewController alloc] initWithNibName:[DisplayUtilities getCorrectNibName:@"LoginConnectViewController"] bundle:nil];
self.navigationController.navigationBar.tintColor = [UIColor whiteColor];

18
Photo/LoginViewController.xib
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F45" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
@ -15,21 +15,6 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="18">
<rect key="frame" x="18" y="364" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="login-signup.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="signUpWithEmail:" destination="-1" eventType="touchUpInside" id="21"/>
</connections>
</button>
<button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="20">
<rect key="frame" x="18" y="412" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@ -56,7 +41,6 @@
</objects>
<resources>
<image name="login-login-with.png" width="282" height="37"/>
<image name="login-signup.png" width="282" height="37"/>
<image name="trovebox-logo-ipad.png" width="840" height="222"/>
</resources>
</document>

20
Photo/LoginViewController5.xib
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="4510" systemVersion="13A603" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
</dependencies>
<objects>
@ -15,21 +15,6 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="18">
<rect key="frame" x="18" y="419" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="login-signup.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="signUpWithEmail:" destination="-1" eventType="touchUpInside" id="21"/>
</connections>
</button>
<button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="20">
<rect key="frame" x="18" y="467" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@ -57,7 +42,6 @@
</objects>
<resources>
<image name="login-login-with.png" width="282" height="37"/>
<image name="login-signup.png" width="282" height="37"/>
<image name="trovebox-logo-ipad.png" width="840" height="222"/>
</resources>
</document>

20
Photo/LoginViewControlleriPad.xib
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4510" systemVersion="12F37" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.iPad.XIB" version="3.0" toolsVersion="4510" systemVersion="13A603" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none">
<dependencies>
<deployment defaultVersion="1536" identifier="iOS"/>
<deployment defaultVersion="1792" identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="3742"/>
</dependencies>
<objects>
@ -30,21 +30,6 @@
<action selector="signInWithEmail:" destination="-1" eventType="touchUpInside" id="45"/>
</connections>
</button>
<button contentMode="center" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="3">
<rect key="frame" x="241" y="554" width="285" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="15"/>
<state key="normal" image="login-signup.png">
<color key="titleColor" red="0.19607843459999999" green="0.30980393290000002" blue="0.52156865600000002" alpha="1" colorSpace="calibratedRGB"/>
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
</state>
<state key="highlighted">
<color key="titleColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</state>
<connections>
<action selector="signUpWithEmail:" destination="-1" eventType="touchUpInside" id="44"/>
</connections>
</button>
<imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" image="trovebox-logo-ipad.png" id="42">
<rect key="frame" x="208" y="206" width="352" height="91"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
@ -56,7 +41,6 @@
</objects>
<resources>
<image name="login-login-with.png" width="282" height="37"/>
<image name="login-signup.png" width="282" height="37"/>
<image name="trovebox-logo-ipad.png" width="840" height="222"/>
</resources>
</document>

2
Photo/PrivateAuthenticationService.h
View file

@ -24,8 +24,6 @@
@interface PrivateAuthenticationService : NSObject
+ (Account *) createNewAccountWithUser:(NSString*) user email:(NSString*) email password:(NSString*) pwd;
+ (BOOL) checkUserFacebookEmail:(NSString*) email;
+ (NSArray *) signIn:(NSString*) email password:(NSString*) pwd;
+ (NSString *) recoverPassword:(NSString *) email;
+ (void) sendToServerReceipt:(NSData *) receipt forUser:(NSString *) email;

14
Trovebox.xcodeproj/project.pbxproj
View file

@ -98,8 +98,6 @@
CD1528481628DB8500EA08FF /* Account.m in Sources */ = {isa = PBXBuildFile; fileRef = CD15283C1628DB8500EA08FF /* Account.m */; };
CD15284A1628DB8500EA08FF /* LoginViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1528401628DB8500EA08FF /* LoginViewController.m */; };
CD15284B1628DB8500EA08FF /* LoginViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD1528411628DB8500EA08FF /* LoginViewController.xib */; };
CD15284C1628DB8500EA08FF /* LoginCreateAccountViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1528431628DB8500EA08FF /* LoginCreateAccountViewController.m */; };
CD15284D1628DB8500EA08FF /* LoginCreateAccountViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD1528441628DB8500EA08FF /* LoginCreateAccountViewController.xib */; };
CD15284E1628DB8500EA08FF /* LoginConnectViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1528461628DB8500EA08FF /* LoginConnectViewController.m */; };
CD15284F1628DB8500EA08FF /* LoginConnectViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD1528471628DB8500EA08FF /* LoginConnectViewController.xib */; };
CD1A6CDB1704811B0002763A /* TMPhotoQuiltViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1A6CDA1704811A0002763A /* TMPhotoQuiltViewCell.m */; };
@ -118,7 +116,6 @@
CD1D827016E9215600877A8E /* MenuTableViewSectionCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD1D826F16E9215600877A8E /* MenuTableViewSectionCell.xib */; };
CD1D827316E9412800877A8E /* MenuTableViewSearchCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1D827216E9412800877A8E /* MenuTableViewSearchCell.m */; };
CD1D827516E9413A00877A8E /* MenuTableViewSearchCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD1D827416E9413900877A8E /* MenuTableViewSearchCell.xib */; };
CD206936163B232C00F92F8A /* LoginCreateAccountViewController5.xib in Resources */ = {isa = PBXBuildFile; fileRef = CD206934163B232C00F92F8A /* LoginCreateAccountViewController5.xib */; };
CD25838F17F4C24900A62574 /* UploadStatusTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD25838E17F4C24900A62574 /* UploadStatusTableViewController.m */; };
CD30D57016303E54001A0CA0 /* ELCAsset.m in Sources */ = {isa = PBXBuildFile; fileRef = CD30D56216303E54001A0CA0 /* ELCAsset.m */; };
CD30D57116303E54001A0CA0 /* ELCAssetCell.m in Sources */ = {isa = PBXBuildFile; fileRef = CD30D56416303E54001A0CA0 /* ELCAssetCell.m */; };
@ -893,9 +890,6 @@
CD15283F1628DB8500EA08FF /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = "<group>"; };
CD1528401628DB8500EA08FF /* LoginViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginViewController.m; sourceTree = "<group>"; };
CD1528411628DB8500EA08FF /* LoginViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginViewController.xib; sourceTree = "<group>"; };
CD1528421628DB8500EA08FF /* LoginCreateAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginCreateAccountViewController.h; sourceTree = "<group>"; };
CD1528431628DB8500EA08FF /* LoginCreateAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginCreateAccountViewController.m; sourceTree = "<group>"; };
CD1528441628DB8500EA08FF /* LoginCreateAccountViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginCreateAccountViewController.xib; sourceTree = "<group>"; };
CD1528451628DB8500EA08FF /* LoginConnectViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginConnectViewController.h; sourceTree = "<group>"; };
CD1528461628DB8500EA08FF /* LoginConnectViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoginConnectViewController.m; sourceTree = "<group>"; };
CD1528471628DB8500EA08FF /* LoginConnectViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginConnectViewController.xib; sourceTree = "<group>"; };
@ -929,7 +923,6 @@
CD1D827116E9412800877A8E /* MenuTableViewSearchCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MenuTableViewSearchCell.h; sourceTree = "<group>"; };
CD1D827216E9412800877A8E /* MenuTableViewSearchCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MenuTableViewSearchCell.m; sourceTree = "<group>"; };
CD1D827416E9413900877A8E /* MenuTableViewSearchCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MenuTableViewSearchCell.xib; sourceTree = "<group>"; };
CD206934163B232C00F92F8A /* LoginCreateAccountViewController5.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LoginCreateAccountViewController5.xib; sourceTree = "<group>"; };
CD25838D17F4C24900A62574 /* UploadStatusTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UploadStatusTableViewController.h; sourceTree = "<group>"; };
CD25838E17F4C24900A62574 /* UploadStatusTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UploadStatusTableViewController.m; sourceTree = "<group>"; };
CD2583E317FCB3B000A62574 /* ELCAssetSelectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ELCAssetSelectionDelegate.h; sourceTree = "<group>"; };
@ -1623,10 +1616,6 @@
CD1528411628DB8500EA08FF /* LoginViewController.xib */,
CDCC0BC616E0C66400BE4481 /* LoginViewController5.xib */,
CDDFDA3E1729422A00D992DC /* LoginViewControlleriPad.xib */,
CD1528421628DB8500EA08FF /* LoginCreateAccountViewController.h */,
CD1528431628DB8500EA08FF /* LoginCreateAccountViewController.m */,
CD1528441628DB8500EA08FF /* LoginCreateAccountViewController.xib */,
CD206934163B232C00F92F8A /* LoginCreateAccountViewController5.xib */,
CD1528451628DB8500EA08FF /* LoginConnectViewController.h */,
CD1528461628DB8500EA08FF /* LoginConnectViewController.m */,
CD1528471628DB8500EA08FF /* LoginConnectViewController.xib */,
@ -2689,13 +2678,11 @@
CDFAF34716285495007A4FDF /* NewestPhotoCell.xib in Resources */,
CDFAF34916285495007A4FDF /* UploadCell.xib in Resources */,
CD15284B1628DB8500EA08FF /* LoginViewController.xib in Resources */,
CD15284D1628DB8500EA08FF /* LoginCreateAccountViewController.xib in Resources */,
CD15284F1628DB8500EA08FF /* LoginConnectViewController.xib in Resources */,
CD30D57216303E54001A0CA0 /* ELCAssetPicker.xib in Resources */,
CD30D57416303E54001A0CA0 /* ELCImagePickerController.xib in Resources */,
CD30D57716303E54001A0CA0 /* SyncViewController.xib in Resources */,
CD30D84216369CF1001A0CA0 /* PhotoViewController.xib in Resources */,
CD206936163B232C00F92F8A /* LoginCreateAccountViewController5.xib in Resources */,
CDC7AF39164028E100FC8BC1 /* PhotoViewController5.xib in Resources */,
CDCC0A8F16E0C23700BE4481 /* appbar_empty.png in Resources */,
CDCC0A9016E0C23700BE4481 /* appbar_empty@2x.png in Resources */,
@ -3001,7 +2988,6 @@
CDFAF36016285C4E007A4FDF /* Synced+Methods.m in Sources */,
CD1528481628DB8500EA08FF /* Account.m in Sources */,
CD15284A1628DB8500EA08FF /* LoginViewController.m in Sources */,
CD15284C1628DB8500EA08FF /* LoginCreateAccountViewController.m in Sources */,
CD15284E1628DB8500EA08FF /* LoginConnectViewController.m in Sources */,
CD1CDE39162C275F00E57F73 /* CoreDataTableViewController.m in Sources */,
CD1CDE3C162C2AE400E57F73 /* CoreLocationController.m in Sources */,