diff --git a/Photo/GalleryViewController.m b/Photo/GalleryViewController.m index 9667230..9b41efa 100644 --- a/Photo/GalleryViewController.m +++ b/Photo/GalleryViewController.m @@ -179,12 +179,6 @@ - (void)quiltView:(TMQuiltView *)quiltView didSelectCellAtIndexPath:(NSIndexPath *)indexPath { - NSMutableArray *temp = [NSMutableArray array]; - for (WebPhoto *photo in self.photos) - { - [temp addObject:photo.mwphoto]; - } - // Create & present browser MWPhotoBrowser *browser = [[MWPhotoBrowser alloc] initWithDelegate:self]; // Set options diff --git a/Photo/HomeTableViewController.h b/Photo/HomeTableViewController.h index d1ad372..236bef5 100644 --- a/Photo/HomeTableViewController.h +++ b/Photo/HomeTableViewController.h @@ -37,8 +37,10 @@ // to update profile #import "DateUtilities.h" +#import "MWPhotoBrowser.h" -@interface HomeTableViewController : CoreDataTableViewController + +@interface HomeTableViewController : CoreDataTableViewController { EGORefreshTableHeaderView *_refreshHeaderView; diff --git a/Photo/HomeTableViewController.m b/Photo/HomeTableViewController.m index 707d352..60b4688 100644 --- a/Photo/HomeTableViewController.m +++ b/Photo/HomeTableViewController.m @@ -23,6 +23,7 @@ @interface HomeTableViewController () // refresh the list. It is not necessary when comes from photo @property (nonatomic) BOOL needsUpdate; +@property (nonatomic, strong) MWPhoto* mwphoto; - (void)doneLoadingTableViewData; @end @@ -30,6 +31,7 @@ @implementation HomeTableViewController @synthesize noPhotoImageView=_noPhotoImageView; @synthesize needsUpdate = _needsUpdate; +@synthesize mwphoto=_mwphoto; - (id)initWithStyle:(UITableViewStyle)style { @@ -131,7 +133,7 @@ // now the logo UIImageView *titleView = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"home-trovebox-logo.png"]]; [self.navigationController.navigationBar.topItem setTitleView:titleView]; - + // check if needs to update the profile [self needsUpdateProfileDetails]; @@ -174,7 +176,7 @@ [buttonRight setImage:buttonRightImage forState:UIControlStateNormal]; buttonRight.frame = CGRectMake(0, 0, buttonRightImage.size.width, buttonRightImage.size.height); [buttonRight addTarget:self action:@selector(openCamera:) forControlEvents:UIControlEventTouchUpInside]; - + UIBarButtonItem *customRightButton = [[UIBarButtonItem alloc] initWithCustomView:buttonRight]; self.navigationItem.rightBarButtonItem = customRightButton; @@ -424,6 +426,34 @@ } } +- (void) tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath +{ + Timeline *photo = [self.fetchedResultsController objectAtIndexPath:indexPath]; + if ([photo.status isEqualToString:kUploadStatusTypeUploaded]){ + + // Create & present browser + self.mwphoto = [MWPhoto photoWithURL:[NSURL URLWithString:photo.photoUrlDetail]]; + + MWPhotoBrowser *browser = [[MWPhotoBrowser alloc] initWithDelegate:self]; + // Set options + // browser.wantsFullScreenLayout = YES; + browser.displayActionButton = YES; + UINavigationController *nav = [[UINavigationController alloc]initWithRootViewController:browser]; + + // Present + [self presentModalViewController:nav animated:NO]; + } +} + +- (NSUInteger)numberOfPhotosInPhotoBrowser:(MWPhotoBrowser *)photoBrowser { + return 1; +} + +- (MWPhoto *)photoBrowser:(MWPhotoBrowser *)photoBrowser photoAtIndex:(NSUInteger)index { + return self.mwphoto; +} + + // Override to support conditional editing of the table view. // This only needs to be implemented if you are going to be returning NO // for some items. By default, all items are editable. diff --git a/Photo/Photo.h b/Photo/Photo.h index 9c71403..996cf86 100644 --- a/Photo/Photo.h +++ b/Photo/Photo.h @@ -2,7 +2,7 @@ // Photo.h // Trovebox // -// Created by Patrick Santana on 14/03/13. +// Created by Patrick Santana on 29/03/13. // Copyright (c) 2013 Trovebox. All rights reserved. // @@ -16,11 +16,11 @@ @property (nonatomic, retain) NSNumber * height; @property (nonatomic, retain) NSString * identification; @property (nonatomic, retain) NSString * pageUrl; +@property (nonatomic, retain) NSNumber * thumbHeight; +@property (nonatomic, retain) NSString * thumbUrl; +@property (nonatomic, retain) NSNumber * thumbWidth; @property (nonatomic, retain) NSString * title; @property (nonatomic, retain) NSString * url; @property (nonatomic, retain) NSNumber * width; -@property (nonatomic, retain) NSNumber * thumbWidth; -@property (nonatomic, retain) NSNumber * thumbHeight; -@property (nonatomic, retain) NSString * thumbUrl; @end diff --git a/Photo/Photo.m b/Photo/Photo.m index 2574d65..79c61d3 100644 --- a/Photo/Photo.m +++ b/Photo/Photo.m @@ -2,7 +2,7 @@ // Photo.m // Trovebox // -// Created by Patrick Santana on 14/03/13. +// Created by Patrick Santana on 29/03/13. // Copyright (c) 2013 Trovebox. All rights reserved. // @@ -15,11 +15,11 @@ @dynamic height; @dynamic identification; @dynamic pageUrl; +@dynamic thumbHeight; +@dynamic thumbUrl; +@dynamic thumbWidth; @dynamic title; @dynamic url; @dynamic width; -@dynamic thumbWidth; -@dynamic thumbHeight; -@dynamic thumbUrl; @end diff --git a/Photo/Photo.xcdatamodeld/Photo.xcdatamodel/contents b/Photo/Photo.xcdatamodeld/Photo.xcdatamodel/contents index 8eee223..ac6a6bb 100644 --- a/Photo/Photo.xcdatamodeld/Photo.xcdatamodel/contents +++ b/Photo/Photo.xcdatamodeld/Photo.xcdatamodel/contents @@ -1,5 +1,5 @@ - + @@ -35,6 +35,7 @@ + @@ -43,8 +44,8 @@ - - + + \ No newline at end of file diff --git a/Photo/Synced.h b/Photo/Synced.h index a24cf4e..cbc90dd 100644 --- a/Photo/Synced.h +++ b/Photo/Synced.h @@ -1,21 +1,9 @@ // // Synced.h -// Photo +// Trovebox // -// Created by Patrick Santana on 15/10/12. -// Copyright 2012 Photo -// -// 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. +// Created by Patrick Santana on 29/03/13. +// Copyright (c) 2013 Trovebox. All rights reserved. // #import diff --git a/Photo/Synced.m b/Photo/Synced.m index 38e92b0..06c5b1e 100644 --- a/Photo/Synced.m +++ b/Photo/Synced.m @@ -1,21 +1,9 @@ // // Synced.m -// Photo +// Trovebox // -// Created by Patrick Santana on 15/10/12. -// Copyright 2012 Photo -// -// 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. +// Created by Patrick Santana on 29/03/13. +// Copyright (c) 2013 Trovebox. All rights reserved. // #import "Synced.h" diff --git a/Photo/Timeline+Methods.m b/Photo/Timeline+Methods.m index f676998..17ac839 100644 --- a/Photo/Timeline+Methods.m +++ b/Photo/Timeline+Methods.m @@ -184,9 +184,11 @@ NSString * const kUploadStatusTypeUploadFinished =@"A_UploadFinished"; if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)] == YES && [[UIScreen mainScreen] scale] == 2.00) { // retina display photo.photoUrl = [NSString stringWithFormat:@"%@",[raw objectForKey:@"path610x530xCR"]]; + photo.photoUrlDetail = [NSString stringWithFormat:@"%@",[raw objectForKey:@"path610x530"]]; }else{ // not retina display photo.photoUrl = [NSString stringWithFormat:@"%@",[raw objectForKey:@"path305x265xCR"]]; + photo.photoUrlDetail = [NSString stringWithFormat:@"%@",[raw objectForKey:@"path305x265"]]; } NSString *title = [raw objectForKey:@"title"]; diff --git a/Photo/Timeline.h b/Photo/Timeline.h index 38c5094..6407d4e 100644 --- a/Photo/Timeline.h +++ b/Photo/Timeline.h @@ -1,21 +1,9 @@ // // Timeline.h -// Photo +// Trovebox // -// Created by Patrick Santana on 15/10/12. -// Copyright 2012 Photo -// -// 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. +// Created by Patrick Santana on 29/03/13. +// Copyright (c) 2013 Trovebox. All rights reserved. // #import @@ -34,8 +22,8 @@ @property (nonatomic, retain) NSNumber * permission; @property (nonatomic, retain) NSString * photoDataTempUrl; @property (nonatomic, retain) NSData * photoDataThumb; -@property (nonatomic, retain) NSNumber * photoToUpload; @property (nonatomic, retain) NSString * photoPageUrl; +@property (nonatomic, retain) NSNumber * photoToUpload; @property (nonatomic, retain) NSString * photoUploadMultiplesUrl; @property (nonatomic, retain) NSNumber * photoUploadProgress; @property (nonatomic, retain) NSData * photoUploadResponse; @@ -46,5 +34,6 @@ @property (nonatomic, retain) NSString * title; @property (nonatomic, retain) NSNumber * twitter; @property (nonatomic, retain) NSString * userUrl; +@property (nonatomic, retain) NSString * photoUrlDetail; @end diff --git a/Photo/Timeline.m b/Photo/Timeline.m index b2e6042..0cc4b50 100644 --- a/Photo/Timeline.m +++ b/Photo/Timeline.m @@ -1,21 +1,9 @@ // // Timeline.m -// Photo +// Trovebox // -// Created by Patrick Santana on 15/10/12. -// Copyright 2012 Photo -// -// 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. +// Created by Patrick Santana on 29/03/13. +// Copyright (c) 2013 Trovebox. All rights reserved. // #import "Timeline.h" @@ -33,8 +21,8 @@ @dynamic permission; @dynamic photoDataTempUrl; @dynamic photoDataThumb; -@dynamic photoToUpload; @dynamic photoPageUrl; +@dynamic photoToUpload; @dynamic photoUploadMultiplesUrl; @dynamic photoUploadProgress; @dynamic photoUploadResponse; @@ -45,5 +33,6 @@ @dynamic title; @dynamic twitter; @dynamic userUrl; +@dynamic photoUrlDetail; @end diff --git a/Photo/WebPhoto.m b/Photo/WebPhoto.m index 3f8f093..0e515b8 100644 --- a/Photo/WebPhoto.m +++ b/Photo/WebPhoto.m @@ -70,7 +70,7 @@ NSTimeInterval date = d; photo.date = [NSDate dateWithTimeIntervalSince1970:date]; - photo.mwphoto = [MWPhoto photoWithURL:photo.url]; + photo.mwphoto = [MWPhoto photoWithURL:[NSURL URLWithString:photo.url]]; } // return result diff --git a/Photo/WebService.m b/Photo/WebService.m index 9b2c557..39d4523 100644 --- a/Photo/WebService.m +++ b/Photo/WebService.m @@ -77,10 +77,10 @@ if ([[UIScreen mainScreen] respondsToSelector:@selector(scale)] == YES && [[UIScreen mainScreen] scale] == 2.00) { // retina display - [request appendString:@"610x530xCR"]; + [request appendString:@"610x530xCR,610x530"]; }else{ // not retina display - [request appendString:@"305x265xCR"]; + [request appendString:@"305x265xCR,305x265"]; } return [self parseResponse:[self sendSynchronousRequest:request httpMethod:@"GET"]]; diff --git a/Trovebox.xcodeproj/project.pbxproj b/Trovebox.xcodeproj/project.pbxproj index 43ffc8a..b9d43fd 100644 --- a/Trovebox.xcodeproj/project.pbxproj +++ b/Trovebox.xcodeproj/project.pbxproj @@ -12,6 +12,9 @@ CD004A3D161F02DA006B1C6E /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD004A3C161F02DA006B1C6E /* CoreLocation.framework */; }; CD004A3F161F030F006B1C6E /* Twitter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD004A3E161F030F006B1C6E /* Twitter.framework */; }; CD004A41161F0324006B1C6E /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD004A40161F0324006B1C6E /* CoreFoundation.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; + CD014602170641C800FFE797 /* Synced.m in Sources */ = {isa = PBXBuildFile; fileRef = CD014601170641C800FFE797 /* Synced.m */; }; + CD01462A170641C900FFE797 /* Photo.m in Sources */ = {isa = PBXBuildFile; fileRef = CD014629170641C900FFE797 /* Photo.m */; }; + CD01462D1706479300FFE797 /* Timeline.m in Sources */ = {isa = PBXBuildFile; fileRef = CD01462C1706479300FFE797 /* Timeline.m */; }; 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 */; }; @@ -27,8 +30,6 @@ CD1A6D191704959E0002763A /* MWTapDetectingImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1A6D101704959E0002763A /* MWTapDetectingImageView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; CD1A6D1A1704959E0002763A /* MWTapDetectingView.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1A6D121704959E0002763A /* MWTapDetectingView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; CD1A6D1B1704959E0002763A /* MWZoomingScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1A6D141704959E0002763A /* MWZoomingScrollView.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; - CD1CDE33162C244200E57F73 /* Synced.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE32162C244200E57F73 /* Synced.m */; }; - CD1CDE36162C244200E57F73 /* Timeline.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE35162C244200E57F73 /* Timeline.m */; }; CD1CDE39162C275F00E57F73 /* CoreDataTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE38162C275F00E57F73 /* CoreDataTableViewController.m */; }; CD1CDE3C162C2AE400E57F73 /* CoreLocationController.m in Sources */ = {isa = PBXBuildFile; fileRef = CD1CDE3B162C2AE400E57F73 /* CoreLocationController.m */; }; CD1CDE51162C2D8300E57F73 /* ImageIO.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CD1CDE50162C2D8300E57F73 /* ImageIO.framework */; }; @@ -68,7 +69,6 @@ CD4613D0161C78B00028619D /* WrapController.m in Sources */ = {isa = PBXBuildFile; fileRef = CDEC2565161C3A280062E9B0 /* WrapController.m */; }; CD5F5E4316F20E050044427E /* Gallery.m in Sources */ = {isa = PBXBuildFile; fileRef = CD5F5E4216F20E050044427E /* Gallery.m */; }; CD5F5E4616F20E490044427E /* Photo+Methods.m in Sources */ = {isa = PBXBuildFile; fileRef = CD5F5E4516F20E490044427E /* Photo+Methods.m */; }; - CD5F5E4C16F245270044427E /* Photo.m in Sources */ = {isa = PBXBuildFile; fileRef = CD5F5E4B16F245270044427E /* Photo.m */; }; CD764288161ED9BB00E0B657 /* iRate.bundle in Resources */ = {isa = PBXBuildFile; fileRef = CD764285161ED9BB00E0B657 /* iRate.bundle */; }; CD764289161ED9BB00E0B657 /* iRate.m in Sources */ = {isa = PBXBuildFile; fileRef = CD764287161ED9BB00E0B657 /* iRate.m */; }; CD76429F161EDAC000E0B657 /* ASIAuthenticationDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CD76428C161EDAC000E0B657 /* ASIAuthenticationDialog.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; @@ -676,6 +676,12 @@ CD004A3C161F02DA006B1C6E /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; }; CD004A3E161F030F006B1C6E /* Twitter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Twitter.framework; path = System/Library/Frameworks/Twitter.framework; sourceTree = SDKROOT; }; CD004A40161F0324006B1C6E /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; }; + CD014600170641C800FFE797 /* Synced.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Synced.h; sourceTree = ""; }; + CD014601170641C800FFE797 /* Synced.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Synced.m; sourceTree = ""; }; + CD014628170641C900FFE797 /* Photo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Photo.h; sourceTree = ""; }; + CD014629170641C900FFE797 /* Photo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Photo.m; sourceTree = ""; }; + CD01462B1706479300FFE797 /* Timeline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timeline.h; sourceTree = ""; }; + CD01462C1706479300FFE797 /* Timeline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Timeline.m; sourceTree = ""; }; CD15283B1628DB8500EA08FF /* Account.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Account.h; sourceTree = ""; }; CD15283C1628DB8500EA08FF /* Account.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Account.m; sourceTree = ""; }; CD15283F1628DB8500EA08FF /* LoginViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoginViewController.h; sourceTree = ""; }; @@ -703,10 +709,6 @@ CD1A6D121704959E0002763A /* MWTapDetectingView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MWTapDetectingView.m; path = mwphotobrowser/MWTapDetectingView.m; sourceTree = ""; }; CD1A6D131704959E0002763A /* MWZoomingScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWZoomingScrollView.h; path = mwphotobrowser/MWZoomingScrollView.h; sourceTree = ""; }; CD1A6D141704959E0002763A /* MWZoomingScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MWZoomingScrollView.m; path = mwphotobrowser/MWZoomingScrollView.m; sourceTree = ""; }; - CD1CDE31162C244200E57F73 /* Synced.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Synced.h; sourceTree = ""; }; - CD1CDE32162C244200E57F73 /* Synced.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Synced.m; sourceTree = ""; }; - CD1CDE34162C244200E57F73 /* Timeline.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Timeline.h; sourceTree = ""; }; - CD1CDE35162C244200E57F73 /* Timeline.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Timeline.m; sourceTree = ""; }; CD1CDE37162C275F00E57F73 /* CoreDataTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreDataTableViewController.h; sourceTree = ""; }; CD1CDE38162C275F00E57F73 /* CoreDataTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CoreDataTableViewController.m; sourceTree = ""; }; CD1CDE3A162C2AE400E57F73 /* CoreLocationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CoreLocationController.h; sourceTree = ""; }; @@ -769,8 +771,6 @@ CD5F5E4216F20E050044427E /* Gallery.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Gallery.m; sourceTree = ""; }; CD5F5E4416F20E490044427E /* Photo+Methods.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Photo+Methods.h"; sourceTree = ""; }; CD5F5E4516F20E490044427E /* Photo+Methods.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Photo+Methods.m"; sourceTree = ""; }; - CD5F5E4A16F245270044427E /* Photo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Photo.h; sourceTree = ""; }; - CD5F5E4B16F245270044427E /* Photo.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Photo.m; sourceTree = ""; }; CD764285161ED9BB00E0B657 /* iRate.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = iRate.bundle; path = Frameworks/iRate/iRate/iRate.bundle; sourceTree = ""; }; CD764286161ED9BB00E0B657 /* iRate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = iRate.h; path = Frameworks/iRate/iRate/iRate.h; sourceTree = ""; }; CD764287161ED9BB00E0B657 /* iRate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = iRate.m; path = Frameworks/iRate/iRate/iRate.m; sourceTree = ""; }; @@ -1283,15 +1283,15 @@ CDFAF35F16285C4E007A4FDF /* Synced+Methods.m */, CDFAF35A16285BC6007A4FDF /* Timeline+Methods.h */, CDFAF35B16285BC6007A4FDF /* Timeline+Methods.m */, - CD5F5E4A16F245270044427E /* Photo.h */, - CD5F5E4B16F245270044427E /* Photo.m */, CDAFB9EC16122263002D6E86 /* Photo.xcdatamodeld */, + CD01462B1706479300FFE797 /* Timeline.h */, + CD01462C1706479300FFE797 /* Timeline.m */, + CD014628170641C900FFE797 /* Photo.h */, + CD014629170641C900FFE797 /* Photo.m */, + CD014600170641C800FFE797 /* Synced.h */, + CD014601170641C800FFE797 /* Synced.m */, CD5F5E4116F20E050044427E /* Gallery.h */, CD5F5E4216F20E050044427E /* Gallery.m */, - CD1CDE34162C244200E57F73 /* Timeline.h */, - CD1CDE35162C244200E57F73 /* Timeline.m */, - CD1CDE31162C244200E57F73 /* Synced.h */, - CD1CDE32162C244200E57F73 /* Synced.m */, ); name = CoreData; sourceTree = ""; @@ -2552,8 +2552,6 @@ CD15284A1628DB8500EA08FF /* LoginViewController.m in Sources */, CD15284C1628DB8500EA08FF /* LoginCreateAccountViewController.m in Sources */, CD15284E1628DB8500EA08FF /* LoginConnectViewController.m in Sources */, - CD1CDE33162C244200E57F73 /* Synced.m in Sources */, - CD1CDE36162C244200E57F73 /* Timeline.m in Sources */, CD1CDE39162C275F00E57F73 /* CoreDataTableViewController.m in Sources */, CD1CDE3C162C2AE400E57F73 /* CoreLocationController.m in Sources */, CD84B36F162D49180008FE7D /* PrivateConstants.m in Sources */, @@ -2605,7 +2603,6 @@ CDAC02B516EF62EB00D3BB7F /* TMQuiltViewController.m in Sources */, CD5F5E4316F20E050044427E /* Gallery.m in Sources */, CD5F5E4616F20E490044427E /* Photo+Methods.m in Sources */, - CD5F5E4C16F245270044427E /* Photo.m in Sources */, CD927E4716F8712100843FEE /* WebPhoto.m in Sources */, CD1A6CDB1704811B0002763A /* TMPhotoQuiltViewCell.m in Sources */, CD1A6D151704959E0002763A /* MWCaptionView.m in Sources */, @@ -2614,6 +2611,9 @@ CD1A6D191704959E0002763A /* MWTapDetectingImageView.m in Sources */, CD1A6D1A1704959E0002763A /* MWTapDetectingView.m in Sources */, CD1A6D1B1704959E0002763A /* MWZoomingScrollView.m in Sources */, + CD014602170641C800FFE797 /* Synced.m in Sources */, + CD01462A170641C900FFE797 /* Photo.m in Sources */, + CD01462D1706479300FFE797 /* Timeline.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; };