diff --git a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj index ce29fd50..20063b5c 100644 --- a/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj +++ b/platform-darwin/MasterPassword-iOS.xcodeproj/project.pbxproj @@ -3917,7 +3917,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = "/bin/sh -e"; - shellScript = "exec Scripts/genassets"; + shellScript = "exec Scripts/genassets\n"; showEnvVarsInLog = 0; }; DAB7AE4C1F3D56AD00C856B1 /* ShellScript */ = { diff --git a/platform-darwin/Source/iOS/MPAnswersViewController.m b/platform-darwin/Source/iOS/MPAnswersViewController.m index 0b3ca98e..3e18885e 100644 --- a/platform-darwin/Source/iOS/MPAnswersViewController.m +++ b/platform-darwin/Source/iOS/MPAnswersViewController.m @@ -120,21 +120,21 @@ MPSiteEntity *site = [self siteInContext:[MPiOSAppDelegate managedObjectContextForMainThreadIfReady]]; if (indexPath.section == 0) { if (indexPath.item == 0) { - MPGlobalAnswersCell *cell = [MPGlobalAnswersCell dequeueCellFromTableView:tableView indexPath:indexPath]; + MPGlobalAnswersCell *cell = [MPGlobalAnswersCell dequeueFromTableView:tableView indexPath:indexPath]; [cell setSite:site]; return cell; } if (indexPath.item == 1) - return [MPSendAnswersCell dequeueCellFromTableView:tableView indexPath:indexPath]; + return [MPSendAnswersCell dequeueFromTableView:tableView indexPath:indexPath]; if (indexPath.item == 2) { - MPMultipleAnswersCell *cell = [MPMultipleAnswersCell dequeueCellFromTableView:tableView indexPath:indexPath]; + MPMultipleAnswersCell *cell = [MPMultipleAnswersCell dequeueFromTableView:tableView indexPath:indexPath]; cell.accessoryType = self.multiple? UITableViewCellAccessoryCheckmark: UITableViewCellAccessoryNone; return cell; } Throw( @"Unsupported row index: %@", indexPath ); } - MPAnswersQuestionCell *cell = [MPAnswersQuestionCell dequeueCellFromTableView:tableView indexPath:indexPath]; + MPAnswersQuestionCell *cell = [MPAnswersQuestionCell dequeueFromTableView:tableView indexPath:indexPath]; MPSiteQuestionEntity *question = nil; if ([site.questions count] > indexPath.item) question = site.questions[indexPath.item]; diff --git a/platform-darwin/Source/iOS/MPGuideViewController.m b/platform-darwin/Source/iOS/MPGuideViewController.m index d7e9e89f..1e8eb10d 100644 --- a/platform-darwin/Source/iOS/MPGuideViewController.m +++ b/platform-darwin/Source/iOS/MPGuideViewController.m @@ -150,7 +150,7 @@ - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - MPGuideStepCell *cell = [MPGuideStepCell dequeueCellFromCollectionView:collectionView indexPath:indexPath]; + MPGuideStepCell *cell = [MPGuideStepCell dequeueFromCollectionView:collectionView indexPath:indexPath]; cell.imageView.image = ((MPGuideStep *)self.steps[indexPath.item]).image; cell.contentView.frame = cell.bounds; diff --git a/platform-darwin/Source/iOS/MPSitesViewController.m b/platform-darwin/Source/iOS/MPSitesViewController.m index 02767caf..f569c318 100644 --- a/platform-darwin/Source/iOS/MPSitesViewController.m +++ b/platform-darwin/Source/iOS/MPSitesViewController.m @@ -179,7 +179,7 @@ typedef NS_OPTIONS( NSUInteger, MPPasswordsTips ) { - (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath { - MPSiteCell *cell = [MPSiteCell dequeueCellFromCollectionView:collectionView indexPath:indexPath]; + MPSiteCell *cell = [MPSiteCell dequeueFromCollectionView:collectionView indexPath:indexPath]; [cell setFuzzyGroups:self.fuzzyGroups]; id item = self.dataSource[(NSUInteger)indexPath.section][(NSUInteger)indexPath.item]; if ([item isKindOfClass:[MPSiteEntity class]]) diff --git a/platform-darwin/Source/iOS/MPStoreViewController.m b/platform-darwin/Source/iOS/MPStoreViewController.m index d6081f59..8dbb5dd9 100644 --- a/platform-darwin/Source/iOS/MPStoreViewController.m +++ b/platform-darwin/Source/iOS/MPStoreViewController.m @@ -102,9 +102,9 @@ PearlEnum( MPDevelopmentFuelConsumption, SKProduct *product = content; MPStoreProductCell *cell; if ([product.productIdentifier isEqualToString:MPProductFuel]) - cell = [MPStoreFuelProductCell dequeueCellFromTableView:tableView indexPath:indexPath]; + cell = [MPStoreFuelProductCell dequeueFromTableView:tableView indexPath:indexPath]; else - cell = [MPStoreProductCell dequeueCellFromTableView:tableView indexPath:indexPath]; + cell = [MPStoreProductCell dequeueFromTableView:tableView indexPath:indexPath]; [cell updateWithProduct:product transaction:self.transactions[product.productIdentifier]]; return cell;