diff --git a/iphone/CoreApi/CoreApi.modulemap b/iphone/CoreApi/CoreApi.modulemap new file mode 100644 index 0000000000..479c573e5a --- /dev/null +++ b/iphone/CoreApi/CoreApi.modulemap @@ -0,0 +1,14 @@ +framework module CoreApi { + header "AppInfo.h" + header "MWMCommon.h" + header "MWMTypes.h" + header "MWMBookmarksObserver.h" + header "MWMBookmarksManager.h" + header "MWMCatalogCommon.h" + header "MWMUTM.h" + header "MWMCategory.h" + header "MWMTag.h" + header "MWMTagGroup.h" + header "MWMFrameworkHelper.h" + header "MWMCarPlayBookmarkObject.h" +} diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..cd51be0ba8 --- /dev/null +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -0,0 +1,521 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 50; + objects = { + +/* Begin PBXBuildFile section */ + 470015F42342509C00EBF03D /* CoreApi.h in Headers */ = {isa = PBXBuildFile; fileRef = 470015F22342509C00EBF03D /* CoreApi.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 470016072342541100EBF03D /* MWMTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 470016062342541100EBF03D /* MWMTag.m */; }; + 470016082342541100EBF03D /* MWMTagGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 470016052342541000EBF03D /* MWMTagGroup.m */; }; + 4700160F2342579000EBF03D /* MWMTag.h in Headers */ = {isa = PBXBuildFile; fileRef = 470016042342540F00EBF03D /* MWMTag.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 470016102342579200EBF03D /* MWMTagGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 470016032342540E00EBF03D /* MWMTagGroup.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 475784C22344B422008291A4 /* Framework.h in Headers */ = {isa = PBXBuildFile; fileRef = 475784C02344B421008291A4 /* Framework.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 475784C32344B422008291A4 /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 475784C12344B422008291A4 /* Framework.cpp */; }; + 479834EA2342697400724D1E /* MWMTag+Convenience.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479834E62342697100724D1E /* MWMTag+Convenience.mm */; }; + 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, ); }; }; + 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, ); }; }; + 479F704F234FB60400011E2E /* MWMCatalogObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F704D234FB60400011E2E /* MWMCatalogObserver.h */; }; + 479F7050234FB60400011E2E /* MWMCatalogObserver.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479F704E234FB60400011E2E /* MWMCatalogObserver.mm */; }; + 479F7053234FB7BC00011E2E /* MWMCatalogCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7052234FB65F00011E2E /* MWMCatalogCommon.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 479F7056234FB7F200011E2E /* MWMBookmarksManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F7054234FB7F100011E2E /* MWMBookmarksManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 479F7057234FB7F200011E2E /* MWMBookmarksManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 479F7055234FB7F100011E2E /* MWMBookmarksManager.mm */; }; + 479F705B234FBB1100011E2E /* MWMUTM.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F705A234FBAC200011E2E /* MWMUTM.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 479F705E234FBB8C00011E2E /* MWMCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = 479F705C234FBB8B00011E2E /* MWMCategory.m */; }; + 479F705F234FBB8F00011E2E /* MWMCategory.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F705D234FBB8C00011E2E /* MWMCategory.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 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, ); }; }; + 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, ); }; }; + 47EEAFF72350D060005CF316 /* MWMCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 47EEAFF52350CEF6005CF316 /* MWMCommon.h */; settings = {ATTRIBUTES = (Public, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 470015EF2342509C00EBF03D /* CoreApi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = CoreApi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 470015F22342509C00EBF03D /* CoreApi.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = CoreApi.h; sourceTree = ""; }; + 470015F32342509C00EBF03D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 470016032342540E00EBF03D /* MWMTagGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTagGroup.h; sourceTree = ""; }; + 470016042342540F00EBF03D /* MWMTag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTag.h; sourceTree = ""; }; + 470016052342541000EBF03D /* MWMTagGroup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMTagGroup.m; sourceTree = ""; }; + 470016062342541100EBF03D /* MWMTag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMTag.m; sourceTree = ""; }; + 4700161223425CFD00EBF03D /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; + 470016142342633D00EBF03D /* CoreApi.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = CoreApi.modulemap; sourceTree = ""; }; + 475784C02344B421008291A4 /* Framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Framework.h; sourceTree = ""; }; + 475784C12344B422008291A4 /* Framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Framework.cpp; sourceTree = ""; }; + 479834E62342697100724D1E /* MWMTag+Convenience.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMTag+Convenience.mm"; sourceTree = ""; }; + 479834E72342697200724D1E /* MWMTagGroup+Convenience.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMTagGroup+Convenience.mm"; sourceTree = ""; }; + 479834E82342697200724D1E /* MWMTag+Convenience.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTag+Convenience.h"; sourceTree = ""; }; + 479834E92342697300724D1E /* MWMTagGroup+Convenience.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTagGroup+Convenience.h"; sourceTree = ""; }; + 479834EE23426C0100724D1E /* common-debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-debug.xcconfig"; path = "../../xcode/common-debug.xcconfig"; sourceTree = ""; }; + 479834EF23426C0100724D1E /* common-release.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = "common-release.xcconfig"; path = "../../xcode/common-release.xcconfig"; sourceTree = ""; }; + 479F7045234F774000011E2E /* MWMFrameworkHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkHelper.h; sourceTree = ""; }; + 479F7046234F774000011E2E /* MWMFrameworkHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFrameworkHelper.mm; sourceTree = ""; }; + 479F7049234F785B00011E2E /* MWMTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTypes.h; sourceTree = ""; }; + 479F704D234FB60400011E2E /* MWMCatalogObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCatalogObserver.h; sourceTree = ""; }; + 479F704E234FB60400011E2E /* MWMCatalogObserver.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCatalogObserver.mm; sourceTree = ""; }; + 479F7052234FB65F00011E2E /* MWMCatalogCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCatalogCommon.h; sourceTree = ""; }; + 479F7054234FB7F100011E2E /* MWMBookmarksManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksManager.h; sourceTree = ""; }; + 479F7055234FB7F100011E2E /* MWMBookmarksManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmarksManager.mm; sourceTree = ""; }; + 479F705A234FBAC200011E2E /* MWMUTM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUTM.h; sourceTree = ""; }; + 479F705C234FBB8B00011E2E /* MWMCategory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMCategory.m; sourceTree = ""; }; + 479F705D234FBB8C00011E2E /* MWMCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCategory.h; sourceTree = ""; }; + 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 = ""; }; + 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 = ""; }; + 47EEAFF52350CEF6005CF316 /* MWMCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCommon.h; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 470015EC2342509C00EBF03D /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 470015E52342509C00EBF03D = { + isa = PBXGroup; + children = ( + 479834EE23426C0100724D1E /* common-debug.xcconfig */, + 479834EF23426C0100724D1E /* common-release.xcconfig */, + 4700160B2342562200EBF03D /* Target Support Files */, + 470015F12342509C00EBF03D /* CoreApi */, + 470015F02342509C00EBF03D /* Products */, + 4700161123425CFC00EBF03D /* Frameworks */, + ); + sourceTree = ""; + }; + 470015F02342509C00EBF03D /* Products */ = { + isa = PBXGroup; + children = ( + 470015EF2342509C00EBF03D /* CoreApi.framework */, + ); + name = Products; + sourceTree = ""; + }; + 470015F12342509C00EBF03D /* CoreApi */ = { + isa = PBXGroup; + children = ( + 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 */, + ); + path = CoreApi; + sourceTree = ""; + }; + 4700160B2342562200EBF03D /* Target Support Files */ = { + isa = PBXGroup; + children = ( + 470016142342633D00EBF03D /* CoreApi.modulemap */, + ); + name = "Target Support Files"; + sourceTree = ""; + }; + 4700161123425CFC00EBF03D /* Frameworks */ = { + isa = PBXGroup; + children = ( + 4700161223425CFD00EBF03D /* UIKit.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 477C775523435B69001C5B4E /* Framework */ = { + isa = PBXGroup; + children = ( + 475784C12344B422008291A4 /* Framework.cpp */, + 475784C02344B421008291A4 /* Framework.h */, + 479F7045234F774000011E2E /* MWMFrameworkHelper.h */, + 479F7046234F774000011E2E /* MWMFrameworkHelper.mm */, + ); + path = Framework; + sourceTree = ""; + }; + 479F7048234F784B00011E2E /* Common */ = { + isa = PBXGroup; + children = ( + 479F7049234F785B00011E2E /* MWMTypes.h */, + 47EEAFF52350CEF6005CF316 /* MWMCommon.h */, + 47EEAFF32350CEDB005CF316 /* AppInfo.h */, + 47EEAFF22350CEDA005CF316 /* AppInfo.mm */, + ); + path = Common; + sourceTree = ""; + }; + 479F704C234FB5C800011E2E /* Bookmarks */ = { + isa = PBXGroup; + children = ( + 479F7051234FB62A00011E2E /* Catalog */, + 479F7054234FB7F100011E2E /* MWMBookmarksManager.h */, + 479F7055234FB7F100011E2E /* MWMBookmarksManager.mm */, + 479F705D234FBB8C00011E2E /* MWMCategory.h */, + 479F705C234FBB8B00011E2E /* MWMCategory.m */, + 479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */, + 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */, + 47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */, + ); + path = Bookmarks; + sourceTree = ""; + }; + 479F7051234FB62A00011E2E /* Catalog */ = { + isa = PBXGroup; + children = ( + 479F7052234FB65F00011E2E /* MWMCatalogCommon.h */, + 479F704D234FB60400011E2E /* MWMCatalogObserver.h */, + 479F704E234FB60400011E2E /* MWMCatalogObserver.mm */, + 479F705A234FBAC200011E2E /* MWMUTM.h */, + ); + path = Catalog; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXHeadersBuildPhase section */ + 470015EA2342509C00EBF03D /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 470015F42342509C00EBF03D /* CoreApi.h in Headers */, + 479F705F234FBB8F00011E2E /* MWMCategory.h in Headers */, + 47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */, + 479834F223426CCC00724D1E /* MWMTag+Convenience.h in Headers */, + 479F704F234FB60400011E2E /* MWMCatalogObserver.h in Headers */, + 47EEAFF72350D060005CF316 /* MWMCommon.h in Headers */, + 479F7056234FB7F200011E2E /* MWMBookmarksManager.h in Headers */, + 479F704B234F78AB00011E2E /* MWMFrameworkHelper.h in Headers */, + 479834F323426CD200724D1E /* MWMTagGroup+Convenience.h in Headers */, + 470016102342579200EBF03D /* MWMTagGroup.h in Headers */, + 479F7063234FBC5900011E2E /* MWMCarPlayBookmarkObject.h in Headers */, + 47EEAFF62350CF48005CF316 /* AppInfo.h in Headers */, + 479F7053234FB7BC00011E2E /* MWMCatalogCommon.h in Headers */, + 4700160F2342579000EBF03D /* MWMTag.h in Headers */, + 479F705B234FBB1100011E2E /* MWMUTM.h in Headers */, + 479F704A234F785B00011E2E /* MWMTypes.h in Headers */, + 47D609DC234FE625008ECC47 /* MWMBookmarksObserver.h in Headers */, + 475784C22344B422008291A4 /* Framework.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXHeadersBuildPhase section */ + +/* Begin PBXNativeTarget section */ + 470015EE2342509C00EBF03D /* CoreApi */ = { + isa = PBXNativeTarget; + buildConfigurationList = 470015F72342509C00EBF03D /* Build configuration list for PBXNativeTarget "CoreApi" */; + buildPhases = ( + 470015EA2342509C00EBF03D /* Headers */, + 470015EB2342509C00EBF03D /* Sources */, + 470015EC2342509C00EBF03D /* Frameworks */, + 470015ED2342509C00EBF03D /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = CoreApi; + productName = CoreApi; + productReference = 470015EF2342509C00EBF03D /* CoreApi.framework */; + productType = "com.apple.product-type.framework"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 470015E62342509C00EBF03D /* Project object */ = { + isa = PBXProject; + attributes = { + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = maps.me; + TargetAttributes = { + 470015EE2342509C00EBF03D = { + CreatedOnToolsVersion = 10.2; + }; + }; + }; + buildConfigurationList = 470015E92342509C00EBF03D /* Build configuration list for PBXProject "CoreApi" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + ); + mainGroup = 470015E52342509C00EBF03D; + productRefGroup = 470015F02342509C00EBF03D /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 470015EE2342509C00EBF03D /* CoreApi */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 470015ED2342509C00EBF03D /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 479834F023426C0100724D1E /* common-debug.xcconfig in Resources */, + 479834F123426C0100724D1E /* common-release.xcconfig in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 470015EB2342509C00EBF03D /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 479F7050234FB60400011E2E /* MWMCatalogObserver.mm in Sources */, + 479F7062234FBC4700011E2E /* MWMCarPlayBookmarkObject.mm in Sources */, + 479F705E234FBB8C00011E2E /* MWMCategory.m in Sources */, + 479834EB2342697400724D1E /* MWMTagGroup+Convenience.mm in Sources */, + 470016082342541100EBF03D /* MWMTagGroup.m in Sources */, + 479F7057234FB7F200011E2E /* MWMBookmarksManager.mm in Sources */, + 479F7047234F774100011E2E /* MWMFrameworkHelper.mm in Sources */, + 470016072342541100EBF03D /* MWMTag.m in Sources */, + 479834EA2342697400724D1E /* MWMTag+Convenience.mm in Sources */, + 475784C32344B422008291A4 /* Framework.cpp in Sources */, + 47EEAFF42350CEDB005CF316 /* AppInfo.mm in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 470015F52342509C00EBF03D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 479834EE23426C0100724D1E /* common-debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 470015F62342509C00EBF03D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 479834EF23426C0100724D1E /* common-release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + VALIDATE_PRODUCT = YES; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 470015F82342509C00EBF03D /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 479834EE23426C0100724D1E /* common-debug.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = N9X2A789QT; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(OMIM_ROOT)", + "$(BOOST_ROOT)", + "$(OMIM_ROOT)/3party/glm", + ); + INFOPLIST_FILE = CoreApi/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = CoreApi.modulemap; + PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 470015F92342509C00EBF03D /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 479834EF23426C0100724D1E /* common-release.xcconfig */; + buildSettings = { + CODE_SIGN_IDENTITY = ""; + CODE_SIGN_STYLE = Automatic; + DEFINES_MODULE = YES; + DEVELOPMENT_TEAM = N9X2A789QT; + DYLIB_COMPATIBILITY_VERSION = 1; + DYLIB_CURRENT_VERSION = 1; + DYLIB_INSTALL_NAME_BASE = "@rpath"; + HEADER_SEARCH_PATHS = ( + "$(inherited)", + "$(OMIM_ROOT)", + "$(BOOST_ROOT)", + "$(OMIM_ROOT)/3party/glm", + ); + INFOPLIST_FILE = CoreApi/Info.plist; + INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 10.0; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@loader_path/Frameworks", + ); + MACH_O_TYPE = staticlib; + MODULEMAP_FILE = CoreApi.modulemap; + PRODUCT_BUNDLE_IDENTIFIER = com.mapswithme.CoreApi; + PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + SKIP_INSTALL = YES; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 470015E92342509C00EBF03D /* Build configuration list for PBXProject "CoreApi" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 470015F52342509C00EBF03D /* Debug */, + 470015F62342509C00EBF03D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 470015F72342509C00EBF03D /* Build configuration list for PBXNativeTarget "CoreApi" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 470015F82342509C00EBF03D /* Debug */, + 470015F92342509C00EBF03D /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 470015E62342509C00EBF03D /* Project object */; +} diff --git a/iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogCommon.h similarity index 97% rename from iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogCommon.h index e568457a8a..181495736d 100644 --- a/iphone/Maps/Core/Bookmarks/MWMCatalogCommon.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogCommon.h @@ -1,3 +1,5 @@ +#import + typedef NS_ENUM(NSInteger, MWMCategoryProgress) { MWMCategoryProgressDownloadStarted, diff --git a/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogObserver.h similarity index 100% rename from iphone/Maps/Core/Bookmarks/MWMCatalogObserver.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogObserver.h diff --git a/iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogObserver.mm similarity index 100% rename from iphone/Maps/Core/Bookmarks/MWMCatalogObserver.mm rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMCatalogObserver.mm diff --git a/iphone/Maps/Bookmarks/Catalog/MWMUTM.h b/iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMUTM.h similarity index 100% rename from iphone/Maps/Bookmarks/Catalog/MWMUTM.h rename to iphone/CoreApi/CoreApi/Bookmarks/Catalog/MWMUTM.h diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h similarity index 94% rename from iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h rename to iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index d8ac1df756..0f49023866 100644 --- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -1,5 +1,6 @@ -#import "MWMBookmarksObserver.h" #import "MWMTypes.h" + +#import "MWMBookmarksObserver.h" #import "MWMCatalogCommon.h" #import "MWMUTM.h" @@ -71,9 +72,9 @@ typedef void (^PingCompletionBlock)(BOOL success); - (NSURL * _Nullable)injectCatalogUTMContent:(NSURL * _Nullable)url content:(MWMUTMContent)content; - (NSURL * _Nullable)catalogFrontendUrlPlusPath:(NSString *)path utm:(MWMUTM)utm; -- (NSURL *_Nullable)deeplinkForCategoryId:(MWMMarkGroupID)groupId; -- (NSURL *_Nullable)publicLinkForCategoryId:(MWMMarkGroupID)groupId; -- (NSURL * _Nullable)webEditorUrlForCategoryId:(MWMMarkGroupID)groupId; +- (NSURL * _Nullable)deeplinkForCategoryId:(MWMMarkGroupID)groupId; +- (NSURL * _Nullable)publicLinkForCategoryId:(MWMMarkGroupID)groupId; +- (NSURL * _Nullable)webEditorUrlForCategoryId:(MWMMarkGroupID)groupId language:(NSString *)languageCode; - (void)downloadItemWithId:(NSString *)itemId name:(NSString *)name progress:(_Nullable ProgressBlock)progress @@ -86,7 +87,7 @@ typedef void (^PingCompletionBlock)(BOOL success); - (BOOL)isCategoryDownloading:(NSString *)itemId; - (BOOL)hasCategoryDownloaded:(NSString *)itemId; -- (void)loadTags:(LoadTagsCompletionBlock)completionBlock; +- (void)loadTagsWithLanguage:(NSString * _Nullable)languageCode completion:(LoadTagsCompletionBlock)completionBlock; - (void)setCategory:(MWMMarkGroupID)groupId tags:(NSArray *)tags; - (void)setCategory:(MWMMarkGroupID)groupId authorType:(MWMCategoryAuthorType)author; diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm similarity index 82% rename from iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm rename to iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index f5357fb1ce..73cbe5bd81 100644 --- a/iphone/Maps/Core/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -1,12 +1,10 @@ #import "MWMBookmarksManager.h" -#import "AppInfo.h" + #import "MWMCategory.h" #import "MWMCarPlayBookmarkObject.h" -#import "MWMTag+Convenience.h" -#import "MWMTagGroup+Convenience.h" #import "MWMCatalogObserver.h" -#import "Statistics.h" -#import "SwiftBridge.h" +#import "MWMTag.h" +#import "MWMTagGroup+Convenience.h" #include "Framework.h" @@ -23,19 +21,6 @@ #include -NSString * const CloudErrorToString(Cloud::SynchronizationResult result) -{ - switch (result) - { - case Cloud::SynchronizationResult::Success: return nil; - case Cloud::SynchronizationResult::AuthError: return kStatAuth; - case Cloud::SynchronizationResult::NetworkError: return kStatNetwork; - case Cloud::SynchronizationResult::DiskError: return kStatDisk; - case Cloud::SynchronizationResult::UserInterrupted: return kStatUserInterrupted; - case Cloud::SynchronizationResult::InvalidCall: return kStatInvalidCall; - } -} - @interface MWMBookmarksManager () @property(nonatomic, readonly) BookmarkManager & bm; @@ -113,22 +98,21 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) __weak auto wSelf = self; bookmarkCallbacks.m_onFileSuccess = [wSelf](std::string const & filePath, bool isTemporaryFile) { - __strong auto self = wSelf; - if (!self) - return; - [self processFileEvent:YES]; + __strong __typeof(self) self = wSelf; [self loopObservers:^(id observer) { if ([observer respondsToSelector:@selector(onBookmarksFileLoadSuccess)]) [observer onBookmarksFileLoadSuccess]; }]; - [Statistics logEvent:kStatEventName(kStatApplication, kStatImport) - withParameters:@{kStatValue: kStatKML}]; }; } { __weak auto wSelf = self; bookmarkCallbacks.m_onFileError = [wSelf](std::string const & filePath, bool isTemporaryFile) { - [wSelf processFileEvent:NO]; + __strong __typeof(self) self = wSelf; + [self loopObservers:^(id observer) { + if ([observer respondsToSelector:@selector(onBookmarksFileLoadError)]) + [observer onBookmarksFileLoadError]; + }]; }; } self.bm.SetAsyncLoadingCallbacks(std::move(bookmarkCallbacks)); @@ -204,60 +188,38 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) { auto onSynchronizationStarted = [self](Cloud::SynchronizationType type) { - if (type == Cloud::SynchronizationType::Backup) - { - [Statistics logEvent:kStatBookmarksSyncStarted]; - } - else - { - [self loopObservers:^(id observer) { - if ([observer respondsToSelector:@selector(onRestoringStarted)]) + [self loopObservers:^(id observer) { + if (type == Cloud::SynchronizationType::Backup) { + if ([observer respondsToSelector:@selector(onBackupStarted)]) { + [observer onBackupStarted]; + } + } else { + if ([observer respondsToSelector:@selector(onRestoringStarted)]) { [observer onRestoringStarted]; - }]; - } + } + } + }]; }; - auto onSynchronizationFinished = [self](Cloud::SynchronizationType type, Cloud::SynchronizationResult result, - std::string const & errorStr) + auto onSynchronizationFinished = [self](Cloud::SynchronizationType type, + Cloud::SynchronizationResult result, + std::string const & errorStr) { - if (result == Cloud::SynchronizationResult::Success) - { - [Statistics logEvent:type == Cloud::SynchronizationType::Backup ? kStatBookmarksSyncSuccess : - kStatBookmarksRestoreProposalSuccess]; - } - else if (auto const error = CloudErrorToString(result)) - { - [Statistics logEvent:type == Cloud::SynchronizationType::Backup ? kStatBookmarksSyncError : - kStatBookmarksRestoreProposalError - withParameters:@{kStatType: error, kStatError: @(errorStr.c_str())}]; - } - [self loopObservers:^(id observer) { if ([observer respondsToSelector:@selector(onSynchronizationFinished:)]) [observer onSynchronizationFinished:static_cast(base::Underlying(result))]; }]; }; - auto onRestoreRequested = [self](Cloud::RestoringRequestResult result, std::string const & deviceName, - uint64_t backupTimestampInMs) + auto onRestoreRequested = [self](Cloud::RestoringRequestResult result, + std::string const & deviceName, + uint64_t backupTimestampInMs) { auto const res = static_cast(base::Underlying(result)); NSDate * date = nil; - if (result == Cloud::RestoringRequestResult::BackupExists) - { - auto const interval = static_cast(backupTimestampInMs / 1000.); - date = [NSDate dateWithTimeIntervalSince1970:interval]; - } - else if (result == Cloud::RestoringRequestResult::NoBackup) - { - [Statistics logEvent:kStatBookmarksRestoreProposalError - withParameters:@{kStatType: kStatNoBackup, kStatError: @("")}]; - } - else if (result == Cloud::RestoringRequestResult::NotEnoughDiskSpace) - { - [Statistics logEvent:kStatBookmarksRestoreProposalError - withParameters:@{kStatType: kStatDisk, kStatError: @("Not enough disk space")}]; + if (result == Cloud::RestoringRequestResult::BackupExists) { + date = [NSDate dateWithTimeIntervalSince1970:backupTimestampInMs / 1000]; } [self loopObservers:^(id observer) { @@ -274,8 +236,10 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) }]; }; - self.bm.SetCloudHandlers(std::move(onSynchronizationStarted), std::move(onSynchronizationFinished), - std::move(onRestoreRequested), std::move(onRestoredFilesPrepared)); + self.bm.SetCloudHandlers(std::move(onSynchronizationStarted), + std::move(onSynchronizationFinished), + std::move(onRestoreRequested), + std::move(onRestoredFilesPrepared)); self.bm.LoadBookmarks(); } @@ -533,23 +497,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) - (void)requestRestoring { - auto const status = Platform::ConnectionStatus(); - auto statusStr = [](Platform::EConnectionType type) -> NSString * { - switch (type) - { - case Platform::EConnectionType::CONNECTION_NONE: - return kStatOffline; - case Platform::EConnectionType::CONNECTION_WWAN: - return kStatMobile; - case Platform::EConnectionType::CONNECTION_WIFI: - return kStatWifi; - } - } (status); - - [Statistics logEvent:kStatBookmarksRestoreProposalClick - withParameters:@{kStatNetwork : statusStr}]; - - if (status == Platform::EConnectionType::CONNECTION_NONE) + if (Platform::ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE) { [self loopObservers:^(id observer) { if ([observer respondsToSelector:@selector(onRestoringRequest:deviceName:backupDate:)]) @@ -568,7 +516,6 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) - (void)cancelRestoring { - [Statistics logEvent:kStatBookmarksRestoreProposalCancel]; self.bm.CancelCloudRestoring(); } @@ -617,10 +564,9 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) return urlString ? [NSURL URLWithString:urlString] : nil; } -- (NSURL *)webEditorUrlForCategoryId:(MWMMarkGroupID)groupId { +- (NSURL *)webEditorUrlForCategoryId:(MWMMarkGroupID)groupId language:(NSString *)languageCode { auto serverId = self.bm.GetCategoryServerId(groupId); - auto language = [[AppInfo sharedInfo] twoLetterLanguageId].UTF8String; - NSString * urlString = @(self.bm.GetCatalog().GetWebEditorUrl(serverId, language).c_str()); + NSString *urlString = @(self.bm.GetCatalog().GetWebEditorUrl(serverId, languageCode.UTF8String).c_str()); return [NSURL URLWithString:urlString]; } @@ -720,7 +666,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) return self.bm.GetCatalog().HasDownloaded(itemId.UTF8String); } -- (void)loadTags:(LoadTagsCompletionBlock)completionBlock { +- (void)loadTagsWithLanguage:(NSString *)languageCode completion:(LoadTagsCompletionBlock)completionBlock { auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups, uint32_t maxTagsCount) { if (success) @@ -737,8 +683,7 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) completionBlock(nil, 0); }; - self.bm.GetCatalog().RequestTagGroups([[AppInfo sharedInfo] twoLetterLanguageId].UTF8String, - std::move(onTagsCompletion)); + self.bm.GetCatalog().RequestTagGroups(languageCode.UTF8String, std::move(onTagsCompletion)); } - (void)setCategory:(MWMMarkGroupID)groupId tags:(NSArray *)tags @@ -810,19 +755,6 @@ NSString * const CloudErrorToString(Cloud::SynchronizationResult result) } } -- (void)processFileEvent:(BOOL)success -{ - UIAlertController * alert = [UIAlertController - alertControllerWithTitle:L(@"load_kmz_title") - message:success ? L(@"load_kmz_successful") : L(@"load_kmz_failed") - preferredStyle:UIAlertControllerStyleAlert]; - UIAlertAction * action = - [UIAlertAction actionWithTitle:L(@"ok") style:UIAlertActionStyleDefault handler:nil]; - [alert addAction:action]; - alert.preferredAction = action; - [[UIViewController topViewController] presentViewController:alert animated:YES completion:nil]; -} - - (NSString *)deviceId { return @(web_api::DeviceId().c_str()); } diff --git a/iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h similarity index 77% rename from iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h rename to iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h index 50431e79c9..697e1b6b61 100644 --- a/iphone/Maps/Core/Bookmarks/MWMBookmarksObserver.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h @@ -1,4 +1,7 @@ +#import + #import "MWMTypes.h" +NS_ASSUME_NONNULL_BEGIN typedef NS_ENUM(NSUInteger, MWMRestoringRequestResult) { @@ -22,14 +25,19 @@ typedef NS_ENUM(NSUInteger, MWMSynchronizationResult) @protocol MWMBookmarksObserver @optional - (void)onConversionFinish:(BOOL)success; -- (void)onRestoringRequest:(MWMRestoringRequestResult)result deviceName:(NSString * _Nullable)name backupDate:(NSDate * _Nullable)date; +- (void)onRestoringRequest:(MWMRestoringRequestResult)result + deviceName:(NSString * _Nullable)name + backupDate:(NSDate * _Nullable)date; - (void)onSynchronizationFinished:(MWMSynchronizationResult)result; +- (void)onBackupStarted; - (void)onRestoringStarted; - (void)onRestoringFilesPrepared; - (void)onBookmarksLoadFinished; - (void)onBookmarksFileLoadSuccess; +- (void)onBookmarksFileLoadError; - (void)onBookmarksCategoryDeleted:(MWMMarkGroupID)groupId; - (void)onBookmarkDeleted:(MWMMarkID)bookmarkId; - (void)onBookmarksCategoryFilePrepared:(MWMBookmarksShareStatus)status; @end +NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.h similarity index 84% rename from iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h rename to iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.h index e4976f46c9..838cb33b93 100644 --- a/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.h @@ -1,3 +1,8 @@ +#import +#import + +#import "MWMTypes.h" + NS_ASSUME_NONNULL_BEGIN @interface MWMCarPlayBookmarkObject : NSObject diff --git a/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm similarity index 97% rename from iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm rename to iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm index 6386ea8a22..4da3e7d02c 100644 --- a/iphone/Maps/Classes/CarPlay/MWMCarPlayBookmarkObject.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMCarPlayBookmarkObject.mm @@ -1,5 +1,5 @@ #import "MWMCarPlayBookmarkObject.h" -#include "Framework.h" +#include #include "geometry/mercator.hpp" @interface MWMCarPlayBookmarkObject() diff --git a/iphone/Maps/Bookmarks/Catalog/MWMCategory.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.h similarity index 93% rename from iphone/Maps/Bookmarks/Catalog/MWMCategory.h rename to iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.h index 3e729b5581..aa79c77dfe 100644 --- a/iphone/Maps/Bookmarks/Catalog/MWMCategory.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.h @@ -1,3 +1,7 @@ +#import + +#import "MWMTypes.h" + NS_ASSUME_NONNULL_BEGIN @class MWMBookmarksManager; diff --git a/iphone/Maps/Bookmarks/Catalog/MWMCategory.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.m similarity index 100% rename from iphone/Maps/Bookmarks/Catalog/MWMCategory.m rename to iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.m diff --git a/iphone/Maps/Common/AppInfo.h b/iphone/CoreApi/CoreApi/Common/AppInfo.h similarity index 72% rename from iphone/Maps/Common/AppInfo.h rename to iphone/CoreApi/CoreApi/Common/AppInfo.h index fa2e5eebcc..714e51f925 100644 --- a/iphone/Maps/Common/AppInfo.h +++ b/iphone/CoreApi/CoreApi/Common/AppInfo.h @@ -1,3 +1,5 @@ +#import + typedef NS_ENUM(NSInteger, MWMOpenGLDriver) { MWMOpenGLDriverRegular, MWMOpenGLDriverMetalPre103, // iOS 10..10.3 @@ -10,15 +12,10 @@ typedef NS_ENUM(NSInteger, MWMOpenGLDriver) { - (instancetype)init __attribute__((unavailable("init is not available"))); @property(nonatomic, readonly) NSString * countryCode; -@property(nonatomic, readonly) NSString * uniqueId; @property(nonatomic, readonly) NSString * bundleVersion; @property(nonatomic, readonly) NSString * buildNumber; -@property(nonatomic, readonly) NSUUID * advertisingId; -@property(nonatomic, readonly) NSString * inputLanguage; -@property(nonatomic, readonly) NSString * twoLetterInputLanguage; @property(nonatomic, readonly) NSString * languageId; @property(nonatomic, readonly) NSString * twoLetterLanguageId; -@property(nonatomic, readonly) NSDate * buildDate; @property(nonatomic, readonly) NSString * deviceModel; @property(nonatomic, readonly) MWMOpenGLDriver openGLDriver; @property(nonatomic, readonly) BOOL canMakeCalls; diff --git a/iphone/Maps/Common/AppInfo.mm b/iphone/CoreApi/CoreApi/Common/AppInfo.mm similarity index 66% rename from iphone/Maps/Common/AppInfo.mm rename to iphone/CoreApi/CoreApi/Common/AppInfo.mm index bd04e2fffb..db43fd5d87 100644 --- a/iphone/Maps/Common/AppInfo.mm +++ b/iphone/CoreApi/CoreApi/Common/AppInfo.mm @@ -1,6 +1,5 @@ #import "AppInfo.h" #import "MWMCommon.h" -#import "SwiftBridge.h" #include "platform/platform_ios.h" #include "platform/preferred_languages.hpp" @@ -8,25 +7,19 @@ #include -#import #import #import namespace { std::string const kCountryCodeKey = "CountryCode"; -std::string const kUniqueIdKey = "UniqueId"; } // namespace @interface AppInfo () @property(nonatomic) NSString * countryCode; -@property(nonatomic) NSString * uniqueId; @property(nonatomic) NSString * bundleVersion; @property(nonatomic) NSString * buildNumber; -@property(nonatomic) NSString * deviceInfo; -@property(nonatomic) NSUUID * advertisingId; -@property(nonatomic) NSDate * buildDate; @property(nonatomic) NSString * deviceModel; @end @@ -84,25 +77,6 @@ std::string const kUniqueIdKey = "UniqueId"; return _countryCode; } -- (NSString *)uniqueId -{ - if (!_uniqueId) - { - std::string uniqueString; - if (settings::Get(kUniqueIdKey, uniqueString)) // if id stored in settings - { - _uniqueId = @(uniqueString.c_str()); - } - else // if id not stored in settings - { - _uniqueId = [UIDevice.currentDevice.identifierForVendor UUIDString]; - if (_uniqueId) // then saving in settings - settings::Set(kUniqueIdKey, std::string(_uniqueId.UTF8String)); - } - } - return _uniqueId; -} - - (NSString *)bundleVersion { if (!_bundleVersion) @@ -117,34 +91,6 @@ std::string const kUniqueIdKey = "UniqueId"; return _buildNumber; } -- (NSUUID *)advertisingId -{ - if (!_advertisingId) - { - ASIdentifierManager * m = [ASIdentifierManager sharedManager]; - if (m.isAdvertisingTrackingEnabled) - _advertisingId = m.advertisingIdentifier; - } - return _advertisingId; -} - -- (NSString *)inputLanguage -{ - auto window = UIApplication.sharedApplication.keyWindow; - auto firstResponder = [window firstResponder]; - if (!firstResponder) - return self.languageId; - auto textInputMode = firstResponder.textInputMode; - if (!textInputMode) - return self.languageId; - return textInputMode.primaryLanguage; -} - -- (NSString *)twoLetterInputLanguage -{ - return @(languages::Normalize(self.inputLanguage.UTF8String).c_str()); -} - - (NSString *)languageId { return NSLocale.preferredLanguages.firstObject; @@ -156,19 +102,6 @@ std::string const kUniqueIdKey = "UniqueId"; return languageId ? @(languages::Normalize(languageId.UTF8String).c_str()) : @"en"; } -- (NSDate *)buildDate -{ - if (!_buildDate) - { - NSString * dateStr = [NSString stringWithFormat:@"%@ %@", @(__DATE__), @(__TIME__)]; - NSDateFormatter * dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"LLL d yyyy HH:mm:ss"]; - [dateFormatter setLocale:[[NSLocale alloc] initWithLocaleIdentifier:@"en_US_POSIX"]]; - _buildDate = [dateFormatter dateFromString:dateStr]; - } - return _buildDate; -} - - (NSString *)deviceModel { if (!_deviceModel) diff --git a/iphone/Maps/Common/MWMCommon.h b/iphone/CoreApi/CoreApi/Common/MWMCommon.h similarity index 100% rename from iphone/Maps/Common/MWMCommon.h rename to iphone/CoreApi/CoreApi/Common/MWMCommon.h diff --git a/iphone/CoreApi/CoreApi/Common/MWMTypes.h b/iphone/CoreApi/CoreApi/Common/MWMTypes.h new file mode 100644 index 0000000000..87755d0e65 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Common/MWMTypes.h @@ -0,0 +1,82 @@ +#import + +typedef void (^MWMVoidBlock)(void); +typedef void (^MWMStringBlock)(NSString *); +typedef void (^MWMURLBlock)(NSURL *); +typedef BOOL (^MWMCheckStringBlock)(NSString *); +typedef void (^MWMBoolBlock)(BOOL); + +typedef NS_ENUM(NSUInteger, MWMDayTime) { MWMDayTimeDay, MWMDayTimeNight }; + +typedef NS_ENUM(NSUInteger, MWMUnits) { MWMUnitsMetric, MWMUnitsImperial }; + +typedef NS_ENUM(NSUInteger, MWMTheme) { + MWMThemeDay, + MWMThemeNight, + MWMThemeVehicleDay, + MWMThemeVehicleNight, + MWMThemeAuto +}; + +typedef uint64_t MWMMarkID; +typedef uint64_t MWMTrackID; +typedef uint64_t MWMMarkGroupID; +typedef NSArray *MWMMarkIDCollection; +typedef NSArray *MWMTrackIDCollection; +typedef NSArray *MWMGroupIDCollection; + +typedef NS_ENUM(NSUInteger, MWMBookmarksShareStatus) { + MWMBookmarksShareStatusSuccess, + MWMBookmarksShareStatusEmptyCategory, + MWMBookmarksShareStatusArchiveError, + MWMBookmarksShareStatusFileError +}; + +typedef NS_ENUM(NSUInteger, MWMCategoryAccessStatus) { + MWMCategoryAccessStatusLocal, + MWMCategoryAccessStatusPublic, + MWMCategoryAccessStatusPrivate, + MWMCategoryAccessStatusAuthorOnly, + MWMCategoryAccessStatusOther +}; + +typedef NS_ENUM(NSUInteger, MWMCategoryAuthorType) { + MWMCategoryAuthorTypeLocal, + MWMCategoryAuthorTypeTraveler +}; + +//typedef NS_ENUM(NSUInteger, MWMRestoringRequestResult) +//{ +// MWMRestoringRequestResultBackupExists, +// MWMRestoringRequestResultNoBackup, +// MWMRestoringRequestResultNotEnoughDiskSpace, +// MWMRestoringRequestResultNoInternet, +// MWMRestoringRequestResultRequestError +//}; +// +//typedef NS_ENUM(NSUInteger, MWMSynchronizationResult) +//{ +// MWMSynchronizationResultSuccess, +// MWMSynchronizationResultAuthError, +// MWMSynchronizationResultNetworkError, +// MWMSynchronizationResultDiskError, +// MWMSynchronizationResultUserInterrupted, +// MWMSynchronizationResultInvalidCall +//}; +// +//@protocol MWMBookmarksObserver +//@optional +//- (void)onConversionFinish:(BOOL)success; +//- (void)onRestoringRequest:(MWMRestoringRequestResult)result deviceName:(NSString * _Nullable)name backupDate:(NSDate * _Nullable)date; +//- (void)onSynchronizationFinished:(MWMSynchronizationResult)result; +//- (void)onBackupStarted; +//- (void)onRestoringStarted; +//- (void)onRestoringFilesPrepared; +//- (void)onBookmarksLoadFinished; +//- (void)onBookmarksFileLoadSuccess; +//- (void)onBookmarksFileLoadError; +//- (void)onBookmarksCategoryDeleted:(MWMMarkGroupID)groupId; +//- (void)onBookmarkDeleted:(MWMMarkID)bookmarkId; +//- (void)onBookmarksCategoryFilePrepared:(MWMBookmarksShareStatus)status; +// +//@end diff --git a/iphone/CoreApi/CoreApi/CoreApi-swift.h b/iphone/CoreApi/CoreApi/CoreApi-swift.h new file mode 100644 index 0000000000..11405d6fed --- /dev/null +++ b/iphone/CoreApi/CoreApi/CoreApi-swift.h @@ -0,0 +1,19 @@ +//! Project version number for CoreApi. +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 diff --git a/iphone/CoreApi/CoreApi/CoreApi.h b/iphone/CoreApi/CoreApi/CoreApi.h new file mode 100644 index 0000000000..a39e62d954 --- /dev/null +++ b/iphone/CoreApi/CoreApi/CoreApi.h @@ -0,0 +1,21 @@ +//! Project version number for CoreApi. +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 diff --git a/iphone/Maps/Core/Framework/Framework.cpp b/iphone/CoreApi/CoreApi/Framework/Framework.cpp similarity index 100% rename from iphone/Maps/Core/Framework/Framework.cpp rename to iphone/CoreApi/CoreApi/Framework/Framework.cpp diff --git a/iphone/Maps/Core/Framework/Framework.h b/iphone/CoreApi/CoreApi/Framework/Framework.h similarity index 100% rename from iphone/Maps/Core/Framework/Framework.h rename to iphone/CoreApi/CoreApi/Framework/Framework.h diff --git a/iphone/Maps/Core/Framework/MWMFrameworkHelper.h b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h similarity index 60% rename from iphone/Maps/Core/Framework/MWMFrameworkHelper.h rename to iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h index 7f1e96bdb7..559d9f3a7f 100644 --- a/iphone/Maps/Core/Framework/MWMFrameworkHelper.h +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h @@ -1,31 +1,34 @@ +#import +#import + +#import "MWMTypes.h" + typedef NS_ENUM(NSUInteger, MWMZoomMode) { MWMZoomModeIn = 0, MWMZoomModeOut }; +typedef NS_ENUM(NSInteger, MWMConnectionType) { + MWMConnectionTypeNone, + MWMConnectionTypeWifi, + MWMConnectionTypeCellular +} NS_SWIFT_NAME(ConnectionType); + +NS_ASSUME_NONNULL_BEGIN + NS_SWIFT_NAME(FrameworkHelper) @interface MWMFrameworkHelper : NSObject -+ (void)processFirstLaunch; - -+ (void)setVisibleViewport:(CGRect)rect; - ++ (void)processFirstLaunch:(BOOL)hasLocation; ++ (void)setVisibleViewport:(CGRect)rect scaleFactor:(CGFloat)scale; + (void)setTheme:(MWMTheme)theme; - -+ (MWMDayTime)daytime; - -+ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action cancelAction:(MWMVoidBlock)cancel; - ++ (MWMDayTime)daytimeAtLocation:(nullable CLLocation *)location; + (void)createFramework; - + (BOOL)canUseNetwork; - + (BOOL)isNetworkConnected; - + (BOOL)isWiFiConnected; - ++ (MWMConnectionType)connectionType; + (MWMMarkGroupID)invalidCategoryId; - + (void)zoomMap:(MWMZoomMode)mode; + (void)moveMap:(UIOffset)offset; + (void)deactivateMapSelection:(BOOL)notifyUI NS_SWIFT_NAME(deactivateMapSelection(notifyUI:)); @@ -34,7 +37,8 @@ NS_SWIFT_NAME(FrameworkHelper) + (NSArray *)obtainLastSearchQueries; + (void)rotateMap:(double)azimuth animated:(BOOL)isAnimated; + (void)updatePositionArrowOffset:(BOOL)useDefault offset:(int)offsetY; - + (BOOL)shouldShowCrown; @end + +NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Core/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm similarity index 66% rename from iphone/Maps/Core/Framework/MWMFrameworkHelper.mm rename to iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index b8d0d856a7..e8fac4e21f 100644 --- a/iphone/Maps/Core/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -1,37 +1,27 @@ #import "MWMFrameworkHelper.h" -#import "MWMLocationManager.h" -#import "MapViewController.h" -#import "MWMAlertViewController.h" -#import "MWMCategory.h" -#import "Statistics.h" -#import "3party/Alohalytics/src/alohalytics_objc.h" -#import "EAGLView.h" -#include "Framework.h" +#include + +#include "base/sunrise_sunset.hpp" + +#include "map/crown.hpp" #include "platform/network_policy_ios.h" #include "platform/local_country_file_utils.hpp" -extern NSString * const kAlohalyticsTapEventKey; - -#include "base/sunrise_sunset.hpp" -#include "map/crown.hpp" - @implementation MWMFrameworkHelper -+ (void)processFirstLaunch ++ (void)processFirstLaunch:(BOOL)hasLocation { auto & f = GetFramework(); - CLLocation * lastLocation = [MWMLocationManager lastLocation]; - if (!lastLocation) + if (!hasLocation) f.SwitchMyPositionNextMode(); else f.RunFirstLaunchAnimation(); } -+ (void)setVisibleViewport:(CGRect)rect ++ (void)setVisibleViewport:(CGRect)rect scaleFactor:(CGFloat)scale { - CGFloat const scale = [MapViewController sharedController].mapView.contentScaleFactor; CGFloat const x0 = rect.origin.x * scale; CGFloat const y0 = rect.origin.y * scale; CGFloat const x1 = x0 + rect.size.width * scale; @@ -59,14 +49,13 @@ extern NSString * const kAlohalyticsTapEventKey; f.SetMapStyle(newStyle); } -+ (MWMDayTime)daytime ++ (MWMDayTime)daytimeAtLocation:(CLLocation *)location { - CLLocation * lastLocation = [MWMLocationManager lastLocation]; - if (!lastLocation) + if (!location) return MWMDayTimeDay; - auto const coord = lastLocation.coordinate; - auto const timeUtc = static_cast(NSDate.date.timeIntervalSince1970); - auto const dayTime = GetDayTime(timeUtc, coord.latitude, coord.longitude); + DayTimeType dayTime = GetDayTime(NSDate.date.timeIntervalSince1970, + location.coordinate.latitude, + location.coordinate.longitude); switch (dayTime) { case DayTimeType::Day: @@ -76,36 +65,6 @@ extern NSString * const kAlohalyticsTapEventKey; } } -+ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action cancelAction:(MWMVoidBlock)cancel -{ - switch (Platform::ConnectionStatus()) - { - case Platform::EConnectionType::CONNECTION_NONE: - [[MWMAlertViewController activeAlertController] presentNoConnectionAlert]; - if (cancel) - cancel(); - break; - case Platform::EConnectionType::CONNECTION_WIFI: - action(); - break; - case Platform::EConnectionType::CONNECTION_WWAN: - { - if (!GetFramework().GetDownloadingPolicy().IsCellularDownloadEnabled()) - { - [[MWMAlertViewController activeAlertController] presentNoWiFiAlertWithOkBlock:[action] { - GetFramework().GetDownloadingPolicy().EnableCellularDownload(true); - action(); - } andCancelBlock:cancel]; - } - else - { - action(); - } - break; - } - } -} - + (void)createFramework { UNUSED_VALUE(GetFramework()); } + (BOOL)canUseNetwork @@ -123,6 +82,17 @@ extern NSString * const kAlohalyticsTapEventKey; return GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_WIFI; } ++ (MWMConnectionType)connectionType { + switch (GetPlatform().ConnectionStatus()) { + case Platform::EConnectionType::CONNECTION_NONE: + return MWMConnectionTypeNone; + case Platform::EConnectionType::CONNECTION_WIFI: + return MWMConnectionTypeWifi; + case Platform::EConnectionType::CONNECTION_WWAN: + return MWMConnectionTypeCellular; + } +} + + (MWMMarkGroupID)invalidCategoryId { return kml::kInvalidMarkGroupId; } + (NSArray *)obtainLastSearchQueries @@ -140,8 +110,6 @@ extern NSString * const kAlohalyticsTapEventKey; + (void)zoomMap:(MWMZoomMode)mode { - [Statistics logEvent:kStatEventName(kStatZoom, kStatOut)]; - [Alohalytics logEvent:kAlohalyticsTapEventKey withValue:@"-"]; switch(mode) { case MWMZoomModeIn: GetFramework().Scale(Framework::SCALE_MAG, true); diff --git a/iphone/CoreApi/CoreApi/Info.plist b/iphone/CoreApi/CoreApi/Info.plist new file mode 100644 index 0000000000..e1fe4cfb7b --- /dev/null +++ b/iphone/CoreApi/CoreApi/Info.plist @@ -0,0 +1,22 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + + diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag+Convenience.h b/iphone/CoreApi/CoreApi/MWMTag+Convenience.h similarity index 100% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag+Convenience.h rename to iphone/CoreApi/CoreApi/MWMTag+Convenience.h diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag+Convenience.mm b/iphone/CoreApi/CoreApi/MWMTag+Convenience.mm similarity index 100% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag+Convenience.mm rename to iphone/CoreApi/CoreApi/MWMTag+Convenience.mm diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag.h b/iphone/CoreApi/CoreApi/MWMTag.h similarity index 86% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag.h rename to iphone/CoreApi/CoreApi/MWMTag.h index a61af26b57..9f092e0590 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag.h +++ b/iphone/CoreApi/CoreApi/MWMTag.h @@ -1,3 +1,5 @@ +#import + @interface MWMTag : NSObject @property(copy, nonatomic) NSString * tagId; diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag.m b/iphone/CoreApi/CoreApi/MWMTag.m similarity index 100% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTag.m rename to iphone/CoreApi/CoreApi/MWMTag.m diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup+Convenience.h b/iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.h similarity index 100% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup+Convenience.h rename to iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.h diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup+Convenience.mm b/iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.mm similarity index 100% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup+Convenience.mm rename to iphone/CoreApi/CoreApi/MWMTagGroup+Convenience.mm diff --git a/iphone/CoreApi/CoreApi/MWMTagGroup.h b/iphone/CoreApi/CoreApi/MWMTagGroup.h new file mode 100644 index 0000000000..54ccd5a044 --- /dev/null +++ b/iphone/CoreApi/CoreApi/MWMTagGroup.h @@ -0,0 +1,9 @@ +#import "MWMTag.h" + +@interface MWMTagGroup : NSObject + +@property(copy, nonatomic) NSString * name; +@property(copy, nonatomic) NSArray * tags; + +@end + diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup.m b/iphone/CoreApi/CoreApi/MWMTagGroup.m similarity index 100% rename from iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup.m rename to iphone/CoreApi/CoreApi/MWMTagGroup.m diff --git a/iphone/Maps/3party/MyTarget/MWMMyTarget.mm b/iphone/Maps/3party/MyTarget/MWMMyTarget.mm index 16b66b7d8a..31d05e3ff4 100644 --- a/iphone/Maps/3party/MyTarget/MWMMyTarget.mm +++ b/iphone/Maps/3party/MyTarget/MWMMyTarget.mm @@ -1,7 +1,6 @@ #import "MWMMyTarget.h" #import #import -#import "MWMCommon.h" #import "MWMSettings.h" #import "MapsAppDelegate.h" #import "Statistics.h" diff --git a/iphone/Maps/Bookmarks/BookmarksSection.h b/iphone/Maps/Bookmarks/BookmarksSection.h index 8af19136a9..dbf3c8802c 100644 --- a/iphone/Maps/Bookmarks/BookmarksSection.h +++ b/iphone/Maps/Bookmarks/BookmarksSection.h @@ -1,4 +1,4 @@ -#import "MWMTypes.h" +#import #import "TableSectionDataSource.h" NS_ASSUME_NONNULL_BEGIN diff --git a/iphone/Maps/Bookmarks/BookmarksSection.mm b/iphone/Maps/Bookmarks/BookmarksSection.mm index 02e675e799..d4dc7371b2 100644 --- a/iphone/Maps/Bookmarks/BookmarksSection.mm +++ b/iphone/Maps/Bookmarks/BookmarksSection.mm @@ -1,11 +1,10 @@ #import "BookmarksSection.h" #import "CircleView.h" #import "ColorPickerView.h" -#import "MWMBookmarksManager.h" #import "MWMLocationHelpers.h" #import "MWMSearchManager.h" -#include "Framework.h" +#import #include "geometry/distance_on_sphere.hpp" diff --git a/iphone/Maps/Bookmarks/BookmarksVC.h b/iphone/Maps/Bookmarks/BookmarksVC.h index b3e2142aca..043f1e9103 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.h +++ b/iphone/Maps/Bookmarks/BookmarksVC.h @@ -1,5 +1,5 @@ #import "MWMViewController.h" -#import "MWMTypes.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm index 1adbdbe26f..d4875e94cd 100644 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ b/iphone/Maps/Bookmarks/BookmarksVC.mm @@ -1,16 +1,15 @@ #import "BookmarksVC.h" #import "BookmarksSection.h" #import "InfoSection.h" -#import "MWMBookmarksManager.h" #import "MWMCategoryInfoCell.h" -#import "MWMCommon.h" + #import "MWMKeyboard.h" #import "MWMLocationObserver.h" #import "MWMSearchNoResults.h" #import "SwiftBridge.h" #import "TracksSection.h" -#include "Framework.h" +#import #include "map/bookmarks_search_params.hpp" diff --git a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift index bee7e4a7b6..d33434b5a3 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift @@ -227,6 +227,16 @@ extension BMCDefaultViewModel { } func requestRestoring() { + let statusStr: String; + switch FrameworkHelper.connectionType() { + case .none: + statusStr = kStatOffline + case .wifi: + statusStr = kStatWifi + case .cellular: + statusStr = kStatMobile + } + Statistics.logEvent(kStatBookmarksRestoreProposalClick, withParameters: [kStatNetwork : statusStr]) manager.requestRestoring() } @@ -240,10 +250,15 @@ extension BMCDefaultViewModel { } manager.cancelRestoring() + Statistics.logEvent(kStatBookmarksRestoreProposalCancel) } } extension BMCDefaultViewModel: MWMBookmarksObserver { + func onBackupStarted() { + Statistics.logEvent(kStatBookmarksSyncStarted) + } + func onRestoringStarted() { filesPrepared = false MWMAlertViewController.activeAlert().presentSpinnerAlert(withTitle: L("bookmarks_restore_process")) @@ -307,15 +322,20 @@ extension BMCDefaultViewModel: MWMBookmarksObserver { }, leftButtonAction: cancelAction) case .noBackup: + Statistics.logEvent(kStatBookmarksRestoreProposalError, + withParameters: [kStatType: kStatNoBackup, kStatError: ""]) MWMAlertViewController.activeAlert().presentDefaultAlert(withTitle: L("bookmarks_restore_empty_title"), message: L("bookmarks_restore_empty_message"), rightButtonTitle: L("ok"), leftButtonTitle: nil, rightButtonAction: nil) - case .notEnoughDiskSpace: MWMAlertViewController.activeAlert().presentNotEnoughSpaceAlert() - - case .requestError: assertionFailure() + case .notEnoughDiskSpace: + Statistics.logEvent(kStatBookmarksRestoreProposalError, + withParameters: [kStatType: kStatDisk, kStatError: "Not enough disk space"]) + MWMAlertViewController.activeAlert().presentNotEnoughSpaceAlert() + case .requestError: + assertionFailure() } } } @@ -346,4 +366,13 @@ extension BMCDefaultViewModel: MWMBookmarksObserver { view?.update(sections: [.categories]) view?.conversionFinished(success: success) } + + func onBookmarksFileLoadSuccess() { + Statistics.logEvent(kStatEventName(kStatApplication, kStatImport), withParameters: [kStatValue : kStatKML]) + MWMAlertViewController.activeAlert().presentInfoAlert(L("load_kmz_title"), text: L("load_kmz_successful")) + } + + func onBookmarksFileLoadError() { + MWMAlertViewController.activeAlert().presentInfoAlert(L("load_kmz_title"), text: L("load_kmz_failed")) + } } diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift index 7a9bf14c63..3e52bfa487 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift @@ -97,7 +97,8 @@ final class EditOnWebViewController: MWMViewController { } private func presentSharingOptions() { - guard let url = MWMBookmarksManager.shared().webEditorUrl(forCategoryId: category.categoryId) else { + guard let url = MWMBookmarksManager.shared().webEditorUrl(forCategoryId: category.categoryId, + language: AppInfo.shared()?.twoLetterLanguageId ?? "en") else { assert(false, "Unexpected empty url for category \(category.title)") return } diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup.h b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup.h deleted file mode 100644 index 2f7c0bd9a0..0000000000 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/MWMTagGroup.h +++ /dev/null @@ -1,9 +0,0 @@ -#import "MWMTag.h" - -@interface MWMTagGroup : NSObject - -@property (copy, nonatomic) NSString * name; -@property (copy, nonatomic) NSArray * tags; - -@end - diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift index 749f53d910..71b7c1e16c 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/SharingTagsViewController.swift @@ -1,3 +1,4 @@ + protocol SharingTagsViewControllerDelegate: AnyObject { func sharingTagsViewController(_ viewController: SharingTagsViewController, didSelect tags: [MWMTag]) func sharingTagsViewControllerDidCancel(_ viewController: SharingTagsViewController) diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagCollectionViewCell.swift b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagCollectionViewCell.swift index 7b9d216073..abcfd3e3bd 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagCollectionViewCell.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagCollectionViewCell.swift @@ -1,3 +1,4 @@ + final class TagCollectionViewCell: UICollectionViewCell { @IBOutlet private weak var title: UILabel! diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagSectionHeaderView.swift b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagSectionHeaderView.swift index 3b396c8524..7c095ec4c7 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagSectionHeaderView.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagSectionHeaderView.swift @@ -1,3 +1,4 @@ + final class TagSectionHeaderView: UICollectionReusableView { @IBOutlet weak var title: UILabel! diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsDataSource.swift b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsDataSource.swift index 569d1de523..477511e40e 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsDataSource.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsDataSource.swift @@ -1,9 +1,10 @@ + final class TagsDataSource: NSObject { private var tagGroups: [MWMTagGroup] = [] private var maxTagsNumber: Int = 0 func loadTags(onComplete: @escaping (Bool) -> Void) { - MWMBookmarksManager.shared().loadTags { tags, maxTagsNumber in + MWMBookmarksManager.shared().loadTags(withLanguage: AppInfo.shared()?.twoLetterLanguageId) { tags, maxTagsNumber in if let tags = tags { self.tagGroups = tags self.maxTagsNumber = maxTagsNumber diff --git a/iphone/Maps/Bookmarks/InfoSection.mm b/iphone/Maps/Bookmarks/InfoSection.mm index 640b005e09..45d6882cc0 100644 --- a/iphone/Maps/Bookmarks/InfoSection.mm +++ b/iphone/Maps/Bookmarks/InfoSection.mm @@ -2,7 +2,7 @@ #import "MWMCategoryInfoCell.h" #import "SwiftBridge.h" -#include "Framework.h" +#include @interface InfoSection () { kml::MarkGroupId _categoryId; diff --git a/iphone/Maps/Bookmarks/SelectSetVC.mm b/iphone/Maps/Bookmarks/SelectSetVC.mm index 4e4efc9d02..edd546b3f2 100644 --- a/iphone/Maps/Bookmarks/SelectSetVC.mm +++ b/iphone/Maps/Bookmarks/SelectSetVC.mm @@ -2,7 +2,7 @@ #import "SwiftBridge.h" #import "UIViewController+Navigation.h" -#include "Framework.h" +#import @interface SelectSetVC () { diff --git a/iphone/Maps/Bookmarks/TracksSection.h b/iphone/Maps/Bookmarks/TracksSection.h index 042b38bb6b..98b7aa590a 100644 --- a/iphone/Maps/Bookmarks/TracksSection.h +++ b/iphone/Maps/Bookmarks/TracksSection.h @@ -1,4 +1,4 @@ -#import "MWMTypes.h" +#import #import "TableSectionDataSource.h" NS_ASSUME_NONNULL_BEGIN diff --git a/iphone/Maps/Bookmarks/TracksSection.mm b/iphone/Maps/Bookmarks/TracksSection.mm index 2733bef0c0..4e71be0a7f 100644 --- a/iphone/Maps/Bookmarks/TracksSection.mm +++ b/iphone/Maps/Bookmarks/TracksSection.mm @@ -1,9 +1,9 @@ #import "TracksSection.h" #import "CircleView.h" -#import "MWMBookmarksManager.h" +#import #import "Statistics.h" -#include "Framework.h" +#include namespace { CGFloat const kPinDiameter = 22.0f; diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index cf84e81a11..c25d545f48 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -15,16 +15,16 @@ #import "3party/Alohalytics/src/alohalytics_objc.h" #import "MPNativeAd+MWM.h" #import "MPNativeAd.h" -#import "MWMTypes.h" #import "MoPub-Bridging-Header.h" #import "UIKitCategories.h" #import "private.h" -#import "AppInfo.h" +#import + #import "BookmarksVC.h" #import "FacebookNativeAdAdapter.h" -#import "LocalNotificationManager.h" +//#import "LocalNotificationManager.h" #import "CatalogPromoItem.h" #import "CoreNotificationWrapper.h" #import "DeepLinkHelper.h" @@ -34,14 +34,12 @@ #import "MWMAuthorizationViewModel.h" #import "MWMAvailableAreaAffectDirection.h" #import "MWMBanner.h" -#import "MWMBookmarksManager.h" #import "MWMBottomMenuViewController.h" #import "MWMCircularProgress+Swift.h" #import "MWMCollectionViewController.h" #import "MWMConsts.h" #import "MWMController.h" #import "MWMEditorHelper.h" -#import "MWMFrameworkHelper.h" #import "MWMGeoTrackerCore.h" #import "MWMKeyboard.h" #import "MWMLocationManager.h" @@ -84,14 +82,9 @@ #import "UIImageView+WebImage.h" #import "UIViewController+Navigation.h" #import "WebViewController.h" -#import "MWMCategory.h" -#import "MWMCarPlayBookmarkObject.h" -#import "MWMCatalogCommon.h" #import "MWMEye.h" #import "MWMPurchaseManager.h" #import "MWMPurchaseValidation.h" -#import "MWMTag.h" -#import "MWMTagGroup.h" #import "EAGLView.h" #import "MWMCarPlaySearchService.h" #import "MWMCarPlaySearchResultObject.h" @@ -99,4 +92,3 @@ #import "MWMRouterResultCode.h" #import "MWMLocationModeListener.h" #import "MWMSpeedCameraManagerMode.h" -#import "MWMUTM.h" diff --git a/iphone/Maps/Categories/UIButton+Orientation.mm b/iphone/Maps/Categories/UIButton+Orientation.mm index f982325b90..4a8df5e65a 100644 --- a/iphone/Maps/Categories/UIButton+Orientation.mm +++ b/iphone/Maps/Categories/UIButton+Orientation.mm @@ -1,6 +1,7 @@ -#import "MWMCommon.h" #import "UIButton+Orientation.h" +#import + @implementation UIButton (Orientation) - (void)matchInterfaceOrientation diff --git a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm index 6a771c1af6..05491d13e5 100644 --- a/iphone/Maps/Categories/UIFont+MapsMeFonts.mm +++ b/iphone/Maps/Categories/UIFont+MapsMeFonts.mm @@ -1,5 +1,3 @@ -#import "MWMCommon.h" - NSString * const kMediumFontName = @"HelveticaNeue-Medium"; NSString * const kLightFontName = @"HelveticaNeue-Light"; diff --git a/iphone/Maps/Categories/UIImageView+Coloring.mm b/iphone/Maps/Categories/UIImageView+Coloring.mm index 2f98cad71a..50e0c8b7ad 100644 --- a/iphone/Maps/Categories/UIImageView+Coloring.mm +++ b/iphone/Maps/Categories/UIImageView+Coloring.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "UIImageView+Coloring.h" #import diff --git a/iphone/Maps/Categories/UIKitCategories.h b/iphone/Maps/Categories/UIKitCategories.h index b842f83649..6a79ddbfc9 100644 --- a/iphone/Maps/Categories/UIKitCategories.h +++ b/iphone/Maps/Categories/UIKitCategories.h @@ -1,3 +1,5 @@ +#import + static inline CGPoint SubtractCGPoint(CGPoint p1, CGPoint p2) { return CGPointMake(p1.x - p2.x, p1.y - p2.y); @@ -38,13 +40,6 @@ static inline CGFloat LengthCGPoint(CGPoint point) @property (nonatomic) CGFloat height; @property (nonatomic) CGSize size; -+ (void)animateWithDuration:(NSTimeInterval)duration - delay:(NSTimeInterval)delay - damping:(double)dampingRatio - initialVelocity:(double)springVelocity - options:(UIViewAnimationOptions)options - animations:(MWMVoidBlock)animations - completion:(void (^)(BOOL finished))completion; - (void)sizeToIntegralFit; @end @@ -69,24 +64,6 @@ static inline CGFloat LengthCGPoint(CGPoint point) @end - -typedef void (^MWMAlertViewBlock) (UIAlertView * alertView); -typedef void (^MWMAlertViewCompletionBlock) (UIAlertView * alertView, NSInteger buttonIndex); - -@interface UIAlertView (Blocks) - -@property (copy, nonatomic) MWMAlertViewCompletionBlock tapBlock; -@property (copy, nonatomic) MWMAlertViewCompletionBlock willDismissBlock; -@property (copy, nonatomic) MWMAlertViewCompletionBlock didDismissBlock; - -@property (copy, nonatomic) MWMAlertViewBlock willPresentBlock; -@property (copy, nonatomic) MWMAlertViewBlock didPresentBlock; -@property (copy, nonatomic) MWMAlertViewBlock cancelBlock; - -@property (copy, nonatomic) BOOL(^shouldEnableFirstOtherButtonBlock)(UIAlertView * alertView); - -@end - @interface UIViewController (Safari) - (void)openUrl:(NSURL *)url; diff --git a/iphone/Maps/Categories/UIKitCategories.mm b/iphone/Maps/Categories/UIKitCategories.mm index 4027829a6e..3d91f832d5 100644 --- a/iphone/Maps/Categories/UIKitCategories.mm +++ b/iphone/Maps/Categories/UIKitCategories.mm @@ -1,5 +1,4 @@ #import "UIKitCategories.h" -#import "MWMCommon.h" #import "UIButton+RuntimeAttributes.h" #import "UIImageView+Coloring.h" @@ -75,23 +74,6 @@ self.frame = CGRectMake(self.frame.origin.x, self.frame.origin.y, size.width, size.height); } -+ (void)animateWithDuration:(NSTimeInterval)duration - delay:(NSTimeInterval)delay - damping:(double)dampingRatio - initialVelocity:(double)springVelocity - options:(UIViewAnimationOptions)options - animations:(MWMVoidBlock)animations - completion:(void (^)(BOOL))completion -{ - [UIView animateWithDuration:duration - delay:delay - usingSpringWithDamping:dampingRatio - initialSpringVelocity:springVelocity - options:options - animations:animations - completion:completion]; -} - - (void)sizeToIntegralFit { [self sizeToFit]; diff --git a/iphone/Maps/Categories/UIViewController+Navigation.mm b/iphone/Maps/Categories/UIViewController+Navigation.mm index fe1ad3fa31..cd30380d1c 100644 --- a/iphone/Maps/Categories/UIViewController+Navigation.mm +++ b/iphone/Maps/Categories/UIViewController+Navigation.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "UIButton+Orientation.h" #import "UIViewController+Navigation.h" diff --git a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift index 3d1ef94730..b842e32c0a 100644 --- a/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift +++ b/iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift @@ -63,7 +63,7 @@ final class ListTemplateBuilder { } private class func obtainHistory(template: CPListTemplate) { - let searchQueries = FrameworkHelper.obtainLastSearchQueries() ?? [] + let searchQueries = FrameworkHelper.obtainLastSearchQueries() let items = searchQueries.map({ (text) -> CPListItem in let item = CPListItem(text: text, detailText: nil, image: UIImage(named: "ic_carplay_recent")) item.userInfo = ListItemInfo(type: CPConstants.ListItemType.history, diff --git a/iphone/Maps/Classes/ColorPickerView.mm b/iphone/Maps/Classes/ColorPickerView.mm index af2452d823..08c23466f2 100644 --- a/iphone/Maps/Classes/ColorPickerView.mm +++ b/iphone/Maps/Classes/ColorPickerView.mm @@ -2,7 +2,7 @@ #import "CircleView.h" #import -#include "Framework.h" +#include #define BUTTONMARGIN 7 #define BUTTONMARGINHEIGHT 16 diff --git a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm index d4f404c173..3deea9f061 100644 --- a/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm +++ b/iphone/Maps/Classes/Components/MWMAddPlaceNavigationBar.mm @@ -1,7 +1,6 @@ #import "MWMAddPlaceNavigationBar.h" -#import "MWMCommon.h" -#include "Framework.h" +#include @interface MWMAddPlaceNavigationBar () diff --git a/iphone/Maps/Classes/Components/MWMButton.mm b/iphone/Maps/Classes/Components/MWMButton.mm index 326fc2bf08..b4e8f1d4fc 100644 --- a/iphone/Maps/Classes/Components/MWMButton.mm +++ b/iphone/Maps/Classes/Components/MWMButton.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMButton.h" namespace diff --git a/iphone/Maps/Classes/Components/MWMDropDown.mm b/iphone/Maps/Classes/Components/MWMDropDown.mm index daf77aca0d..abdd334b81 100644 --- a/iphone/Maps/Classes/Components/MWMDropDown.mm +++ b/iphone/Maps/Classes/Components/MWMDropDown.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMDropDown.h" namespace diff --git a/iphone/Maps/Classes/Components/MWMMailViewController.mm b/iphone/Maps/Classes/Components/MWMMailViewController.mm index 82134a77d3..88a2134727 100644 --- a/iphone/Maps/Classes/Components/MWMMailViewController.mm +++ b/iphone/Maps/Classes/Components/MWMMailViewController.mm @@ -1,5 +1,4 @@ #import "MWMMailViewController.h" -#import "MWMCommon.h" @implementation MWMMailViewController diff --git a/iphone/Maps/Classes/Components/MWMMultilineLabel.mm b/iphone/Maps/Classes/Components/MWMMultilineLabel.mm index d17a3fdb47..893836b6d3 100644 --- a/iphone/Maps/Classes/Components/MWMMultilineLabel.mm +++ b/iphone/Maps/Classes/Components/MWMMultilineLabel.mm @@ -1,6 +1,7 @@ -#import "MWMCommon.h" #import "MWMMultilineLabel.h" +#import + @implementation MWMMultilineLabel - (void)setBounds:(CGRect)bounds diff --git a/iphone/Maps/Classes/Components/MWMNavigationController.m b/iphone/Maps/Classes/Components/MWMNavigationController.m index 0e94c89b13..79c82f3fb9 100644 --- a/iphone/Maps/Classes/Components/MWMNavigationController.m +++ b/iphone/Maps/Classes/Components/MWMNavigationController.m @@ -1,5 +1,4 @@ #import "MWMNavigationController.h" -#import "MWMCommon.h" #import "MWMController.h" #import diff --git a/iphone/Maps/Classes/Components/MWMViewController.mm b/iphone/Maps/Classes/Components/MWMViewController.mm index 96850837a6..56c22db117 100644 --- a/iphone/Maps/Classes/Components/MWMViewController.mm +++ b/iphone/Maps/Classes/Components/MWMViewController.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MapsAppDelegate.h" #import "MapViewController.h" #import "MWMAlertViewController.h" diff --git a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm index c4d008f848..81c381cd09 100644 --- a/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm +++ b/iphone/Maps/Classes/CustomAlert/AlertController/MWMAlertViewController.mm @@ -1,5 +1,4 @@ #import "MWMAlertViewController+CPP.h" -#import "MWMCommon.h" #import "MWMController.h" #import "MWMDownloadTransitMapAlert.h" #import "MWMLocationAlert.h" diff --git a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm index b25266b8ad..3753af8a12 100644 --- a/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/BaseAlert/MWMAlert.mm @@ -1,6 +1,5 @@ #import "MWMAlert+CPP.h" #import "MWMAlertViewController.h" -#import "MWMCommon.h" #import "MWMDefaultAlert.h" #import "MWMDownloadTransitMapAlert.h" #import "MWMEditorViralAlert.h" diff --git a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm index 57cfda6540..5db59c1bbd 100644 --- a/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DefaultAlert/MWMDefaultAlert.mm @@ -1,7 +1,7 @@ #import "MWMDefaultAlert.h" #import "Statistics.h" -#include "Framework.h" +#include static CGFloat const kDividerTopConstant = -8.; diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm index 2431e5df20..2ab9a80fd1 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloadTransitMapAlert.mm @@ -1,6 +1,5 @@ #import "MWMDownloadTransitMapAlert.h" #import "MWMCircularProgress.h" -#import "MWMCommon.h" #import "MWMDownloaderDialogCell.h" #import "MWMDownloaderDialogHeader.h" #import "MWMFrameworkListener.h" @@ -9,7 +8,7 @@ #import "SwiftBridge.h" #import "UILabel+RuntimeAttributes.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm index 33b393ce4c..b6f9d531c7 100644 --- a/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm +++ b/iphone/Maps/Classes/CustomAlert/DownloadTransitMapsAlert/MWMDownloaderDialogHeader.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMDownloaderDialogHeader.h" #import "MWMDownloadTransitMapAlert.h" #import "Statistics.h" diff --git a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm index 2b014e69f5..3f0832d21f 100644 --- a/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/LocationAlert/MWMLocationAlert.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMLocationAlert.h" #import "MWMAlertViewController.h" #import "Statistics.h" diff --git a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm index cb2031a203..74dcd61406 100644 --- a/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/MWMEditorViralAlert.mm @@ -3,7 +3,6 @@ #import "MWMAlertViewController.h" #import "MWMAuthorizationCommon.h" #import "MWMBottomMenuViewController.h" -#import "MWMCommon.h" #import "Statistics.h" @interface MWMEditorViralAlert () diff --git a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm index d9183763d9..e96f99b8bb 100644 --- a/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RateAlert/MWMRateAlert.mm @@ -1,5 +1,7 @@ #import "MWMRateAlert.h" -#import "AppInfo.h" + +#import + #import "MWMAlertViewController.h" #import "MWMMailViewController.h" #import "Statistics.h" diff --git a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm index 2f6cae629f..4d5eee5d5a 100644 --- a/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/RoutingDisclaimerAlert/MWMRoutingDisclaimerAlert.mm @@ -1,5 +1,4 @@ #import "MWMRoutingDisclaimerAlert.h" -#import "MWMCommon.h" #import "MWMAlertViewController.h" #import "Statistics.h" diff --git a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm index 2519cda3c5..08a7869e50 100644 --- a/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm +++ b/iphone/Maps/Classes/CustomAlert/SearchAlert/MWMSearchNoResultsAlert.mm @@ -1,9 +1,8 @@ #import "MWMSearchNoResultsAlert.h" -#import "MWMCommon.h" #import "MWMSearch.h" #import "Statistics.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm index 240d6caf81..976945e44c 100644 --- a/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm +++ b/iphone/Maps/Classes/CustomViews/CircularProgress/MWMCircularProgressView.mm @@ -1,5 +1,4 @@ #import "MWMCircularProgressView.h" -#import "MWMCommon.h" #import "SwiftBridge.h" #import "UIImageView+Coloring.h" diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm index f62afcc009..ffd16a0091 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationCommon.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMAuthorizationCommon.h" #import "UIButton+RuntimeAttributes.h" diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm index 2dbf65e0c2..f5eca1a396 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationLoginViewController.mm @@ -4,7 +4,7 @@ #import "MWMAuthorizationWebViewLoginViewController.h" #import "Statistics.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm index 8f22e65392..5b9f91d3cd 100644 --- a/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm +++ b/iphone/Maps/Classes/CustomViews/Login/MWMAuthorizationWebViewLoginViewController.mm @@ -1,5 +1,4 @@ #import "MWMAuthorizationWebViewLoginViewController.h" -#import "MWMCommon.h" #import "MWMAlertViewController.h" #import "MWMAuthorizationCommon.h" #import "MWMCircularProgress.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm index 1baaa943a8..1c9b6d75d0 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/APIBar/MWMAPIBar.mm @@ -1,9 +1,8 @@ #import "MWMAPIBar.h" #import "MWMAPIBarView.h" -#import "MWMCommon.h" #import "Statistics.h" -#include "Framework.h" +#include static NSString * const kKeyPath = @"subviews"; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm index 6c85ab920f..d09a844e6b 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/MWMMapViewControlsManager.mm @@ -1,7 +1,6 @@ #import "MWMMapViewControlsManager.h" #import "MWMAddPlaceNavigationBar.h" #import "MWMBottomMenuControllerProtocol.h" -#import "MWMCommon.h" #import "MWMMapDownloadDialog.h" #import "MWMNetworkPolicy.h" #import "MWMPlacePageManager.h" @@ -15,7 +14,8 @@ #import "MapsAppDelegate.h" #import "SwiftBridge.h" -#include "Framework.h" +#include +#import #include "platform/local_country_file_utils.hpp" #include "platform/platform.hpp" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm index 6f4f0f5c8d..362faa5ef7 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtons.mm @@ -9,7 +9,7 @@ #import "SwiftBridge.h" #import "3party/Alohalytics/src/alohalytics_objc.h" -#include "Framework.h" +#include extern NSString * const kAlohalyticsTapEventKey; diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm index 1591580395..46e323bae5 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/SideButtons/MWMSideButtonsView.mm @@ -1,5 +1,4 @@ #import "MWMSideButtonsView.h" -#import "MWMCommon.h" #import "MWMBottomMenuViewController.h" #import "MWMButton.h" #import "MWMMapViewControlsCommon.h" diff --git a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm index eb35d6fcf1..2e4a5305f1 100644 --- a/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm +++ b/iphone/Maps/Classes/CustomViews/MapViewControls/TrafficButton/MWMTrafficButtonViewController.mm @@ -1,7 +1,6 @@ #import "MWMTrafficButtonViewController.h" #import "MWMAlertViewController.h" #import "MWMButton.h" -#import "MWMCommon.h" #import "MWMMapViewControlsCommon.h" #import "MWMMapViewControlsManager.h" #import "MWMTrafficManager.h" diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm index 0cb51a0a82..dfd52569aa 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/MWMNavigationDashboardEntity.mm @@ -5,7 +5,7 @@ #import "MWMSettings.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "map/routing_manager.hpp" diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm index a4b8d556fe..972378f1bc 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMRoutePreview.mm @@ -1,6 +1,5 @@ #import "MWMRoutePreview.h" #import "MWMCircularProgress.h" -#import "MWMCommon.h" #import "MWMLocationManager.h" #import "MWMNavigationDashboardEntity.h" #import "MWMNavigationDashboardManager.h" diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm index ed7ca9ad91..499cd4be9e 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMTaxiPreviewDataSource.mm @@ -2,7 +2,7 @@ #import "MWMNetworkPolicy.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "partners_api/taxi_provider.hpp" diff --git a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m index 7f5710fc5d..b2aa95b28f 100644 --- a/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m +++ b/iphone/Maps/Classes/CustomViews/NavigationDashboard/Views/RoutePreview/MWMiPhoneRoutePreview.m @@ -1,6 +1,5 @@ #import "MWMiPhoneRoutePreview.h" #import "MWMAvailableAreaAffectDirection.h" -#import "MWMCommon.h" @interface MWMRoutePreview () diff --git a/iphone/Maps/Classes/DeepLinkHelper.mm b/iphone/Maps/Classes/DeepLinkHelper.mm index 33bc99eb15..a4acb8e437 100644 --- a/iphone/Maps/Classes/DeepLinkHelper.mm +++ b/iphone/Maps/Classes/DeepLinkHelper.mm @@ -2,7 +2,7 @@ #import -#import "Framework.h" +#include #import "Statistics.h" #import "MapViewController.h" #import "MapsAppDelegate.h" diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index 340a883fe2..d8ab34bde4 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -13,7 +13,7 @@ #include "drape/visual_scale.hpp" #include "drape_frontend/visual_params.hpp" -#include "Framework.h" +#include #ifdef OMIM_METAL_AVAILABLE #import "MetalContextFactory.h" diff --git a/iphone/Maps/Classes/MWMSegue.m b/iphone/Maps/Classes/MWMSegue.m index 6e08bea8a8..926470b260 100644 --- a/iphone/Maps/Classes/MWMSegue.m +++ b/iphone/Maps/Classes/MWMSegue.m @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMSegue.h" @implementation MWMSegue diff --git a/iphone/Maps/Classes/MWMTextView.m b/iphone/Maps/Classes/MWMTextView.m index 1aa749b363..35b6928dcd 100644 --- a/iphone/Maps/Classes/MWMTextView.m +++ b/iphone/Maps/Classes/MWMTextView.m @@ -1,5 +1,4 @@ #import "MWMTextView.h" -#import "MWMCommon.h" @interface MWMTextView () diff --git a/iphone/Maps/Classes/MapViewController.h b/iphone/Maps/Classes/MapViewController.h index 22813f4cb6..65836c7034 100644 --- a/iphone/Maps/Classes/MapViewController.h +++ b/iphone/Maps/Classes/MapViewController.h @@ -1,7 +1,8 @@ #import "MWMMapDownloaderMode.h" #import "MWMViewController.h" #import "MWMMyPositionMode.h" -#import "MWMUTM.h" + +#import @class MWMWelcomePageController; @class MWMMapViewControlsManager; diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index 9cb019ed78..e96eb1cf44 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -5,8 +5,7 @@ #import "MWMAuthorizationCommon.h" #import "MWMAuthorizationWebViewLoginViewController.h" #import "MWMAutoupdateController.h" -#import "MWMBookmarksManager.h" -#import "MWMCommon.h" +#import #import "MWMEditBookmarkController.h" #import "MWMEditorViewController.h" #import "MWMFacilitiesController.h" @@ -19,9 +18,9 @@ #import "MapsAppDelegate.h" #import "SwiftBridge.h" #import "MWMLocationModeListener.h" -#import "MWMUTM.h" -#include "Framework.h" +#include +#import #include "drape_frontend/user_event_stream.hpp" @@ -830,7 +829,7 @@ NSString * const kHotelFacilitiesSegue = @"Map2FacilitiesSegue"; [[self.mapView.leadingAnchor constraintEqualToAnchor:self.view.leadingAnchor] setActive:YES]; [[self.mapView.trailingAnchor constraintEqualToAnchor:self.view.trailingAnchor] setActive:YES]; self.controlsView.hidden = NO; - [MWMFrameworkHelper setVisibleViewport:self.view.bounds]; + [MWMFrameworkHelper setVisibleViewport:self.view.bounds scaleFactor:self.view.contentScaleFactor]; } - (void)enableCarPlayRepresentation diff --git a/iphone/Maps/Classes/MapsAppDelegate.mm b/iphone/Maps/Classes/MapsAppDelegate.mm index f5cf041488..fd3cedbc15 100644 --- a/iphone/Maps/Classes/MapsAppDelegate.mm +++ b/iphone/Maps/Classes/MapsAppDelegate.mm @@ -4,7 +4,6 @@ #import "EAGLView.h" #import "LocalNotificationManager.h" #import "MWMAuthorizationCommon.h" -#import "MWMCommon.h" #import "MWMCoreRouterType.h" #import "MWMFrameworkListener.h" #import "MWMFrameworkObservers.h" @@ -30,7 +29,8 @@ #import #import -#include "Framework.h" +#include +#import #include "map/framework_light.hpp" #include "map/gps_tracker.hpp" diff --git a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm index 76c4a7816c..69afcf90d9 100644 --- a/iphone/Maps/Classes/Share/MWMShareActivityItem.mm +++ b/iphone/Maps/Classes/Share/MWMShareActivityItem.mm @@ -3,7 +3,7 @@ #import "3party/Alohalytics/src/alohalytics_objc.h" -#include "Framework.h" +#include NSString * httpGe0Url(NSString * shortUrl) { diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm index 471f6e98cd..3b0fa214fa 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.mm @@ -3,7 +3,6 @@ #import "CLLocation+Mercator.h" #import "MWMBookmarksBannerViewController.h" #import "MWMCircularProgress.h" -#import "MWMCommon.h" #import "MWMFrameworkListener.h" #import "MWMMegafonBannerViewController.h" #import "MWMStorage.h" @@ -11,7 +10,7 @@ #import "Statistics.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "partners_api/downloader_promo.hpp" diff --git a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib index eca25eed08..0df6984ba2 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib +++ b/iphone/Maps/Classes/Widgets/MWMMapDownloadDialog.xib @@ -4,7 +4,7 @@ - + diff --git a/iphone/Maps/Classes/Widgets/MWMMapWidgets.h b/iphone/Maps/Classes/Widgets/MWMMapWidgets.h index 73ff218541..78ceb1589b 100644 --- a/iphone/Maps/Classes/Widgets/MWMMapWidgets.h +++ b/iphone/Maps/Classes/Widgets/MWMMapWidgets.h @@ -1,4 +1,4 @@ -#include "Framework.h" +#include @interface MWMMapWidgets : NSObject diff --git a/iphone/Maps/Common/MWMTypes.h b/iphone/Maps/Common/MWMTypes.h deleted file mode 100644 index ab69fb656f..0000000000 --- a/iphone/Maps/Common/MWMTypes.h +++ /dev/null @@ -1,44 +0,0 @@ -typedef void (^MWMVoidBlock)(void); -typedef void (^MWMStringBlock)(NSString *); -typedef void (^MWMURLBlock)(NSURL *); -typedef BOOL (^MWMCheckStringBlock)(NSString *); -typedef void (^MWMBoolBlock)(BOOL); - -typedef NS_ENUM(NSUInteger, MWMDayTime) { MWMDayTimeDay, MWMDayTimeNight }; - -typedef NS_ENUM(NSUInteger, MWMUnits) { MWMUnitsMetric, MWMUnitsImperial }; - -typedef NS_ENUM(NSUInteger, MWMTheme) { - MWMThemeDay, - MWMThemeNight, - MWMThemeVehicleDay, - MWMThemeVehicleNight, - MWMThemeAuto -}; - -typedef uint64_t MWMMarkID; -typedef uint64_t MWMTrackID; -typedef uint64_t MWMMarkGroupID; -typedef NSArray *MWMMarkIDCollection; -typedef NSArray *MWMTrackIDCollection; -typedef NSArray *MWMGroupIDCollection; - -typedef NS_ENUM(NSUInteger, MWMBookmarksShareStatus) { - MWMBookmarksShareStatusSuccess, - MWMBookmarksShareStatusEmptyCategory, - MWMBookmarksShareStatusArchiveError, - MWMBookmarksShareStatusFileError -}; - -typedef NS_ENUM(NSUInteger, MWMCategoryAccessStatus) { - MWMCategoryAccessStatusLocal, - MWMCategoryAccessStatusPublic, - MWMCategoryAccessStatusPrivate, - MWMCategoryAccessStatusAuthorOnly, - MWMCategoryAccessStatusOther -}; - -typedef NS_ENUM(NSUInteger, MWMCategoryAuthorType) { - MWMCategoryAuthorTypeLocal, - MWMCategoryAuthorTypeTraveler -}; diff --git a/iphone/Maps/Common/Statistics/MWMCustomFacebookEvents.mm b/iphone/Maps/Common/Statistics/MWMCustomFacebookEvents.mm index 5644827050..8ed3fff4f6 100644 --- a/iphone/Maps/Common/Statistics/MWMCustomFacebookEvents.mm +++ b/iphone/Maps/Common/Statistics/MWMCustomFacebookEvents.mm @@ -3,7 +3,7 @@ #import -#include "Framework.h" +#include @implementation MWMCustomFacebookEvents diff --git a/iphone/Maps/Common/Statistics/Statistics.mm b/iphone/Maps/Common/Statistics/Statistics.mm index 0c3e65b2d9..068484f767 100644 --- a/iphone/Maps/Common/Statistics/Statistics.mm +++ b/iphone/Maps/Common/Statistics/Statistics.mm @@ -1,5 +1,4 @@ #import "Statistics.h" -#import "AppInfo.h" #import "MWMCustomFacebookEvents.h" #import "MWMSettings.h" @@ -10,6 +9,7 @@ #import #import #import +#import #include "platform/platform.hpp" #include "platform/settings.hpp" diff --git a/iphone/Maps/Common/WebViewController.h b/iphone/Maps/Common/WebViewController.h index 754440b8b3..b78c833079 100644 --- a/iphone/Maps/Common/WebViewController.h +++ b/iphone/Maps/Common/WebViewController.h @@ -1,6 +1,6 @@ #import #import "MWMViewController.h" -#import "MWMTypes.h" +#import NS_ASSUME_NONNULL_BEGIN diff --git a/iphone/Maps/Common/WebViewController.mm b/iphone/Maps/Common/WebViewController.mm index d78d40cec5..2cb9bcf4da 100644 --- a/iphone/Maps/Common/WebViewController.mm +++ b/iphone/Maps/Common/WebViewController.mm @@ -1,5 +1,5 @@ #import "WebViewController.h" -#import "Framework.h" +#include #include "base/assert.hpp" diff --git a/iphone/Maps/Core/Editor/MWMEditorHelper.mm b/iphone/Maps/Core/Editor/MWMEditorHelper.mm index abfa62fcb2..2e71787a03 100644 --- a/iphone/Maps/Core/Editor/MWMEditorHelper.mm +++ b/iphone/Maps/Core/Editor/MWMEditorHelper.mm @@ -1,5 +1,5 @@ #import "MWMEditorHelper.h" -#import "AppInfo.h" +#import #import "MWMAuthorizationCommon.h" #include "editor/osm_editor.hpp" diff --git a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm index 051327be16..306de380b6 100644 --- a/iphone/Maps/Core/Framework/MWMFrameworkListener.mm +++ b/iphone/Maps/Core/Framework/MWMFrameworkListener.mm @@ -1,6 +1,6 @@ #import "MWMFrameworkListener.h" -#include "Framework.h" +#include #include "storage/storage.hpp" #include "storage/storage_defines.hpp" diff --git a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm index dc5c6e5913..90a01a7ba0 100644 --- a/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm +++ b/iphone/Maps/Core/Framework/ProxyObjects/Routing/MWMRoutingManager.mm @@ -8,7 +8,7 @@ #import "MWMCoreUnits.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "routing/following_info.hpp" #include "routing/turns.hpp" diff --git a/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm b/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm index 5852b5aef8..3b75f060a8 100644 --- a/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm +++ b/iphone/Maps/Core/InappPurchase/Impl/MWMPurchaseValidation.mm @@ -1,6 +1,6 @@ #import "MWMPurchaseValidation.h" -#include "Framework.h" +#include #include "private.h" static NSMutableDictionary *> *callbacks = [NSMutableDictionary dictionary]; diff --git a/iphone/Maps/Core/Location/MWMLocationManager.mm b/iphone/Maps/Core/Location/MWMLocationManager.mm index f3dff485a1..7c38e6028e 100644 --- a/iphone/Maps/Core/Location/MWMLocationManager.mm +++ b/iphone/Maps/Core/Location/MWMLocationManager.mm @@ -10,7 +10,7 @@ #import "SwiftBridge.h" #import "3party/Alohalytics/src/alohalytics_objc.h" -#include "Framework.h" +#include #include "map/gps_tracker.hpp" diff --git a/iphone/Maps/Core/Location/MWMLocationPredictor.mm b/iphone/Maps/Core/Location/MWMLocationPredictor.mm index 39159182a6..bf4c9e9791 100644 --- a/iphone/Maps/Core/Location/MWMLocationPredictor.mm +++ b/iphone/Maps/Core/Location/MWMLocationPredictor.mm @@ -1,6 +1,6 @@ #import "MWMLocationPredictor.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/Core/Metrics/MWMEye.mm b/iphone/Maps/Core/Metrics/MWMEye.mm index eb72eb89e6..b5e3094b84 100644 --- a/iphone/Maps/Core/Metrics/MWMEye.mm +++ b/iphone/Maps/Core/Metrics/MWMEye.mm @@ -1,6 +1,6 @@ #import "MWMEye.h" -#include "Framework.h" +#include #include "metrics/eye.hpp" @implementation MWMEye diff --git a/iphone/Maps/Core/Notifications/LocalNotificationManager.mm b/iphone/Maps/Core/Notifications/LocalNotificationManager.mm index 35dd5c88d3..cde88fb1cd 100644 --- a/iphone/Maps/Core/Notifications/LocalNotificationManager.mm +++ b/iphone/Maps/Core/Notifications/LocalNotificationManager.mm @@ -8,7 +8,7 @@ #include "platform/network_policy_ios.h" -#include "Framework.h" +#include static NSString * const kLastUGCNotificationDate = @"LastUGCNotificationDate"; diff --git a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm index ed2cd3eebd..3ee71bf7d4 100644 --- a/iphone/Maps/Core/Notifications/MWMPushNotifications.mm +++ b/iphone/Maps/Core/Notifications/MWMPushNotifications.mm @@ -2,7 +2,6 @@ #import #import #import -#import "MWMCommon.h" #import "Statistics.h" #include "platform/marketing_service.hpp" diff --git a/iphone/Maps/Core/Routing/MWMRouter+RouteManager.mm b/iphone/Maps/Core/Routing/MWMRouter+RouteManager.mm index 4ccbb7e2f1..032e0f5605 100644 --- a/iphone/Maps/Core/Routing/MWMRouter+RouteManager.mm +++ b/iphone/Maps/Core/Routing/MWMRouter+RouteManager.mm @@ -1,6 +1,6 @@ #import "MWMRouter.h" -#include "Framework.h" +#include @interface MWMRouter () diff --git a/iphone/Maps/Core/Routing/MWMRouter.mm b/iphone/Maps/Core/Routing/MWMRouter.mm index a239dde864..94faf03280 100644 --- a/iphone/Maps/Core/Routing/MWMRouter.mm +++ b/iphone/Maps/Core/Routing/MWMRouter.mm @@ -17,7 +17,7 @@ #import "SwiftBridge.h" #import "UIImage+RGBAData.h" -#include "Framework.h" +#include #include "routing/following_info.hpp" diff --git a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm index 61b78e220e..4d4d9177d0 100644 --- a/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm +++ b/iphone/Maps/Core/Search/MWMSearch+CoreSpotlight.mm @@ -1,13 +1,10 @@ #import #import #import -#import "AppInfo.h" -#import "MWMCommon.h" +#import #import "MWMSearch+CoreSpotlight.h" #import "MWMSettings.h" -#include "Framework.h" - @implementation MWMSearch (CoreSpotlight) + (void)addCategoriesToSpotlight diff --git a/iphone/Maps/Core/Search/MWMSearch.h b/iphone/Maps/Core/Search/MWMSearch.h index 0038de96c2..8aee00436c 100644 --- a/iphone/Maps/Core/Search/MWMSearch.h +++ b/iphone/Maps/Core/Search/MWMSearch.h @@ -1,8 +1,9 @@ +#import + #import "MWMBanner.h" #import "MWMHotelParams.h" #import "MWMSearchItemType.h" #import "MWMSearchObserver.h" -#import "MWMTypes.h" namespace search { diff --git a/iphone/Maps/Core/Search/MWMSearch.mm b/iphone/Maps/Core/Search/MWMSearch.mm index 62cfb121bd..ecbd53956d 100644 --- a/iphone/Maps/Core/Search/MWMSearch.mm +++ b/iphone/Maps/Core/Search/MWMSearch.mm @@ -4,7 +4,7 @@ #import "MWMFrameworkListener.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "partners_api/booking_availability_params.hpp" #include "partners_api/ads_engine.hpp" diff --git a/iphone/Maps/Core/Settings/MWMSettings.mm b/iphone/Maps/Core/Settings/MWMSettings.mm index a2f9a80cf9..a7a9eacbcf 100644 --- a/iphone/Maps/Core/Settings/MWMSettings.mm +++ b/iphone/Maps/Core/Settings/MWMSettings.mm @@ -5,7 +5,7 @@ #import "3party/Alohalytics/src/alohalytics_objc.h" #import "Flurry.h" -#include "Framework.h" +#include #include "platform/settings.hpp" diff --git a/iphone/Maps/Core/Storage/MWMStorage.mm b/iphone/Maps/Core/Storage/MWMStorage.mm index e88f2109d2..e0909214e3 100644 --- a/iphone/Maps/Core/Storage/MWMStorage.mm +++ b/iphone/Maps/Core/Storage/MWMStorage.mm @@ -1,9 +1,9 @@ #import "MWMStorage.h" #import "MWMAlertViewController.h" #import "MWMRouter.h" -#import "MWMFrameworkHelper.h" -#include "Framework.h" +#include +#import #include "storage/storage_helpers.hpp" @@ -17,7 +17,7 @@ using namespace storage; { if (IsEnoughSpaceForDownload(countryId, GetFramework().GetStorage())) { - [MWMFrameworkHelper checkConnectionAndPerformAction:[countryId, onSuccess] { + [self checkConnectionAndPerformAction:[countryId, onSuccess] { GetFramework().GetStorage().DownloadNode(countryId); if (onSuccess) onSuccess(); @@ -33,7 +33,7 @@ using namespace storage; + (void)retryDownloadNode:(CountryId const &)countryId { - [MWMFrameworkHelper checkConnectionAndPerformAction:[countryId] { + [self checkConnectionAndPerformAction:[countryId] { GetFramework().GetStorage().RetryDownloadNode(countryId); } cancelAction:nil]; } @@ -42,7 +42,7 @@ using namespace storage; { if (IsEnoughSpaceForUpdate(countryId, GetFramework().GetStorage())) { - [MWMFrameworkHelper checkConnectionAndPerformAction:[countryId] { + [self checkConnectionAndPerformAction:[countryId] { GetFramework().GetStorage().UpdateNode(countryId); } cancelAction:onCancel]; } @@ -94,7 +94,7 @@ using namespace storage; }); if (storage::IsEnoughSpaceForDownload(requiredSize)) { - [MWMFrameworkHelper checkConnectionAndPerformAction:[countryIds, onSuccess, &s] { + [self checkConnectionAndPerformAction:[countryIds, onSuccess, &s] { for (auto const & countryId : countryIds) s.DownloadNode(countryId); if (onSuccess) @@ -109,4 +109,34 @@ using namespace storage; } } ++ (void)checkConnectionAndPerformAction:(MWMVoidBlock)action cancelAction:(MWMVoidBlock)cancel +{ + switch (Platform::ConnectionStatus()) + { + case Platform::EConnectionType::CONNECTION_NONE: + [[MWMAlertViewController activeAlertController] presentNoConnectionAlert]; + if (cancel) + cancel(); + break; + case Platform::EConnectionType::CONNECTION_WIFI: + action(); + break; + case Platform::EConnectionType::CONNECTION_WWAN: + { + if (!GetFramework().GetDownloadingPolicy().IsCellularDownloadEnabled()) + { + [[MWMAlertViewController activeAlertController] presentNoWiFiAlertWithOkBlock:[action] { + GetFramework().GetDownloadingPolicy().EnableCellularDownload(true); + action(); + } andCancelBlock:cancel]; + } + else + { + action(); + } + break; + } + } +} + @end diff --git a/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm b/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm index 8c07bd59db..ca5ec166b6 100644 --- a/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm +++ b/iphone/Maps/Core/Subscriptions/MWMPurchaseManager.mm @@ -1,7 +1,7 @@ #import "MWMPurchaseManager.h" #import "MWMPurchaseValidation.h" -#include "Framework.h" +#include #include "private.h" #import diff --git a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm index bd8186d452..26f01847b3 100644 --- a/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm +++ b/iphone/Maps/Core/TextToSpeech/MWMTextToSpeech.mm @@ -1,6 +1,5 @@ #import #import -#import "MWMCommon.h" #import "MWMRouter.h" #import "MWMTextToSpeech+CPP.h" #import "Statistics.h" @@ -8,7 +7,7 @@ #include "LocaleTranslator.h" -#include "Framework.h" +#include #include "platform/languages.hpp" diff --git a/iphone/Maps/Core/Traffic/MWMTrafficManager.mm b/iphone/Maps/Core/Traffic/MWMTrafficManager.mm index c52b809ad6..23890da697 100644 --- a/iphone/Maps/Core/Traffic/MWMTrafficManager.mm +++ b/iphone/Maps/Core/Traffic/MWMTrafficManager.mm @@ -1,6 +1,6 @@ #import "MWMTrafficManager.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/Core/UGC/MWMUGCHelper.mm b/iphone/Maps/Core/UGC/MWMUGCHelper.mm index ab41abefef..8ff49c5a7e 100644 --- a/iphone/Maps/Core/UGC/MWMUGCHelper.mm +++ b/iphone/Maps/Core/UGC/MWMUGCHelper.mm @@ -1,6 +1,6 @@ #import "MWMUGCHelper.h" -#include "Framework.h" +#include @implementation MWMUGCHelper diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index d76a47ff9b..a8a422edf6 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -31,10 +31,6 @@ 33C558E3217F6CF100299E70 /* UploadActionCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33C558E2217F6CF100299E70 /* UploadActionCell.swift */; }; 33E905462180C40900868CAC /* UIViewController+Authorization.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33E905452180C40900868CAC /* UIViewController+Authorization.swift */; }; 33F7668F21A57CDF00A88B16 /* EditOnWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33F7668E21A57CDF00A88B16 /* EditOnWebViewController.swift */; }; - 33F8BA4121998BEB00ECA8EE /* MWMTag.m in Sources */ = {isa = PBXBuildFile; fileRef = 33F8BA4021998BEB00ECA8EE /* MWMTag.m */; }; - 33F8BA4421998BFA00ECA8EE /* MWMTagGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 33F8BA4321998BFA00ECA8EE /* MWMTagGroup.m */; }; - 33F8BA472199A91900ECA8EE /* MWMTag+Convenience.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33F8BA462199A91900ECA8EE /* MWMTag+Convenience.mm */; }; - 33F8BA4A2199AA1300ECA8EE /* MWMTagGroup+Convenience.mm in Sources */ = {isa = PBXBuildFile; fileRef = 33F8BA492199AA1300ECA8EE /* MWMTagGroup+Convenience.mm */; }; 33F8BA4E2199AB9500ECA8EE /* TagsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33F8BA4D2199AB9500ECA8EE /* TagsDataSource.swift */; }; 3404163C1E7BDFE000E2B6D6 /* PhotosViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3404163A1E7BDFE000E2B6D6 /* PhotosViewController.swift */; }; 340416441E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 340416421E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift */; }; @@ -48,7 +44,6 @@ 340474F41E08199D00C92850 /* Fabric.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474DD1E08199D00C92850 /* Fabric.framework */; }; 340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340474EB1E08199D00C92850 /* MWMMyTarget.mm */; }; 3404750F1E08199E00C92850 /* MyTrackerSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */; }; - 3404754A1E081A4600C92850 /* AppInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475161E081A4600C92850 /* AppInfo.mm */; }; 3404754D1E081A4600C92850 /* MWMKeyboard.m in Sources */ = {isa = PBXBuildFile; fileRef = 340475191E081A4600C92850 /* MWMKeyboard.m */; }; 340475501E081A4600C92850 /* fabric_logging_ios.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475201E081A4600C92850 /* fabric_logging_ios.mm */; }; 340475531E081A4600C92850 /* MWMCustomFacebookEvents.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340475221E081A4600C92850 /* MWMCustomFacebookEvents.mm */; }; @@ -153,7 +148,6 @@ 346DB8371E5C4F6700E3123E /* GalleryViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 346DB8231E5C4F6700E3123E /* GalleryViewController.xib */; }; 346DB83A1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8251E5C4F6700E3123E /* GalleryItemModel.swift */; }; 346DB83D1E5C4F6700E3123E /* GalleryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 346DB8261E5C4F6700E3123E /* GalleryModel.swift */; }; - 347039A91FB9A5CF00E47496 /* MWMBookmarksManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 347039A71FB9A5CF00E47496 /* MWMBookmarksManager.mm */; }; 347040301EA6470700038379 /* BorderedButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3470402E1EA6470700038379 /* BorderedButton.swift */; }; 3472B5CB200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5C9200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift */; }; 3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3472B5CD200F4A2B00DC6CD5 /* BackgroundFetchTask.swift */; }; @@ -176,9 +170,7 @@ 34845DB71E166084003D55B9 /* Common.swift in Sources */ = {isa = PBXBuildFile; fileRef = 34845DB51E166084003D55B9 /* Common.swift */; }; 3486B5081E27A4B50069C126 /* LocalNotificationManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5061E27A4B50069C126 /* LocalNotificationManager.mm */; }; 3486B50D1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B50B1E27A6DA0069C126 /* MWMPushNotifications.mm */; }; - 3486B5161E27AD3B0069C126 /* Framework.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5101E27AD3B0069C126 /* Framework.cpp */; }; 3486B5191E27AD3B0069C126 /* MWMFrameworkListener.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */; }; - 3486B51E1E27AD590069C126 /* MWMFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3486B51C1E27AD590069C126 /* MWMFrameworkHelper.mm */; }; 3488B0131E9D0AEC0068AFD8 /* AdBanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3488B0101E9D0AEC0068AFD8 /* AdBanner.swift */; }; 3488B0161E9D0AEC0068AFD8 /* AdBanner.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3488B0111E9D0AEC0068AFD8 /* AdBanner.xib */; }; 3488B01A1E9D0B230068AFD8 /* UIColor+Modifications.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */; }; @@ -198,11 +190,11 @@ 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349A13801DEC138C00C7DB60 /* MWMMobileInternetAlert.mm */; }; 349A13851DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A13811DEC138C00C7DB60 /* MWMMobileInternetAlert.xib */; }; 349D1ABC1E2D05EF004A2006 /* SearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1ABA1E2D05EF004A2006 /* SearchBar.swift */; }; - 349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349D1AC41E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm */; }; + 349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 349D1AC41E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.m */; }; 349D1AD21E2E325B004A2006 /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1AC51E2E325B004A2006 /* MWMBottomMenuCollectionViewLandscapeCell.xib */; }; 349D1AD51E2E325B004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1AC61E2E325B004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib */; }; - 349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349D1AC81E2E325B004A2006 /* MWMBottomMenuLayout.mm */; }; - 349D1ADB1E2E325C004A2006 /* MWMBottomMenuView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349D1ACA1E2E325B004A2006 /* MWMBottomMenuView.mm */; }; + 349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.m in Sources */ = {isa = PBXBuildFile; fileRef = 349D1AC81E2E325B004A2006 /* MWMBottomMenuLayout.m */; }; + 349D1ADB1E2E325C004A2006 /* MWMBottomMenuView.m in Sources */ = {isa = PBXBuildFile; fileRef = 349D1ACA1E2E325B004A2006 /* MWMBottomMenuView.m */; }; 349D1ADE1E2E325C004A2006 /* MWMBottomMenuViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 349D1ACC1E2E325B004A2006 /* MWMBottomMenuViewController.mm */; }; 349D1AE11E2E325C004A2006 /* MWMBottomMenuViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349D1ACD1E2E325B004A2006 /* MWMBottomMenuViewController.xib */; }; 349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 349D1CE21E3F836900A878FD /* UIViewController+Hierarchy.swift */; }; @@ -419,6 +411,7 @@ 479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 479D306422C664CE00D18278 /* MWMDownloadBannerViewController.m */; }; 479D306822C66C8F00D18278 /* MWMBookmarksBannerViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 479D306722C66C8F00D18278 /* MWMBookmarksBannerViewController.m */; }; 479EE94A2292FB03009DEBA6 /* ActivityIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */; }; + 47A65CAD2350044800DCD85F /* CoreApi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A65CAC2350044800DCD85F /* CoreApi.framework */; }; 47AEF8402231249E00D20538 /* categories_brands.txt in Resources */ = {isa = PBXBuildFile; fileRef = 47AEF83F2231249E00D20538 /* categories_brands.txt */; }; 47B06DED21B696C20094CCAD /* GeoTracker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B06DEC21B696C20094CCAD /* GeoTracker.swift */; }; 47B06DF021B697230094CCAD /* MWMGeoTrackerCore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47B06DEF21B697230094CCAD /* MWMGeoTrackerCore.mm */; }; @@ -587,9 +580,7 @@ B33D21AC20DA515800BAD749 /* MWMCategoryInfoCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = B33D21AA20DA515800BAD749 /* MWMCategoryInfoCell.mm */; }; B33D21AD20DA515800BAD749 /* MWMCategoryInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B33D21AB20DA515800BAD749 /* MWMCategoryInfoCell.xib */; }; B33D21AF20DAF9F000BAD749 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = B33D21AE20DAF9F000BAD749 /* Toast.swift */; }; - B33D21B220DBCC5E00BAD749 /* MWMCatalogObserver.mm in Sources */ = {isa = PBXBuildFile; fileRef = B33D21B120DBCC5D00BAD749 /* MWMCatalogObserver.mm */; }; B33D21B820E130D000BAD749 /* BookmarksTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B33D21B720E130D000BAD749 /* BookmarksTabViewController.swift */; }; - B366130420D5D9BC00E7DC3E /* MWMCategory.m in Sources */ = {isa = PBXBuildFile; fileRef = B366130320D5D9BC00E7DC3E /* MWMCategory.m */; }; B366130A20D5E2E000E7DC3E /* CatalogCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B366130820D5E2E000E7DC3E /* CatalogCategoryCell.swift */; }; B366130B20D5E2E000E7DC3E /* CatalogCategoryCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B366130920D5E2E000E7DC3E /* CatalogCategoryCell.xib */; }; B3E3B4FD20D463B700DA8C13 /* BMCCategoriesHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = B3E3B4FC20D463B700DA8C13 /* BMCCategoriesHeader.xib */; }; @@ -633,7 +624,6 @@ CDCA2743223F8D1E00167D87 /* ListItemInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA2742223F8D1E00167D87 /* ListItemInfo.swift */; }; CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA2744223FCFD200167D87 /* SearchResultInfo.swift */; }; CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */; }; - CDCA277222426A2400167D87 /* MWMCarPlayBookmarkObject.mm in Sources */ = {isa = PBXBuildFile; fileRef = CDCA277122426A2400167D87 /* MWMCarPlayBookmarkObject.mm */; }; CDCA27812243F59800167D87 /* CarPlayRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27802243F59800167D87 /* CarPlayRouter.swift */; }; CDCA27842245090900167D87 /* ListenerContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA27832245090900167D87 /* ListenerContainer.swift */; }; CDCA278622451F5000167D87 /* RouteInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = CDCA278522451F5000167D87 /* RouteInfo.swift */; }; @@ -695,11 +685,11 @@ F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6D67CDD2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib */; }; F6D67CE9206929590032FD38 /* PPPSearchSimilarButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6D67CE8206929590032FD38 /* PPPSearchSimilarButton.swift */; }; F6D67CEB2069318B0032FD38 /* PPPSearchSimilarButton.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6D67CEA2069318B0032FD38 /* PPPSearchSimilarButton.xib */; }; - F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.mm */; }; + F6E2FD501E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.m */; }; F6E2FD531E097BA00083EBEC /* MWMMapDownloaderAdsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC001E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.xib */; }; - F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.mm */; }; + F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.m */; }; F6E2FD591E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC031E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.xib */; }; - F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC051E097B9F0083EBEC /* MWMMapDownloaderCellHeader.mm */; }; + F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC051E097B9F0083EBEC /* MWMMapDownloaderCellHeader.m */; }; F6E2FD5F1E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC071E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm */; }; F6E2FD621E097BA00083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC081E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.xib */; }; F6E2FD651E097BA00083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC0A1E097B9F0083EBEC /* MWMMapDownloaderPlaceTableViewCell.mm */; }; @@ -892,14 +882,6 @@ 33C558E2217F6CF100299E70 /* UploadActionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UploadActionCell.swift; sourceTree = ""; }; 33E905452180C40900868CAC /* UIViewController+Authorization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIViewController+Authorization.swift"; sourceTree = ""; }; 33F7668E21A57CDF00A88B16 /* EditOnWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditOnWebViewController.swift; sourceTree = ""; }; - 33F8BA3F21998BEB00ECA8EE /* MWMTag.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTag.h; sourceTree = ""; }; - 33F8BA4021998BEB00ECA8EE /* MWMTag.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMTag.m; sourceTree = ""; }; - 33F8BA4221998BFA00ECA8EE /* MWMTagGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTagGroup.h; sourceTree = ""; }; - 33F8BA4321998BFA00ECA8EE /* MWMTagGroup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMTagGroup.m; sourceTree = ""; }; - 33F8BA452199A91900ECA8EE /* MWMTag+Convenience.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTag+Convenience.h"; sourceTree = ""; }; - 33F8BA462199A91900ECA8EE /* MWMTag+Convenience.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMTag+Convenience.mm"; sourceTree = ""; }; - 33F8BA482199AA1300ECA8EE /* MWMTagGroup+Convenience.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTagGroup+Convenience.h"; sourceTree = ""; }; - 33F8BA492199AA1300ECA8EE /* MWMTagGroup+Convenience.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = "MWMTagGroup+Convenience.mm"; sourceTree = ""; }; 33F8BA4D2199AB9500ECA8EE /* TagsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TagsDataSource.swift; sourceTree = ""; }; 3404163A1E7BDFE000E2B6D6 /* PhotosViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosViewController.swift; sourceTree = ""; }; 340416421E7BED3900E2B6D6 /* PhotosTransitionAnimator.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhotosTransitionAnimator.swift; sourceTree = ""; }; @@ -917,14 +899,10 @@ 340474EB1E08199D00C92850 /* MWMMyTarget.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMyTarget.mm; sourceTree = ""; }; 340474EC1E08199D00C92850 /* MWMMyTargetDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMyTargetDelegate.h; sourceTree = ""; }; 340474EE1E08199D00C92850 /* MyTrackerSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = MyTrackerSDK.framework; sourceTree = ""; }; - 340475151E081A4600C92850 /* AppInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppInfo.h; sourceTree = ""; }; - 340475161E081A4600C92850 /* AppInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = AppInfo.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 340475181E081A4600C92850 /* MWMKeyboard.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMKeyboard.h; sourceTree = ""; }; 340475191E081A4600C92850 /* MWMKeyboard.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMKeyboard.m; sourceTree = ""; }; 3404751A1E081A4600C92850 /* MWMKeyboardObserver.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMKeyboardObserver.h; sourceTree = ""; }; - 3404751B1E081A4600C92850 /* MWMCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCommon.h; sourceTree = ""; }; 3404751C1E081A4600C92850 /* MWMMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMacros.h; sourceTree = ""; }; - 3404751D1E081A4600C92850 /* MWMTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMTypes.h; sourceTree = ""; }; 3404751F1E081A4600C92850 /* fabric_logging.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = fabric_logging.hpp; sourceTree = ""; }; 340475201E081A4600C92850 /* fabric_logging_ios.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = fabric_logging_ios.mm; sourceTree = ""; }; 340475211E081A4600C92850 /* MWMCustomFacebookEvents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCustomFacebookEvents.h; sourceTree = ""; }; @@ -1092,9 +1070,6 @@ 346DB8261E5C4F6700E3123E /* GalleryModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GalleryModel.swift; sourceTree = ""; }; 346EDAD91B9F0E35004F8DB5 /* MWMMultilineLabel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMultilineLabel.h; sourceTree = ""; }; 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMultilineLabel.mm; sourceTree = ""; }; - 347039A61FB9A5CF00E47496 /* MWMBookmarksManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksManager.h; sourceTree = ""; }; - 347039A71FB9A5CF00E47496 /* MWMBookmarksManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmarksManager.mm; sourceTree = ""; }; - 347039AB1FB9A97E00E47496 /* MWMBookmarksObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksObserver.h; sourceTree = ""; }; 3470402E1EA6470700038379 /* BorderedButton.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BorderedButton.swift; sourceTree = ""; }; 3472B5C9200F43EF00DC6CD5 /* BackgroundFetchScheduler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundFetchScheduler.swift; sourceTree = ""; }; 3472B5CD200F4A2B00DC6CD5 /* BackgroundFetchTask.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BackgroundFetchTask.swift; sourceTree = ""; }; @@ -1131,13 +1106,9 @@ 3486B5061E27A4B50069C126 /* LocalNotificationManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = LocalNotificationManager.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 3486B50A1E27A4C50069C126 /* MWMPushNotifications.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMPushNotifications.h; sourceTree = ""; }; 3486B50B1E27A6DA0069C126 /* MWMPushNotifications.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPushNotifications.mm; sourceTree = ""; }; - 3486B5101E27AD3B0069C126 /* Framework.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Framework.cpp; sourceTree = ""; }; - 3486B5111E27AD3B0069C126 /* Framework.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Framework.h; sourceTree = ""; }; 3486B5121E27AD3B0069C126 /* MWMFrameworkListener.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkListener.h; sourceTree = ""; }; 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFrameworkListener.mm; sourceTree = ""; }; 3486B5141E27AD3B0069C126 /* MWMFrameworkObservers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkObservers.h; sourceTree = ""; }; - 3486B51B1E27AD590069C126 /* MWMFrameworkHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMFrameworkHelper.h; sourceTree = ""; }; - 3486B51C1E27AD590069C126 /* MWMFrameworkHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMFrameworkHelper.mm; sourceTree = ""; }; 3488B0101E9D0AEC0068AFD8 /* AdBanner.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AdBanner.swift; sourceTree = ""; }; 3488B0111E9D0AEC0068AFD8 /* AdBanner.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AdBanner.xib; sourceTree = ""; }; 3488B0181E9D0B230068AFD8 /* UIColor+Modifications.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIColor+Modifications.swift"; sourceTree = ""; }; @@ -1167,13 +1138,13 @@ 349A35791B53D4C9009677EE /* MWMCircularProgressView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCircularProgressView.mm; sourceTree = ""; }; 349D1ABA1E2D05EF004A2006 /* SearchBar.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SearchBar.swift; sourceTree = ""; }; 349D1AC31E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuCollectionViewCell.h; sourceTree = ""; }; - 349D1AC41E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBottomMenuCollectionViewCell.mm; sourceTree = ""; }; + 349D1AC41E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMBottomMenuCollectionViewCell.m; sourceTree = ""; }; 349D1AC51E2E325B004A2006 /* MWMBottomMenuCollectionViewLandscapeCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuCollectionViewLandscapeCell.xib; sourceTree = ""; }; 349D1AC61E2E325B004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuCollectionViewPortraitCell.xib; sourceTree = ""; }; 349D1AC71E2E325B004A2006 /* MWMBottomMenuLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuLayout.h; sourceTree = ""; }; - 349D1AC81E2E325B004A2006 /* MWMBottomMenuLayout.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBottomMenuLayout.mm; sourceTree = ""; }; + 349D1AC81E2E325B004A2006 /* MWMBottomMenuLayout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMBottomMenuLayout.m; sourceTree = ""; }; 349D1AC91E2E325B004A2006 /* MWMBottomMenuView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuView.h; sourceTree = ""; }; - 349D1ACA1E2E325B004A2006 /* MWMBottomMenuView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBottomMenuView.mm; sourceTree = ""; }; + 349D1ACA1E2E325B004A2006 /* MWMBottomMenuView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMBottomMenuView.m; sourceTree = ""; }; 349D1ACB1E2E325B004A2006 /* MWMBottomMenuViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuViewController.h; sourceTree = ""; }; 349D1ACC1E2E325B004A2006 /* MWMBottomMenuViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMBottomMenuViewController.mm; sourceTree = ""; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; }; 349D1ACD1E2E325B004A2006 /* MWMBottomMenuViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuViewController.xib; sourceTree = ""; }; @@ -1451,7 +1422,6 @@ 4598438521394CFD00F8CAB2 /* MetalPerformanceShaders.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalPerformanceShaders.framework; path = System/Library/Frameworks/MetalPerformanceShaders.framework; sourceTree = SDKROOT; }; 4598438921394D7700F8CAB2 /* shaders_metal.metallib */ = {isa = PBXFileReference; explicitFileType = "archive.metal-library"; path = shaders_metal.metallib; sourceTree = BUILT_PRODUCTS_DIR; }; 45A37B9D20B33F5D005FBDBB /* FBAudienceNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBAudienceNetwork.framework; path = MoPubSDK/AdNetworkSupport/FacebookAudienceNetwork/SDK/FBAudienceNetwork.framework; sourceTree = ""; }; - 45AC339022C4F57C004DC574 /* MWMUTM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUTM.h; sourceTree = ""; }; 45CBCCBB20590AAB006B55C2 /* libkml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libkml.a; sourceTree = BUILT_PRODUCTS_DIR; }; 45FFD65C1E965EBE00DB854E /* liblocal_ads.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = liblocal_ads.a; path = "/Users/r.kuznetsov/Dev/Projects/omim/xcode/local_ads/../../../omim-build/xcode/Debug/liblocal_ads.a"; sourceTree = ""; }; 46F26CD610F623BA00ECCA39 /* EAGLView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; path = EAGLView.h; sourceTree = ""; }; @@ -1530,6 +1500,7 @@ 479D306622C66C8F00D18278 /* MWMBookmarksBannerViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksBannerViewController.h; sourceTree = ""; }; 479D306722C66C8F00D18278 /* MWMBookmarksBannerViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMBookmarksBannerViewController.m; sourceTree = ""; }; 479EE9492292FB03009DEBA6 /* ActivityIndicator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = ActivityIndicator.swift; path = CustomViews/ActivityIndicator.swift; sourceTree = ""; }; + 47A65CAC2350044800DCD85F /* CoreApi.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CoreApi.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 47AEF83F2231249E00D20538 /* categories_brands.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = categories_brands.txt; path = ../../data/categories_brands.txt; sourceTree = ""; }; 47B06DEC21B696C20094CCAD /* GeoTracker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeoTracker.swift; sourceTree = ""; }; 47B06DEE21B697230094CCAD /* MWMGeoTrackerCore.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMGeoTrackerCore.h; sourceTree = ""; }; @@ -1686,12 +1657,7 @@ B33D21AA20DA515800BAD749 /* MWMCategoryInfoCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCategoryInfoCell.mm; sourceTree = ""; }; B33D21AB20DA515800BAD749 /* MWMCategoryInfoCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMCategoryInfoCell.xib; sourceTree = ""; }; B33D21AE20DAF9F000BAD749 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = ""; }; - B33D21B020DBCC5D00BAD749 /* MWMCatalogObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCatalogObserver.h; sourceTree = ""; }; - B33D21B120DBCC5D00BAD749 /* MWMCatalogObserver.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCatalogObserver.mm; sourceTree = ""; }; - B33D21B320DBF3EB00BAD749 /* MWMCatalogCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCatalogCommon.h; sourceTree = ""; }; B33D21B720E130D000BAD749 /* BookmarksTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksTabViewController.swift; sourceTree = ""; }; - B366130220D5D9BC00E7DC3E /* MWMCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCategory.h; sourceTree = ""; }; - B366130320D5D9BC00E7DC3E /* MWMCategory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMCategory.m; sourceTree = ""; }; B366130820D5E2E000E7DC3E /* CatalogCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogCategoryCell.swift; sourceTree = ""; }; B366130920D5E2E000E7DC3E /* CatalogCategoryCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CatalogCategoryCell.xib; sourceTree = ""; }; B3E3B4FC20D463B700DA8C13 /* BMCCategoriesHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BMCCategoriesHeader.xib; sourceTree = ""; }; @@ -1751,8 +1717,6 @@ CDCA2744223FCFD200167D87 /* SearchResultInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchResultInfo.swift; sourceTree = ""; }; CDCA2746223FD24600167D87 /* MWMCarPlaySearchResultObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlaySearchResultObject.h; sourceTree = ""; }; CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlaySearchResultObject.mm; sourceTree = ""; }; - CDCA277022426A2400167D87 /* MWMCarPlayBookmarkObject.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCarPlayBookmarkObject.h; sourceTree = ""; }; - CDCA277122426A2400167D87 /* MWMCarPlayBookmarkObject.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCarPlayBookmarkObject.mm; sourceTree = ""; }; CDCA27802243F59800167D87 /* CarPlayRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarPlayRouter.swift; sourceTree = ""; }; CDCA27832245090900167D87 /* ListenerContainer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ListenerContainer.swift; sourceTree = ""; }; CDCA278522451F5000167D87 /* RouteInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RouteInfo.swift; sourceTree = ""; }; @@ -1876,13 +1840,13 @@ F6D67CEA2069318B0032FD38 /* PPPSearchSimilarButton.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PPPSearchSimilarButton.xib; sourceTree = ""; }; F6DF5F321CD1136800A87154 /* LocaleTranslator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocaleTranslator.h; sourceTree = ""; }; F6E2FBFE1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderAdsTableViewCell.h; sourceTree = ""; }; - F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderAdsTableViewCell.mm; sourceTree = ""; }; + F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMMapDownloaderAdsTableViewCell.m; sourceTree = ""; }; F6E2FC001E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMapDownloaderAdsTableViewCell.xib; sourceTree = ""; }; F6E2FC011E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderButtonTableViewCell.h; sourceTree = ""; }; - F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderButtonTableViewCell.mm; sourceTree = ""; }; + F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMMapDownloaderButtonTableViewCell.m; sourceTree = ""; }; F6E2FC031E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMapDownloaderButtonTableViewCell.xib; sourceTree = ""; }; F6E2FC041E097B9F0083EBEC /* MWMMapDownloaderCellHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderCellHeader.h; sourceTree = ""; }; - F6E2FC051E097B9F0083EBEC /* MWMMapDownloaderCellHeader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderCellHeader.mm; sourceTree = ""; }; + F6E2FC051E097B9F0083EBEC /* MWMMapDownloaderCellHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMMapDownloaderCellHeader.m; sourceTree = ""; }; F6E2FC061E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapDownloaderLargeCountryTableViewCell.h; sourceTree = ""; }; F6E2FC071E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapDownloaderLargeCountryTableViewCell.mm; sourceTree = ""; }; F6E2FC081E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMMapDownloaderLargeCountryTableViewCell.xib; sourceTree = ""; }; @@ -2130,6 +2094,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 47A65CAD2350044800DCD85F /* CoreApi.framework in Frameworks */, 4577B28121F2066A00864FAC /* libvulkan_wrapper.a in Frameworks */, CDB4D4D5222D118E00104869 /* CarPlay.framework in Frameworks */, BB2C99B021B6AB4500F7371C /* libdescriptions.a in Frameworks */, @@ -2317,6 +2282,7 @@ isa = PBXGroup; children = ( 450B5C822355F50200E9019E /* libweb_api.a */, + 47A65CAC2350044800DCD85F /* CoreApi.framework */, 4577B28021F2066A00864FAC /* libvulkan_wrapper.a */, CDB4D4D4222D118E00104869 /* CarPlay.framework */, BB2C99AF21B6AB4500F7371C /* libdescriptions.a */, @@ -2417,14 +2383,6 @@ 331630D02191D74B00BB91A9 /* TagSectionHeaderView.swift */, 33BCDF8A218C976D00EF5B74 /* TagsCollectionViewLayout.swift */, 33B19C66218B481700B323A7 /* TagCollectionViewCell.swift */, - 33F8BA3F21998BEB00ECA8EE /* MWMTag.h */, - 33F8BA4021998BEB00ECA8EE /* MWMTag.m */, - 33F8BA452199A91900ECA8EE /* MWMTag+Convenience.h */, - 33F8BA462199A91900ECA8EE /* MWMTag+Convenience.mm */, - 33F8BA4221998BFA00ECA8EE /* MWMTagGroup.h */, - 33F8BA4321998BFA00ECA8EE /* MWMTagGroup.m */, - 33F8BA482199AA1300ECA8EE /* MWMTagGroup+Convenience.h */, - 33F8BA492199AA1300ECA8EE /* MWMTagGroup+Convenience.mm */, 33F8BA4D2199AB9500ECA8EE /* TagsDataSource.swift */, ); path = Tags; @@ -2484,13 +2442,9 @@ 340475141E081A4600C92850 /* Common */ = { isa = PBXGroup; children = ( - 340475151E081A4600C92850 /* AppInfo.h */, - 340475161E081A4600C92850 /* AppInfo.mm */, 34845DB51E166084003D55B9 /* Common.swift */, 340475171E081A4600C92850 /* Keyboard */, - 3404751B1E081A4600C92850 /* MWMCommon.h */, 3404751C1E081A4600C92850 /* MWMMacros.h */, - 3404751D1E081A4600C92850 /* MWMTypes.h */, 3404751E1E081A4600C92850 /* Statistics */, 340475261E081A4600C92850 /* WebViewController.h */, 340475271E081A4600C92850 /* WebViewController.mm */, @@ -3014,12 +2968,6 @@ 347039A51FB9A5B400E47496 /* Bookmarks */ = { isa = PBXGroup; children = ( - 347039A61FB9A5CF00E47496 /* MWMBookmarksManager.h */, - 347039A71FB9A5CF00E47496 /* MWMBookmarksManager.mm */, - 347039AB1FB9A97E00E47496 /* MWMBookmarksObserver.h */, - B33D21B020DBCC5D00BAD749 /* MWMCatalogObserver.h */, - B33D21B120DBCC5D00BAD749 /* MWMCatalogObserver.mm */, - B33D21B320DBF3EB00BAD749 /* MWMCatalogCommon.h */, ); path = Bookmarks; sourceTree = ""; @@ -3091,13 +3039,9 @@ isa = PBXGroup; children = ( CDCA27762243CCFF00167D87 /* ProxyObjects */, - 3486B5101E27AD3B0069C126 /* Framework.cpp */, - 3486B5111E27AD3B0069C126 /* Framework.h */, 3486B5121E27AD3B0069C126 /* MWMFrameworkListener.h */, 3486B5131E27AD3B0069C126 /* MWMFrameworkListener.mm */, 3486B5141E27AD3B0069C126 /* MWMFrameworkObservers.h */, - 3486B51B1E27AD590069C126 /* MWMFrameworkHelper.h */, - 3486B51C1E27AD590069C126 /* MWMFrameworkHelper.mm */, ); path = Framework; sourceTree = ""; @@ -3162,13 +3106,13 @@ isa = PBXGroup; children = ( 349D1AC31E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.h */, - 349D1AC41E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm */, + 349D1AC41E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.m */, 349D1AC51E2E325B004A2006 /* MWMBottomMenuCollectionViewLandscapeCell.xib */, 349D1AC61E2E325B004A2006 /* MWMBottomMenuCollectionViewPortraitCell.xib */, 349D1AC71E2E325B004A2006 /* MWMBottomMenuLayout.h */, - 349D1AC81E2E325B004A2006 /* MWMBottomMenuLayout.mm */, + 349D1AC81E2E325B004A2006 /* MWMBottomMenuLayout.m */, 349D1AC91E2E325B004A2006 /* MWMBottomMenuView.h */, - 349D1ACA1E2E325B004A2006 /* MWMBottomMenuView.mm */, + 349D1ACA1E2E325B004A2006 /* MWMBottomMenuView.m */, 349D1ACB1E2E325B004A2006 /* MWMBottomMenuViewController.h */, 349D1ACC1E2E325B004A2006 /* MWMBottomMenuViewController.mm */, 349D1ACD1E2E325B004A2006 /* MWMBottomMenuViewController.xib */, @@ -3738,13 +3682,13 @@ B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */, B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */, B3E3B50120D485FA00DA8C13 /* DownloadedBookmarksDataSource.swift */, - B366130220D5D9BC00E7DC3E /* MWMCategory.h */, - B366130320D5D9BC00E7DC3E /* MWMCategory.m */, B366130820D5E2E000E7DC3E /* CatalogCategoryCell.swift */, B366130920D5E2E000E7DC3E /* CatalogCategoryCell.xib */, 470F5A592181DE7400754295 /* PaidRouteViewController.swift */, 470F5A5A2181DE7400754295 /* PaidRouteViewController.xib */, - 45AC339022C4F57C004DC574 /* MWMUTM.h */, + 4728F68E22CE430800E00028 /* BookmarksSubscriptionViewController.swift */, + 4728F68F22CE430800E00028 /* BookmarksSubscriptionViewController.xib */, + 99865A1A234F629100127532 /* BookmarksSubscriptionButton.swift */, CD4A1F19230EADC100F2A6B6 /* CatalogConnectionErrorView.swift */, CD4A1F1B230EB43B00F2A6B6 /* CatalogConnectionErrorView.xib */, 47E6688923196F0000057733 /* UIViewController+Subscription.swift */, @@ -3828,8 +3772,6 @@ CDCA273E2238087700167D87 /* MWMCarPlaySearchService.mm */, CDCA2746223FD24600167D87 /* MWMCarPlaySearchResultObject.h */, CDCA2747223FD24600167D87 /* MWMCarPlaySearchResultObject.mm */, - CDCA277022426A2400167D87 /* MWMCarPlayBookmarkObject.h */, - CDCA277122426A2400167D87 /* MWMCarPlayBookmarkObject.mm */, ); path = CarPlay; sourceTree = ""; @@ -4186,13 +4128,13 @@ isa = PBXGroup; children = ( F6E2FBFE1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.h */, - F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.mm */, + F6E2FBFF1E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.m */, F6E2FC001E097B9F0083EBEC /* MWMMapDownloaderAdsTableViewCell.xib */, F6E2FC011E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.h */, - F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.mm */, + F6E2FC021E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.m */, F6E2FC031E097B9F0083EBEC /* MWMMapDownloaderButtonTableViewCell.xib */, F6E2FC041E097B9F0083EBEC /* MWMMapDownloaderCellHeader.h */, - F6E2FC051E097B9F0083EBEC /* MWMMapDownloaderCellHeader.mm */, + F6E2FC051E097B9F0083EBEC /* MWMMapDownloaderCellHeader.m */, F6E2FC061E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.h */, F6E2FC071E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.mm */, F6E2FC081E097B9F0083EBEC /* MWMMapDownloaderLargeCountryTableViewCell.xib */, @@ -5299,8 +5241,6 @@ 3467CEB2202C6EEE00D3C670 /* BMCNotificationsHeader.swift in Sources */, 34F4072F1E9E1AFF00E57AC0 /* BannersCache.swift in Sources */, 34D3B0211E389D05004100F9 /* MWMEditorAddAdditionalNameTableViewCell.mm in Sources */, - B366130420D5D9BC00E7DC3E /* MWMCategory.m in Sources */, - 3486B51E1E27AD590069C126 /* MWMFrameworkHelper.mm in Sources */, F6E2FE491E097BA00083EBEC /* MWMPlacePageData.mm in Sources */, 99D363192358685300941BF4 /* SubscriptionGroupItem.swift in Sources */, 348F8A531F863B6100060C2A /* UGCReview.swift in Sources */, @@ -5312,7 +5252,6 @@ CDB92CEE229E9CF900EC757C /* MWMDiscoveryMapObjects.mm in Sources */, 34B6FD5F2015E6BF00C18E97 /* DiscoveryBookingCell.swift in Sources */, 34D3B01B1E389D05004100F9 /* MWMButtonCell.mm in Sources */, - 3486B5161E27AD3B0069C126 /* Framework.cpp in Sources */, 34ABA6291C2D567B00FE1BEC /* MWMInputLoginValidator.mm in Sources */, 337F98B421D3C9F200C8AC27 /* SearchHistoryViewController.swift in Sources */, 3404F49D2028A2430090E401 /* BMCActionsCreateCell.swift in Sources */, @@ -5354,7 +5293,7 @@ 3404757E1E081B3300C92850 /* iosOGLContext.mm in Sources */, 34763F071F3092E700F4D2D3 /* String+Format.swift in Sources */, 346DB83A1E5C4F6700E3123E /* GalleryItemModel.swift in Sources */, - F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.mm in Sources */, + F6E2FD5C1E097BA00083EBEC /* MWMMapDownloaderCellHeader.m in Sources */, CDCA278E2248F34C00167D87 /* MWMRoutingManager.mm in Sources */, 34D3AFF21E37945B004100F9 /* UITableView+Cells.swift in Sources */, 34D3B0301E389D05004100F9 /* MWMEditorCategoryCell.mm in Sources */, @@ -5373,7 +5312,6 @@ 474C9F632141896800369009 /* MWMEye.mm in Sources */, F6791B141C43DF0B007A8A6E /* MWMStartButton.mm in Sources */, 479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */, - 33F8BA4421998BFA00ECA8EE /* MWMTagGroup.m in Sources */, F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.mm in Sources */, F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */, 34AC8FD11EFC02C000E7F910 /* MWMRoutePoint.mm in Sources */, @@ -5396,7 +5334,6 @@ 34D3B0181E389D05004100F9 /* EditorAdditionalNamePlaceholderTableViewCell.swift in Sources */, 346DB8281E5C4F6700E3123E /* GalleryCell.swift in Sources */, 47B9065521C7FA400079C85E /* NSString+MD5.m in Sources */, - 33F8BA4121998BEB00ECA8EE /* MWMTag.m in Sources */, CDB4D5022231412900104869 /* SettingsTemplateBuilder.swift in Sources */, F6EBB26F1FD7E33300B69B6A /* DiscoveryNoResultsCell.swift in Sources */, 47D0026721999DA900F651A2 /* PendingTransactionsHandler.swift in Sources */, @@ -5415,7 +5352,7 @@ 33F7668F21A57CDF00A88B16 /* EditOnWebViewController.swift in Sources */, 34AB664A1FC5AA330078E451 /* RouteManageriPadPresentationController.swift in Sources */, B366130A20D5E2E000E7DC3E /* CatalogCategoryCell.swift in Sources */, - 349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */, + 349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.m in Sources */, F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */, 34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.m in Sources */, CDB92CF822A5350500EC757C /* MWMDiscoveryHotelViewModel.m in Sources */, @@ -5439,7 +5376,6 @@ 349D1CE41E3F836900A878FD /* UIViewController+Hierarchy.swift in Sources */, CDB4D4E1222D70DF00104869 /* CarPlayMapViewController.swift in Sources */, 472C40EB232BAE20009AA777 /* CatalogPromoItem+Core.mm in Sources */, - 347039A91FB9A5CF00E47496 /* MWMBookmarksManager.mm in Sources */, F692F3831EA0FAF5001E82EB /* MWMAutoupdateController.mm in Sources */, 34574A671E3B85F80061E839 /* ThemeManager.swift in Sources */, 34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */, @@ -5450,7 +5386,7 @@ 6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */, 479D306822C66C8F00D18278 /* MWMBookmarksBannerViewController.m in Sources */, CDCA2748223FD24600167D87 /* MWMCarPlaySearchResultObject.mm in Sources */, - 349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.mm in Sources */, + 349D1AD81E2E325C004A2006 /* MWMBottomMenuLayout.m in Sources */, F6E2FEBE1E097BA00083EBEC /* MWMPPPreviewLayoutHelper.mm in Sources */, 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.mm in Sources */, 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.mm in Sources */, @@ -5466,7 +5402,7 @@ 3486B50D1E27A6DA0069C126 /* MWMPushNotifications.mm in Sources */, 47C3DB582268CDDB00DF6F91 /* DeeplinkInfoViewController.swift in Sources */, 3404F490202898CC0090E401 /* BMCModels.swift in Sources */, - F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.mm in Sources */, + F6E2FD561E097BA00083EBEC /* MWMMapDownloaderButtonTableViewCell.m in Sources */, CDB4D5002231412900104869 /* MapTemplateBuilder.swift in Sources */, 47C8789022DF525A00A772DA /* SubscriptionSuccessViewController.swift in Sources */, 3462258F1DDC5DBA001E8752 /* MWMSearchNoResultsAlert.mm in Sources */, @@ -5513,7 +5449,6 @@ 6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */, 472C40E4232A7B9F009AA777 /* CatalogSingleItemCell.swift in Sources */, B33D21B820E130D000BAD749 /* BookmarksTabViewController.swift in Sources */, - 3404754A1E081A4600C92850 /* AppInfo.mm in Sources */, 3358607E217632A2006D11F2 /* BookmarksSharingViewController.swift in Sources */, CDB92CF1229EB8A800EC757C /* MWMDiscoverySearchViewModel.m in Sources */, 34AB662F1FC5AA330078E451 /* RouteManageriPhonePresentationController.swift in Sources */, @@ -5534,7 +5469,6 @@ F6664C021E6459DA00E703C2 /* PPReviewHeaderCell.swift in Sources */, F6E2FE7C1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.mm in Sources */, 340E1EFB1E2F614400CE49BF /* Storyboard.swift in Sources */, - B33D21B220DBCC5E00BAD749 /* MWMCatalogObserver.mm in Sources */, 34E776331F15FAC2003040B3 /* MWMPlacePageManagerHelper.mm in Sources */, F6E2FF361E097BA00083EBEC /* MWMSearchSuggestionCell.mm in Sources */, 3472B5CF200F4A2B00DC6CD5 /* BackgroundFetchTask.swift in Sources */, @@ -5576,13 +5510,11 @@ 34FE5A6F1F18F30F00BCA729 /* TrafficButtonArea.swift in Sources */, F6E2FF691E097BA00083EBEC /* MWMUnitsController.mm in Sources */, 6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */, - 33F8BA472199A91900ECA8EE /* MWMTag+Convenience.mm in Sources */, F6E2FE9D1E097BA00083EBEC /* MWMiPhonePlacePageLayoutImpl.mm in Sources */, CDCA27382237F1BD00167D87 /* BookmarkInfo.swift in Sources */, 34AB668C1FC5AA330078E451 /* NavigationStreetNameView.swift in Sources */, 3454D7C81E07F045004AF2AD /* UIButton+RuntimeAttributes.mm in Sources */, 337F98A621D37B7400C8AC27 /* SearchTabViewController.swift in Sources */, - 33F8BA4A2199AA1300ECA8EE /* MWMTagGroup+Convenience.mm in Sources */, 479D306122C6634900D18278 /* MWMMegafonBannerViewController.m in Sources */, 3488B0131E9D0AEC0068AFD8 /* AdBanner.swift in Sources */, 3404755F1E081A4600C92850 /* MWMLocationPredictor.mm in Sources */, @@ -5620,7 +5552,6 @@ 47C7F97521930F5300C2760C /* IInAppBilling.swift in Sources */, 4719A64E21A30C3B009F9AA7 /* PaidRouteStatistics.swift in Sources */, 34BBD6601F8270360070CA50 /* AuthorizationiPadPresentationController.swift in Sources */, - CDCA277222426A2400167D87 /* MWMCarPlayBookmarkObject.mm in Sources */, F6E2FD7D1E097BA00083EBEC /* MWMMapDownloaderExtendedDataSource.mm in Sources */, F6E2FED31E097BA00083EBEC /* MWMSearchHotelsFilterViewController.mm in Sources */, 340475741E081A4600C92850 /* MWMStorage.mm in Sources */, @@ -5649,7 +5580,7 @@ 34D3AFE21E376F7E004100F9 /* UITableView+Updates.swift in Sources */, 3404164C1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */, 6741AA141BF340DE002C974C /* MWMMultilineLabel.mm in Sources */, - 349D1ADB1E2E325C004A2006 /* MWMBottomMenuView.mm in Sources */, + 349D1ADB1E2E325C004A2006 /* MWMBottomMenuView.m in Sources */, 344BEAF61F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */, F6E2FD921E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */, CD96C71C22A8113100DB7CFE /* MWMDiscoveryControllerViewModel.mm in Sources */, diff --git a/iphone/Maps/Maps_Prefix.pch b/iphone/Maps/Maps_Prefix.pch index 19d5cc075e..bf5a18bf03 100644 --- a/iphone/Maps/Maps_Prefix.pch +++ b/iphone/Maps/Maps_Prefix.pch @@ -8,7 +8,6 @@ #import "MWMConsts.h" #import "MWMMacros.h" - #import "MWMTypes.h" #import "UIColor+MapsMeColor.h" #import "UIFont+MapsMeFonts.h" #import "UIKitCategories.h" diff --git a/iphone/Maps/UI/Appearance/ThemeManager.swift b/iphone/Maps/UI/Appearance/ThemeManager.swift index eac42222d2..7b3ecdfa8d 100644 --- a/iphone/Maps/UI/Appearance/ThemeManager.swift +++ b/iphone/Maps/UI/Appearance/ThemeManager.swift @@ -18,7 +18,7 @@ final class ThemeManager: NSObject { case .vehicleNight: return isVehicleRouting ? .vehicleNight : .night case .auto: guard isVehicleRouting else { return .day } - switch FrameworkHelper.daytime() { + switch FrameworkHelper.daytime(at: MWMLocationManager.lastLocation()) { case .day: return .vehicleDay case .night: return .vehicleNight } diff --git a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm index 96eaa0594d..352f6b8626 100644 --- a/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm +++ b/iphone/Maps/UI/Authorization/MWMAuthorizationViewModel.mm @@ -3,7 +3,7 @@ #import #import "Statistics.h" -#include "Framework.h" +#include #include diff --git a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.h b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.h index 81ef2f1f49..17745f1e1c 100644 --- a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.h +++ b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.h @@ -1,6 +1,6 @@ #import "MWMViewController.h" -#include "Framework.h" +#include @interface MWMAutoupdateController : MWMViewController diff --git a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm index 01e47f16a9..b1a7033a95 100644 --- a/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm +++ b/iphone/Maps/UI/Autoupdate/MWMAutoupdateController.mm @@ -1,6 +1,5 @@ #import "MWMAutoupdateController.h" #import "MWMCircularProgress.h" -#import "MWMCommon.h" #import "MWMFrameworkListener.h" #import "MWMStorage.h" #import "Statistics.h" diff --git a/iphone/Maps/UI/AvailableArea/VisibleArea.swift b/iphone/Maps/UI/AvailableArea/VisibleArea.swift index 6060a34b6b..7c24c482bb 100644 --- a/iphone/Maps/UI/AvailableArea/VisibleArea.swift +++ b/iphone/Maps/UI/AvailableArea/VisibleArea.swift @@ -15,7 +15,7 @@ final class VisibleArea: AvailableArea { return } } - FrameworkHelper.setVisibleViewport(areaFrame) + FrameworkHelper.setVisibleViewport(areaFrame, scaleFactor: contentScaleFactor) } } diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m similarity index 99% rename from iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.mm rename to iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m index 0ce4ad1bcb..88aab4213e 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuCollectionViewCell.m @@ -1,5 +1,4 @@ #import "MWMBottomMenuCollectionViewCell.h" -#import "MWMCommon.h" #import "SwiftBridge.h" #import "UIImageView+Coloring.h" diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuLayout.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuLayout.m similarity index 93% rename from iphone/Maps/UI/BottomMenu/MWMBottomMenuLayout.mm rename to iphone/Maps/UI/BottomMenu/MWMBottomMenuLayout.m index 280c7b41da..4b56525b34 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuLayout.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuLayout.m @@ -7,7 +7,7 @@ { UICollectionViewLayoutAttributes * attr = [UICollectionViewLayoutAttributes layoutAttributesForCellWithIndexPath:indexPath]; - CGPoint origin = {}; + CGPoint origin = CGPointZero; CGSize size = self.collectionView.frame.size; NSUInteger const buttonsCount = self.buttonsCount; CGFloat const position = (CGFloat)indexPath.item / buttonsCount; @@ -23,7 +23,7 @@ size.height = nearbyint(size.height / buttonsCount); } NSAssert(!CGSizeEqualToSize(size, CGSizeZero), @"Invalid cell size"); - attr.frame = {origin, size}; + attr.frame = CGRectMake(origin.x, origin.y, size.width, size.height); return attr; } diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m similarity index 90% rename from iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm rename to iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m index 8e108bb3d8..cec7e33abd 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuView.m @@ -1,13 +1,10 @@ #import "MWMBottomMenuView.h" #import "MWMAvailableAreaAffectDirection.h" #import "MWMButton.h" -#import "MWMCommon.h" +//#import -namespace -{ -CGFloat constexpr kAdditionalHeight = 64; -CGFloat constexpr kDefaultMainButtonsHeight = 48; -} // namespace +static CGFloat kAdditionalHeight = 64; +static CGFloat kDefaultMainButtonsHeight = 48; @interface MWMBottomMenuView () @@ -81,7 +78,7 @@ CGFloat constexpr kDefaultMainButtonsHeight = 48; - (void)updateGeometry { - auto const availableArea = self.availableArea; + CGRect availableArea = self.availableArea; if (CGRectEqualToRect(availableArea, CGRectZero)) return; self.separatorHeight.constant = 0.0; @@ -108,12 +105,14 @@ CGFloat constexpr kDefaultMainButtonsHeight = 48; } break; } - auto const mainHeight = self.mainButtonsHeight.constant; - auto const separatorHeight = self.separatorHeight.constant; - auto const additionalHeight = self.additionalButtonsHeight.constant; - auto const height = mainHeight + separatorHeight + additionalHeight; - self.frame = {{availableArea.origin.x, availableArea.size.height - height}, - {availableArea.size.width, height}}; + CGFloat mainHeight = self.mainButtonsHeight.constant; + CGFloat separatorHeight = self.separatorHeight.constant; + CGFloat additionalHeight = self.additionalButtonsHeight.constant; + CGFloat height = mainHeight + separatorHeight + additionalHeight; + self.frame = CGRectMake(availableArea.origin.x, + availableArea.size.height - height, + availableArea.size.width, + height); } - (void)morphMenuButtonTemplate:(NSString *)morphTemplate direct:(BOOL)direct diff --git a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm index ec97e013eb..17421980da 100644 --- a/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm +++ b/iphone/Maps/UI/BottomMenu/MWMBottomMenuViewController.mm @@ -4,7 +4,6 @@ #import "MWMBottomMenuControllerProtocol.h" #import "MWMBottomMenuLayout.h" #import "MWMButton.h" -#import "MWMCommon.h" #import "MWMDiscoveryController.h" #import "MWMMapViewControlsManager.h" #import "MWMNetworkPolicy.h" @@ -13,7 +12,7 @@ #import "Statistics.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "platform/platform.hpp" diff --git a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift index a6fa767e30..00c1cabdef 100644 --- a/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift +++ b/iphone/Maps/UI/CarPlay/CarPlayMapViewController.swift @@ -123,7 +123,7 @@ final class CarPlayMapViewController: MWMViewController { frame.origin = origin frame.size = CGSize(width: viewBounds.width - origin.x, height: viewBounds.height - origin.y) - FrameworkHelper.setVisibleViewport(frame) + FrameworkHelper.setVisibleViewport(frame, scaleFactor: view.contentScaleFactor) } private func updateVisibleViewPortToNavigationState() { @@ -136,11 +136,11 @@ final class CarPlayMapViewController: MWMViewController { frame.origin = origin frame.size = CGSize(width: viewBounds.width - (origin.x + mapControlsWidth), height: viewBounds.height - origin.y) - FrameworkHelper.setVisibleViewport(frame) + FrameworkHelper.setVisibleViewport(frame, scaleFactor: view.contentScaleFactor) } private func updateVisibleViewPortToDefaultState() { - FrameworkHelper.setVisibleViewport(view.bounds) + FrameworkHelper.setVisibleViewport(view.bounds, scaleFactor: view.contentScaleFactor) } override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { diff --git a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm index 5b7c1e91ad..80bc57851d 100644 --- a/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm +++ b/iphone/Maps/UI/Discovery/MWMDiscoveryController.mm @@ -1,6 +1,6 @@ #import "MWMDiscoveryController.h" -#import "Framework.h" +#include #import "MWMDiscoveryControllerViewModel.h" #import "MWMDiscoveryCityGalleryObjects.h" #import "MWMDiscoveryMapObjects.h" diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderAdsTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderAdsTableViewCell.m similarity index 100% rename from iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderAdsTableViewCell.mm rename to iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderAdsTableViewCell.m diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.m similarity index 90% rename from iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.mm rename to iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.m index ea5c1ddd69..417714e8d9 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderButtonTableViewCell.m @@ -1,8 +1,8 @@ #import "MWMMapDownloaderButtonTableViewCell.h" -#include "storage/storage.hpp" - -using namespace storage; +//#include "storage/storage.hpp" +// +//using namespace storage; @implementation MWMMapDownloaderButtonTableViewCell diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m similarity index 87% rename from iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm rename to iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m index 3d5f0e3e83..0c0460d23d 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderCellHeader.m @@ -15,7 +15,7 @@ - (void)drawTextInRect:(CGRect)rect { - rect = UIEdgeInsetsInsetRect(rect, {.left = 16}); + rect = UIEdgeInsetsInsetRect(rect, UIEdgeInsetsMake(0, 16, 0, 0)); if (@available(iOS 11.0, *)) rect = UIEdgeInsetsInsetRect(rect, self.safeAreaInsets); [super drawTextInRect:rect]; diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm index 97eb96a1c3..6cc567e328 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderLargeCountryTableViewCell.mm @@ -1,4 +1,3 @@ -#import "MWMCommon.h" #import "MWMMapDownloaderLargeCountryTableViewCell.h" @interface MWMMapDownloaderLargeCountryTableViewCell () diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm index 7da1bfa3ba..6b90aa0902 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderPlaceTableViewCell.mm @@ -1,6 +1,6 @@ #import "MWMMapDownloaderPlaceTableViewCell.h" -#include "Framework.h" +#include @interface MWMMapDownloaderTableViewCell () diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm index 838d38806e..ebeacaed2d 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderSubplaceTableViewCell.mm @@ -1,5 +1,4 @@ #import "MWMMapDownloaderSubplaceTableViewCell.h" -#import "MWMCommon.h" @interface MWMMapDownloaderTableViewCell () diff --git a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm index 7167c29320..c3d5b353ac 100644 --- a/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm +++ b/iphone/Maps/UI/Downloader/Cells/MWMMapDownloaderTableViewCell.mm @@ -1,10 +1,10 @@ #import "MWMMapDownloaderTableViewCell.h" -#import "MWMCommon.h" #import "MWMCircularProgress.h" #import "MWMMapDownloaderLargeCountryTableViewCell.h" #import "NSString+Categories.h" -#include "Framework.h" +#include +#import @interface MWMMapDownloaderTableViewCell () diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm index 100566fffd..aee2fd26e6 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderDefaultDataSource.mm @@ -1,10 +1,9 @@ #import "MWMMapDownloaderDefaultDataSource.h" -#import "MWMCommon.h" #import "MWMMapDownloaderLargeCountryTableViewCell.h" #import "MWMMapDownloaderPlaceTableViewCell.h" #import "SwiftBridge.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm index 35f9bf1344..e42c725499 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSource.mm @@ -2,7 +2,7 @@ #import "CLLocation+Mercator.h" #import "MWMLocationManager.h" -#include "Framework.h" +#include #include "storage/country_info_getter.hpp" diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm index fa1febba3d..b75070b81a 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderExtendedDataSourceWithAds.mm @@ -2,7 +2,7 @@ #import "MWMMapDownloaderAdsTableViewCell.h" #import "MWMMyTarget.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderSearchDataSource.mm b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderSearchDataSource.mm index 569a9f29c1..2fbaba09c6 100644 --- a/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderSearchDataSource.mm +++ b/iphone/Maps/UI/Downloader/DataSources/MWMMapDownloaderSearchDataSource.mm @@ -3,7 +3,7 @@ #import "MWMMapDownloaderPlaceTableViewCell.h" #import "MWMMapDownloaderSubplaceTableViewCell.h" -#include "Framework.h" +#include using namespace storage; diff --git a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm index b91cfce125..9294057bbb 100644 --- a/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMBaseMapDownloaderViewController.mm @@ -1,6 +1,5 @@ #import "MWMBaseMapDownloaderViewController.h" #import "MWMButton.h" -#import "MWMCommon.h" #import "MWMFrameworkListener.h" #import "MWMFrameworkObservers.h" #import "MWMMapDownloaderAdsTableViewCell.h" @@ -17,7 +16,7 @@ #import "SwiftBridge.h" #import "UIViewController+Navigation.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm index 9c2d257c5c..b23d2b8965 100644 --- a/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm +++ b/iphone/Maps/UI/Downloader/MWMMapDownloaderViewController.mm @@ -3,7 +3,7 @@ #import "MWMMapDownloaderSearchDataSource.h" #import "SwiftBridge.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm index c616089393..bef2ce3cd1 100644 --- a/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm +++ b/iphone/Maps/UI/Downloader/NoMaps/MWMNoMapsView.mm @@ -1,5 +1,4 @@ #import "MWMNoMapsView.h" -#import "MWMCommon.h" #import "MWMKeyboard.h" @interface MWMNoMapsView () diff --git a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm index 26b8ef4b67..9ea9ea5eef 100644 --- a/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm +++ b/iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm @@ -9,7 +9,7 @@ #import "UIImageView+Coloring.h" #import "UIViewController+Navigation.h" -#include "Framework.h" +#include namespace { diff --git a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.mm b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.mm index c99ec521fa..b8f550818e 100644 --- a/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.mm +++ b/iphone/Maps/UI/Editor/Cells/MWMEditorSelectTableViewCell.mm @@ -1,5 +1,5 @@ #import "MWMEditorSelectTableViewCell.h" -#import "MWMCommon.h" +#import #import "UIImageView+Coloring.h" @interface MWMEditorSelectTableViewCell () diff --git a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm index aac3a13360..557e717beb 100644 --- a/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm +++ b/iphone/Maps/UI/Editor/Cuisine/MWMCuisineEditorViewController.mm @@ -1,5 +1,4 @@ #import "MWMCuisineEditorViewController.h" -#import "MWMCommon.h" #import "MWMKeyboard.h" #import "MWMTableViewCell.h" #import "SwiftBridge.h" diff --git a/iphone/Maps/UI/Editor/MWMEditorViewController.mm b/iphone/Maps/UI/Editor/MWMEditorViewController.mm index d9d464dc10..16fb3402f7 100644 --- a/iphone/Maps/UI/Editor/MWMEditorViewController.mm +++ b/iphone/Maps/UI/Editor/MWMEditorViewController.mm @@ -23,7 +23,7 @@ #import "MapViewController.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "editor/osm_editor.hpp" diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm index 1bc3a9536e..be9662587e 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorController.mm @@ -1,7 +1,6 @@ #import "MWMObjectsCategorySelectorController.h" #import "MWMAuthorizationCommon.h" #import "MWMObjectsCategorySelectorDataSource.h" -#import "MWMCommon.h" #import "MWMEditorViewController.h" #import "MWMKeyboard.h" #import "MWMTableViewCell.h" @@ -9,7 +8,7 @@ #import "SwiftBridge.h" #import "UIViewController+Navigation.h" -#include "Framework.h" +#include using namespace osm; diff --git a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm index 75f447dfa2..6b1a0fc646 100644 --- a/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm +++ b/iphone/Maps/UI/Editor/MWMObjectsCategorySelectorDataSource.mm @@ -2,7 +2,7 @@ #include "LocaleTranslator.h" -#include "Framework.h" +#include #include "indexer/classificator.hpp" diff --git a/iphone/Maps/UI/Migration/MWMMigrationView.mm b/iphone/Maps/UI/Migration/MWMMigrationView.mm new file mode 100644 index 0000000000..099589192a --- /dev/null +++ b/iphone/Maps/UI/Migration/MWMMigrationView.mm @@ -0,0 +1,126 @@ +#import "MWMMigrationView.h" + +@interface MWMMigrationView () + +@property (weak, nonatomic) IBOutlet UIImageView * image; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageMinHeight; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint * imageHeight; + +@property (weak, nonatomic) IBOutlet UILabel * title; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleTopOffset; +@property (weak, nonatomic) IBOutlet NSLayoutConstraint * titleImageOffset; + +@property (weak, nonatomic) IBOutlet UILabel * text; +@property (weak, nonatomic) IBOutlet UILabel * info; + +@property (weak, nonatomic) IBOutlet UIButton * primaryButton; +@property (weak, nonatomic) IBOutlet UIButton * secondaryButton; +@property (weak, nonatomic) IBOutlet UIView * spinnerView; + +@property (nonatomic) MWMCircularProgress * spinner; + +@end + +@implementation MWMMigrationView + +- (void)awakeFromNib +{ + [super awakeFromNib]; + self.state = MWMMigrationViewState::Default; + self.secondaryButton.titleLabel.textAlignment = NSTextAlignmentCenter; +} + +- (void)layoutSubviews +{ + [super layoutSubviews]; + self.title.preferredMaxLayoutWidth = self.title.width; + self.text.preferredMaxLayoutWidth = self.text.width; + self.info.preferredMaxLayoutWidth = self.info.width; + [super layoutSubviews]; +} + +- (void)setFrame:(CGRect)frame +{ + [self updateForSize:frame.size]; + super.frame = frame; +} + +- (void)updateForSize:(CGSize)size +{ + BOOL const hideImage = (self.imageHeight.multiplier * size.height <= self.imageMinHeight.constant); + self.titleImageOffset.priority = hideImage ? UILayoutPriorityDefaultLow : UILayoutPriorityDefaultHigh; + self.image.hidden = hideImage; + [self layoutIfNeeded]; +} + +- (void)configDefaultState +{ + [self stopSpinner]; + self.info.hidden = YES; + self.info.textColor = [UIColor blackHintText]; + self.primaryButton.enabled = YES; + self.secondaryButton.enabled = YES; + self.primaryButton.hidden = NO; + self.secondaryButton.hidden = NO; +} + +- (void)startSpinner +{ + self.spinnerView.hidden = NO; + self.spinner = [MWMCircularProgress downloaderProgressForParentView:self.spinnerView]; + self.spinner.delegate = self.delegate; + [self.spinner setInvertColor:YES]; + self.spinner.state = MWMCircularProgressStateSpinner; +} + +- (void)stopSpinner +{ + self.spinnerView.hidden = YES; + self.spinner = nil; +} + +- (void)setProgress:(CGFloat)progress +{ + self.spinner.progress = progress; +} + +#pragma mark - Properties + +- (void)setState:(MWMMigrationViewState)state +{ + [self layoutIfNeeded]; + [self configDefaultState]; + switch (state) + { + case MWMMigrationViewState::Default: + self.primaryButton.hidden = NO; + self.secondaryButton.hidden = NO; + break; + case MWMMigrationViewState::Processing: + self.info.hidden = NO; + self.info.text = [NSString stringWithFormat:@"%@ %@", L(@"downloader_downloading"), self.nodeLocalName]; + [self startSpinner]; + self.primaryButton.enabled = NO; + self.primaryButton.hidden = YES; + self.secondaryButton.hidden = YES; + break; + case MWMMigrationViewState::ErrorNoConnection: + self.info.hidden = NO; + self.info.textColor = [UIColor red]; + self.info.text = L(@"common_check_internet_connection_dialog"); + self.primaryButton.hidden = YES; + self.secondaryButton.hidden = YES; + break; + case MWMMigrationViewState::ErrorNoSpace: + self.info.hidden = NO; + self.info.textColor = [UIColor red]; + self.info.text = L(@"migration_no_space_message"); + self.primaryButton.hidden = YES; + self.secondaryButton.hidden = YES; + break; + } + _state = state; + [UIView animateWithDuration:kDefaultAnimationDuration animations:^{ [self layoutIfNeeded]; }]; +} + +@end diff --git a/iphone/Maps/UI/Migration/MWMMigrationViewController.mm b/iphone/Maps/UI/Migration/MWMMigrationViewController.mm new file mode 100644 index 0000000000..2aa1abdcdb --- /dev/null +++ b/iphone/Maps/UI/Migration/MWMMigrationViewController.mm @@ -0,0 +1,171 @@ +#import "MWMAlertViewController.h" +#import "MWMLocationManager.h" +#import "MWMMapDownloaderViewController.h" +#import "MWMMigrationView.h" +#import "MWMMigrationViewController.h" +#import "Statistics.h" + +#include +#import + +using namespace storage; + +@interface MWMMigrationViewController () + +@end + +@implementation MWMMigrationViewController +{ + CountryId m_countryId; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + m_countryId = kInvalidCountryId; + [self configNavBar]; + [self checkState]; + static_cast(self.view).delegate = self; +} + +- (void)configNavBar +{ + self.title = L(@"download_maps"); +} + +- (void)checkState +{ + if (!GetFramework().IsEnoughSpaceForMigrate()) + [self setState:MWMMigrationViewState::ErrorNoSpace]; + else if (!Platform::IsConnected()) + [self setState:MWMMigrationViewState::ErrorNoConnection]; + else + [self setState:MWMMigrationViewState::Default]; +} + +- (void)performLimitedMigration:(BOOL)limited +{ + [Statistics logEvent:kStatDownloaderMigrationStarted + withParameters:@{kStatType : limited ? kStatCurrentMap : kStatAllMaps}]; + auto & f = GetFramework(); + + ms::LatLon position = MercatorBounds::ToLatLon(f.GetViewportCenter()); + CLLocation * lastLocation = [MWMLocationManager lastLocation]; + if (lastLocation) + position = ms::LatLon(lastLocation.coordinate.latitude, lastLocation.coordinate.longitude); + + auto migrate = ^ + { + GetFramework().Migrate(!limited); + MWMMapDownloaderViewController * dvc = [self.storyboard + instantiateViewControllerWithIdentifier:@"MWMMapDownloaderViewController"]; + [dvc setParentCountryId:@(GetFramework().GetStorage().GetRootId().c_str()) + mode:MWMMapDownloaderModeDownloaded]; + NSMutableArray *viewControllers = [NSMutableArray arrayWithArray:self.navigationController.viewControllers]; + [viewControllers removeLastObject]; + [viewControllers addObject:dvc]; + [self.navigationController setViewControllers:viewControllers animated:YES]; + [Statistics logEvent:kStatDownloaderMigrationCompleted]; + }; + + auto onStatusChanged = [self, migrate](CountryId const & countryId) { + if (m_countryId == kInvalidCountryId || m_countryId != countryId) + return; + auto & f = GetFramework(); + auto s = f.GetStorage().GetPrefetchStorage(); + NodeStatuses nodeStatuses{}; + s->GetNodeStatuses(countryId, nodeStatuses); + switch (nodeStatuses.m_status) + { + case NodeStatus::OnDisk: migrate(); break; + case NodeStatus::Undefined: + case NodeStatus::Error: [self showError:nodeStatuses.m_error countryId:countryId]; break; + default: break; + } + }; + + auto onProgressChanged = [self](CountryId const & countryId, + LocalAndRemoteSize const & progress) { + MWMMigrationView * view = static_cast(self.view); + [view setProgress:static_cast(progress.first) / progress.second]; + }; + +// [MWMFrameworkHelper checkConnectionAndPerformAction:^{ +// self->m_countryId = f.PreMigrate(position, onStatusChanged, onProgressChanged); +// if (self->m_countryId != kInvalidCountryId) +// [self setState:MWMMigrationViewState::Processing]; +// else +// migrate(); +// } cancelAction:nil]; +} + +- (void)showError:(NodeErrorCode)errorCode countryId:(CountryId const &)countryId +{ + [self setState:MWMMigrationViewState::Default]; + MWMAlertViewController * avc = [MWMAlertViewController activeAlertController]; + auto const retryBlock = ^ + { + GetFramework().GetStorage().GetPrefetchStorage()->RetryDownloadNode(self->m_countryId); + [self setState:MWMMigrationViewState::Processing]; + }; + auto const cancelBlock = ^ + { + GetFramework().GetStorage().GetPrefetchStorage()->CancelDownloadNode(self->m_countryId); + }; + switch (errorCode) + { + case NodeErrorCode::NoError: + break; + case NodeErrorCode::UnknownError: + [Statistics logEvent:kStatDownloaderMigrationError withParameters:@{kStatType : kStatUnknownError}]; + [avc presentDownloaderInternalErrorAlertWithOkBlock:retryBlock cancelBlock:cancelBlock]; + break; + case NodeErrorCode::OutOfMemFailed: + [Statistics logEvent:kStatDownloaderMigrationError withParameters:@{kStatType : kStatNoSpace}]; + [avc presentDownloaderNotEnoughSpaceAlert]; + break; + case NodeErrorCode::NoInetConnection: + [Statistics logEvent:kStatDownloaderMigrationError withParameters:@{kStatType : kStatNoConnection}]; + [avc presentDownloaderNoConnectionAlertWithOkBlock:retryBlock cancelBlock:cancelBlock]; + break; + } +} + +- (void)setState:(MWMMigrationViewState)state +{ + MWMMigrationView * migrationView = static_cast(self.view); + if (state == MWMMigrationViewState::Processing) + { + NodeAttrs nodeAttrs; + GetFramework().GetStorage().GetPrefetchStorage()->GetNodeAttrs(m_countryId, nodeAttrs); + migrationView.nodeLocalName = @(nodeAttrs.m_nodeLocalName.c_str()); + self.navigationItem.leftBarButtonItem.enabled = NO; + } + else + { + self.navigationItem.leftBarButtonItem.enabled = YES; + } + migrationView.state = state; +} + +#pragma mark - MWMCircularProgressProtocol + +- (void)progressButtonPressed:(MWMCircularProgress *)progress +{ + GetFramework().GetStorage().GetPrefetchStorage()->CancelDownloadNode(m_countryId); + [self setState:MWMMigrationViewState::Default]; +} + +#pragma mark - Actions + +- (IBAction)primaryAction +{ + [self performLimitedMigration:NO]; +} + +- (IBAction)secondaryAction +{ + [self performLimitedMigration:YES]; +} + +@end diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h index 4242be160a..f6d241c794 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.h +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.h @@ -212,8 +212,8 @@ typedef void (^RefreshPromoCallbackBlock)(NSIndexSet *insertedSections); // UGC - (ftraits::UGCRatingCategories)ugcRatingCategories; - (void)setUGCUpdateFrom:(MWMUGCReviewModel *)reviewModel + language:(NSString *)language resultHandler:(void (^)(BOOL))resultHandler; - // Route points - (RouteMarkType)routeMarkType; - (size_t)intermediateIndex; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm index 6032f3f844..8afcdf63d1 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageData.mm @@ -1,15 +1,12 @@ #import "MWMPlacePageData.h" -#import "AppInfo.h" #import "LocaleTranslator.h" #import "MWMDiscoveryCityGalleryObjects.h" #import "MWMDiscoveryGuideViewModel.h" #import "MWMBannerHelpers.h" -#import "MWMBookmarksManager.h" #import "MWMUGCViewModel.h" -#import "SwiftBridge.h" #import "Statistics.h" -#include "Framework.h" +#import #include "local_ads/event.hpp" @@ -684,16 +681,17 @@ NSString * const kUserDefaultsLatLonAsDMSKey = @"UserDefaultsLatLonAsDMS"; - (ftraits::UGCRatingCategories)ugcRatingCategories { return [self getRawData].GetRatingCategories(); } -- (void)setUGCUpdateFrom:(MWMUGCReviewModel *)reviewModel resultHandler:(void (^)(BOOL))resultHandler -{ +- (void)setUGCUpdateFrom:(MWMUGCReviewModel *)reviewModel + language:(NSString *)language + resultHandler:(void (^)(BOOL))resultHandler { using namespace ugc; auto appInfo = AppInfo.sharedInfo; auto const locale = static_cast(StringUtf8Multilang::GetLangIndex(appInfo.twoLetterLanguageId.UTF8String)); std::vector keyboardLanguages; // TODO: Set the list of used keyboard languages (not only the recent one). - auto lastInputLanguage = appInfo.twoLetterInputLanguage; - keyboardLanguages.emplace_back(StringUtf8Multilang::GetLangIndex(lastInputLanguage.UTF8String)); + auto twoLetterInputLanguage = languages::Normalize(language.UTF8String); + keyboardLanguages.emplace_back(StringUtf8Multilang::GetLangIndex(twoLetterInputLanguage)); KeyboardText t{reviewModel.text.UTF8String, locale, keyboardLanguages}; Ratings r; diff --git a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm index afd2c7a540..e8f2943851 100644 --- a/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm +++ b/iphone/Maps/UI/PlacePage/MWMPlacePageManager.mm @@ -2,7 +2,7 @@ #import "CLLocation+Mercator.h" #import "MWMAPIBar.h" #import "MWMActivityViewController.h" -#import "MWMBookmarksManager.h" +//#import "MWMBookmarksManager.h" #import "MWMFrameworkListener.h" #import "MWMFrameworkObservers.h" #import "MWMLocationHelpers.h" @@ -19,7 +19,7 @@ #import "Statistics.h" #import "SwiftBridge.h" -#include "Framework.h" +#import #include "map/bookmark.hpp" #include "map/utils.hpp" @@ -804,7 +804,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page: - (MapViewController *)ownerViewController { return [MapViewController sharedController]; } -- (void)saveUgcWithModel:(MWMUGCReviewModel *)model resultHandler:(void (^)(BOOL))resultHandler +- (void)saveUgcWithModel:(MWMUGCReviewModel *)model language:(NSString *)language resultHandler:(void (^)(BOOL))resultHandler { auto data = self.data; if (!data) @@ -814,7 +814,7 @@ void RegisterEventIfPossible(eye::MapObject::Event::Type const type, place_page: return; } - [data setUGCUpdateFrom:model resultHandler:resultHandler]; + [data setUGCUpdateFrom:model language:language resultHandler:resultHandler]; } #pragma mark - MWMPlacePagePromoProtocol diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm index b71b03bfe5..f72063d2c7 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMActionBarButton.mm @@ -1,5 +1,4 @@ #import "MWMActionBarButton.h" -#import "MWMCommon.h" #import "MWMButton.h" #import "MWMCircularProgress.h" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm index 5257119f6d..81fbae05f8 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/ActionBar/MWMPlacePageActionBar.mm @@ -1,5 +1,5 @@ #import "MWMPlacePageActionBar.h" -#import "AppInfo.h" +#import #import "MWMActionBarButton.h" #import "MWMCircularProgress.h" #import "MWMNavigationDashboardManager.h" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm index b375adcc77..ac1ff750a4 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMOpeningHoursLayoutHelper.mm @@ -1,5 +1,4 @@ #import "MWMOpeningHoursLayoutHelper.h" -#import "MWMCommon.h" #import "MWMOpeningHours.h" #import "MWMPlacePageData.h" #import "MWMTableViewCell.h" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm index ebfa7e6259..51e1288965 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/OpeningHoursCell/MWMPlacePageOpeningHoursCell.mm @@ -1,5 +1,5 @@ #import "MWMPlacePageOpeningHoursCell.h" -#import "MWMCommon.h" +#import #import "MWMOpeningHoursCommon.h" #import "MWMPlacePageOpeningHoursDayView.h" #import "Statistics.h" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm index fd248339b0..b7abe3bf52 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/RegularCell/MWMPlacePageRegularCell.mm @@ -1,5 +1,4 @@ #import "MWMPlacePageRegularCell.h" -#import "MWMCommon.h" #import "MWMLocationManager.h" #import "MapViewController.h" #import "MapsAppDelegate.h" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewController.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewController.swift index 95980a621f..bc12813c7e 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewController.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewController.swift @@ -1,7 +1,7 @@ @objc(MWMGCReviewSaver) protocol UGCReviewSaver { typealias onSaveHandler = (Bool) -> Void - func saveUgc(model: UGCAddReviewController.Model, resultHandler: @escaping onSaveHandler) + func saveUgc(model: UGCAddReviewController.Model, language: String, resultHandler: @escaping onSaveHandler) } @objc(MWMUGCAddReviewController) @@ -70,7 +70,7 @@ final class UGCAddReviewController: MWMTableViewController { reviewPosted = true model.text = text - saver.saveUgc(model: model, resultHandler: { (saveResult) in + saver.saveUgc(model: model, language: textCell?.reviewLanguage ?? "en", resultHandler: { (saveResult) in guard let nc = self.navigationController else { return } if !saveResult { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewTextCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewTextCell.swift index 3853bf251e..fc42f710d7 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewTextCell.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/UGC/UGCAddReview/UGCAddReviewTextCell.swift @@ -16,6 +16,10 @@ final class UGCAddReviewTextCell: MWMTableViewCell { get { return textView.text } set { textView.text = newValue } } + + var reviewLanguage: String? { + get { return textView.textInputMode?.primaryLanguage } + } } extension UGCAddReviewTextCell: UITextViewDelegate { diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm index 8d4374126a..4e61fa71c2 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/MWMPlacePageLayout.mm @@ -24,6 +24,8 @@ #include "storage/storage_defines.hpp" +#import + namespace { using place_page::MetainfoRows; diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm index 9f1278d5b7..8319945b88 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/PlacePageView/MWMPPView.mm @@ -1,5 +1,4 @@ #import "MWMPPView.h" -#import "MWMCommon.h" #import "MWMPlacePageActionBar.h" #import "SwiftBridge.h" diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm index 69b135fa8d..d32fd51ae5 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm +++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Preview/MWMPPPreviewLayoutHelper.mm @@ -1,6 +1,5 @@ #import "MWMPPPreviewLayoutHelper.h" #import -#import "MWMCommon.h" #import "MWMDirectionView.h" #import "MWMPlacePageData.h" #import "MWMPlacePageManagerHelper.h" diff --git a/iphone/Maps/UI/Promo/MWMPromoApi.mm b/iphone/Maps/UI/Promo/MWMPromoApi.mm index caa5a9b274..4880b4841f 100644 --- a/iphone/Maps/UI/Promo/MWMPromoApi.mm +++ b/iphone/Maps/UI/Promo/MWMPromoApi.mm @@ -1,7 +1,7 @@ #import "MWMPromoApi.h" #import "MWMPromoAfterBooking.h" -#include "Framework.h" +#include #include "platform/network_policy.hpp" #include "platform/preferred_languages.hpp" diff --git a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.h b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.h index 2e6564b6d0..9ebb807a01 100644 --- a/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.h +++ b/iphone/Maps/UI/Search/Filters/MWMSearchHotelsFilterViewController.h @@ -1,5 +1,6 @@ +#import + #import "MWMSearchFilterViewController.h" -#import "MWMTypes.h" #import "MWMHotelParams.h" @class MWMSearchHotelsFilterViewController; diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Filter.h b/iphone/Maps/UI/Search/MWMSearchManager+Filter.h index 57ce31dab8..a1dbbf7166 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Filter.h +++ b/iphone/Maps/UI/Search/MWMSearchManager+Filter.h @@ -1,6 +1,7 @@ +#import + #import "MWMSearchManager.h" #import "MWMSearchHotelsFilterViewController.h" -#import "MWMTypes.h" #import "MWMHotelParams.h" @interface MWMSearchManager (Filter) diff --git a/iphone/Maps/UI/Search/MWMSearchManager+Layout.mm b/iphone/Maps/UI/Search/MWMSearchManager+Layout.mm index cb30dc34ff..9821e8a0db 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager+Layout.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager+Layout.mm @@ -1,6 +1,7 @@ -#import "MWMCommon.h" #import "MWMSearchManager+Layout.h" +#import + namespace { CGFloat const kWidthForiPad = 320.0; diff --git a/iphone/Maps/UI/Search/MWMSearchManager.mm b/iphone/Maps/UI/Search/MWMSearchManager.mm index 09fd56b6e0..5e0ba49440 100644 --- a/iphone/Maps/UI/Search/MWMSearchManager.mm +++ b/iphone/Maps/UI/Search/MWMSearchManager.mm @@ -1,5 +1,4 @@ #import "MWMSearchManager.h" -#import "MWMCommon.h" #import "MWMFrameworkListener.h" #import "MWMMapViewControlsManager.h" #import "MWMNoMapsViewController.h" diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm index ae46fd0918..23e0d1e325 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm +++ b/iphone/Maps/UI/Search/TableView/MWMSearchCell.mm @@ -1,8 +1,7 @@ -#import "MWMCommon.h" #import "MWMSearchCell.h" #import "Statistics.h" -#include "Framework.h" +#include #include "base/logging.hpp" diff --git a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h index 6f490811b2..d776e22b08 100644 --- a/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h +++ b/iphone/Maps/UI/Search/TableView/MWMSearchTableViewController.h @@ -4,7 +4,7 @@ #import "MWMSearchTextField.h" #import "MWMViewController.h" -#include "Framework.h" +#include namespace search { diff --git a/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm b/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm index 004e4a5d4c..6a85735514 100644 --- a/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm +++ b/iphone/Maps/UI/Search/Tabs/MWMSearchFrameworkHelper.mm @@ -4,7 +4,7 @@ #include "platform/preferred_languages.hpp" -#include "Framework.h" +#include @implementation MWMSearchFrameworkHelper diff --git a/iphone/Maps/UI/Settings/MWMAboutController.mm b/iphone/Maps/UI/Settings/MWMAboutController.mm index 13d4c9b88f..72e21d9c38 100644 --- a/iphone/Maps/UI/Settings/MWMAboutController.mm +++ b/iphone/Maps/UI/Settings/MWMAboutController.mm @@ -1,12 +1,12 @@ #import "MWMAboutController.h" -#import "AppInfo.h" + +#import + #import "Statistics.h" #import "SwiftBridge.h" #import "WebViewController.h" #import "3party/Alohalytics/src/alohalytics_objc.h" -#include "Framework.h" - extern NSString * const kAlohalyticsTapEventKey; @interface MWMAboutController () diff --git a/iphone/Maps/UI/Settings/MWMHelpController.mm b/iphone/Maps/UI/Settings/MWMHelpController.mm index d9d23848a8..1e7075e646 100644 --- a/iphone/Maps/UI/Settings/MWMHelpController.mm +++ b/iphone/Maps/UI/Settings/MWMHelpController.mm @@ -1,6 +1,5 @@ #import "MWMHelpController.h" -#import "AppInfo.h" -#import "MWMCommon.h" +#import #import "MWMMailViewController.h" #import "Statistics.h" #import "WebViewController.h" diff --git a/iphone/Maps/UI/Settings/MWMPowerManagmentViewController.mm b/iphone/Maps/UI/Settings/MWMPowerManagmentViewController.mm index d430f11f8b..bc2f211509 100644 --- a/iphone/Maps/UI/Settings/MWMPowerManagmentViewController.mm +++ b/iphone/Maps/UI/Settings/MWMPowerManagmentViewController.mm @@ -3,7 +3,7 @@ #import "Statistics.h" #import "SwiftBridge.h" -#include "Framework.h" +#include using namespace power_management; diff --git a/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm b/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm index 2a65c19be2..cf5532ea28 100644 --- a/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm +++ b/iphone/Maps/UI/Settings/MWMRecentTrackSettingsController.mm @@ -1,7 +1,7 @@ #import "MWMRecentTrackSettingsController.h" #import "SwiftBridge.h" -#include "Framework.h" +#include #include "map/gps_tracker.hpp" diff --git a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm index 7b48af0d2f..dbb2b1526d 100644 --- a/iphone/Maps/UI/Settings/MWMSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMSettingsViewController.mm @@ -6,7 +6,7 @@ #include "LocaleTranslator.h" -#include "Framework.h" +#import #include "routing/speed_camera_manager.hpp" diff --git a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm index da555685c4..0099000493 100644 --- a/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm +++ b/iphone/Maps/UI/Settings/MWMTTSSettingsViewController.mm @@ -5,7 +5,7 @@ #import "SwiftBridge.h" #import "WebViewController.h" -#include "Framework.h" +#include #include "LocaleTranslator.h" #include "routing/speed_camera_manager.hpp" diff --git a/iphone/Maps/UI/Welcome/WelcomePageController.swift b/iphone/Maps/UI/Welcome/WelcomePageController.swift index d9836d32ff..4597ea6e63 100644 --- a/iphone/Maps/UI/Welcome/WelcomePageController.swift +++ b/iphone/Maps/UI/Welcome/WelcomePageController.swift @@ -98,7 +98,7 @@ final class WelcomePageController: UIPageViewController { view.removeFromSuperview() removeFromParent() parentController.closePageController(self) - FrameworkHelper.processFirstLaunch() + FrameworkHelper.processFirstLaunch(MWMLocationManager.lastLocation() != nil) } @objc func show() { diff --git a/iphone/Maps/main.mm b/iphone/Maps/main.mm index 4313e3be2b..40c0de18b5 100644 --- a/iphone/Maps/main.mm +++ b/iphone/Maps/main.mm @@ -1,6 +1,5 @@ #import #import -#import "MWMCommon.h" #import "MapsAppDelegate.h" #ifdef OMIM_PRODUCTION diff --git a/platform/platform_ios.mm b/platform/platform_ios.mm index 73c45e0f4e..aea20de817 100644 --- a/platform/platform_ios.mm +++ b/platform/platform_ios.mm @@ -22,8 +22,6 @@ #include #include -#import "iphone/Maps/Common/MWMCommon.h" - #import "3party/Alohalytics/src/alohalytics_objc.h" #import diff --git a/xcode/kml/kml.xcodeproj/project.pbxproj b/xcode/kml/kml.xcodeproj/project.pbxproj index 3734431cbd..6f8da71663 100644 --- a/xcode/kml/kml.xcodeproj/project.pbxproj +++ b/xcode/kml/kml.xcodeproj/project.pbxproj @@ -12,20 +12,7 @@ 45E4559620584ABA00D9F45E /* serdes_binary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E4559220584ABA00D9F45E /* serdes_binary.cpp */; }; 45E4560120584DF200D9F45E /* serdes_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E455FF20584DEF00D9F45E /* serdes_tests.cpp */; }; 45E4560320584E1C00D9F45E /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4557D205849A600D9F45E /* libkml.a */; }; - 45E4560420584E2600D9F45E /* libplatform.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4560520584E2600D9F45E /* libplatform.a */; }; - 45E4560620584E3600D9F45E /* libcoding.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4560720584E3600D9F45E /* libcoding.a */; }; - 45E4560820584E4100D9F45E /* libgeometry.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4560920584E4100D9F45E /* libgeometry.a */; }; - 45E4560A20584E4700D9F45E /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4560B20584E4700D9F45E /* libbase.a */; }; - 45E4560C20584E5200D9F45E /* libexpat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4560D20584E5200D9F45E /* libexpat.a */; }; - 45E4560E20584E6A00D9F45E /* libalohalitics.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4560F20584E6A00D9F45E /* libalohalitics.a */; }; - 45E4561120584E8F00D9F45E /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 45E4561020584E8F00D9F45E /* libz.tbd */; }; 45E456142058509200D9F45E /* testingmain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45E456122058508C00D9F45E /* testingmain.cpp */; }; - BB31223C20A0B24500B80260 /* libindexer.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BB31223B20A0B24500B80260 /* libindexer.a */; }; - EBAAF0D820A5A01700C4D321 /* libeditor.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAAF0D720A5A01700C4D321 /* libeditor.a */; }; - EBAAF0DA20A5A01D00C4D321 /* libicu.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAAF0D920A5A01D00C4D321 /* libicu.a */; }; - EBAAF0DC20A5A0BD00C4D321 /* libjansson.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAAF0DB20A5A0BD00C4D321 /* libjansson.a */; }; - EBAAF0DE20A5A0C300C4D321 /* libpugixml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAAF0DD20A5A0C300C4D321 /* libpugixml.a */; }; - EBAAF0E020A5A0DF00C4D321 /* libprotobuf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = EBAAF0DF20A5A0DF00C4D321 /* libprotobuf.a */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -55,20 +42,7 @@ 45E4559420584ABA00D9F45E /* types.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = types.hpp; sourceTree = ""; }; 45E455ED20584DCB00D9F45E /* kml_tests.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = kml_tests.app; sourceTree = BUILT_PRODUCTS_DIR; }; 45E455FF20584DEF00D9F45E /* serdes_tests.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serdes_tests.cpp; sourceTree = ""; }; - 45E4560520584E2600D9F45E /* libplatform.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libplatform.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 45E4560720584E3600D9F45E /* libcoding.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libcoding.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 45E4560920584E4100D9F45E /* libgeometry.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libgeometry.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 45E4560B20584E4700D9F45E /* libbase.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libbase.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 45E4560D20584E5200D9F45E /* libexpat.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libexpat.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 45E4560F20584E6A00D9F45E /* libalohalitics.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libalohalitics.a; sourceTree = BUILT_PRODUCTS_DIR; }; - 45E4561020584E8F00D9F45E /* libz.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; }; 45E456122058508C00D9F45E /* testingmain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = testingmain.cpp; path = ../../testing/testingmain.cpp; sourceTree = ""; }; - BB31223B20A0B24500B80260 /* libindexer.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libindexer.a; sourceTree = BUILT_PRODUCTS_DIR; }; - EBAAF0D720A5A01700C4D321 /* libeditor.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libeditor.a; sourceTree = BUILT_PRODUCTS_DIR; }; - EBAAF0D920A5A01D00C4D321 /* libicu.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libicu.a; sourceTree = BUILT_PRODUCTS_DIR; }; - EBAAF0DB20A5A0BD00C4D321 /* libjansson.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libjansson.a; sourceTree = BUILT_PRODUCTS_DIR; }; - EBAAF0DD20A5A0C300C4D321 /* libpugixml.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libpugixml.a; sourceTree = BUILT_PRODUCTS_DIR; }; - EBAAF0DF20A5A0DF00C4D321 /* libprotobuf.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libprotobuf.a; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -83,20 +57,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - EBAAF0E020A5A0DF00C4D321 /* libprotobuf.a in Frameworks */, - EBAAF0DE20A5A0C300C4D321 /* libpugixml.a in Frameworks */, - EBAAF0DC20A5A0BD00C4D321 /* libjansson.a in Frameworks */, - EBAAF0DA20A5A01D00C4D321 /* libicu.a in Frameworks */, - EBAAF0D820A5A01700C4D321 /* libeditor.a in Frameworks */, - BB31223C20A0B24500B80260 /* libindexer.a in Frameworks */, 45E4560320584E1C00D9F45E /* libkml.a in Frameworks */, - 45E4560420584E2600D9F45E /* libplatform.a in Frameworks */, - 45E4560620584E3600D9F45E /* libcoding.a in Frameworks */, - 45E4560820584E4100D9F45E /* libgeometry.a in Frameworks */, - 45E4560A20584E4700D9F45E /* libbase.a in Frameworks */, - 45E4560C20584E5200D9F45E /* libexpat.a in Frameworks */, - 45E4560E20584E6A00D9F45E /* libalohalitics.a in Frameworks */, - 45E4561120584E8F00D9F45E /* libz.tbd in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -154,19 +115,6 @@ 45E4560220584E1C00D9F45E /* Frameworks */ = { isa = PBXGroup; children = ( - EBAAF0DF20A5A0DF00C4D321 /* libprotobuf.a */, - EBAAF0DD20A5A0C300C4D321 /* libpugixml.a */, - EBAAF0DB20A5A0BD00C4D321 /* libjansson.a */, - EBAAF0D920A5A01D00C4D321 /* libicu.a */, - EBAAF0D720A5A01700C4D321 /* libeditor.a */, - BB31223B20A0B24500B80260 /* libindexer.a */, - 45E4561020584E8F00D9F45E /* libz.tbd */, - 45E4560F20584E6A00D9F45E /* libalohalitics.a */, - 45E4560D20584E5200D9F45E /* libexpat.a */, - 45E4560B20584E4700D9F45E /* libbase.a */, - 45E4560920584E4100D9F45E /* libgeometry.a */, - 45E4560720584E3600D9F45E /* libcoding.a */, - 45E4560520584E2600D9F45E /* libplatform.a */, ); name = Frameworks; sourceTree = ""; diff --git a/xcode/map/map.xcodeproj/project.pbxproj b/xcode/map/map.xcodeproj/project.pbxproj index b6eab4dc99..2b6bfb6cc4 100644 --- a/xcode/map/map.xcodeproj/project.pbxproj +++ b/xcode/map/map.xcodeproj/project.pbxproj @@ -130,6 +130,7 @@ 45F6EE9D1FB1C77600019892 /* search_api.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45F6EE9A1FB1C77500019892 /* search_api.hpp */; }; 45F6EE9E1FB1C77600019892 /* mwm_tree.hpp in Headers */ = {isa = PBXBuildFile; fileRef = 45F6EE9B1FB1C77500019892 /* mwm_tree.hpp */; }; 45F6EE9F1FB1C77600019892 /* search_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 45F6EE9C1FB1C77500019892 /* search_api.cpp */; }; + 470015E4234246AE00EBF03D /* bookmark_catalog.hpp in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4564FA80209497A60043CCFB /* bookmark_catalog.hpp */; }; 475BD61B211C5FDC00E298C6 /* libshaders.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 475BD61A211C5FDC00E298C6 /* libshaders.a */; }; 47A9D82220A19E9E00E4671B /* libopen_location_code.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A9D82120A19E9E00E4671B /* libopen_location_code.a */; }; 47A9D82420A19EC300E4671B /* libkml.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 47A9D82320A19EC300E4671B /* libkml.a */; }; @@ -245,6 +246,16 @@ /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ + 470015E32342469300EBF03D /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = map; + dstSubfolderSpec = 16; + files = ( + 470015E4234246AE00EBF03D /* bookmark_catalog.hpp in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; 674A29DD1B26FD1C001A525C /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; @@ -1081,6 +1092,7 @@ 675345B71A4054AD00A0A8C3 /* Sources */, 675345B81A4054AD00A0A8C3 /* Frameworks */, 675345B91A4054AD00A0A8C3 /* Headers */, + 470015E32342469300EBF03D /* CopyFiles */, ); buildRules = ( ); diff --git a/xcode/omim.xcworkspace/contents.xcworkspacedata b/xcode/omim.xcworkspace/contents.xcworkspacedata index 2ab7598941..aa834b3d57 100644 --- a/xcode/omim.xcworkspace/contents.xcworkspacedata +++ b/xcode/omim.xcworkspace/contents.xcworkspacedata @@ -190,6 +190,9 @@ + +