From c5c5d201939a3dd233b27052d07f4a35cfe1c9aa Mon Sep 17 00:00:00 2001 From: Ash Furrow Date: Tue, 22 Oct 2013 20:31:57 -0400 Subject: [PATCH] Further abstracted initial photo model. --- FRP/FRPFullSizePhotoViewController.m | 2 +- FRP/FRPFullSizePhotoViewModel.h | 2 +- FRP/FRPFullSizePhotoViewModel.m | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/FRP/FRPFullSizePhotoViewController.m b/FRP/FRPFullSizePhotoViewController.m index 682dbcf..05fe64c 100644 --- a/FRP/FRPFullSizePhotoViewController.m +++ b/FRP/FRPFullSizePhotoViewController.m @@ -48,7 +48,7 @@ [self.pageViewController setViewControllers:@[[self photoViewControllerForIndex:self.viewModel.initialPhotoIndex]] direction:UIPageViewControllerNavigationDirectionForward animated:NO completion:nil]; // Configure self - self.title = [self.viewModel.initialPhotoModel photoName]; + self.title = self.viewModel.initialPhotoName; @weakify(self); UIButton *infoButton = [UIButton buttonWithType:UIButtonTypeInfoDark]; diff --git a/FRP/FRPFullSizePhotoViewModel.h b/FRP/FRPFullSizePhotoViewModel.h index 3aa044a..20c902d 100644 --- a/FRP/FRPFullSizePhotoViewModel.h +++ b/FRP/FRPFullSizePhotoViewModel.h @@ -16,7 +16,7 @@ @property (nonatomic, readonly) NSInteger initialPhotoIndex; --(FRPPhotoModel *)initialPhotoModel; +@property (nonatomic, readonly) NSString *initialPhotoName; -(FRPPhotoModel *)photoModelAtIndex:(NSInteger)index; @end diff --git a/FRP/FRPFullSizePhotoViewModel.m b/FRP/FRPFullSizePhotoViewModel.m index 557433e..a1e5e1b 100644 --- a/FRP/FRPFullSizePhotoViewModel.m +++ b/FRP/FRPFullSizePhotoViewModel.m @@ -32,8 +32,8 @@ return self; } --(FRPPhotoModel *)initialPhotoModel { - return self.photoArray[self.initialPhotoIndex]; +-(NSString *)initialPhotoName { + return [self.photoArray[self.initialPhotoIndex] photoName]; } -(FRPPhotoModel *)photoModelAtIndex:(NSInteger)index {