From 2472a594c65b36d2e18ae1cbb96515f244fa9708 Mon Sep 17 00:00:00 2001 From: Aleksey Belouosv Date: Mon, 14 Oct 2019 18:37:47 +0300 Subject: [PATCH] [iOS] move more files to CoreApi lib --- iphone/CoreApi/CoreApi.modulemap | 3 + .../CoreApi/CoreApi.xcodeproj/project.pbxproj | 80 +++++++++++-- .../Catalog/Tags}/MWMTag+Convenience.h | 0 .../Catalog/Tags}/MWMTag+Convenience.mm | 0 .../{ => Bookmarks/Catalog/Tags}/MWMTag.h | 0 .../{ => Bookmarks/Catalog/Tags}/MWMTag.m | 0 .../Catalog/Tags}/MWMTagGroup+Convenience.h | 0 .../Catalog/Tags}/MWMTagGroup+Convenience.mm | 0 .../Catalog/Tags}/MWMTagGroup.h | 0 .../Catalog/Tags}/MWMTagGroup.m | 0 .../Bookmarks/MWMCarPlayBookmarkObject.mm | 2 +- iphone/CoreApi/CoreApi/CoreApi-swift.h | 17 +-- iphone/CoreApi/CoreApi/CoreApi.h | 18 +-- .../CoreApi/Framework/MWMFrameworkHelper.h | 1 + .../CoreApi/Framework/MWMFrameworkHelper.mm | 107 +++++++++--------- .../Core => CoreApi/CoreApi}/Metrics/MWMEye.h | 2 + .../CoreApi}/Metrics/MWMEye.mm | 2 +- .../Search}/MWMSearchFrameworkHelper.h | 2 + .../Search}/MWMSearchFrameworkHelper.mm | 2 +- .../CoreApi}/Traffic/MWMTrafficManager.h | 2 + .../CoreApi}/Traffic/MWMTrafficManager.mm | 2 +- iphone/Maps/Bridging-Header.h | 5 - .../MWMTrafficButtonViewController.mm | 4 +- .../BackgroundFetchTask.swift | 2 +- iphone/Maps/Core/UGC/MWMUGCHelper.h | 5 - iphone/Maps/Core/UGC/MWMUGCHelper.mm | 17 --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 42 +------ .../UI/Discovery/MWMDiscoveryController.mm | 4 +- .../MWMSearchHotelsFilterViewController.mm | 4 +- 29 files changed, 166 insertions(+), 157 deletions(-) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTag+Convenience.h (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTag+Convenience.mm (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTag.h (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTag.m (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTagGroup+Convenience.h (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTagGroup+Convenience.mm (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTagGroup.h (100%) rename iphone/CoreApi/CoreApi/{ => Bookmarks/Catalog/Tags}/MWMTagGroup.m (100%) rename iphone/{Maps/Core => CoreApi/CoreApi}/Metrics/MWMEye.h (97%) rename iphone/{Maps/Core => CoreApi/CoreApi}/Metrics/MWMEye.mm (96%) rename iphone/{Maps/UI/Search/Tabs => CoreApi/CoreApi/Search}/MWMSearchFrameworkHelper.h (89%) rename iphone/{Maps/UI/Search/Tabs => CoreApi/CoreApi/Search}/MWMSearchFrameworkHelper.mm (98%) rename iphone/{Maps/Core => CoreApi/CoreApi}/Traffic/MWMTrafficManager.h (97%) rename iphone/{Maps/Core => CoreApi/CoreApi}/Traffic/MWMTrafficManager.mm (99%) delete mode 100644 iphone/Maps/Core/UGC/MWMUGCHelper.h delete mode 100644 iphone/Maps/Core/UGC/MWMUGCHelper.mm diff --git a/iphone/CoreApi/CoreApi.modulemap b/iphone/CoreApi/CoreApi.modulemap index 479c573e5a..8af88871e2 100644 --- a/iphone/CoreApi/CoreApi.modulemap +++ b/iphone/CoreApi/CoreApi.modulemap @@ -1,5 +1,6 @@ framework module CoreApi { header "AppInfo.h" + header "MWMEye.h" header "MWMCommon.h" header "MWMTypes.h" header "MWMBookmarksObserver.h" @@ -11,4 +12,6 @@ framework module CoreApi { header "MWMTagGroup.h" header "MWMFrameworkHelper.h" header "MWMCarPlayBookmarkObject.h" + header "MWMTrafficManager.h" + header "MWMSearchFrameworkHelper.h" } diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index cd51be0ba8..0705e5c28f 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -18,8 +18,8 @@ 479834EB2342697400724D1E /* MWMTagGroup+Convenience.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479834E72342697200724D1E /* MWMTagGroup+Convenience.mm */; }; 479834F023426C0100724D1E /* common-debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 479834EE23426C0100724D1E /* common-debug.xcconfig */; }; 479834F123426C0100724D1E /* common-release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 479834EF23426C0100724D1E /* common-release.xcconfig */; }; - 479834F223426CCC00724D1E /* MWMTag+Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 479834E82342697200724D1E /* MWMTag+Convenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 479834F323426CD200724D1E /* MWMTagGroup+Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 479834E92342697300724D1E /* MWMTagGroup+Convenience.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 479834F223426CCC00724D1E /* MWMTag+Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 479834E82342697200724D1E /* MWMTag+Convenience.h */; }; + 479834F323426CD200724D1E /* MWMTagGroup+Convenience.h in Headers */ = {isa = PBXBuildFile; fileRef = 479834E92342697300724D1E /* MWMTagGroup+Convenience.h */; }; 479F7047234F774100011E2E /* MWMFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479F7046234F774000011E2E /* MWMFrameworkHelper.mm */; }; 479F704A234F785B00011E2E /* MWMTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7049234F785B00011E2E /* MWMTypes.h */; settings = {ATTRIBUTES = (Public, ); }; }; 479F704B234F78AB00011E2E /* MWMFrameworkHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7045234F774000011E2E /* MWMFrameworkHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -34,6 +34,12 @@ 479F7062234FBC4700011E2E /* MWMCarPlayBookmarkObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */; }; 479F7063234FBC5900011E2E /* MWMCarPlayBookmarkObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */ = {isa = PBXBuildFile; fileRef = 47A65CAE235008C700DCD85F /* CoreApi-swift.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47C637D12354A6FB00E12DE0 /* MWMEye.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637CF2354A6FA00E12DE0 /* MWMEye.mm */; }; + 47C637D22354A6FB00E12DE0 /* MWMEye.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637D02354A6FB00E12DE0 /* MWMEye.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47C637D62354AEBE00E12DE0 /* MWMTrafficManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637D42354AEBD00E12DE0 /* MWMTrafficManager.mm */; }; + 47C637D72354AEBE00E12DE0 /* MWMTrafficManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637D52354AEBE00E12DE0 /* MWMTrafficManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */; }; + 47C637DD2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47D609DC234FE625008ECC47 /* MWMBookmarksObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47EEAFF42350CEDB005CF316 /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47EEAFF22350CEDA005CF316 /* AppInfo.mm */; }; 47EEAFF62350CF48005CF316 /* AppInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 47EEAFF32350CEDB005CF316 /* AppInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -72,6 +78,12 @@ 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlayBookmarkObject.h; sourceTree = ""; }; 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlayBookmarkObject.mm; sourceTree = ""; }; 47A65CAE235008C700DCD85F /* CoreApi-swift.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "CoreApi-swift.h"; sourceTree = ""; }; + 47C637CF2354A6FA00E12DE0 /* MWMEye.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEye.mm; sourceTree = ""; }; + 47C637D02354A6FB00E12DE0 /* MWMEye.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEye.h; sourceTree = ""; }; + 47C637D42354AEBD00E12DE0 /* MWMTrafficManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTrafficManager.mm; sourceTree = ""; }; + 47C637D52354AEBE00E12DE0 /* MWMTrafficManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTrafficManager.h; sourceTree = ""; }; + 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFrameworkHelper.mm; sourceTree = ""; }; + 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFrameworkHelper.h; sourceTree = ""; }; 47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksObserver.h; sourceTree = ""; }; 47EEAFF22350CEDA005CF316 /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = AppInfo.mm; sourceTree = ""; }; 47EEAFF32350CEDB005CF316 /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = ""; }; @@ -112,17 +124,12 @@ 470015F12342509C00EBF03D /* CoreApi */ = { isa = PBXGroup; children = ( + 47C637D92354B76700E12DE0 /* Search */, + 47C637D32354AEA800E12DE0 /* Traffic */, + 47C637CE2354A6E600E12DE0 /* Metrics */, 479F704C234FB5C800011E2E /* Bookmarks */, 479F7048234F784B00011E2E /* Common */, 477C775523435B69001C5B4E /* Framework */, - 470016042342540F00EBF03D /* MWMTag.h */, - 470016062342541100EBF03D /* MWMTag.m */, - 470016032342540E00EBF03D /* MWMTagGroup.h */, - 470016052342541000EBF03D /* MWMTagGroup.m */, - 479834E82342697200724D1E /* MWMTag+Convenience.h */, - 479834E62342697100724D1E /* MWMTag+Convenience.mm */, - 479834E92342697300724D1E /* MWMTagGroup+Convenience.h */, - 479834E72342697200724D1E /* MWMTagGroup+Convenience.mm */, 470015F22342509C00EBF03D /* CoreApi.h */, 47A65CAE235008C700DCD85F /* CoreApi-swift.h */, 470015F32342509C00EBF03D /* Info.plist */, @@ -186,6 +193,7 @@ 479F7051234FB62A00011E2E /* Catalog */ = { isa = PBXGroup; children = ( + 47C637D82354B75200E12DE0 /* Tags */, 479F7052234FB65F00011E2E /* MWMCatalogCommon.h */, 479F704D234FB60400011E2E /* MWMCatalogObserver.h */, 479F704E234FB60400011E2E /* MWMCatalogObserver.mm */, @@ -194,6 +202,48 @@ path = Catalog; sourceTree = ""; }; + 47C637CE2354A6E600E12DE0 /* Metrics */ = { + isa = PBXGroup; + children = ( + 47C637D02354A6FB00E12DE0 /* MWMEye.h */, + 47C637CF2354A6FA00E12DE0 /* MWMEye.mm */, + ); + path = Metrics; + sourceTree = ""; + }; + 47C637D32354AEA800E12DE0 /* Traffic */ = { + isa = PBXGroup; + children = ( + 47C637D52354AEBE00E12DE0 /* MWMTrafficManager.h */, + 47C637D42354AEBD00E12DE0 /* MWMTrafficManager.mm */, + ); + path = Traffic; + sourceTree = ""; + }; + 47C637D82354B75200E12DE0 /* Tags */ = { + isa = PBXGroup; + children = ( + 470016042342540F00EBF03D /* MWMTag.h */, + 470016062342541100EBF03D /* MWMTag.m */, + 470016032342540E00EBF03D /* MWMTagGroup.h */, + 470016052342541000EBF03D /* MWMTagGroup.m */, + 479834E82342697200724D1E /* MWMTag+Convenience.h */, + 479834E62342697100724D1E /* MWMTag+Convenience.mm */, + 479834E92342697300724D1E /* MWMTagGroup+Convenience.h */, + 479834E72342697200724D1E /* MWMTagGroup+Convenience.mm */, + ); + path = Tags; + sourceTree = ""; + }; + 47C637D92354B76700E12DE0 /* Search */ = { + isa = PBXGroup; + children = ( + 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */, + 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */, + ); + path = Search; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -208,6 +258,7 @@ 479F704F234FB60400011E2E /* MWMCatalogObserver.h in Headers */, 47EEAFF72350D060005CF316 /* MWMCommon.h in Headers */, 479F7056234FB7F200011E2E /* MWMBookmarksManager.h in Headers */, + 47C637DD2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h in Headers */, 479F704B234F78AB00011E2E /* MWMFrameworkHelper.h in Headers */, 479834F323426CD200724D1E /* MWMTagGroup+Convenience.h in Headers */, 470016102342579200EBF03D /* MWMTagGroup.h in Headers */, @@ -217,8 +268,10 @@ 4700160F2342579000EBF03D /* MWMTag.h in Headers */, 479F705B234FBB1100011E2E /* MWMUTM.h in Headers */, 479F704A234F785B00011E2E /* MWMTypes.h in Headers */, + 47C637D72354AEBE00E12DE0 /* MWMTrafficManager.h in Headers */, 47D609DC234FE625008ECC47 /* MWMBookmarksObserver.h in Headers */, 475784C22344B422008291A4 /* Framework.h in Headers */, + 47C637D22354A6FB00E12DE0 /* MWMEye.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -292,6 +345,8 @@ buildActionMask = 2147483647; files = ( 479F7050234FB60400011E2E /* MWMCatalogObserver.mm in Sources */, + 47C637D12354A6FB00E12DE0 /* MWMEye.mm in Sources */, + 47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */, 479F7062234FBC4700011E2E /* MWMCarPlayBookmarkObject.mm in Sources */, 479F705E234FBB8C00011E2E /* MWMCategory.m in Sources */, 479834EB2342697400724D1E /* MWMTagGroup+Convenience.mm in Sources */, @@ -300,6 +355,7 @@ 479F7047234F774100011E2E /* MWMFrameworkHelper.mm in Sources */, 470016072342541100EBF03D /* MWMTag.m in Sources */, 479834EA2342697400724D1E /* MWMTag+Convenience.mm in Sources */, + 47C637D62354AEBE00E12DE0 /* MWMTrafficManager.mm in Sources */, 475784C32344B422008291A4 /* Framework.cpp in Sources */, 47EEAFF42350CEDB005CF316 /* AppInfo.mm in Sources */, ); @@ -430,6 +486,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 479834EE23426C0100724D1E /* common-debug.xcconfig */; buildSettings = { + CLANG_WARN_COMMA = NO; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; @@ -464,6 +522,8 @@ isa = XCBuildConfiguration; baseConfigurationReference = 479834EF23426C0100724D1E /* common-release.xcconfig */; buildSettings = { + CLANG_WARN_COMMA = NO; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; DEFINES_MODULE = YES; diff --git a/iphone/CoreApi/CoreApi/MWMTag+Convenience.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag+Convenience.h similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTag+Convenience.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag+Convenience.h diff --git a/iphone/CoreApi/CoreApi/MWMTag+Convenience.mm b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag+Convenience.mm similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTag+Convenience.mm rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag+Convenience.mm diff --git a/iphone/CoreApi/CoreApi/MWMTag.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag.h similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTag.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag.h diff --git a/iphone/CoreApi/CoreApi/MWMTag.m b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag.m similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTag.m rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTag.m diff --git a/iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup+Convenience.h similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup+Convenience.h diff --git a/iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.mm b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup+Convenience.mm similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.mm rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup+Convenience.mm diff --git a/iphone/CoreApi/CoreApi/MWMTagGroup.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup.h similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTagGroup.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup.h diff --git a/iphone/CoreApi/CoreApi/MWMTagGroup.m b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup.m similarity index 100% rename from iphone/CoreApi/CoreApi/MWMTagGroup.m rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/Tags/MWMTagGroup.m diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm index 4da3e7d02c..6386ea8a22 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm @@ -1,5 +1,5 @@ #import "MWMCarPlayBookmarkObject.h" -#include +#include "Framework.h" #include "geometry/mercator.hpp" @interface MWMCarPlayBookmarkObject() diff --git a/iphone/CoreApi/CoreApi/CoreApi-swift.h b/iphone/CoreApi/CoreApi/CoreApi-swift.h index 11405d6fed..479a22fd0a 100644 --- a/iphone/CoreApi/CoreApi/CoreApi-swift.h +++ b/iphone/CoreApi/CoreApi/CoreApi-swift.h @@ -4,16 +4,17 @@ FOUNDATION_EXPORT double CoreApiVersionNumber; //! Project version string for CoreApi. FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; - #import -#import +#import +#import +#import +#import #import -#import - +#import #import +#import #import #import -#import -#import -#import -#import +#import +#import +#import diff --git a/iphone/CoreApi/CoreApi/CoreApi.h b/iphone/CoreApi/CoreApi/CoreApi.h index a39e62d954..3816221685 100644 --- a/iphone/CoreApi/CoreApi/CoreApi.h +++ b/iphone/CoreApi/CoreApi/CoreApi.h @@ -6,16 +6,16 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import +#import +#import +#import +#import #import -#import -#import - +#import #import +#import #import #import -#import -#import -#import -#import -#import -#import +#import +#import +#import diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h index 559d9f3a7f..d339dce636 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h @@ -38,6 +38,7 @@ NS_SWIFT_NAME(FrameworkHelper) + (void)rotateMap:(double)azimuth animated:(BOOL)isAnimated; + (void)updatePositionArrowOffset:(BOOL)useDefault offset:(int)offsetY; + (BOOL)shouldShowCrown; ++ (void)uploadUGC:(void (^)(UIBackgroundFetchResult))completionHandler; @end diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index e8fac4e21f..5d36964768 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -1,27 +1,25 @@ #import "MWMFrameworkHelper.h" -#include +#include "Framework.h" #include "base/sunrise_sunset.hpp" #include "map/crown.hpp" -#include "platform/network_policy_ios.h" #include "platform/local_country_file_utils.hpp" +#include "platform/network_policy_ios.h" @implementation MWMFrameworkHelper -+ (void)processFirstLaunch:(BOOL)hasLocation -{ - auto & f = GetFramework(); ++ (void)processFirstLaunch:(BOOL)hasLocation { + auto &f = GetFramework(); if (!hasLocation) f.SwitchMyPositionNextMode(); else f.RunFirstLaunchAnimation(); } -+ (void)setVisibleViewport:(CGRect)rect scaleFactor:(CGFloat)scale -{ ++ (void)setVisibleViewport:(CGRect)rect scaleFactor:(CGFloat)scale { CGFloat const x0 = rect.origin.x * scale; CGFloat const y0 = rect.origin.y * scale; CGFloat const x1 = x0 + rect.size.width * scale; @@ -29,19 +27,23 @@ GetFramework().SetVisibleViewport(m2::RectD(x0, y0, x1, y1)); } -+ (void)setTheme:(MWMTheme)theme -{ - auto & f = GetFramework(); ++ (void)setTheme:(MWMTheme)theme { + auto &f = GetFramework(); auto const style = f.GetMapStyle(); auto const newStyle = ^MapStyle(MWMTheme theme) { - switch (theme) - { - case MWMThemeDay: return MapStyleClear; - case MWMThemeVehicleDay: return MapStyleVehicleClear; - case MWMThemeNight: return MapStyleDark; - case MWMThemeVehicleNight: return MapStyleVehicleDark; - case MWMThemeAuto: NSAssert(NO, @"Invalid theme"); return MapStyleClear; + switch (theme) { + case MWMThemeDay: + return MapStyleClear; + case MWMThemeVehicleDay: + return MapStyleVehicleClear; + case MWMThemeNight: + return MapStyleDark; + case MWMThemeVehicleNight: + return MapStyleVehicleDark; + case MWMThemeAuto: + NSAssert(NO, @"Invalid theme"); + return MapStyleClear; } }(theme); @@ -49,36 +51,34 @@ f.SetMapStyle(newStyle); } -+ (MWMDayTime)daytimeAtLocation:(CLLocation *)location -{ ++ (MWMDayTime)daytimeAtLocation:(CLLocation *)location { if (!location) return MWMDayTimeDay; - DayTimeType dayTime = GetDayTime(NSDate.date.timeIntervalSince1970, - location.coordinate.latitude, - location.coordinate.longitude); - switch (dayTime) - { - case DayTimeType::Day: - case DayTimeType::PolarDay: return MWMDayTimeDay; - case DayTimeType::Night: - case DayTimeType::PolarNight: return MWMDayTimeNight; + DayTimeType dayTime = + GetDayTime(NSDate.date.timeIntervalSince1970, location.coordinate.latitude, location.coordinate.longitude); + switch (dayTime) { + case DayTimeType::Day: + case DayTimeType::PolarDay: + return MWMDayTimeDay; + case DayTimeType::Night: + case DayTimeType::PolarNight: + return MWMDayTimeNight; } } -+ (void)createFramework { UNUSED_VALUE(GetFramework()); } ++ (void)createFramework { + UNUSED_VALUE(GetFramework()); +} -+ (BOOL)canUseNetwork -{ ++ (BOOL)canUseNetwork { return network_policy::CanUseNetwork(); } -+ (BOOL)isNetworkConnected -{ ++ (BOOL)isNetworkConnected { return GetPlatform().ConnectionStatus() != Platform::EConnectionType::CONNECTION_NONE; } -+ (BOOL)isWiFiConnected -{ ++ (BOOL)isWiFiConnected { return GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_WIFI; } @@ -93,14 +93,14 @@ } } -+ (MWMMarkGroupID)invalidCategoryId { return kml::kInvalidMarkGroupId; } ++ (MWMMarkGroupID)invalidCategoryId { + return kml::kInvalidMarkGroupId; +} -+ (NSArray *)obtainLastSearchQueries -{ - NSMutableArray * result = [NSMutableArray array]; - auto const & queries = GetFramework().GetLastSearchQueries(); - for (auto const & item : queries) - { ++ (NSArray *)obtainLastSearchQueries { + NSMutableArray *result = [NSMutableArray array]; + auto const &queries = GetFramework().GetLastSearchQueries(); + for (auto const &item : queries) { [result addObject:@(item.second.c_str())]; } return [result copy]; @@ -108,9 +108,8 @@ #pragma mark - Map Interaction -+ (void)zoomMap:(MWMZoomMode)mode -{ - switch(mode) { ++ (void)zoomMap:(MWMZoomMode)mode { + switch (mode) { case MWMZoomModeIn: GetFramework().Scale(Framework::SCALE_MAG, true); break; @@ -120,23 +119,19 @@ } } -+ (void)moveMap:(UIOffset)offset -{ ++ (void)moveMap:(UIOffset)offset { GetFramework().Move(offset.horizontal, offset.vertical, true); } -+ (void)deactivateMapSelection:(BOOL)notifyUI -{ ++ (void)deactivateMapSelection:(BOOL)notifyUI { GetFramework().DeactivateMapSelection(notifyUI); } -+ (void)switchMyPositionMode -{ ++ (void)switchMyPositionMode { GetFramework().SwitchMyPositionNextMode(); } -+ (void)stopLocationFollow -{ ++ (void)stopLocationFollow { GetFramework().StopLocationFollow(); } @@ -152,4 +147,10 @@ return crown::NeedToShow(GetFramework().GetPurchase()); } ++ (void)uploadUGC:(void (^)(UIBackgroundFetchResult))completionHandler { + GetFramework().UploadUGC([completionHandler](bool isSuccessful) { + completionHandler(isSuccessful ? UIBackgroundFetchResultNewData : UIBackgroundFetchResultFailed); + }); +} + @end diff --git a/iphone/Maps/Core/Metrics/MWMEye.h b/iphone/CoreApi/CoreApi/Metrics/MWMEye.h similarity index 97% rename from iphone/Maps/Core/Metrics/MWMEye.h rename to iphone/CoreApi/CoreApi/Metrics/MWMEye.h index db442b8f7f..ea8cca5771 100644 --- a/iphone/Maps/Core/Metrics/MWMEye.h +++ b/iphone/CoreApi/CoreApi/Metrics/MWMEye.h @@ -1,3 +1,5 @@ +#import + typedef NS_ENUM(NSUInteger, MWMTip) { MWMTipBookmarks, diff --git a/iphone/Maps/Core/Metrics/MWMEye.mm b/iphone/CoreApi/CoreApi/Metrics/MWMEye.mm similarity index 96% rename from iphone/Maps/Core/Metrics/MWMEye.mm rename to iphone/CoreApi/CoreApi/Metrics/MWMEye.mm index 0bf5ae728e..5bdbec1e42 100644 --- a/iphone/Maps/Core/Metrics/MWMEye.mm +++ b/iphone/CoreApi/CoreApi/Metrics/MWMEye.mm @@ -1,6 +1,6 @@ #import "MWMEye.h" -#include +#include "Framework.h" @implementation MWMEye diff --git a/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.h b/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.h similarity index 89% rename from iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.h rename to iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.h index 4689891594..5509fe6ecf 100644 --- a/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.h +++ b/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.h @@ -1,3 +1,5 @@ +#import + NS_ASSUME_NONNULL_BEGIN @interface MWMSearchFrameworkHelper : NSObject diff --git a/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm similarity index 98% rename from iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm rename to iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm index 6a85735514..004e4a5d4c 100644 --- a/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Search/MWMSearchFrameworkHelper.mm @@ -4,7 +4,7 @@ #include "platform/preferred_languages.hpp" -#include +#include "Framework.h" @implementation MWMSearchFrameworkHelper diff --git a/iphone/Maps/Core/Traffic/MWMTrafficManager.h b/iphone/CoreApi/CoreApi/Traffic/MWMTrafficManager.h similarity index 97% rename from iphone/Maps/Core/Traffic/MWMTrafficManager.h rename to iphone/CoreApi/CoreApi/Traffic/MWMTrafficManager.h index 0588507c95..f9a2548554 100644 --- a/iphone/Maps/Core/Traffic/MWMTrafficManager.h +++ b/iphone/CoreApi/CoreApi/Traffic/MWMTrafficManager.h @@ -1,3 +1,5 @@ +#import + typedef NS_ENUM(NSUInteger, MWMTrafficManagerState) { MWMTrafficManagerStateDisabled, MWMTrafficManagerStateEnabled, diff --git a/iphone/Maps/Core/Traffic/MWMTrafficManager.mm b/iphone/CoreApi/CoreApi/Traffic/MWMTrafficManager.mm similarity index 99% rename from iphone/Maps/Core/Traffic/MWMTrafficManager.mm rename to iphone/CoreApi/CoreApi/Traffic/MWMTrafficManager.mm index 23890da697..c52b809ad6 100644 --- a/iphone/Maps/Core/Traffic/MWMTrafficManager.mm +++ b/iphone/CoreApi/CoreApi/Traffic/MWMTrafficManager.mm @@ -1,6 +1,6 @@ #import "MWMTrafficManager.h" -#include +#include "Framework.h" namespace { diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index c25d545f48..1c9234dda0 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -24,7 +24,6 @@ #import "BookmarksVC.h" #import "FacebookNativeAdAdapter.h" -//#import "LocalNotificationManager.h" #import "CatalogPromoItem.h" #import "CoreNotificationWrapper.h" #import "DeepLinkHelper.h" @@ -63,7 +62,6 @@ #import "MWMRoutingOptions.h" #import "MWMSearchItemType.h" #import "MWMSearchNoResults.h" -#import "MWMSearchFrameworkHelper.h" #import "MWMSettings.h" #import "MWMSideButtons.h" #import "MWMTableViewCell.h" @@ -72,8 +70,6 @@ #import "MWMTextToSpeechObserver.h" #import "MWMTextView.h" #import "MWMTrafficButtonViewController.h" -#import "MWMTrafficManager.h" -#import "MWMUGCHelper.h" #import "MWMViewController.h" #import "Statistics.h" #import "UIButton+RuntimeAttributes.h" @@ -82,7 +78,6 @@ #import "UIImageView+WebImage.h" #import "UIViewController+Navigation.h" #import "WebViewController.h" -#import "MWMEye.h" #import "MWMPurchaseManager.h" #import "MWMPurchaseValidation.h" #import "EAGLView.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index 2e4a5305f1..eb37a8fd98 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -1,9 +1,11 @@ #import "MWMTrafficButtonViewController.h" + +#import + #import "MWMAlertViewController.h" #import "MWMButton.h" #import "MWMMapViewControlsCommon.h" #import "MWMMapViewControlsManager.h" -#import "MWMTrafficManager.h" #import "MapViewController.h" #import "SwiftBridge.h" diff --git a/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTask/BackgroundFetchTask.swift b/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTask/BackgroundFetchTask.swift index a6237d8fa0..85c3732e5e 100644 --- a/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTask/BackgroundFetchTask.swift +++ b/iphone/Maps/Core/BackgroundFetchScheduler/BackgroundFetchTask/BackgroundFetchTask.swift @@ -53,7 +53,7 @@ final class BackgroundUGCUpload: BackgroundFetchTask { override var frameworkType: BackgroundFetchTaskFrameworkType { return .full } override fileprivate func fire() { - MWMUGCHelper.uploadEdits(self.finish) + FrameworkHelper.uploadUGC(self.finish) } override var description: String { diff --git a/iphone/Maps/Core/UGC/MWMUGCHelper.h b/iphone/Maps/Core/UGC/MWMUGCHelper.h deleted file mode 100644 index d1f03265f8..0000000000 --- a/iphone/Maps/Core/UGC/MWMUGCHelper.h +++ /dev/null @@ -1,5 +0,0 @@ -@interface MWMUGCHelper : NSObject - -+ (void)uploadEdits:(void (^)(UIBackgroundFetchResult))completionHandler; - -@end diff --git a/iphone/Maps/Core/UGC/MWMUGCHelper.mm b/iphone/Maps/Core/UGC/MWMUGCHelper.mm deleted file mode 100644 index 8ff49c5a7e..0000000000 --- a/iphone/Maps/Core/UGC/MWMUGCHelper.mm +++ /dev/null @@ -1,17 +0,0 @@ -#import "MWMUGCHelper.h" - -#include - -@implementation MWMUGCHelper - -+ (void)uploadEdits:(void (^)(UIBackgroundFetchResult))completionHandler -{ - auto const lambda = [completionHandler](bool isSuccessful) { - completionHandler(isSuccessful ? UIBackgroundFetchResultNewData - : UIBackgroundFetchResultFailed); - }; - - GetFramework().UploadUGC(lambda); -} - -@end diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index a8a422edf6..0ec24417ff 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -20,7 +20,6 @@ 33603C85219F0F6300B11FFE /* SharingPropertiesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33603C84219F0F6300B11FFE /* SharingPropertiesViewController.swift */; }; 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */; }; 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */; }; - 337F98B021D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 337F98AF21D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm */; }; 337F98B221D3BAE600C8AC27 /* SearchCategoriesViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */; }; 337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */; }; 337F98B821D3D67E00C8AC27 /* SearchHistoryQueryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */; }; @@ -57,7 +56,6 @@ 3404756E1E081A4600C92850 /* MWMSearch.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3404753D1E081A4600C92850 /* MWMSearch.mm */; }; 340475711E081A4600C92850 /* MWMSettings.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475411E081A4600C92850 /* MWMSettings.mm */; }; 340475741E081A4600C92850 /* MWMStorage.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475441E081A4600C92850 /* MWMStorage.mm */; }; - 340475771E081A4600C92850 /* MWMTrafficManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475471E081A4600C92850 /* MWMTrafficManager.mm */; }; 3404757E1E081B3300C92850 /* iosOGLContext.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3404757A1E081B3300C92850 /* iosOGLContext.mm */; }; 340475811E081B3300C92850 /* iosOGLContextFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3404757C1E081B3300C92850 /* iosOGLContextFactory.mm */; }; 3404F48B202894EA0090E401 /* BMCViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404F489202894EA0090E401 /* BMCViewController.swift */; }; @@ -153,7 +151,6 @@ 3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5CD200F4A2B00DC6CD5 /* BackgroundFetchTask.swift */; }; 3472B5D3200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5D1200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift */; }; 3472B5E1200F86C800DC6CD5 /* MWMEditorHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5DF200F86C800DC6CD5 /* MWMEditorHelper.mm */; }; - 3472B5EB200F8CFF00DC6CD5 /* MWMUGCHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5E9200F8CFF00DC6CD5 /* MWMUGCHelper.mm */; }; 34763EE71F2F392300F4D2D3 /* MWMTextToSpeech.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34763EE51F2F392300F4D2D3 /* MWMTextToSpeech.mm */; }; 34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34763F051F3092E700F4D2D3 /* String+Format.swift */; }; 3476B8DD1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */ = {isa = PBXBuildFile; fileRef = 3476B8D51BFDD30B00874594 /* tts-how-to-set-up-voice.html */; }; @@ -386,7 +383,6 @@ 474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */; }; 474AC76D2139E4F2002F9BF9 /* RemoveAdsViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */; }; 474C9F5A213FF75800369009 /* StoreKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 474C9F59213FF75800369009 /* StoreKit.framework */; }; - 474C9F632141896800369009 /* MWMEye.mm in Sources */ = {isa = PBXBuildFile; fileRef = 474C9F622141896800369009 /* MWMEye.mm */; }; 4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CD9E20AAD48A00BD8166 /* Checkmark.swift */; }; 4767CDA420AAF66B00BD8166 /* NSAttributedString+HTML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CDA320AAF66B00BD8166 /* NSAttributedString+HTML.swift */; }; 4767CDA620AB1F6200BD8166 /* LeftAlignedIconButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CDA520AB1F6200BD8166 /* LeftAlignedIconButton.swift */; }; @@ -870,8 +866,6 @@ 33603C84219F0F6300B11FFE /* SharingPropertiesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharingPropertiesViewController.swift; sourceTree = ""; }; 337F98A021D37B5700C8AC27 /* SearchHistoryViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = SearchHistoryViewController.xib; sourceTree = ""; }; 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchTabViewController.swift; sourceTree = ""; }; - 337F98AE21D3B60600C8AC27 /* MWMSearchFrameworkHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMSearchFrameworkHelper.h; sourceTree = ""; }; - 337F98AF21D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFrameworkHelper.mm; sourceTree = ""; }; 337F98B121D3BAE600C8AC27 /* SearchCategoriesViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchCategoriesViewController.swift; sourceTree = ""; }; 337F98B321D3C9F200C8AC27 /* SearchHistoryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryViewController.swift; sourceTree = ""; }; 337F98B721D3D67E00C8AC27 /* SearchHistoryQueryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchHistoryQueryCell.swift; sourceTree = ""; }; @@ -931,8 +925,6 @@ 340475411E081A4600C92850 /* MWMSettings.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSettings.mm; sourceTree = ""; }; 340475431E081A4600C92850 /* MWMStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMStorage.h; sourceTree = ""; }; 340475441E081A4600C92850 /* MWMStorage.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMStorage.mm; sourceTree = ""; }; - 340475461E081A4600C92850 /* MWMTrafficManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTrafficManager.h; sourceTree = ""; }; - 340475471E081A4600C92850 /* MWMTrafficManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTrafficManager.mm; sourceTree = ""; }; 340475791E081B3300C92850 /* iosOGLContext.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iosOGLContext.h; sourceTree = ""; }; 3404757A1E081B3300C92850 /* iosOGLContext.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = iosOGLContext.mm; sourceTree = ""; }; 3404757B1E081B3300C92850 /* iosOGLContextFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iosOGLContextFactory.h; sourceTree = ""; }; @@ -1076,8 +1068,6 @@ 3472B5D1200F501500DC6CD5 /* BackgroundFetchTaskFrameworkType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundFetchTaskFrameworkType.swift; sourceTree = ""; }; 3472B5DE200F86C800DC6CD5 /* MWMEditorHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEditorHelper.h; sourceTree = ""; }; 3472B5DF200F86C800DC6CD5 /* MWMEditorHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorHelper.mm; sourceTree = ""; }; - 3472B5E8200F8CFF00DC6CD5 /* MWMUGCHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUGCHelper.h; sourceTree = ""; }; - 3472B5E9200F8CFF00DC6CD5 /* MWMUGCHelper.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMUGCHelper.mm; sourceTree = ""; }; 347526FA1DC0B00F00918CF5 /* common-debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../../xcode/common-debug.xcconfig"; sourceTree = ""; }; 347526FB1DC0B00F00918CF5 /* common-release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../../xcode/common-release.xcconfig"; sourceTree = ""; }; 34763EE41F2F392300F4D2D3 /* MWMTextToSpeech.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTextToSpeech.h; sourceTree = ""; }; @@ -1468,8 +1458,6 @@ 474AC76A2139E4F2002F9BF9 /* RemoveAdsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RemoveAdsViewController.swift; sourceTree = ""; }; 474AC76B2139E4F2002F9BF9 /* RemoveAdsViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RemoveAdsViewController.xib; sourceTree = ""; }; 474C9F59213FF75800369009 /* StoreKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = StoreKit.framework; path = System/Library/Frameworks/StoreKit.framework; sourceTree = SDKROOT; }; - 474C9F612141896800369009 /* MWMEye.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMEye.h; sourceTree = ""; }; - 474C9F622141896800369009 /* MWMEye.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEye.mm; sourceTree = ""; }; 4767CD9E20AAD48A00BD8166 /* Checkmark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkmark.swift; sourceTree = ""; }; 4767CDA320AAF66B00BD8166 /* NSAttributedString+HTML.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+HTML.swift"; sourceTree = ""; }; 4767CDA520AB1F6200BD8166 /* LeftAlignedIconButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftAlignedIconButton.swift; sourceTree = ""; }; @@ -2485,7 +2473,6 @@ 470F5A7B2189BA7200754295 /* InappPurchase */, 474C9F602141894300369009 /* Metrics */, 472E3F4221468AF40020E412 /* Subscriptions */, - 3472B5E7200F8CEB00DC6CD5 /* UGC */, 3472B5DD200F868E00DC6CD5 /* Editor */, 3472B5C8200F436700DC6CD5 /* BackgroundFetchScheduler */, 34F4071C1E9E1AFF00E57AC0 /* Ads */, @@ -2500,7 +2487,6 @@ 3404753F1E081A4600C92850 /* Settings */, 340475421E081A4600C92850 /* Storage */, 34763EE31F2F392300F4D2D3 /* TextToSpeech */, - 340475451E081A4600C92850 /* Traffic */, ); path = Core; sourceTree = ""; @@ -2585,15 +2571,6 @@ path = Storage; sourceTree = ""; }; - 340475451E081A4600C92850 /* Traffic */ = { - isa = PBXGroup; - children = ( - 340475461E081A4600C92850 /* MWMTrafficManager.h */, - 340475471E081A4600C92850 /* MWMTrafficManager.mm */, - ); - path = Traffic; - sourceTree = ""; - }; 3404F4A02028A6C00090E401 /* Categories */ = { isa = PBXGroup; children = ( @@ -2999,15 +2976,6 @@ path = BackgroundFetchTask; sourceTree = ""; }; - 3472B5E7200F8CEB00DC6CD5 /* UGC */ = { - isa = PBXGroup; - children = ( - 3472B5E8200F8CFF00DC6CD5 /* MWMUGCHelper.h */, - 3472B5E9200F8CFF00DC6CD5 /* MWMUGCHelper.mm */, - ); - path = UGC; - sourceTree = ""; - }; 34763EE31F2F392300F4D2D3 /* TextToSpeech */ = { isa = PBXGroup; children = ( @@ -3534,8 +3502,6 @@ 474C9F602141894300369009 /* Metrics */ = { isa = PBXGroup; children = ( - 474C9F612141896800369009 /* MWMEye.h */, - 474C9F622141896800369009 /* MWMEye.mm */, ); path = Metrics; sourceTree = ""; @@ -4530,8 +4496,6 @@ F6E2FD0F1E097B9F0083EBEC /* HistoryTab */, F6E2FD231E097BA00083EBEC /* MWMSearchTabbedViewProtocol.h */, 337F98A521D37B7400C8AC27 /* SearchTabViewController.swift */, - 337F98AE21D3B60600C8AC27 /* MWMSearchFrameworkHelper.h */, - 337F98AF21D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm */, ); path = Tabs; sourceTree = ""; @@ -5195,7 +5159,6 @@ 349FC5481F680DAE00968C9F /* ExpandableReviewView.swift in Sources */, F6E2FF5A1E097BA00083EBEC /* MWMNightModeController.mm in Sources */, 47F86D0120C93D8D00FEE291 /* TabViewController.swift in Sources */, - 337F98B021D3B60600C8AC27 /* MWMSearchFrameworkHelper.mm in Sources */, 6741A9A51BF340DE002C974C /* MWMShareActivityItem.mm in Sources */, 3408963F1F83CEDE00BC7117 /* MWMAuthorizationViewModel.mm in Sources */, F6E2FE1F1E097BA00083EBEC /* MWMOpeningHoursCommon.mm in Sources */, @@ -5309,7 +5272,6 @@ 47E3C72D2111E6A2008B3B27 /* FadeTransitioning.swift in Sources */, 34845DAF1E1649F6003D55B9 /* DownloaderNoResultsEmbedViewController.swift in Sources */, CD6E8677226774C700D1EDF7 /* CPConstants.swift in Sources */, - 474C9F632141896800369009 /* MWMEye.mm in Sources */, F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */, 479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */, F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */, @@ -5432,7 +5394,7 @@ 348A8DFB1F66775A00D83026 /* RatingViewSettings.swift in Sources */, 3472B5E1200F86C800DC6CD5 /* MWMEditorHelper.mm in Sources */, 47B06DF021B697230094CCAD /* MWMGeoTrackerCore.mm in Sources */, - F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */, + F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.m in Sources */, 4719A643219CB61D009F9AA7 /* BillingPendingTransaction.swift in Sources */, CD9AD96F2281DF3600EC174A /* CategoryInfo.swift in Sources */, F6E2FE881E097BA00083EBEC /* MWMPlacePageRegularCell.mm in Sources */, @@ -5477,7 +5439,6 @@ F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.mm in Sources */, F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */, 3DD1A20F22D8DD1100B158F4 /* MWMPromoApi.mm in Sources */, - 3472B5EB200F8CFF00DC6CD5 /* MWMUGCHelper.mm in Sources */, 3454D7C21E07F045004AF2AD /* NSString+Categories.mm in Sources */, 6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */, 4767CDC120B477BA00BD8166 /* WelcomeViewController.swift in Sources */, @@ -5622,7 +5583,6 @@ F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */, 344532561F7155540059FBCC /* UGCReviewModel.swift in Sources */, 6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */, - 340475771E081A4600C92850 /* MWMTrafficManager.mm in Sources */, 346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */, 340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */, 340416501E7C086000E2B6D6 /* PhotoViewController.swift in Sources */, diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm index 5b294714b5..6342640edd 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm @@ -1,12 +1,12 @@ #import "MWMDiscoveryController.h" -#include +#import + #import "MWMDiscoveryControllerViewModel.h" #import "MWMDiscoveryCityGalleryObjects.h" #import "MWMDiscoveryMapObjects.h" #import "MWMDiscoveryTableManager.h" #import "MWMDiscoveryTapDelegate.h" -#import "MWMEye.h" #import "MWMMapViewControlsManager.h" #import "MWMRoutePoint+CPP.h" #import "MWMRouter.h" diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm index 1e7997ce58..56ebe6bc58 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.mm @@ -1,6 +1,8 @@ #import "MWMSearchHotelsFilterViewController.h" + +#import + #import "ActionSheetPicker.h" -#import "MWMEye.h" #import "MWMSearchFilterViewController_Protected.h" #import "Statistics.h" #import "SwiftBridge.h"