diff --git a/.gitignore b/.gitignore index 6d135af0c8..a7b3693557 100644 --- a/.gitignore +++ b/.gitignore @@ -54,12 +54,11 @@ iphone/*/*.xcodeproj/*.mode1v3 iphone/*/*.xcodeproj/*.pbxuser iphone/*/*.xcodeproj/*.perspectivev3 iphone/*/*.xcodeproj/project.xcworkspace/* -iphone/*/*.xcodeproj/xcuserdata/* iphone/*/build/* -xcode/**/xcuserdata -xcode/**/xcshareddata tools/emacsmode/build **/DerivedData/* +**/xcshareddata +**/xcuserdata # GeneratedFiles version/version.hpp diff --git a/iphone/Maps/Bookmarks/BookmarksRootVC.mm b/iphone/Maps/Bookmarks/BookmarksRootVC.mm index 58107e423d..82d49d0d9d 100644 --- a/iphone/Maps/Bookmarks/BookmarksRootVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksRootVC.mm @@ -133,9 +133,12 @@ - (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator { - [coordinator animateAlongsideTransition:^(id context) { - [self.tableView reloadRowsAtIndexPaths:self.tableView.indexPathsForVisibleRows withRowAnimation:UITableViewRowAnimationFade]; - } completion:^(id context) {}]; + [coordinator + animateAlongsideTransition:^(id context) { + NSArray * ips = self.tableView.indexPathsForVisibleRows; + [self.tableView reloadRowsAtIndexPaths:ips withRowAnimation:UITableViewRowAnimationFade]; + } + completion:nil]; } - (NSString *)truncateString:(NSString *)string toWidth:(CGFloat)width withFont:(UIFont *)font @@ -164,7 +167,8 @@ { NSString * txt = f.text; // Update edited category name - if (txt.length && ![txt isEqualToString:cell.textLabel.text]) + NSString * cellLabel = cell.textLabel.text; + if (txt.length && ![txt isEqualToString:cellLabel]) { cell.textLabel.text = txt; // Rename category diff --git a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm b/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm index 72d4bc5ef1..f7fb0b7833 100644 --- a/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/CALayer+RuntimeAttributes.mm @@ -10,7 +10,7 @@ - (UIColor *)borderUIColor { - return [UIColor colorWithCGColor:self.borderColor]; + return [UIColor colorWithCGColor:static_cast(self.borderColor)]; } - (void)setBorderColorName:(NSString *)colorName @@ -25,7 +25,7 @@ - (UIColor *)shadowUIColor { - return [UIColor colorWithCGColor:self.shadowColor]; + return [UIColor colorWithCGColor:static_cast(self.shadowColor)]; } - (void)setShadowColorName:(NSString *)colorName diff --git a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm b/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm index f617cac15a..2cc2480547 100644 --- a/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UIButton+RuntimeAttributes.mm @@ -11,7 +11,12 @@ [self setTitle:L(localizedText) forState:UIControlStateDisabled]; } -- (NSString *)localizedText { return L([self titleForState:UIControlStateNormal]); } +- (NSString *)localizedText +{ + NSString * title = [self titleForState:UIControlStateNormal]; + return L(title); +} + - (void)setFontName:(NSString *)fontName { self.titleLabel.font = [UIFont fontWithName:fontName]; } - (void)setTextColorName:(NSString *)colorName { diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index 498bd899fc..0ebaa470f0 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -109,7 +109,8 @@ @"itms-apps://itunes.apple.com/WebObjects/MZStore.woa/wa/" @"viewContentsUserReviews?id=510623322&onlyLatestVersion=true&pageNumber=0&" @"sortOrdering=1&type=Purple+Software"; - [self openURL:[NSURL URLWithString:urlString]]; + NSURL * url = [NSURL URLWithString:urlString]; + [self openURL:url]; } @end diff --git a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm b/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm index fce903fb2d..4dc885cad3 100644 --- a/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UILabel+RuntimeAttributes.mm @@ -10,9 +10,10 @@ { self.text = L(localizedText); } - -- (NSString *)localizedText { - return L(self.text); +- (NSString *)localizedText +{ + NSString * text = self.text; + return L(text); } - (void)setFontName:(NSString *)fontName diff --git a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm b/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm index 95e1737071..b1994c242f 100644 --- a/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm +++ b/iphone/Maps/Categories/UITextField+RuntimeAttributes.mm @@ -13,7 +13,8 @@ - (NSString *)localizedPlaceholder { - return L(self.placeholder); + NSString * placeholder = self.placeholder; + return L(placeholder); } - (void)setFontName:(NSString *)fontName diff --git a/iphone/Maps/Classes/CircleView.mm b/iphone/Maps/Classes/CircleView.mm index b91d883292..38cce89a5f 100644 --- a/iphone/Maps/Classes/CircleView.mm +++ b/iphone/Maps/Classes/CircleView.mm @@ -55,7 +55,8 @@ + (UIImage *)imageWithView:(UIView *)view { UIGraphicsBeginImageContextWithOptions(view.bounds.size, NO, 0.0); - [view.layer renderInContext:UIGraphicsGetCurrentContext()]; + CGContextRef context = UIGraphicsGetCurrentContext(); + [view.layer renderInContext:context]; UIImage * img = UIGraphicsGetImageFromCurrentImageContext(); diff --git a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.h b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.h index a9d3ce6353..0f635e44f8 100644 --- a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.h +++ b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.h @@ -2,6 +2,6 @@ @interface MWMMobileInternetAlert : MWMAlert -+ (instancetype)alertWithBlock:(nonnull TMWMVoidBlock)block; ++ (nonnull instancetype)alertWithBlock:(nonnull TMWMVoidBlock)block; @end diff --git a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm index 7b9c73448b..32148ce71f 100644 --- a/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MobileInternetAlert/MWMMobileInternetAlert.mm @@ -18,7 +18,7 @@ NSString * const kStatisticsEvent = @"Mobile Internet Settings Alert"; @implementation MWMMobileInternetAlert -+ (instancetype)alertWithBlock:(nonnull TMWMVoidBlock)block ++ (nonnull instancetype)alertWithBlock:(nonnull TMWMVoidBlock)block { [Statistics logEvent:kStatisticsEvent withParameters:@{kStatAction : kStatOpen}]; MWMMobileInternetAlert * alert = diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm index 3407127fe1..1e3f7e0a97 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm @@ -172,9 +172,11 @@ CGFloat angleWithProgress(CGFloat progress) { return 2.0 * M_PI * progress - M_P ? @"dark" : @"light"; for (NSUInteger i = 0; i < animationImagesCount; ++i) - animationImages[i] = + { + UIImage * image = [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@_%@", @(i + 1), postfix]]; - + animationImages[i] = image; + } self.spinner.animationDuration = 0.8; self.spinner.animationImages = animationImages; [self.spinner startAnimating]; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm index 7426ef6c69..57f27059b7 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuLayout.mm @@ -38,9 +38,10 @@ for (NSUInteger index = 0; index < buttonsCount; index++) { NSIndexPath * indexPath = [NSIndexPath indexPathForItem:index inSection:0]; - [attrs addObject:[self layoutAttributesForItemAtIndexPath:indexPath]]; + UICollectionViewLayoutAttributes * attr = [self layoutAttributesForItemAtIndexPath:indexPath]; + [attrs addObject:attr]; } - return attrs; + return attrs.copy; } - (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm index b9e2ff5154..d77cd6150c 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/BottomMenu/MWMBottomMenuView.mm @@ -531,9 +531,12 @@ CGFloat constexpr kTimeWidthRegular = 128; NSInteger const stepValue = direct ? 1 : -1; NSMutableArray * morphImages = [NSMutableArray arrayWithCapacity:morphImagesCount]; for (NSUInteger i = startValue, j = 0; i != endValue; i += stepValue, j++) - morphImages[j] = + { + UIImage * image = [UIImage imageNamed:[NSString stringWithFormat:@"%@%@_%@", morphTemplate, @(i).stringValue, [UIColor isNightMode] ? @"dark" : @"light"]]; + morphImages[j] = image; + } btn.imageView.animationImages = morphImages; btn.imageView.animationRepeatCount = 1; btn.imageView.image = morphImages.lastObject; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm index 1f62333df1..c0eece810b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm @@ -27,7 +27,7 @@ NSArray * animationImages(NSString * animationTemplate, NSUInteger im { NSString * name = [NSString stringWithFormat:@"%@_%@_%@", animationTemplate, mode, @(i).stringValue]; - [images addObject:[UIImage imageNamed:name]]; + [images addObject:static_cast([UIImage imageNamed:name])]; } return images.copy; } diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm index 417bf6c6f3..3f59af9a68 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/Welcome/PageController/MWMPageControllerDataSource.mm @@ -43,7 +43,8 @@ - (NSInteger)presentationIndexForPageViewController:(UIPageViewController *)pageViewController { - return [self.controllers indexOfObject:pageViewController.viewControllers.firstObject]; + MWMWelcomeController * controller = pageViewController.viewControllers.firstObject; + return [self.controllers indexOfObject:controller]; } - (NSInteger)presentationCountForPageViewController:(UIPageViewController *)pageViewController diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm index b30ddca91b..4452715931 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm @@ -157,7 +157,8 @@ using namespace uber; { // TODO(Vlad): Not the best solution, need to store url's scheme of product in the uber::Product // instead of just "uber://". - return [[UIApplication sharedApplication] canOpenURL:[NSURL URLWithString:@"uber://"]]; + NSURL * url = [NSURL URLWithString:@"uber://"]; + return [[UIApplication sharedApplication] canOpenURL:url]; } - (NSURL *)taxiURL; diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index 0ebeba305d..7d4a7f8f5d 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -225,7 +225,8 @@ using namespace osm_auth_ios; NSString * openLink = userInfo[@"openURL"]; if (!openLink) return NO; - [app openURL:[NSURL URLWithString:openLink]]; + NSURL * url = [NSURL URLWithString:openLink]; + [app openURL:url]; return YES; } @@ -674,7 +675,8 @@ using namespace osm_auth_ios; { if (![userActivity.activityType isEqualToString:CSSearchableItemActionType]) return NO; - NSString * searchString = L(userActivity.userInfo[CSSearchableItemActivityIdentifier]); + NSString * searchStringKey = userActivity.userInfo[CSSearchableItemActivityIdentifier]; + NSString * searchString = L(searchStringKey); if (!searchString) return NO; diff --git a/iphone/Maps/Common/WebViewController.mm b/iphone/Maps/Common/WebViewController.mm index 425a92b907..aaa6677d66 100644 --- a/iphone/Maps/Common/WebViewController.mm +++ b/iphone/Maps/Common/WebViewController.mm @@ -51,7 +51,8 @@ if (self.openInSafari && inType == UIWebViewNavigationTypeLinkClicked && ![inRequest.URL.scheme isEqualToString:@"applewebdata"]) // do not try to open local links in Safari { - [[UIApplication sharedApplication] openURL:[inRequest URL]]; + NSURL * url = [inRequest URL]; + [[UIApplication sharedApplication] openURL:url]; return NO; } diff --git a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm index c13d04b4ba..a9ee13fc56 100644 --- a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm +++ b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm @@ -48,7 +48,8 @@ NSString * categoryKeyString = @(categoryKey.c_str()); NSString * imageName = [NSString stringWithFormat:@"ic_%@_spotlight", categoryKeyString]; - attrSet.thumbnailData = UIImagePNGRepresentation([UIImage imageNamed:imageName]); + UIImage * image = [UIImage imageNamed:imageName]; + attrSet.thumbnailData = UIImagePNGRepresentation(image); CSSearchableItem * item = [[CSSearchableItem alloc] initWithUniqueIdentifier:categoryKeyString @@ -62,9 +63,10 @@ completionHandler:^(NSError * _Nullable error) { if (error) { - [[Crashlytics sharedInstance] recordError:error]; + NSError * err = error; + [[Crashlytics sharedInstance] recordError:err]; LOG(LERROR, - ("addCategoriesToSpotlight failed: ", error.localizedDescription.UTF8String)); + ("addCategoriesToSpotlight failed: ", err.localizedDescription.UTF8String)); } else { diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 3dc7f82bf5..1db5e2c143 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -124,9 +124,7 @@ using TObservers = NSHashTable<__kindof TObserver>; - (void)checkIsHotelResults:(search::Results const &)results { - // TODO: Uncomment on release with search filters. - self.isHotelResults = NO; - // self.isHotelResults = search::HotelsClassifier::IsHotelResults(results); + self.isHotelResults = search::HotelsClassifier::IsHotelResults(results); m_filterQuery = m_everywhereParams.m_query; } diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 94306eb47d..5b6bac4b5f 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -5581,18 +5581,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc dbg"; }; name = Simulator; @@ -5602,18 +5591,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc rel"; }; name = "Simulator Release"; @@ -5623,18 +5601,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc dbg"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; }; @@ -5645,18 +5612,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc beta"; }; name = AdHoc; @@ -5666,18 +5622,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc rel"; VALID_ARCHS = "arm64 armv7 armv7s i386 x86_64"; }; @@ -5688,18 +5633,7 @@ buildSettings = { CLANG_ENABLE_MODULES = YES; ENABLE_BITCODE = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/3party/Flurry", - ); PRODUCT_NAME = "xc pf"; }; name = "Production Full"; @@ -5708,21 +5642,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5754,7 +5677,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm dbg"; }; name = Simulator; }; @@ -5762,21 +5685,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5808,7 +5720,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm rel"; }; name = "Simulator Release"; }; @@ -5816,21 +5728,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5862,7 +5763,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm dbg"; }; name = Debug; }; @@ -5870,21 +5771,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5916,7 +5806,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm beta"; }; name = AdHoc; }; @@ -5924,21 +5814,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -5970,7 +5849,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm rel"; }; name = Release; }; @@ -5978,21 +5857,10 @@ isa = XCBuildConfiguration; buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; - CLANG_ENABLE_MODULES = YES; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - DEVELOPMENT_TEAM = 3T6FSDE8C7; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-cmake-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6024,7 +5892,7 @@ "-leditor", "-ltraffic", ); - PRODUCT_NAME = "$(TARGET_NAME)"; + PRODUCT_NAME = "cm pf"; }; name = "Production Full"; }; @@ -6037,6 +5905,12 @@ BUNDLE_IDENTIFIER = mapsme.debug; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6051,7 +5925,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6079,18 +5956,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6134,6 +6003,12 @@ BUNDLE_IDENTIFIER = mapsme.debug; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6145,7 +6020,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6173,18 +6051,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-debug-$(CURRENT_ARCH)/out/debug", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6229,6 +6099,12 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = L2QFT5NA2Q; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6240,7 +6116,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)", @@ -6270,18 +6149,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-production-$(CURRENT_ARCH)/out/production", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6326,6 +6197,12 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEVELOPMENT_TEAM = N9X2A789QT; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6337,7 +6214,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ( "$(inherited)", @@ -6367,18 +6247,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-production-$(CURRENT_ARCH)/out/production", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6422,6 +6294,12 @@ BUNDLE_IDENTIFIER = mapsme.release; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6436,7 +6314,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6464,18 +6345,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", @@ -6519,6 +6392,12 @@ BUNDLE_IDENTIFIER = mapsme.release; DEVELOPMENT_TEAM = 3T6FSDE8C7; ENABLE_BITCODE = NO; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party", + "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", + "$(PROJECT_DIR)/3party/MyTarget", + ); GCC_ENABLE_PASCAL_STRINGS = NO; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; GCC_PREFIX_HEADER = Maps_Prefix.pch; @@ -6534,7 +6413,10 @@ "$(OMIM_ROOT)/3party/glm", ); INFOPLIST_FILE = MAPSME.plist; - LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/Frameworks"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "$(PROJECT_DIR)/3party/Flurry", + ); OTHER_CFLAGS = ( "$(inherited)", "-Wall", @@ -6562,18 +6444,10 @@ buildSettings = { BUILD_DIR = "$(BUILD_ROOT)"; CLANG_ENABLE_MODULES = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Frameworks/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party", - "$(PROJECT_DIR)/3party/HockeySDK.embeddedframework", - "$(PROJECT_DIR)/3party/MyTarget", - ); LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(OMIM_ROOT)/../omim-iphone-release-$(CURRENT_ARCH)/out/release", - "$(PROJECT_DIR)/3party/Flurry", ); OTHER_LDFLAGS = ( "-lstats_client", diff --git a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/scheme_cmMAPS.ME.xcscheme b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/scheme_cmMAPS.ME.xcscheme index b75f8916a2..aaf3af068d 100644 --- a/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/scheme_cmMAPS.ME.xcscheme +++ b/iphone/Maps/Maps.xcodeproj/xcshareddata/xcschemes/scheme_cmMAPS.ME.xcscheme @@ -15,7 +15,7 @@ @@ -33,7 +33,7 @@ @@ -56,7 +56,7 @@ @@ -75,7 +75,7 @@ diff --git a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm index 096dab803e..c98148a467 100644 --- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm @@ -256,7 +256,8 @@ enum RowInMetaInfo self.cachedDescription = text; [self.tableView beginUpdates]; [self.tableView endUpdates]; - [self.tableView scrollToRowAtIndexPath:[self.tableView indexPathForCell:cell] + NSIndexPath * ip = [self.tableView indexPathForCell:cell]; + [self.tableView scrollToRowAtIndexPath:ip atScrollPosition:UITableViewScrollPositionBottom animated:YES]; } diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index 024a2accde..0b3d9a9010 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -263,8 +263,8 @@ void registerCellsForTableView(vector const & cells, UITab if (self.invalidCells.count) { - MWMEditorTextTableViewCell * cell = - [self.tableView cellForRowAtIndexPath:self.invalidCells.firstObject]; + NSIndexPath * ip = self.invalidCells.firstObject; + MWMEditorTextTableViewCell * cell = [self.tableView cellForRowAtIndexPath:ip]; [cell.textField becomeFirstResponder]; return; } @@ -825,7 +825,8 @@ void registerCellsForTableView(vector const & cells, UITab self.note = text; [self.tableView beginUpdates]; [self.tableView endUpdates]; - [self.tableView scrollToRowAtIndexPath:[self.tableView indexPathForCell:cell] + NSIndexPath * ip = [self.tableView indexPathForCell:cell]; + [self.tableView scrollToRowAtIndexPath:ip atScrollPosition:UITableViewScrollPositionBottom animated:YES]; } @@ -959,8 +960,8 @@ void registerCellsForTableView(vector const & cells, UITab auto const latLon = m_mapObject.GetLatLon(); CLLocation * location = [[CLLocation alloc] initWithLatitude:latLon.lat longitude:latLon.lon]; self.isFeatureUploaded = osm::Editor::Instance().IsFeatureUploaded(fid.m_mwmId, fid.m_index); - [self.tableView reloadRowsAtIndexPaths:@[ [self.tableView indexPathForCell:cell] ] - withRowAnimation:UITableViewRowAnimationFade]; + NSIndexPath * ip = [self.tableView indexPathForCell:cell]; + [self.tableView reloadRowsAtIndexPaths:@[ ip ] withRowAnimation:UITableViewRowAnimationFade]; auto placeDoesntExistAction = ^{ [self.alertController presentPlaceDoesntExistAlertWithBlock:^(NSString * additionalMessage) { diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm index 56c5f2ace7..9b97692410 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursEditorViewController.mm @@ -141,7 +141,9 @@ extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{ - (UITableViewCell * _Nonnull)tableView:(UITableView * _Nonnull)tableView cellForRowAtIndexPath:(NSIndexPath * _Nonnull)indexPath { - return [tableView dequeueReusableCellWithIdentifier:[self cellIdentifierForIndexPath:indexPath]]; + UITableViewCell * cell = + [tableView dequeueReusableCellWithIdentifier:[self cellIdentifierForIndexPath:indexPath]]; + return cell; } - (NSInteger)numberOfSectionsInTableView:(UITableView * _Nonnull)tableView diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.h b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.h index 01ab8c1bb5..63693a6687 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.h +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursModel.h @@ -4,22 +4,22 @@ @protocol MWMOpeningHoursModelProtocol -@property (nonnull, copy, nonatomic) NSString * openingHours; -@property (weak, nonatomic, readonly) UITableView * tableView; -@property (weak, nonatomic, readonly) UIView * advancedEditor; -@property (weak, nonatomic, readonly) MWMTextView * editorView; -@property (weak, nonatomic, readonly) UIButton * toggleModeButton; +@property(nonnull, copy, nonatomic) NSString * openingHours; +@property(nullable, weak, nonatomic, readonly) UITableView * tableView; +@property(nullable, weak, nonatomic, readonly) UIView * advancedEditor; +@property(nullable, weak, nonatomic, readonly) MWMTextView * editorView; +@property(nullable, weak, nonatomic, readonly) UIButton * toggleModeButton; @end @interface MWMOpeningHoursModel : NSObject -@property (nonatomic, readonly) NSUInteger count; -@property (nonatomic, readonly) BOOL canAddSection; +@property(nonatomic, readonly) NSUInteger count; +@property(nonatomic, readonly) BOOL canAddSection; -@property (nonatomic, readonly) BOOL isValid; -@property (nonatomic) BOOL isSimpleMode; -@property (nonatomic, readonly) BOOL isSimpleModeCapable; +@property(nonatomic, readonly) BOOL isValid; +@property(nonatomic) BOOL isSimpleMode; +@property(nonatomic, readonly) BOOL isSimpleModeCapable; - (instancetype _Nullable)initWithDelegate:(id _Nonnull)delegate; diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h index 12989c180f..23c65729a9 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.h @@ -6,7 +6,7 @@ @protocol MWMOpeningHoursSectionProtocol -@property (weak, nonatomic, readonly) UITableView * tableView; +@property(nullable, weak, nonatomic, readonly) UITableView * tableView; - (void)updateActiveSection:(NSUInteger)index; @@ -17,20 +17,20 @@ @interface MWMOpeningHoursSection : NSObject -@property (nonatomic) BOOL allDay; +@property(nonatomic) BOOL allDay; -@property (nonatomic, readonly) NSUInteger index; -@property (nullable, nonatomic) NSNumber * selectedRow; -@property (nonatomic, readonly) NSUInteger numberOfRows; +@property(nonatomic, readonly) NSUInteger index; +@property(nullable, nonatomic) NSNumber * selectedRow; +@property(nonatomic, readonly) NSUInteger numberOfRows; -@property (nullable, nonatomic) NSDateComponents * cachedStartTime; -@property (nullable, nonatomic) NSDateComponents * cachedEndTime; +@property(nullable, nonatomic) NSDateComponents * cachedStartTime; +@property(nullable, nonatomic) NSDateComponents * cachedEndTime; -@property (nonatomic, readonly) BOOL canAddClosedTime; +@property(nonatomic, readonly) BOOL canAddClosedTime; -@property (weak, nonatomic, readonly) id delegate; +@property(nullable, weak, nonatomic, readonly) id delegate; -- (instancetype _Nullable)initWithDelegate:(id _Nonnull)delegate; +- (instancetype _Nonnull)initWithDelegate:(id _Nonnull)delegate; - (void)refreshIndex:(NSUInteger)index; diff --git a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm index d504a7d586..c7a363811a 100644 --- a/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm +++ b/iphone/Maps/UI/Editor/OpeningHours/MWMOpeningHoursSection.mm @@ -24,7 +24,7 @@ using namespace osmoh; @implementation MWMOpeningHoursSection -- (instancetype _Nullable)initWithDelegate:(id _Nonnull)delegate +- (instancetype _Nonnull)initWithDelegate:(id _Nonnull)delegate { self = [super init]; if (self) diff --git a/iphone/Maps/UI/PlacePage/Deprecated/MWMPlacePageEntity.mm b/iphone/Maps/UI/PlacePage/Deprecated/MWMPlacePageEntity.mm index 7a442101f6..b44991cc95 100644 --- a/iphone/Maps/UI/PlacePage/Deprecated/MWMPlacePageEntity.mm +++ b/iphone/Maps/UI/PlacePage/Deprecated/MWMPlacePageEntity.mm @@ -149,13 +149,12 @@ void initFieldsMap() } NSNumberFormatter * decimalFormatter = [[NSNumberFormatter alloc] init]; decimalFormatter.numberStyle = NSNumberFormatterDecimalStyle; - NSString * currencyString = [currencyFormatter - stringFromNumber: - [decimalFormatter - numberFromString: - [@(minPrice.c_str()) - stringByReplacingOccurrencesOfString:@"." - withString:decimalFormatter.decimalSeparator]]]; + NSNumber * currencyNumber = [decimalFormatter + numberFromString:[@(minPrice.c_str()) + stringByReplacingOccurrencesOfString:@"." + withString:decimalFormatter + .decimalSeparator]]; + NSString * currencyString = [currencyFormatter stringFromNumber:currencyNumber]; NSString * currencyPattern = [L(@"place_page_starting_from") stringByReplacingOccurrencesOfString:@"%s" withString:@"%@"]; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index ecd346ce31..979a6808c0 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -278,13 +278,12 @@ using namespace place_page; NSNumberFormatter * decimalFormatter = [[NSNumberFormatter alloc] init]; decimalFormatter.numberStyle = NSNumberFormatterDecimalStyle; - NSString * currencyString = [currencyFormatter - stringFromNumber: - [decimalFormatter - numberFromString:[@(minPrice.c_str()) - stringByReplacingOccurrencesOfString:@"." - withString:decimalFormatter - .decimalSeparator]]]; + NSNumber * currencyNumber = [decimalFormatter + numberFromString:[@(minPrice.c_str()) + stringByReplacingOccurrencesOfString:@"." + withString:decimalFormatter + .decimalSeparator]]; + NSString * currencyString = [currencyFormatter stringFromNumber:currencyNumber]; NSString * pattern = [L(@"place_page_starting_from") stringByReplacingOccurrencesOfString:@"%s" diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index bc31299ad9..20bf307283 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -282,13 +282,15 @@ NSAssert(self.data.phoneNumber, @"Phone number can't be nil!"); NSString * phoneNumber = [[@"telprompt:" stringByAppendingString:self.data.phoneNumber] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:phoneNumber]]; + NSURL * url = [NSURL URLWithString:phoneNumber]; + [[UIApplication sharedApplication] openURL:url]; } - (void)apiBack { [Statistics logEvent:kStatEventName(kStatPlacePage, kStatAPI)]; - [[UIApplication sharedApplication] openURL:[NSURL URLWithString:self.data.apiURL]]; + NSURL * url = [NSURL URLWithString:self.data.apiURL]; + [[UIApplication sharedApplication] openURL:url]; [[MapViewController controller].apiBar back]; } diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm index 368df9e072..867298653d 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm @@ -162,8 +162,10 @@ NSString * titleForButton(EButton type, BOOL isSelected) NSUInteger const animationImagesCount = 11; NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount]; for (NSUInteger i = 0; i < animationImagesCount; ++i) - animationImages[i] = [UIImage imageNamed:[NSString stringWithFormat:@"ic_bookmarks_%@", @(i+1)]]; - + { + UIImage * image = [UIImage imageNamed:[NSString stringWithFormat:@"ic_bookmarks_%@", @(i + 1)]]; + animationImages[i] = image; + } UIImageView * animationIV = btn.imageView; animationIV.animationImages = animationImages; animationIV.animationRepeatCount = 1; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm index c21aa3eb75..299706ac7b 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Banner/MWMPPPreviewBannerCell.mm @@ -82,7 +82,8 @@ CGFloat const kLineSpacing = 5; - (void)downloadAssingImageWithURL:(NSURL *)URL completion:(TMWMVoidBlock)completion { dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{ - UIImage * image = [UIImage imageWithData:[NSData dataWithContentsOfURL:URL]]; + NSData * data = [NSData dataWithContentsOfURL:URL]; + UIImage * image = [UIImage imageWithData:data]; dispatch_async(dispatch_get_main_queue(), ^{ self.icon.image = image; if (image) diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm index eab86eb4d4..787a349695 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookmarkCell/MWMBookmarkCell.mm @@ -132,8 +132,9 @@ NSString * const kTextViewContentSizeKeyPath = @"contentSize"; NSFontAttributeName : [UIFont regular16] }; NSError * error = nil; + NSData * data = [text dataUsingEncoding:NSUnicodeStringEncoding]; NSMutableAttributedString * str = [[NSMutableAttributedString alloc] - initWithData:[text dataUsingEncoding:NSUnicodeStringEncoding] + initWithData:data options:@{ NSDocumentTypeDocumentAttribute : NSHTMLTextDocumentType } @@ -178,9 +179,11 @@ NSString * const kTextViewContentSizeKeyPath = @"contentSize"; NSMutableArray * animationImages = [NSMutableArray arrayWithCapacity:animationImagesCount]; NSString * postfix = [UIColor isNightMode] ? @"dark" : @"light"; for (NSUInteger i = 0; i < animationImagesCount; ++i) - animationImages[i] = + { + UIImage * image = [UIImage imageNamed:[NSString stringWithFormat:@"Spinner_%@_%@", @(i + 1), postfix]]; - + animationImages[i] = image; + } self.spinner.animationDuration = 0.8; self.spinner.animationImages = animationImages; self.spinner.hidden = NO; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm index 243aeb7bc4..3b3ae3bd92 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageInfoCell.mm @@ -166,8 +166,8 @@ CGPoint const tapPoint = [sender locationInView:sender.view.superview]; UIView * targetView = [self.textContainer isKindOfClass:[UITextView class]] ? sender.view : self.textContainer; - [menuController setTargetRect:CGRectMake(tapPoint.x, targetView.minY, 0., 0.) - inView:sender.view.superview]; + UIView * superview = sender.view.superview; + [menuController setTargetRect:CGRectMake(tapPoint.x, targetView.minY, 0., 0.) inView:superview]; [menuController setMenuVisible:YES animated:YES]; [targetView becomeFirstResponder]; [menuController update]; diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 55e6488219..454eaaeee8 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -86,10 +86,10 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar - (void)viewDidLoad { [super viewDidLoad]; - configButton(self.ratingAny, L(@"any"), nil); - configButton(self.rating7, L(@"7.0+"), L(@"good")); - configButton(self.rating8, L(@"8.0+"), L(@"very_good")); - configButton(self.rating9, L(@"9.0+"), L(@"excellent")); + configButton(self.ratingAny, L(@"booking_filters_rating_any"), nil); + configButton(self.rating7, L(@"7.0+"), L(@"booking_filters_ragting_good")); + configButton(self.rating8, L(@"8.0+"), L(@"booking_filters_rating_very_good")); + configButton(self.rating9, L(@"9.0+"), L(@"booking_filters_rating_excellent")); configButton(self.price1, L(@"$"), nil); configButton(self.price2, L(@"$$"), nil); @@ -143,8 +143,8 @@ void configButton(UIButton * button, NSString * primaryText, NSString * secondar { switch (section) { - case 0: return L(@"rating"); - case 1: return L(@"price_category"); + case 0: return L(@"booking_filters_rating"); + case 1: return L(@"booking_filters_price_category"); default: return nil; } } diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm index 85fe989f22..8279272d08 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.mm @@ -69,7 +69,7 @@ UIColor * linkBlueHighlighted = [UIColor linkBlueHighlighted]; UIColor * lightGrayColor = [UIColor lightGrayColor]; - navItem.title = L(@"filters"); + navItem.title = L(@"booking_filters"); navItem.rightBarButtonItem = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemDone target:self @@ -88,7 +88,7 @@ } forState:UIControlStateDisabled]; - navItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:L(@"reset") + navItem.leftBarButtonItem = [[UIBarButtonItem alloc] initWithTitle:L(@"booking_filters_reset") style:UIBarButtonItemStylePlain target:self action:@selector(resetAction)]; diff --git a/iphone/Maps/UI/Search/MWMSearchManager.h b/iphone/Maps/UI/Search/MWMSearchManager.h index d7a7a4866a..64abd1bb8e 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.h +++ b/iphone/Maps/UI/Search/MWMSearchManager.h @@ -12,11 +12,11 @@ typedef NS_ENUM(NSUInteger, MWMSearchManagerState) @interface MWMSearchManager : NSObject -@property (nullable, weak, nonatomic) IBOutlet MWMSearchTextField * searchTextField; +@property(nullable, weak, nonatomic) IBOutlet MWMSearchTextField * searchTextField; -@property (nonatomic) MWMSearchManagerState state; +@property(nonatomic) MWMSearchManagerState state; -@property(nonatomic) IBOutletCollection(UIView) NSArray * topViews; +@property(nonnull, nonatomic) IBOutletCollection(UIView) NSArray * topViews; - (void)mwm_refreshUI; diff --git a/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksManager.mm b/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksManager.mm index eccf0e3a2c..8d40eb670a 100644 --- a/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksManager.mm +++ b/iphone/Maps/UI/Search/TabbedView/BookmarksTab/MWMSearchBookmarksManager.mm @@ -72,7 +72,8 @@ static NSString * const kBookmarksCellIdentifier = @"MWMSearchBookmarksCell"; - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - return [tableView dequeueReusableCellWithIdentifier:kBookmarksCellIdentifier]; + UITableViewCell * cell = [tableView dequeueReusableCellWithIdentifier:kBookmarksCellIdentifier]; + return cell; } #pragma mark - UITableViewDelegate diff --git a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm index 9d7ce8a242..3f78db59d6 100644 --- a/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm +++ b/iphone/Maps/UI/Search/TabbedView/HistoryTab/MWMSearchHistoryManager.mm @@ -102,9 +102,10 @@ static NSString * const kMyPositionCellIdentifier = @"MWMSearchHistoryMyPosition [tCell config:[self stringAtIndex:indexPath.row]]; return tCell; } - return [tableView dequeueReusableCellWithIdentifier:self.isRouteSearchMode - ? kMyPositionCellIdentifier - : kClearCellIdentifier]; + UITableViewCell * cell = [tableView + dequeueReusableCellWithIdentifier:self.isRouteSearchMode ? kMyPositionCellIdentifier + : kClearCellIdentifier]; + return cell; } #pragma mark - UITableViewDelegate diff --git a/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewLayout.mm b/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewLayout.mm index 5b1f41d273..ab3704c99c 100644 --- a/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewLayout.mm +++ b/iphone/Maps/UI/Search/TabbedView/MWMSearchTabbedViewLayout.mm @@ -28,9 +28,10 @@ for (NSUInteger index = 0; index < self.tablesCount; index++) { NSIndexPath * indexPath = [NSIndexPath indexPathForItem:index inSection:0]; - [attrs addObject:[self layoutAttributesForItemAtIndexPath:indexPath]]; + UICollectionViewLayoutAttributes * attr = [self layoutAttributesForItemAtIndexPath:indexPath]; + [attrs addObject:attr]; } - return attrs; + return attrs.copy; } - (BOOL)shouldInvalidateLayoutForBoundsChange:(CGRect)newBounds { return YES; } diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h index ccbbaef8af..6f490811b2 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h @@ -13,7 +13,7 @@ class Result; @protocol MWMSearchTableViewProtocol -@property(weak, nonatomic) MWMSearchTextField * searchTextField; +@property(nullable, weak, nonatomic) MWMSearchTextField * searchTextField; @property(nonatomic) MWMSearchManagerState state; diff --git a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm index 4529c4214f..34dff26271 100644 --- a/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSLanguageViewController.mm @@ -20,7 +20,8 @@ static NSString * const kUnwingSegueIdentifier = @"UnwindToTTSSettings"; if (![segue.identifier isEqualToString:kUnwingSegueIdentifier]) return; MWMTTSSettingsViewController * dest = segue.destinationViewController; - NSUInteger const row = [self.tableView indexPathForCell:sender].row; + UITableViewCell * cell = sender; + NSUInteger const row = [self.tableView indexPathForCell:cell].row; [dest setAdditionalTTSLanguage:[[MWMTextToSpeech tts] availableLanguages][row]]; } diff --git a/xcode/common.xcconfig b/xcode/common.xcconfig index d16023036a..0f18eb65f5 100644 --- a/xcode/common.xcconfig +++ b/xcode/common.xcconfig @@ -7,9 +7,7 @@ QT_PATH = /usr/local/opt/qt5 BOOST_ROOT = $(OMIM_ROOT)/3party/boost HEADER_SEARCH_PATHS = $(inherited) $(OMIM_ROOT) $(BOOST_ROOT) -LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(QT_PATH)/lib -FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(PROJECT_DIR)/Frameworks // Deployment target IPHONEOS_DEPLOYMENT_TARGET = 8.0