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