kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[iOS] [refactoring] replace legacy EditBookmarkViewController with implementation in swift

Browse source
This commit is contained in:
Aleksey Belousov 2020-06-10 13:08:31 +03:00 • committed by Alexander Boriskov
parent c1fd02ba4f
commit 638acd9798
72 changed files with 899 additions and 971 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/CoreApi/CoreApi.modulemap
View file

@ -1,5 +1,6 @@
framework module CoreApi {
header "AppInfo.h"
header "MWMBookmarkColor.h"
header "MWMEye.h"
header "MWMCommon.h"
header "MWMTypes.h"
@ -7,7 +8,7 @@ framework module CoreApi {
header "MWMBookmarksManager.h"
header "MWMCatalogCommon.h"
header "MWMUTM.h"
header "MWMCategory.h"
header "MWMBookmarkGroup.h"
header "MWMTag.h"
header "MWMTagGroup.h"
header "MWMFrameworkHelper.h"
@ -15,4 +16,5 @@ framework module CoreApi {
header "MWMMapOverlayManager.h"
header "MWMSearchFrameworkHelper.h"
header "MWMNetworkPolicy.h"
header "PlacePageBookmarkData.h"
}

22
iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj
View file

@ -17,6 +17,7 @@
470B3624244DDA0A00C0EA9E /* GuidesGalleryItem.h in Headers */ = {isa = PBXBuildFile; fileRef = 470B3622244DDA0A00C0EA9E /* GuidesGalleryItem.h */; settings = {ATTRIBUTES = (Public, ); }; };
470B3625244DDA0A00C0EA9E /* GuidesGalleryItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 470B3623244DDA0A00C0EA9E /* GuidesGalleryItem.mm */; };
470B362C244DDBF600C0EA9E /* GuidesGalleryItem+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 470B362A244DDBF600C0EA9E /* GuidesGalleryItem+Core.h */; };
471527392491EDAA00E91BBA /* MWMBookmarkColor.h in Headers */ = {isa = PBXBuildFile; fileRef = 471527382491EDA400E91BBA /* MWMBookmarkColor.h */; settings = {ATTRIBUTES = (Public, ); }; };
4718C4322355FC3C00640DF1 /* MWMNetworkPolicy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4718C4302355FC3C00640DF1 /* MWMNetworkPolicy.h */; settings = {ATTRIBUTES = (Public, ); }; };
4718C4332355FC3C00640DF1 /* MWMNetworkPolicy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4718C4312355FC3C00640DF1 /* MWMNetworkPolicy.mm */; };
471AB98D23AB925D00F56D49 /* MWMMapSearchResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 471AB98B23AB925D00F56D49 /* MWMMapSearchResult.h */; settings = {ATTRIBUTES = (Public, ); }; };
@ -64,7 +65,7 @@
47942D98237D675400DEFAE3 /* CatalogPromoItem+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942D96237D675400DEFAE3 /* CatalogPromoItem+Core.h */; settings = {ATTRIBUTES = (Public, ); }; };
47942D9C237D927800DEFAE3 /* PlacePageBookmarkData.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942D9A237D927800DEFAE3 /* PlacePageBookmarkData.h */; settings = {ATTRIBUTES = (Public, ); }; };
47942D9D237D927800DEFAE3 /* PlacePageBookmarkData.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47942D9B237D927800DEFAE3 /* PlacePageBookmarkData.mm */; };
47942DA0237D954400DEFAE3 /* PlacePageBookmarkData+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942D9E237D954400DEFAE3 /* PlacePageBookmarkData+Core.h */; settings = {ATTRIBUTES = (Public, ); }; };
47942DA0237D954400DEFAE3 /* PlacePageBookmarkData+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942D9E237D954400DEFAE3 /* PlacePageBookmarkData+Core.h */; };
47942DAB237ED9FE00DEFAE3 /* IOpeningHoursLocalization.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942DAA237ED9FE00DEFAE3 /* IOpeningHoursLocalization.h */; settings = {ATTRIBUTES = (Public, ); }; };
47942DAE2382ABE100DEFAE3 /* UgcSummaryRating.h in Headers */ = {isa = PBXBuildFile; fileRef = 47942DAC2382ABE100DEFAE3 /* UgcSummaryRating.h */; settings = {ATTRIBUTES = (Public, ); }; };
47942DAF2382ABE100DEFAE3 /* UgcSummaryRating.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47942DAD2382ABE100DEFAE3 /* UgcSummaryRating.mm */; };
@ -83,8 +84,8 @@
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, ); }; };
479F705E234FBB8C00011E2E /* MWMBookmarkGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 479F705C234FBB8B00011E2E /* MWMBookmarkGroup.m */; };
479F705F234FBB8F00011E2E /* MWMBookmarkGroup.h in Headers */ = {isa = PBXBuildFile; fileRef = 479F705D234FBB8C00011E2E /* MWMBookmarkGroup.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, ); }; };
@ -153,6 +154,7 @@
470B3622244DDA0A00C0EA9E /* GuidesGalleryItem.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GuidesGalleryItem.h; sourceTree = "<group>"; };
470B3623244DDA0A00C0EA9E /* GuidesGalleryItem.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = GuidesGalleryItem.mm; sourceTree = "<group>"; };
470B362A244DDBF600C0EA9E /* GuidesGalleryItem+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GuidesGalleryItem+Core.h"; sourceTree = "<group>"; };
471527382491EDA400E91BBA /* MWMBookmarkColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarkColor.h; sourceTree = "<group>"; };
4718C4302355FC3C00640DF1 /* MWMNetworkPolicy.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMNetworkPolicy.h; sourceTree = "<group>"; };
4718C4312355FC3C00640DF1 /* MWMNetworkPolicy.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNetworkPolicy.mm; sourceTree = "<group>"; };
471AB98B23AB925D00F56D49 /* MWMMapSearchResult.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMMapSearchResult.h; sourceTree = "<group>"; };
@ -219,8 +221,8 @@
479F7054234FB7F100011E2E /* MWMBookmarksManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksManager.h; sourceTree = "<group>"; };
479F7055234FB7F100011E2E /* MWMBookmarksManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmarksManager.mm; sourceTree = "<group>"; };
479F705A234FBAC200011E2E /* MWMUTM.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUTM.h; sourceTree = "<group>"; };
479F705C234FBB8B00011E2E /* MWMCategory.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMCategory.m; sourceTree = "<group>"; };
479F705D234FBB8C00011E2E /* MWMCategory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCategory.h; sourceTree = "<group>"; };
479F705C234FBB8B00011E2E /* MWMBookmarkGroup.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMBookmarkGroup.m; sourceTree = "<group>"; };
479F705D234FBB8C00011E2E /* MWMBookmarkGroup.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarkGroup.h; sourceTree = "<group>"; };
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>"; };
@ -504,11 +506,12 @@
479F7051234FB62A00011E2E /* Catalog */,
479F7054234FB7F100011E2E /* MWMBookmarksManager.h */,
479F7055234FB7F100011E2E /* MWMBookmarksManager.mm */,
479F705D234FBB8C00011E2E /* MWMCategory.h */,
479F705C234FBB8B00011E2E /* MWMCategory.m */,
479F705D234FBB8C00011E2E /* MWMBookmarkGroup.h */,
479F705C234FBB8B00011E2E /* MWMBookmarkGroup.m */,
479F7060234FBC4500011E2E /* MWMCarPlayBookmarkObject.h */,
479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */,
47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */,
471527382491EDA400E91BBA /* MWMBookmarkColor.h */,
);
path = Bookmarks;
sourceTree = "<group>";
@ -685,7 +688,7 @@
470B3624244DDA0A00C0EA9E /* GuidesGalleryItem.h in Headers */,
470015F42342509C00EBF03D /* CoreApi.h in Headers */,
47942D74237CC41A00DEFAE3 /* HotelBookingData.h in Headers */,
479F705F234FBB8F00011E2E /* MWMCategory.h in Headers */,
479F705F234FBB8F00011E2E /* MWMBookmarkGroup.h in Headers */,
47EF73F9246E035C00D32AB8 /* MWMGuidesManager.h in Headers */,
471AB99123AB931000F56D49 /* MWMMapSearchResult+Core.h in Headers */,
4738A8E0239FACE7007C0F43 /* CoreBanner.h in Headers */,
@ -734,6 +737,7 @@
47E8163723B188D3008FD836 /* MWMStorage.h in Headers */,
47EEAFF62350CF48005CF316 /* AppInfo.h in Headers */,
47F701F3238C877C00D18E95 /* PlacePageButtonsData+Core.h in Headers */,
471527392491EDAA00E91BBA /* MWMBookmarkColor.h in Headers */,
479F7053234FB7BC00011E2E /* MWMCatalogCommon.h in Headers */,
47942D7A237CC41A00DEFAE3 /* HotelRoom.h in Headers */,
4700160F2342579000EBF03D /* MWMTag.h in Headers */,
@ -855,7 +859,7 @@
47942D95237D673E00DEFAE3 /* CatalogPromoItem.mm in Sources */,
47942D6C237CC3DE00DEFAE3 /* PlacePageData.mm in Sources */,
47942DAF2382ABE100DEFAE3 /* UgcSummaryRating.mm in Sources */,
479F705E234FBB8C00011E2E /* MWMCategory.m in Sources */,
479F705E234FBB8C00011E2E /* MWMBookmarkGroup.m in Sources */,
479834EB2342697400724D1E /* MWMTagGroup+Convenience.mm in Sources */,
47EF73FA246E035C00D32AB8 /* MWMGuidesManager.mm in Sources */,
470016082342541100EBF03D /* MWMTagGroup.m in Sources */,

25
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor.h Normal file
View file

@ -0,0 +1,25 @@
#import <Foundation/Foundation.h>
typedef NS_ENUM(NSInteger, MWMBookmarkColor) {
MWMBookmarkColorNone = 0,
MWMBookmarkColorRed,
MWMBookmarkColorBlue,
MWMBookmarkColorPurple,
MWMBookmarkColorYellow,
MWMBookmarkColorPink,
MWMBookmarkColorBrown,
MWMBookmarkColorGreen,
MWMBookmarkColorOrange,
// Extended colors.
MWMBookmarkColorDeepPurple,
MWMBookmarkColorLightBlue,
MWMBookmarkColorCyan,
MWMBookmarkColorTeal,
MWMBookmarkColorLime,
MWMBookmarkColorDeepOrange,
MWMBookmarkColorGray,
MWMBookmarkColorBlueGray,
MWMBookmarkColorCount
} NS_SWIFT_NAME(BookmarkColor);

5
iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.h → iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h
View file

@ -6,7 +6,8 @@ NS_ASSUME_NONNULL_BEGIN
@class MWMBookmarksManager;
@interface MWMCategory : NSObject
NS_SWIFT_NAME(BookmarkGroup)
@interface MWMBookmarkGroup : NSObject
- (instancetype)init NS_UNAVAILABLE;
- (instancetype)initWithCategoryId:(MWMMarkGroupID)categoryId
@ -21,7 +22,7 @@ NS_ASSUME_NONNULL_BEGIN
@property(nonatomic, readonly) NSInteger trackCount;
@property(nonatomic, getter=isVisible) BOOL visible;
@property(nonatomic, readonly, getter=isEmpty) BOOL empty;
@property(nonatomic, readonly) MWMCategoryAccessStatus accessStatus;
@property(nonatomic, readonly) MWMBookmarkGroupAccessStatus accessStatus;
@end

8
iphone/CoreApi/CoreApi/Bookmarks/MWMCategory.m → iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m
View file

@ -1,13 +1,13 @@
#import "MWMCategory.h"
#import "MWMBookmarkGroup.h"
#import "MWMBookmarksManager.h"
@interface MWMCategory ()
@interface MWMBookmarkGroup ()
@property(weak, nonatomic) MWMBookmarksManager *manager;
@end
@implementation MWMCategory
@implementation MWMBookmarkGroup
- (instancetype)initWithCategoryId:(MWMMarkGroupID)categoryId
bookmarksManager:(MWMBookmarksManager *)manager {
@ -60,7 +60,7 @@
return ![self.manager isCategoryNotEmpty:self.categoryId];
}
- (MWMCategoryAccessStatus)accessStatus {
- (MWMBookmarkGroupAccessStatus)accessStatus {
return [self.manager getCategoryAccessStatus:self.categoryId];
}

19
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h
View file

@ -3,8 +3,9 @@
#import "MWMBookmarksObserver.h"
#import "MWMCatalogCommon.h"
#import "MWMUTM.h"
#import "PlacePageBookmarkData.h"
@class MWMCategory;
@class MWMBookmarkGroup;
@class MWMCarPlayBookmarkObject;
@class MWMTagGroup;
@class MWMTag;
@ -15,6 +16,7 @@ typedef void (^LoadTagsCompletionBlock)(NSArray<MWMTagGroup *> * _Nullable tags,
typedef void (^PingCompletionBlock)(BOOL success);
typedef void (^ElevationPointChangedBlock)(double distance);
NS_SWIFT_NAME(BookmarksManager)
@interface MWMBookmarksManager : NSObject
+ (MWMBookmarksManager *)sharedManager;
@ -32,7 +34,7 @@ typedef void (^ElevationPointChangedBlock)(double distance);
- (NSString *)getCategoryName:(MWMMarkGroupID)groupId;
- (uint64_t)getCategoryMarksCount:(MWMMarkGroupID)groupId;
- (uint64_t)getCategoryTracksCount:(MWMMarkGroupID)groupId;
- (MWMCategoryAccessStatus)getCategoryAccessStatus:(MWMMarkGroupID)groupId;
- (MWMBookmarkGroupAccessStatus)getCategoryAccessStatus:(MWMMarkGroupID)groupId;
- (NSString *)getCategoryDescription:(MWMMarkGroupID)groupId;
- (NSString *)getCategoryAuthorName:(MWMMarkGroupID)groupId;
@ -81,16 +83,21 @@ typedef void (^ElevationPointChangedBlock)(double distance);
progress:(_Nullable ProgressBlock)progress
completion:(_Nullable DownloadCompletionBlock)completion;
- (BOOL)isCategoryFromCatalog:(MWMMarkGroupID)groupId;
- (NSArray<MWMCategory *> *)userCategories;
- (NSArray<MWMCategory *> *)categoriesFromCatalog;
- (MWMCategory *)categoryWithId:(MWMMarkGroupID)groupId;
- (NSArray<MWMBookmarkGroup *> *)userCategories;
- (NSArray<MWMBookmarkGroup *> *)categoriesFromCatalog;
- (MWMBookmarkGroup *)categoryWithId:(MWMMarkGroupID)groupId;
- (NSInteger)getCatalogDownloadsCount;
- (BOOL)isCategoryDownloading:(NSString *)itemId;
- (BOOL)hasCategoryDownloaded:(NSString *)itemId;
- (void)updateBookmark:(MWMMarkID)bookmarkId
setGroupId:(MWMMarkGroupID)groupId
title:(NSString *)title
color:(MWMBookmarkColor)color
description:(NSString *)description;
- (void)loadTagsWithLanguage:(NSString * _Nullable)languageCode completion:(LoadTagsCompletionBlock)completionBlock;
- (void)setCategory:(MWMMarkGroupID)groupId tags:(NSArray<MWMTag *> *)tags;
- (void)setCategory:(MWMMarkGroupID)groupId authorType:(MWMCategoryAuthorType)author;
- (void)setCategory:(MWMMarkGroupID)groupId authorType:(MWMBookmarkGroupAuthorType)author;
- (void)uploadAndGetDirectLinkCategoryWithId:(MWMMarkGroupID)itemId
progress:(_Nullable ProgressBlock)progress

101
iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm
View file

@ -1,6 +1,6 @@
#import "MWMBookmarksManager.h"
#import "MWMCategory.h"
#import "MWMBookmarkGroup.h"
#import "MWMCarPlayBookmarkObject.h"
#import "MWMCatalogObserver.h"
#import "MWMTag.h"
@ -22,6 +22,47 @@
#include <utility>
static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) {
switch (bookmarkColor) {
case MWMBookmarkColorNone:
return kml::PredefinedColor::None;
case MWMBookmarkColorRed:
return kml::PredefinedColor::Red;
case MWMBookmarkColorBlue:
return kml::PredefinedColor::Blue;
case MWMBookmarkColorPurple:
return kml::PredefinedColor::Purple;
case MWMBookmarkColorYellow:
return kml::PredefinedColor::Yellow;
case MWMBookmarkColorPink:
return kml::PredefinedColor::Pink;
case MWMBookmarkColorBrown:
return kml::PredefinedColor::Brown;
case MWMBookmarkColorGreen:
return kml::PredefinedColor::Green;
case MWMBookmarkColorOrange:
return kml::PredefinedColor::Orange;
case MWMBookmarkColorDeepPurple:
return kml::PredefinedColor::DeepPurple;
case MWMBookmarkColorLightBlue:
return kml::PredefinedColor::LightBlue;
case MWMBookmarkColorCyan:
return kml::PredefinedColor::Cyan;
case MWMBookmarkColorTeal:
return kml::PredefinedColor::Teal;
case MWMBookmarkColorLime:
return kml::PredefinedColor::Lime;
case MWMBookmarkColorDeepOrange:
return kml::PredefinedColor::DeepOrange;
case MWMBookmarkColorGray:
return kml::PredefinedColor::Gray;
case MWMBookmarkColorBlueGray:
return kml::PredefinedColor::BlueGray;
case MWMBookmarkColorCount:
return kml::PredefinedColor::Count;
}
}
@interface MWMBookmarksManager ()
@property(nonatomic, readonly) BookmarkManager & bm;
@ -290,22 +331,22 @@
return self.bm.GetTrackIds(groupId).size();
}
- (MWMCategoryAccessStatus)getCategoryAccessStatus:(MWMMarkGroupID)groupId
- (MWMBookmarkGroupAccessStatus)getCategoryAccessStatus:(MWMMarkGroupID)groupId
{
switch (self.bm.GetCategoryData(groupId).m_accessRules)
{
case kml::AccessRules::Local:
return MWMCategoryAccessStatusLocal;
return MWMBookmarkGroupAccessStatusLocal;
case kml::AccessRules::Public:
return MWMCategoryAccessStatusPublic;
return MWMBookmarkGroupAccessStatusPublic;
case kml::AccessRules::DirectLink:
return MWMCategoryAccessStatusPrivate;
return MWMBookmarkGroupAccessStatusPrivate;
case kml::AccessRules::AuthorOnly:
return MWMCategoryAccessStatusAuthorOnly;
return MWMBookmarkGroupAccessStatusAuthorOnly;
case kml::AccessRules::P2P:
case kml::AccessRules::Paid:
case kml::AccessRules::Count:
return MWMCategoryAccessStatusOther;
return MWMBookmarkGroupAccessStatusOther;
}
}
@ -624,9 +665,9 @@
return self.bm.IsCategoryFromCatalog(groupId);
}
- (NSArray<MWMCategory *> *)userCategories
- (NSArray<MWMBookmarkGroup *> *)userCategories
{
NSMutableArray<MWMCategory *> * result = [NSMutableArray array];
NSMutableArray<MWMBookmarkGroup *> * result = [NSMutableArray array];
auto const & list = self.bm.GetBmGroupsIdList();
for (auto const & groupId : list)
{
@ -636,9 +677,9 @@
return [result copy];
}
- (NSArray<MWMCategory *> *)categoriesFromCatalog
- (NSArray<MWMBookmarkGroup *> *)categoriesFromCatalog
{
NSMutableArray<MWMCategory *> * result = [NSMutableArray array];
NSMutableArray<MWMBookmarkGroup *> * result = [NSMutableArray array];
auto const & list = self.bm.GetBmGroupsIdList();
for (auto const & groupId : list)
{
@ -648,8 +689,8 @@
return [result copy];
}
- (MWMCategory *)categoryWithId:(MWMMarkGroupID)groupId {
return [[MWMCategory alloc] initWithCategoryId:groupId bookmarksManager:self];
- (MWMBookmarkGroup *)categoryWithId:(MWMMarkGroupID)groupId {
return [[MWMBookmarkGroup alloc] initWithCategoryId:groupId bookmarksManager:self];
}
- (NSInteger)getCatalogDownloadsCount
@ -667,6 +708,33 @@
return self.bm.GetCatalog().HasDownloaded(itemId.UTF8String);
}
- (void)updateBookmark:(MWMMarkID)bookmarkId
setGroupId:(MWMMarkGroupID)groupId
title:(NSString *)title
color:(MWMBookmarkColor)color
description:(NSString *)description {
auto const currentGroupId = self.bm.GetBookmark(bookmarkId)->GetGroupId();
auto editSession = self.bm.GetEditSession();
if (groupId != kml::kInvalidMarkGroupId) {
editSession.MoveBookmark(bookmarkId, currentGroupId, groupId);
}
auto bookmark = editSession.GetBookmarkForEdit(bookmarkId);
if (!bookmark)
return;
auto kmlColor = convertBookmarkColor(color);
if (kmlColor != bookmark->GetColor()) {
self.bm.SetLastEditedBmColor(kmlColor);
}
bookmark->SetColor(kmlColor);
bookmark->SetDescription(description.UTF8String);
if (title.UTF8String != bookmark->GetPreferredName()) {
bookmark->SetCustomName(title.UTF8String);
}
}
- (void)loadTagsWithLanguage:(NSString *)languageCode completion:(LoadTagsCompletionBlock)completionBlock {
auto onTagsCompletion = [completionBlock](bool success, BookmarkCatalog::TagGroups const & tagGroups, uint32_t maxTagsCount)
{
@ -698,15 +766,14 @@
self.bm.GetEditSession().SetCategoryTags(groupId, tagIds);
}
- (void)setCategory:(MWMMarkGroupID)groupId authorType:(MWMCategoryAuthorType)author
- (void)setCategory:(MWMMarkGroupID)groupId authorType:(MWMBookmarkGroupAuthorType)author
{
switch (author)
{
case MWMCategoryAuthorTypeLocal:
case MWMBookmarkGroupAuthorTypeLocal:
self.bm.GetEditSession().SetCategoryCustomProperty(groupId, @"author_type".UTF8String, @"local".UTF8String);
break;
case MWMCategoryAuthorTypeTraveler:
case MWMBookmarkGroupAuthorTypeTraveler:
self.bm.GetEditSession().SetCategoryCustomProperty(groupId, @"author_type".UTF8String, @"tourist".UTF8String);
}
}

30
iphone/CoreApi/CoreApi/Common/MWMTypes.h
View file

@ -1,12 +1,14 @@
#import <Foundation/Foundation.h>
NS_ASSUME_NONNULL_BEGIN
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, MWMDayTime) { MWMDayTimeDay, MWMDayTimeNight } NS_SWIFT_NAME(DayTime);
typedef NS_ENUM(NSUInteger, MWMUnits) { MWMUnitsMetric, MWMUnitsImperial } NS_SWIFT_NAME(Units);
@ -30,17 +32,19 @@ typedef NS_ENUM(NSUInteger, MWMBookmarksShareStatus) {
MWMBookmarksShareStatusEmptyCategory,
MWMBookmarksShareStatusArchiveError,
MWMBookmarksShareStatusFileError
};
} NS_SWIFT_NAME(BookmarksShareStatus);
typedef NS_ENUM(NSUInteger, MWMCategoryAccessStatus) {
MWMCategoryAccessStatusLocal,
MWMCategoryAccessStatusPublic,
MWMCategoryAccessStatusPrivate,
MWMCategoryAccessStatusAuthorOnly,
MWMCategoryAccessStatusOther
};
typedef NS_ENUM(NSUInteger, MWMBookmarkGroupAccessStatus) {
MWMBookmarkGroupAccessStatusLocal,
MWMBookmarkGroupAccessStatusPublic,
MWMBookmarkGroupAccessStatusPrivate,
MWMBookmarkGroupAccessStatusAuthorOnly,
MWMBookmarkGroupAccessStatusOther
} NS_SWIFT_NAME(BookmarkGroupAccessStatus);
typedef NS_ENUM(NSUInteger, MWMCategoryAuthorType) {
MWMCategoryAuthorTypeLocal,
MWMCategoryAuthorTypeTraveler
};
typedef NS_ENUM(NSUInteger, MWMBookmarkGroupAuthorType) {
MWMBookmarkGroupAuthorTypeLocal,
MWMBookmarkGroupAuthorTypeTraveler
} NS_SWIFT_NAME(BookmarkGroupAuthorType);
NS_ASSUME_NONNULL_END

2
iphone/CoreApi/CoreApi/CoreApi-swift.h
View file

@ -12,7 +12,7 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[];
#import <CoreApi/MWMBookmarksManager.h>
#import <CoreApi/MWMBookmarksObserver.h>
#import <CoreApi/MWMCarPlayBookmarkObject.h>
#import <CoreApi/MWMCategory.h>
#import <CoreApi/MWMBookmarkGroup.h>
#import <CoreApi/MWMCommon.h>
#import <CoreApi/MWMEye.h>
#import <CoreApi/MWMGeoUtil.h>

2
iphone/CoreApi/CoreApi/CoreApi.h
View file

@ -9,7 +9,7 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[];
#import <CoreApi/MWMBookmarksManager.h>
#import <CoreApi/MWMBookmarksObserver.h>
#import <CoreApi/MWMCarPlayBookmarkObject.h>
#import <CoreApi/MWMCategory.h>
#import <CoreApi/MWMBookmarkGroup.h>
#import <CoreApi/MWMCommon.h>
#import <CoreApi/MWMEye.h>
#import <CoreApi/MWMFrameworkHelper.h>

3
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h
View file

@ -22,6 +22,7 @@ NS_SWIFT_NAME(FrameworkHelper)
+ (BOOL)canUseNetwork;
+ (BOOL)isNetworkConnected;
+ (BOOL)isWiFiConnected;
+ (MWMMarkID)invalidBookmarkId;
+ (MWMMarkGroupID)invalidCategoryId;
+ (void)zoomMap:(MWMZoomMode)mode;
+ (void)moveMap:(UIOffset)offset;
@ -40,6 +41,8 @@ NS_SWIFT_NAME(FrameworkHelper)
completion:(SearchInDownloaderCompletions)completion;
+ (BOOL)canEditMap;
+ (void)showOnMap:(MWMMarkGroupID)categoryId;
+ (void)updatePlacePageData;
@end
NS_ASSUME_NONNULL_END

8
iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm
View file

@ -81,6 +81,10 @@
return GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_WIFI;
}
+ (MWMMarkID)invalidBookmarkId {
return kml::kInvalidMarkId;
}
+ (MWMMarkGroupID)invalidCategoryId {
return kml::kInvalidMarkGroupId;
}
@ -174,4 +178,8 @@
GetFramework().ShowBookmarkCategory(categoryId);
}
+ (void)updatePlacePageData {
GetFramework().UpdatePlacePageInfoForCurrentSelection();
}
@end

1
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData+Core.h
View file

@ -7,7 +7,6 @@ NS_ASSUME_NONNULL_BEGIN
@interface PlacePageBookmarkData (Core)
- (instancetype)initWithRawData:(place_page::Info const &)rawData;
- (kml::ColorData)kmlColor;
@end

7
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData.h
View file

@ -1,16 +1,19 @@
#import <Foundation/Foundation.h>
#import "MWMTypes.h"
#import "MWMBookmarkColor.h"
NS_ASSUME_NONNULL_BEGIN
@interface PlacePageBookmarkData : NSObject
@property(nonatomic, readonly) uint64_t bookmarkId;
@property(nonatomic, readonly) uint64_t bookmarkGroupId;
@property(nonatomic, readonly) MWMMarkID bookmarkId;
@property(nonatomic, readonly) MWMMarkGroupID bookmarkGroupId;
@property(nonatomic, readonly, nullable) NSString *externalTitle;
@property(nonatomic, readonly, nullable) NSString *bookmarkDescription;
@property(nonatomic, readonly, nullable) NSString *bookmarkCategory;
@property(nonatomic, readonly) BOOL isHtmlDescription;
@property(nonatomic, readonly) BOOL isEditable;
@property(nonatomic, readonly) MWMBookmarkColor color;
@end

49
iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData.mm
View file

@ -1,11 +1,46 @@
#import "PlacePageBookmarkData+Core.h"
@interface PlacePageBookmarkData() {
kml::ColorData _kmlColor;
static MWMBookmarkColor convertKmlColor(kml::PredefinedColor kmlColor) {
switch (kmlColor) {
case kml::PredefinedColor::None:
return MWMBookmarkColorNone;
case kml::PredefinedColor::Red:
return MWMBookmarkColorRed;
case kml::PredefinedColor::Blue:
return MWMBookmarkColorBlue;
case kml::PredefinedColor::Purple:
return MWMBookmarkColorPurple;
case kml::PredefinedColor::Yellow:
return MWMBookmarkColorYellow;
case kml::PredefinedColor::Pink:
return MWMBookmarkColorPink;
case kml::PredefinedColor::Brown:
return MWMBookmarkColorBrown;
case kml::PredefinedColor::Green:
return MWMBookmarkColorGreen;
case kml::PredefinedColor::Orange:
return MWMBookmarkColorOrange;
case kml::PredefinedColor::DeepPurple:
return MWMBookmarkColorDeepPurple;
case kml::PredefinedColor::LightBlue:
return MWMBookmarkColorLightBlue;
case kml::PredefinedColor::Cyan:
return MWMBookmarkColorCyan;
case kml::PredefinedColor::Teal:
return MWMBookmarkColorTeal;
case kml::PredefinedColor::Lime:
return MWMBookmarkColorLime;
case kml::PredefinedColor::DeepOrange:
return MWMBookmarkColorDeepOrange;
case kml::PredefinedColor::Gray:
return MWMBookmarkColorGray;
case kml::PredefinedColor::BlueGray:
return MWMBookmarkColorBlueGray;
case kml::PredefinedColor::Count:
return MWMBookmarkColorCount;
}
}
@end
@implementation PlacePageBookmarkData
@end
@ -22,13 +57,9 @@
_bookmarkCategory = rawData.IsBookmark() ? @(rawData.GetBookmarkCategoryName().c_str()) : nil;
_isHtmlDescription = strings::IsHTML(GetPreferredBookmarkStr(rawData.GetBookmarkData().m_description));
_isEditable = GetFramework().GetBookmarkManager().IsEditableBookmark(_bookmarkId);
_kmlColor = rawData.GetBookmarkData().m_color;
_color = convertKmlColor(rawData.GetBookmarkData().m_color.m_predefinedColor);
}
return self;
}
- (kml::ColorData)kmlColor {
return _kmlColor;
}
@end

89
iphone/Maps/Bookmarks/BookmarkGroupViewController.swift Normal file
View file

@ -0,0 +1,89 @@
import UIKit
protocol BookmarkGroupViewControllerDelegate: AnyObject {
func bookmarkGroupViewController(_ viewController: BookmarkGroupViewController,
didSelect groupTitle: String,
groupId: MWMMarkGroupID)
}
final class BookmarkGroupViewController: MWMTableViewController {
private enum Sections: Int {
case addGroup
case groups
case count
}
weak var delegate: BookmarkGroupViewControllerDelegate?
private let groupName: String
private let groupId: MWMMarkGroupID
private let bookmarkGroups = BookmarksManager.shared().userCategories()
init(groupName: String, groupId: MWMMarkGroupID) {
self.groupName = groupName
self.groupId = groupId
super.init(style: .grouped)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
title = L("bookmark_sets");
}
override func numberOfSections(in tableView: UITableView) -> Int {
Sections.count.rawValue
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
switch Sections(rawValue: section) {
case .addGroup:
return 1
case .groups:
return bookmarkGroups.count
default:
fatalError()
}
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueDefaultCell(for: indexPath)
switch Sections(rawValue: indexPath.section) {
case .addGroup:
cell.textLabel?.text = L("add_new_set")
cell.accessoryType = .disclosureIndicator
case .groups:
let bookmarkGroup = bookmarkGroups[indexPath.row]
cell.textLabel?.text = bookmarkGroup.title
cell.accessoryType = bookmarkGroup.categoryId == groupId ? .checkmark : .none
default:
fatalError()
}
return cell
}
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
switch Sections(rawValue: indexPath.section) {
case .addGroup:
createNewGroup()
case .groups:
let selectedGroup = bookmarkGroups[indexPath.row]
delegate?.bookmarkGroupViewController(self, didSelect: selectedGroup.title, groupId: selectedGroup.categoryId)
default:
fatalError()
}
}
private func createNewGroup() {
alertController.presentCreateBookmarkCategoryAlert(withMaxCharacterNum: 60, minCharacterNum: 0) {
[unowned self] name -> Bool in
guard BookmarksManager.shared().checkCategoryName(name) else { return false }
let newGroupId = BookmarksManager.shared().createCategory(withName: name)
self.delegate?.bookmarkGroupViewController(self, didSelect: name, groupId: newGroupId)
return true
}
}
}

2
iphone/Maps/Bookmarks/BookmarksSection.mm
View file

@ -1,5 +1,5 @@
#import "BookmarksSection.h"
#import "MWMBookmarkColorViewController.h"
#import "legacy_bookmark_colors.h"
#import "MWMLocationHelpers.h"
#import "MWMSearchManager.h"

4
iphone/Maps/Bookmarks/BookmarksTabViewController.swift
View file

@ -7,7 +7,7 @@ final class BookmarksTabViewController: TabViewController {
private static let selectedIndexKey = "BookmarksTabViewController_selectedIndexKey"
@objc public var activeTab: ActiveTab = ActiveTab.init(rawValue:
@objc public var activeTab: ActiveTab = ActiveTab(rawValue:
UserDefaults.standard.integer(forKey: BookmarksTabViewController.selectedIndexKey)) ?? .user {
didSet {
UserDefaults.standard.set(activeTab.rawValue, forKey: BookmarksTabViewController.selectedIndexKey)
@ -30,7 +30,7 @@ final class BookmarksTabViewController: TabViewController {
override func viewDidDisappear(_ animated: Bool) {
super.viewDidDisappear(animated)
activeTab = ActiveTab.init(rawValue: tabView.selectedIndex ?? 0) ?? .user
activeTab = ActiveTab(rawValue: tabView.selectedIndex ?? 0) ?? .user
}
}

1
iphone/Maps/Bookmarks/BookmarksVC.mm
View file

@ -7,7 +7,6 @@
#import "MWMKeyboard.h"
#import "MWMLocationObserver.h"
#import "MWMSearchNoResults.h"
#import "SwiftBridge.h"
#import "TracksSection.h"
#import <CoreApi/CoreApi.h>

2
iphone/Maps/Bookmarks/Catalog/CatalogCategoryCell.swift
View file

@ -20,7 +20,7 @@ final class CatalogCategoryCell: MWMTableViewCell {
delegate?.cell(self, didPress: sender)
}
func update(with category: MWMCategory, delegate: CatalogCategoryCellDelegate?) {
func update(with category: BookmarkGroup, delegate: CatalogCategoryCellDelegate?) {
titleLabel.text = category.title
let placesString = category.placesCountTitle()
let authorString = String(coreFormat: L("author_name_by_prefix"), arguments: [category.author])

16
iphone/Maps/Bookmarks/Catalog/CatalogWebViewController.swift
View file

@ -41,7 +41,7 @@ final class CatalogWebViewController: WebViewController {
}
private init(_ url: URL? = nil, utm: MWMUTM = .none, isAbsoluteUrl: Bool = false) {
var catalogUrl = MWMBookmarksManager.shared().catalogFrontendUrl(utm)!
var catalogUrl = BookmarksManager.shared().catalogFrontendUrl(utm)!
if let u = url {
if isAbsoluteUrl {
catalogUrl = u
@ -49,7 +49,7 @@ final class CatalogWebViewController: WebViewController {
if u.host == "guides_page" {
if let urlComponents = URLComponents(url: u, resolvingAgainstBaseURL: false),
let path = urlComponents.queryItems?.reduce(into: "", { if $1.name == "url" { $0 = $1.value } }),
let calculatedUrl = MWMBookmarksManager.shared().catalogFrontendUrlPlusPath(path, utm: utm) {
let calculatedUrl = BookmarksManager.shared().catalogFrontendUrlPlusPath(path, utm: utm) {
catalogUrl = calculatedUrl
}
} else {
@ -226,7 +226,7 @@ final class CatalogWebViewController: WebViewController {
}
private func showOnMap(_ serverId: String) {
let groupId = MWMBookmarksManager.shared().getGroupId(serverId)
let groupId = BookmarksManager.shared().getGroupId(serverId)
FrameworkHelper.show(onMap: groupId)
navigationController?.popToRootViewController(animated: true)
}
@ -251,7 +251,7 @@ final class CatalogWebViewController: WebViewController {
return
}
var result = MWMBookmarksManager.shared().getCatalogHeaders()
var result = BookmarksManager.shared().getCatalogHeaders()
result["X-Mapsme-Bundle-Tiers"] = encodedString
completion(result)
})
@ -309,7 +309,7 @@ final class CatalogWebViewController: WebViewController {
return
}
if MWMBookmarksManager.shared().isCategoryDownloading(categoryInfo.id) || MWMBookmarksManager.shared().hasCategoryDownloaded(categoryInfo.id) {
if BookmarksManager.shared().isCategoryDownloading(categoryInfo.id) || BookmarksManager.shared().hasCategoryDownloaded(categoryInfo.id) {
MWMAlertViewController.activeAlert().presentDefaultAlert(withTitle: L("error_already_downloaded_guide"),
message: nil,
rightButtonTitle: L("ok"),
@ -318,7 +318,7 @@ final class CatalogWebViewController: WebViewController {
return
}
MWMBookmarksManager.shared().downloadItem(withId: categoryInfo.id, name: categoryInfo.name, progress: { [weak self] progress in
BookmarksManager.shared().downloadItem(withId: categoryInfo.id, name: categoryInfo.name, progress: { [weak self] progress in
self?.updateProgress()
}) { [weak self] categoryId, error in
if let error = error as NSError? {
@ -351,7 +351,7 @@ final class CatalogWebViewController: WebViewController {
self?.showImportError()
}
} else {
if MWMBookmarksManager.shared().getCatalogDownloadsCount() == 0 {
if BookmarksManager.shared().getCatalogDownloadsCount() == 0 {
Statistics.logEvent(kStatInappProductDelivered, withParameters: [kStatVendor: BOOKMARKS_VENDOR,
kStatPurchase: categoryInfo.id],
with: .realtime)
@ -412,7 +412,7 @@ final class CatalogWebViewController: WebViewController {
}
private func updateProgress() {
let numberOfTasks = MWMBookmarksManager.shared().getCatalogDownloadsCount()
let numberOfTasks = BookmarksManager.shared().getCatalogDownloadsCount()
numberOfTasksLabel.text = "\(numberOfTasks)"
progressBgView.isHidden = numberOfTasks == 0
}

16
iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift
View file

@ -1,6 +1,6 @@
class DownloadedBookmarksDataSource {
private var categories: [MWMCategory] = []
private var categories: [BookmarkGroup] = []
var categoriesCount: NSInteger {
get {
return categories.count
@ -14,13 +14,13 @@ class DownloadedBookmarksDataSource {
return result
}
set {
MWMBookmarksManager.shared().setCatalogCategoriesVisible(!newValue)
BookmarksManager.shared().setCatalogCategoriesVisible(!newValue)
}
}
var guideIds: String {
get {
return MWMBookmarksManager.shared().getGuidesIds()
return BookmarksManager.shared().getGuidesIds()
}
}
@ -28,12 +28,12 @@ class DownloadedBookmarksDataSource {
reloadData()
}
func category(at index: Int) -> MWMCategory {
func category(at index: Int) -> BookmarkGroup {
return categories[index]
}
func reloadData() {
categories = MWMBookmarksManager.shared().categoriesFromCatalog()
categories = BookmarksManager.shared().categoriesFromCatalog()
}
func setCategory(visible: Bool, at index: Int) {
@ -42,15 +42,15 @@ class DownloadedBookmarksDataSource {
}
func deleteCategory(at index: Int) {
MWMBookmarksManager.shared().deleteCategory(category(at: index).categoryId)
BookmarksManager.shared().deleteCategory(category(at: index).categoryId)
reloadData()
}
func getServerId(at index: Int) -> String {
return MWMBookmarksManager.shared().getServerId(category(at: index).categoryId)
return BookmarksManager.shared().getServerId(category(at: index).categoryId)
}
func isGuide(at index: Int) -> Bool {
return MWMBookmarksManager.shared().isGuide(category(at: index).categoryId)
return BookmarksManager.shared().isGuide(category(at: index).categoryId)
}
}

4
iphone/Maps/Bookmarks/Catalog/PaidRouteViewController.swift
View file

@ -164,7 +164,7 @@ class PaidRouteViewController: MWMViewController {
}
private func pingServer(_ completion: @escaping (_ success: Bool) -> Void) {
MWMBookmarksManager.shared().ping { (success) in
BookmarksManager.shared().ping { (success) in
completion(success)
}
}
@ -308,7 +308,7 @@ extension PaidRouteViewController : SubscriptionManagerListener {
func didSubscribe(_ subscription: ISubscription) {
subscriptionManager.setSubscriptionActive(true)
MWMBookmarksManager.shared().resetInvalidCategories()
BookmarksManager.shared().resetInvalidCategories()
}
func didDefer(_ subscription: ISubscription) {

2
iphone/Maps/Bookmarks/Catalog/Subscription/BaseSubscriptionViewController.swift
View file

@ -6,7 +6,7 @@ class BaseSubscriptionViewController: MWMViewController {
//MARK: dependency
private(set) var subscriptionManager: ISubscriptionManager?
private let bookmarksManager: MWMBookmarksManager = MWMBookmarksManager.shared()
private let bookmarksManager = BookmarksManager.shared()
private var subscriptionGroup: ISubscriptionGroup?
@objc var onSubscribe: MWMVoidBlock?

4
iphone/Maps/Bookmarks/Catalog/UIViewController+Subscription.swift
View file

@ -1,6 +1,6 @@
extension UIViewController {
func checkInvalidSubscription(_ completion: ((_ deleted: Bool) -> Void)? = nil) {
MWMBookmarksManager.shared().check { [weak self] hasInvalidSubscription in
BookmarksManager.shared().check { [weak self] hasInvalidSubscription in
guard hasInvalidSubscription else {
return
}
@ -21,7 +21,7 @@ extension UIViewController {
}
let onDelete = {
self?.dismiss(animated: true)
MWMBookmarksManager.shared().deleteInvalidCategories()
BookmarksManager.shared().deleteInvalidCategories()
completion?(true)
}
let subscriptionExpiredDialog = SubscriptionExpiredViewController(onSubscribe: onSubscribe, onDelete: onDelete)

12
iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift
View file

@ -87,18 +87,18 @@ final class BMCViewController: MWMViewController {
}
private func shareCategory(category: MWMCategory, anchor: UIView) {
private func shareCategory(category: BookmarkGroup, anchor: UIView) {
let storyboard = UIStoryboard.instance(.sharing)
let shareController = storyboard.instantiateInitialViewController() as! BookmarksSharingViewController
shareController.category = MWMBookmarksManager.shared().category(withId: category.categoryId)
shareController.category = BookmarksManager.shared().category(withId: category.categoryId)
MapViewController.topViewController().navigationController?.pushViewController(shareController,
animated: true)
}
private func openCategorySettings(category: MWMCategory) {
private func openCategorySettings(category: BookmarkGroup) {
let storyboard = UIStoryboard.instance(.categorySettings)
let settingsController = storyboard.instantiateInitialViewController() as! CategorySettingsViewController
settingsController.category = MWMBookmarksManager.shared().category(withId: category.categoryId)
settingsController.category = BookmarksManager.shared().category(withId: category.categoryId)
settingsController.maxCategoryNameLength = viewModel.maxCategoryNameLength
settingsController.minCategoryNameLength = viewModel.minCategoryNameLength
settingsController.delegate = self
@ -107,7 +107,7 @@ final class BMCViewController: MWMViewController {
animated: true)
}
private func openCategory(category: MWMCategory) {
private func openCategory(category: BookmarkGroup) {
let bmViewController = BookmarksVC(category: category.categoryId)
bmViewController.delegate = self
MapViewController.topViewController().navigationController?.pushViewController(bmViewController,
@ -158,7 +158,7 @@ final class BMCViewController: MWMViewController {
Statistics.logEvent(kStatBookmarksListSettingsClick,
withParameters: [kStatOption : kStatSharingOptions])
})
shareAction.isEnabled = MWMBookmarksManager.shared().isCategoryNotEmpty(category.categoryId)
shareAction.isEnabled = BookmarksManager.shared().isCategoryNotEmpty(category.categoryId)
actionSheet.addAction(shareAction)
let delete = L("delete_list")
let deleteAction = UIAlertAction(title: delete, style: .destructive, handler: { [viewModel] _ in

10
iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift
View file

@ -11,15 +11,13 @@ enum BMCShareCategoryStatus {
}
final class BMCDefaultViewModel: NSObject {
var manager: MWMBookmarksManager {
return MWMBookmarksManager.shared()
}
private let manager = BookmarksManager.shared()
weak var view: BMCView?
private var sections: [BMCSection] = []
private var permissions: [BMCPermission] = []
private var categories: [MWMCategory] = []
private var categories: [BookmarkGroup] = []
private var actions: [BMCAction] = []
private var notifications: [BMCNotification] = []
@ -115,7 +113,7 @@ extension BMCDefaultViewModel {
return permissions[index]
}
func category(at index: Int) -> MWMCategory {
func category(at index: Int) -> BookmarkGroup {
return categories[index]
}
@ -348,7 +346,7 @@ extension BMCDefaultViewModel: MWMBookmarksObserver {
reloadData()
}
func onBookmarksCategoryFilePrepared(_ status: MWMBookmarksShareStatus) {
func onBookmarksCategoryFilePrepared(_ status: BookmarksShareStatus) {
switch status {
case .success:
onPreparedToShareCategory?(.success(manager.shareCategoryURL()))

4
iphone/Maps/Bookmarks/Categories/Categories/BMCCategoryCell.swift
View file

@ -16,7 +16,7 @@ final class BMCCategoryCell: MWMTableViewCell {
@IBOutlet weak var visibleCheckmark: Checkmark!
private var category: MWMCategory? {
private var category: BookmarkGroup? {
didSet {
categoryUpdated()
}
@ -24,7 +24,7 @@ final class BMCCategoryCell: MWMTableViewCell {
private weak var delegate: BMCCategoryCellDelegate?
func config(category: MWMCategory, delegate: BMCCategoryCellDelegate) -> UITableViewCell {
func config(category: BookmarkGroup, delegate: BMCCategoryCellDelegate) -> UITableViewCell {
self.category = category
self.delegate = delegate
return self

6
iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift
View file

@ -8,14 +8,12 @@ protocol CategorySettingsViewControllerDelegate: AnyObject {
class CategorySettingsViewController: MWMTableViewController {
@objc var category: MWMCategory!
@objc var category: BookmarkGroup!
@objc var maxCategoryNameLength: UInt = 60
@objc var minCategoryNameLength: UInt = 0
private var changesMade = false
var manager: MWMBookmarksManager {
return MWMBookmarksManager.shared()
}
private let manager = BookmarksManager.shared()
@objc weak var delegate: CategorySettingsViewControllerDelegate?

10
iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift
View file

@ -6,14 +6,12 @@ protocol BookmarksSharingViewControllerDelegate: AnyObject {
}
final class BookmarksSharingViewController: MWMTableViewController {
@objc var category: MWMCategory!
@objc var category: BookmarkGroup!
@objc weak var delegate: BookmarksSharingViewControllerDelegate?
private var sharingTags: [MWMTag]?
private var sharingUserStatus: MWMCategoryAuthorType?
private var sharingUserStatus: BookmarkGroupAuthorType?
private var manager: MWMBookmarksManager {
return MWMBookmarksManager.shared()
}
private let manager = BookmarksManager.shared()
private let kPropertiesControllerIdentifier = "chooseProperties"
private let kTagsControllerIdentifier = "tags"
@ -494,7 +492,7 @@ extension BookmarksSharingViewController: SharingTagsViewControllerDelegate {
extension BookmarksSharingViewController: SharingPropertiesViewControllerDelegate {
func sharingPropertiesViewController(_ viewController: SharingPropertiesViewController,
didSelect userStatus: MWMCategoryAuthorType) {
didSelect userStatus: BookmarkGroupAuthorType) {
sharingUserStatus = userStatus
showSelectTags()
}

8
iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift
View file

@ -4,7 +4,7 @@ protocol EditOnWebViewControllerDelegate: AnyObject {
final class EditOnWebViewController: MWMViewController {
weak var delegate: EditOnWebViewControllerDelegate?
var category: MWMCategory!
var category: BookmarkGroup!
@IBOutlet weak var activityIndicator: ActivityIndicator!
@IBOutlet weak var sendMeLinkButton: MWMButton! {
@ -56,7 +56,7 @@ final class EditOnWebViewController: MWMViewController {
activityIndicator.isHidden = false
sendMeLinkButton.isEnabled = false
sendMeLinkButton.setTitle(nil, for: .normal)
MWMBookmarksManager.shared().uploadCategory(withId: category.categoryId, progress: { (progress) in
BookmarksManager.shared().uploadCategory(withId: category.categoryId, progress: { (progress) in
}) { [weak self] (error) in
guard let self = self else { return }
@ -92,8 +92,8 @@ final class EditOnWebViewController: MWMViewController {
}
private func presentSharingOptions() {
guard let url = MWMBookmarksManager.shared().webEditorUrl(forCategoryId: category.categoryId,
language: AppInfo.shared().twoLetterLanguageId ) else {
guard let url = BookmarksManager.shared().webEditorUrl(forCategoryId: category.categoryId,
language: AppInfo.shared().twoLetterLanguageId ) else {
assert(false, "Unexpected empty url for category \(category.title)")
return
}

2
iphone/Maps/Bookmarks/Categories/Sharing/SharingPropertiesViewController.swift
View file

@ -1,6 +1,6 @@
protocol SharingPropertiesViewControllerDelegate: AnyObject {
func sharingPropertiesViewController(_ viewController: SharingPropertiesViewController,
didSelect userStatus: MWMCategoryAuthorType)
didSelect userStatus: BookmarkGroupAuthorType)
}
final class SharingPropertiesViewController: MWMTableViewController {

2
iphone/Maps/Bookmarks/Categories/Sharing/Tags/TagsDataSource.swift
View file

@ -4,7 +4,7 @@ final class TagsDataSource: NSObject {
private var maxTagsNumber: Int = 0
func loadTags(onComplete: @escaping (Bool) -> Void) {
MWMBookmarksManager.shared().loadTags(withLanguage: AppInfo.shared().twoLetterLanguageId) { tags, maxTagsNumber in
BookmarksManager.shared().loadTags(withLanguage: AppInfo.shared().twoLetterLanguageId) { tags, maxTagsNumber in
if let tags = tags {
self.tagGroups = tags
self.maxTagsNumber = maxTagsNumber

4
iphone/Maps/Bookmarks/InfoSection.mm
View file

@ -1,6 +1,6 @@
#import "InfoSection.h"
#import "MWMCategoryInfoCell.h"
#import "SwiftBridge.h"
//#import "SwiftBridge.h"
#include <CoreApi/Framework.h>
@ -47,7 +47,7 @@
if (self.infoCell != nil)
return self.infoCell;
UITableViewCell *cell = [tableView dequeueReusableCellWithCellClass:MWMCategoryInfoCell.class];
UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MWMCategoryInfoCell"];
CHECK(cell, ("Invalid category info cell."));
auto &bm = GetFramework().GetBookmarkManager();

17
iphone/Maps/Bookmarks/SelectSetVC.h
View file

@ -1,17 +0,0 @@
#import "MWMTableViewController.h"
#include "kml/type_utils.hpp"
@protocol MWMSelectSetDelegate <NSObject>
- (void)didSelectCategory:(NSString *)category withCategoryId:(kml::MarkGroupId)categoryId;
@end
@interface SelectSetVC : MWMTableViewController
- (instancetype)initWithCategory:(NSString *)category
categoryId:(kml::MarkGroupId)categoryId
delegate:(id<MWMSelectSetDelegate>)delegate;
@end

119
iphone/Maps/Bookmarks/SelectSetVC.mm
View file

@ -1,119 +0,0 @@
#import "SelectSetVC.h"
#import "SwiftBridge.h"
#import "UIViewController+Navigation.h"
#import <CoreApi/CoreApi.h>
@interface SelectSetVC ()
{
kml::MarkGroupId m_categoryId;
}
@property (copy, nonatomic) NSString * category;
@property (copy, nonatomic) NSArray<MWMCategory *> * categories;
@property (weak, nonatomic) id<MWMSelectSetDelegate> delegate;
@end
@implementation SelectSetVC
- (instancetype)initWithCategory:(NSString *)category
categoryId:(kml::MarkGroupId)categoryId
delegate:(id<MWMSelectSetDelegate>)delegate
{
self = [super initWithStyle:UITableViewStyleGrouped];
if (self)
{
_category = category;
m_categoryId = categoryId;
_delegate = delegate;
}
return self;
}
- (void)viewDidLoad
{
[super viewDidLoad];
NSAssert(self.category, @"Category can't be nil!");
NSAssert(self.delegate, @"Delegate can't be nil!");
self.title = L(@"bookmark_sets");
[self reloadData];
}
- (void)reloadData
{
self.categories = [[MWMBookmarksManager sharedManager] userCategories];
[self.tableView reloadData];
}
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return 2;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
// "Add new set" button
if (section == 0)
return 1;
return self.categories.count;
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
Class cls = [UITableViewCell class];
auto cell = [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath];
if (indexPath.section == 0)
{
cell.textLabel.text = L(@"add_new_set");
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
}
else
{
MWMCategory * category = self.categories[indexPath.row];
cell.textLabel.text = category.title;
if (m_categoryId == category.categoryId)
cell.accessoryType = UITableViewCellAccessoryCheckmark;
else
cell.accessoryType = UITableViewCellAccessoryNone;
}
return cell;
}
- (void)moveBookmarkToSetWithCategoryId:(kml::MarkGroupId)categoryId
{
m_categoryId = categoryId;
self.category = @(GetFramework().GetBookmarkManager().GetCategoryName(categoryId).c_str());
[self reloadData];
[self.delegate didSelectCategory:self.category withCategoryId:categoryId];
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
[self.tableView deselectRowAtIndexPath:indexPath animated:YES];
if (indexPath.section == 0)
{
[self.alertController presentCreateBookmarkCategoryAlertWithMaxCharacterNum:60
minCharacterNum:0
callback:^BOOL (NSString * name)
{
if (![[MWMBookmarksManager sharedManager] checkCategoryName:name])
return false;
auto const id = [[MWMBookmarksManager sharedManager] createCategoryWithName:name];
[self moveBookmarkToSetWithCategoryId:id];
return true;
}];
}
else
{
auto const categoryId = self.categories[indexPath.row].categoryId;
[self moveBookmarkToSetWithCategoryId:categoryId];
[self.delegate didSelectCategory:self.category withCategoryId:categoryId];
[self goBack];
}
}
@end

2
iphone/Maps/Bookmarks/TracksSection.mm
View file

@ -1,6 +1,6 @@
#import "TracksSection.h"
#import <CoreApi/MWMBookmarksManager.h>
#import "MWMBookmarkColorViewController.h"
#import "legacy_bookmark_colors.h"
#import "Statistics.h"
#include <CoreApi/Framework.h>

2
iphone/Maps/Bridging-Header.h
View file

@ -32,6 +32,7 @@
#import "MWMAlertViewController.h"
#import "MWMAvailableAreaAffectDirection.h"
#import "MWMBottomMenuState.h"
#import "MWMButtonCell.h"
#import "MWMCarPlaySearchResultObject.h"
#import "MWMCarPlaySearchService.h"
#import "MWMCircularProgress.h"
@ -59,6 +60,7 @@
#import "MWMNavigationDashboardManager.h"
#import "MWMNetworkPolicy+UI.h"
#import "MWMNoMapsViewController.h"
#import "MWMNoteCell.h"
#import "MWMPlacePageManagerHelper.h"
#import "MWMPurchaseManager.h"
#import "MWMPurchaseValidation.h"

2
iphone/Maps/Categories/MWMCategory+PlacesCountTitle.swift
View file

@ -1,6 +1,6 @@
import Foundation
extension MWMCategory {
extension BookmarkGroup {
@objc func placesCountTitle() -> String {
if (bookmarksCount > 0 && trackCount > 0) ||
(bookmarksCount == 0 && trackCount == 0) {

6
iphone/Maps/Classes/CarPlay/Template Builders/ListTemplateBuilder.swift
View file

@ -5,7 +5,7 @@ final class ListTemplateBuilder {
enum ListTemplateType {
case history
case bookmarkLists
case bookmarks(category: MWMCategory)
case bookmarks(category: BookmarkGroup)
case searchResults(results: [MWMCarPlaySearchResultObject])
}
@ -75,7 +75,7 @@ final class ListTemplateBuilder {
}
private class func obtainCategories(template: CPListTemplate) {
let bookmarkManager = MWMBookmarksManager.shared()
let bookmarkManager = BookmarksManager.shared()
let categories = bookmarkManager.userCategories()
let items: [CPListItem] = categories.compactMap({ category in
if category.bookmarksCount == 0 { return nil }
@ -91,7 +91,7 @@ final class ListTemplateBuilder {
}
private class func obtainBookmarks(template: CPListTemplate, categoryId: MWMMarkGroupID) {
let bookmarkManager = MWMBookmarksManager.shared()
let bookmarkManager = BookmarksManager.shared()
let bookmarks = bookmarkManager.bookmarks(forCategory: categoryId)
let items = bookmarks.map({ (bookmark) -> CPListItem in
let item = CPListItem(text: bookmark.prefferedName, detailText: bookmark.address)

4
iphone/Maps/Classes/CarPlay/Templates Data/CategoryInfo.swift
View file

@ -1,7 +1,7 @@
struct CategoryInfo: InfoMetadata {
let category: MWMCategory
let category: BookmarkGroup
init(category: MWMCategory) {
init(category: BookmarkGroup) {
self.category = category
}
}

10
iphone/Maps/Classes/Components/MWMTableViewController.h
View file

@ -1,5 +1,15 @@
#import "MWMController.h"
NS_ASSUME_NONNULL_BEGIN
@interface MWMTableViewController : UITableViewController <MWMController>
@end
@interface UITableView (MWMTableViewController)
- (UITableViewCell *)dequeueDefaultCellForIndexPath:(NSIndexPath *)indexPath;
@end
NS_ASSUME_NONNULL_END

11
iphone/Maps/Classes/Components/MWMTableViewController.m
View file

@ -23,8 +23,7 @@
- (void)viewDidLoad
{
[super viewDidLoad];
if (@available(iOS 11.0, *))
self.tableView.insetsContentViewsToSafeArea = YES;
self.tableView.insetsContentViewsToSafeArea = YES;
self.tableView.styleName = @"TableView:PressBackground";
[self.navigationController.navigationBar setTranslucent:NO];
[self.tableView registerClass:[MWMTableViewCell class]
@ -60,3 +59,11 @@
}
@end
@implementation UITableView (MWMTableViewController)
- (UITableViewCell *)dequeueDefaultCellForIndexPath:(NSIndexPath *)indexPath {
return [self dequeueReusableCellWithIdentifier:UITableViewCell.className forIndexPath:indexPath];
}
@end

4
iphone/Maps/Classes/MWMTextView.h
View file

@ -2,7 +2,7 @@
@interface MWMTextView : UITextView
@property (copy, nonatomic) NSString * placeholder;
@property (nonatomic, readonly) UILabel * placeholderView;
@property(nonatomic, copy) NSString *placeholder;
@property(nonatomic, readonly) UILabel *placeholderView;
@end

83
iphone/Maps/Classes/MWMTextView.m
View file

@ -2,17 +2,15 @@
@interface MWMTextView ()
@property (nonatomic, readwrite) UILabel * placeholderView;
@property(nonatomic, readwrite) UILabel *placeholderView;
@end
@implementation MWMTextView
- (void)awakeFromNib
{
- (void)awakeFromNib {
[super awakeFromNib];
[self setTextContainerInset:UIEdgeInsetsZero];
[self updatePlaceholderVisibility];
[NSNotificationCenter.defaultCenter addObserver:self
@ -22,17 +20,12 @@
self.clipsToBounds = YES;
}
- (void)dealloc
{
[NSNotificationCenter.defaultCenter removeObserver:self
name:UITextViewTextDidChangeNotification
object:nil];
- (void)dealloc {
[NSNotificationCenter.defaultCenter removeObserver:self name:UITextViewTextDidChangeNotification object:nil];
}
- (UILabel *)placeholderView
{
if (!_placeholderView)
{
- (UILabel *)placeholderView {
if (!_placeholderView) {
_placeholderView = [[UILabel alloc] initWithFrame:self.bounds];
_placeholderView.opaque = NO;
_placeholderView.backgroundColor = UIColor.clearColor;
@ -48,77 +41,53 @@
#pragma mark - Setters
- (void)setPlaceholder:(NSString *)placeholder
{
_placeholder = placeholder.copy;
self.placeholderView.text = placeholder;
[self resizePlaceholderFrame];
- (NSString *)placeholder {
return self.placeholderView.text;
}
- (void)setFont:(UIFont *)font
{
- (void)setPlaceholder:(NSString *)placeholder {
self.placeholderView.text = placeholder;
}
- (void)setFont:(UIFont *)font {
[super setFont:font];
self.placeholderView.font = font;
}
- (void)setAttributedText:(NSAttributedString *)attributedText
{
- (void)setAttributedText:(NSAttributedString *)attributedText {
[super setAttributedText:attributedText];
[self updatePlaceholderVisibility];
}
- (void)setText:(NSString *)text
{
- (void)setText:(NSString *)text {
[super setText:text];
[self updatePlaceholderVisibility];
}
- (void)setTextAlignment:(NSTextAlignment)textAlignment
{
- (void)setTextAlignment:(NSTextAlignment)textAlignment {
[super setTextAlignment:textAlignment];
self.placeholderView.textAlignment = textAlignment;
}
- (void)setTextContainerInset:(UIEdgeInsets)textContainerInset
{
[super setTextContainerInset:textContainerInset];
[self updatePlaceholderInset:textContainerInset];
}
- (void)layoutSubviews
{
- (void)layoutSubviews {
[super layoutSubviews];
[self resizePlaceholderFrame];
}
- (void)resizePlaceholderFrame
{
[self.placeholderView sizeToFit];
}
- (void)textDidChange:(NSNotification *)aNotification
{
[self updatePlaceholderVisibility];
}
- (void)updatePlaceholderInset:(UIEdgeInsets)inset
{
UIEdgeInsets inset = self.textContainerInset;
self.placeholderView.frame = CGRectMake(inset.left + self.textContainer.lineFragmentPadding,
inset.top,
self.bounds.size.width - inset.right,
self.bounds.size.height - inset.bottom);
[self resizePlaceholderFrame];
[self.placeholderView sizeToFit];
}
- (void)updatePlaceholderVisibility
{
if (!self.text.length)
{
- (void)textDidChange:(NSNotification *)aNotification {
[self updatePlaceholderVisibility];
}
- (void)updatePlaceholderVisibility {
if (self.text.length == 0) {
[self addSubview:self.placeholderView];
[self sendSubviewToBack:self.placeholderView];
}
else
{
} else {
[self.placeholderView removeFromSuperview];
}
}

1
iphone/Maps/Classes/MapViewController.mm
View file

@ -5,7 +5,6 @@
#import "MWMAuthorizationCommon.h"
#import "MWMAuthorizationWebViewLoginViewController.h"
#import "MWMAutoupdateController.h"
#import "MWMEditBookmarkController.h"
#import "MWMEditorViewController.h"
#import "MWMFrameworkListener.h"
#import "MWMFrameworkObservers.h"

70
iphone/Maps/Maps.xcodeproj/project.pbxproj
View file

@ -323,6 +323,8 @@
470F5A5C2181DE7500754295 /* PaidRouteViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 470F5A5A2181DE7400754295 /* PaidRouteViewController.xib */; };
470F5A7D2189BB2F00754295 /* PaidRoutePurchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F5A7C2189BB2F00754295 /* PaidRoutePurchase.swift */; };
470F5A7F2189C30800754295 /* InAppPurchase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 470F5A7E2189C30800754295 /* InAppPurchase.swift */; };
4715273524907F8200E91BBA /* BookmarkColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4715273424907F8200E91BBA /* BookmarkColorViewController.swift */; };
471527372491C20500E91BBA /* BookmarkGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471527362491C20500E91BBA /* BookmarkGroupViewController.swift */; };
4716EABA21A325310029B886 /* IPaidRouteStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4716EAB921A325310029B886 /* IPaidRouteStatistics.swift */; };
4716EAC121A6E0570029B886 /* BookmarksVC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4716EAC021A6E0570029B886 /* BookmarksVC.xib */; };
4719A643219CB61D009F9AA7 /* BillingPendingTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A642219CB61D009F9AA7 /* BillingPendingTransaction.swift */; };
@ -330,6 +332,10 @@
4719A647219CBD7F009F9AA7 /* IBillingPendingTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A646219CBD7F009F9AA7 /* IBillingPendingTransaction.swift */; };
4719A64E21A30C3B009F9AA7 /* PaidRouteStatistics.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A64D21A30C3B009F9AA7 /* PaidRouteStatistics.swift */; };
471A7BB8247FE3C300A0D4C1 /* URL+Query.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */; };
471A7BBE2481A3D000A0D4C1 /* EditBookmarkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471A7BBD2481A3D000A0D4C1 /* EditBookmarkViewController.swift */; };
471A7BC02481C82500A0D4C1 /* BookmarkTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471A7BBF2481C82500A0D4C1 /* BookmarkTitleCell.swift */; };
471A7BC22481D44B00A0D4C1 /* BookmarkTitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 471A7BC12481C9B700A0D4C1 /* BookmarkTitleCell.xib */; };
471A7BC4248471BE00A0D4C1 /* BookmarkUIUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471A7BC3248471BE00A0D4C1 /* BookmarkUIUtils.swift */; };
471AB98923AA8A3500F56D49 /* IDownloaderDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471AB98823AA8A3500F56D49 /* IDownloaderDataSource.swift */; };
471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471AB99323ABA3BD00F56D49 /* SearchMapsDataSource.swift */; };
471BBD942130390F00EB17C9 /* TutorialViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471BBD932130390F00EB17C9 /* TutorialViewController.swift */; };
@ -495,7 +501,6 @@
6741A9E71BF340DE002C974C /* MWMCircularProgressView.m in Sources */ = {isa = PBXBuildFile; fileRef = 349A35791B53D4C9009677EE /* MWMCircularProgressView.m */; };
6741A9EC1BF340DE002C974C /* MWMCircularProgress.m in Sources */ = {isa = PBXBuildFile; fileRef = 349A35761B53D4C9009677EE /* MWMCircularProgress.m */; };
6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA36B80615403A4F004560CC /* BookmarksVC.mm */; };
6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */ = {isa = PBXBuildFile; fileRef = FA054611155C465E001F4E37 /* SelectSetVC.mm */; };
6741AA031BF340DE002C974C /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; };
6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34BC72111B0DECAE0012A34B /* MWMMapViewControlsManager.mm */; };
6741AA191BF340DE002C974C /* MWMDownloaderDialogCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B6C1B46A51F0081A24A /* MWMDownloaderDialogCell.m */; };
@ -626,12 +631,12 @@
995739042355CAA30019AEE7 /* PageIndicator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995739032355CAA30019AEE7 /* PageIndicator.swift */; };
995739062355CAC40019AEE7 /* ImageViewCrossDisolve.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995739052355CAC40019AEE7 /* ImageViewCrossDisolve.swift */; };
995739082355CB660019AEE7 /* AllPassSubscriptionViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995739072355CB660019AEE7 /* AllPassSubscriptionViewController.swift */; };
995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; };
995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; };
9959C75624582DA2008FD4FD /* DirectionView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9959C75524582DA2008FD4FD /* DirectionView.xib */; };
9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9959C75B24599CCC008FD4FD /* DirectionView.swift */; };
9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; };
995F1613244F0AA50060631D /* BottomMenuLayersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */; };
995F1614244F0AA50060631D /* BottomMenuLayersCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */; };
9977E69C247BFB510073780C /* MWMSearchTextField.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E69B247BFB510073780C /* MWMSearchTextField.swift */; };
9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */; };
9977E6A32480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */; };
998927302449DE1500260CE2 /* TabBarArea.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9989272F2449DE1500260CE2 /* TabBarArea.swift */; };
998927382449E60200260CE2 /* BottomMenuPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 998927322449E60200260CE2 /* BottomMenuPresenter.swift */; };
@ -814,11 +819,6 @@
F6E2FD741E097BA00083EBEC /* MWMMapDownloaderTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC111E097B9F0083EBEC /* MWMMapDownloaderTableViewCell.xib */; };
F6E2FD8C1E097BA00083EBEC /* MWMNoMapsView.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.m */; };
F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC281E097B9F0083EBEC /* MWMNoMapsViewController.mm */; };
F6E2FD921E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC2B1E097B9F0083EBEC /* MWMBookmarkColorViewController.mm */; };
F6E2FD951E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC2C1E097B9F0083EBEC /* MWMBookmarkColorViewController.xib */; };
F6E2FD981E097BA00083EBEC /* MWMBookmarkTitleCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC2E1E097B9F0083EBEC /* MWMBookmarkTitleCell.m */; };
F6E2FD9B1E097BA00083EBEC /* MWMBookmarkTitleCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FC2F1E097B9F0083EBEC /* MWMBookmarkTitleCell.xib */; };
F6E2FD9E1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC311E097B9F0083EBEC /* MWMEditBookmarkController.mm */; };
F6E2FDA11E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC351E097B9F0083EBEC /* MWMEditorAdditionalNamesTableViewController.mm */; };
F6E2FDA41E097BA00083EBEC /* MWMCuisineEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC381E097B9F0083EBEC /* MWMCuisineEditorViewController.mm */; };
F6E2FDB61E097BA00083EBEC /* MWMEditorAdditionalNamesHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FC411E097B9F0083EBEC /* MWMEditorAdditionalNamesHeader.m */; };
@ -1439,6 +1439,8 @@
470F5A5A2181DE7400754295 /* PaidRouteViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PaidRouteViewController.xib; sourceTree = "<group>"; };
470F5A7C2189BB2F00754295 /* PaidRoutePurchase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRoutePurchase.swift; sourceTree = "<group>"; };
470F5A7E2189C30800754295 /* InAppPurchase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InAppPurchase.swift; sourceTree = "<group>"; };
4715273424907F8200E91BBA /* BookmarkColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkColorViewController.swift; sourceTree = "<group>"; };
471527362491C20500E91BBA /* BookmarkGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkGroupViewController.swift; sourceTree = "<group>"; };
4716EAB921A325310029B886 /* IPaidRouteStatistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPaidRouteStatistics.swift; sourceTree = "<group>"; };
4716EAC021A6E0570029B886 /* BookmarksVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksVC.xib; sourceTree = "<group>"; };
4716EACA21B01C270029B886 /* MWMUGCReviewSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUGCReviewSource.h; sourceTree = "<group>"; };
@ -1447,6 +1449,10 @@
4719A646219CBD7F009F9AA7 /* IBillingPendingTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IBillingPendingTransaction.swift; sourceTree = "<group>"; };
4719A64D21A30C3B009F9AA7 /* PaidRouteStatistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaidRouteStatistics.swift; sourceTree = "<group>"; };
471A7BB7247FE3C300A0D4C1 /* URL+Query.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "URL+Query.swift"; sourceTree = "<group>"; };
471A7BBD2481A3D000A0D4C1 /* EditBookmarkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditBookmarkViewController.swift; sourceTree = "<group>"; };
471A7BBF2481C82500A0D4C1 /* BookmarkTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkTitleCell.swift; sourceTree = "<group>"; };
471A7BC12481C9B700A0D4C1 /* BookmarkTitleCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarkTitleCell.xib; sourceTree = "<group>"; };
471A7BC3248471BE00A0D4C1 /* BookmarkUIUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkUIUtils.swift; sourceTree = "<group>"; };
471AB98823AA8A3500F56D49 /* IDownloaderDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IDownloaderDataSource.swift; sourceTree = "<group>"; };
471AB99323ABA3BD00F56D49 /* SearchMapsDataSource.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SearchMapsDataSource.swift; sourceTree = "<group>"; };
471BBD932130390F00EB17C9 /* TutorialViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TutorialViewController.swift; sourceTree = "<group>"; };
@ -1716,13 +1722,13 @@
995739052355CAC40019AEE7 /* ImageViewCrossDisolve.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageViewCrossDisolve.swift; sourceTree = "<group>"; };
995739072355CB660019AEE7 /* AllPassSubscriptionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllPassSubscriptionViewController.swift; sourceTree = "<group>"; };
9957FAE0237AE04900855F48 /* MWMMapViewControlsManager+AddPlace.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMMapViewControlsManager+AddPlace.h"; sourceTree = "<group>"; };
995F1610244F07F90060631D /* MWMBottomMenuState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuState.h; sourceTree = "<group>"; };
995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = "<group>"; };
9959C75524582DA2008FD4FD /* DirectionView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DirectionView.xib; sourceTree = "<group>"; };
9959C75B24599CCC008FD4FD /* DirectionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DirectionView.swift; sourceTree = "<group>"; };
995F1610244F07F90060631D /* MWMBottomMenuState.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBottomMenuState.h; sourceTree = "<group>"; };
995F1611244F0AA40060631D /* BottomMenuLayersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayersCell.swift; sourceTree = "<group>"; };
995F1612244F0AA40060631D /* BottomMenuLayersCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BottomMenuLayersCell.xib; sourceTree = "<group>"; };
9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = "<group>"; };
9977E69B247BFB510073780C /* MWMSearchTextField.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MWMSearchTextField.swift; sourceTree = "<group>"; };
9977E6A02480E1EE0073780C /* BottomMenuLayerButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButton.swift; sourceTree = "<group>"; };
9977E6A22480F9BF0073780C /* BottomMenuLayerButtonRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuLayerButtonRenderer.swift; sourceTree = "<group>"; };
9989272F2449DE1500260CE2 /* TabBarArea.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabBarArea.swift; sourceTree = "<group>"; };
998927322449E60200260CE2 /* BottomMenuPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomMenuPresenter.swift; sourceTree = "<group>"; };
@ -2018,14 +2024,7 @@
F6E2FC261E097B9F0083EBEC /* MWMNoMapsView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMNoMapsView.m; sourceTree = "<group>"; };
F6E2FC271E097B9F0083EBEC /* MWMNoMapsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMNoMapsViewController.h; sourceTree = "<group>"; };
F6E2FC281E097B9F0083EBEC /* MWMNoMapsViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMNoMapsViewController.mm; sourceTree = "<group>"; };
F6E2FC2A1E097B9F0083EBEC /* MWMBookmarkColorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBookmarkColorViewController.h; sourceTree = "<group>"; };
F6E2FC2B1E097B9F0083EBEC /* MWMBookmarkColorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmarkColorViewController.mm; sourceTree = "<group>"; };
F6E2FC2C1E097B9F0083EBEC /* MWMBookmarkColorViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBookmarkColorViewController.xib; sourceTree = "<group>"; };
F6E2FC2D1E097B9F0083EBEC /* MWMBookmarkTitleCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMBookmarkTitleCell.h; sourceTree = "<group>"; };
F6E2FC2E1E097B9F0083EBEC /* MWMBookmarkTitleCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMBookmarkTitleCell.m; sourceTree = "<group>"; };
F6E2FC2F1E097B9F0083EBEC /* MWMBookmarkTitleCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBookmarkTitleCell.xib; sourceTree = "<group>"; };
F6E2FC301E097B9F0083EBEC /* MWMEditBookmarkController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditBookmarkController.h; sourceTree = "<group>"; };
F6E2FC311E097B9F0083EBEC /* MWMEditBookmarkController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MWMEditBookmarkController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
F6E2FC2A1E097B9F0083EBEC /* legacy_bookmark_colors.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = legacy_bookmark_colors.h; sourceTree = "<group>"; };
F6E2FC341E097B9F0083EBEC /* MWMEditorAdditionalNamesTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorAdditionalNamesTableViewController.h; sourceTree = "<group>"; };
F6E2FC351E097B9F0083EBEC /* MWMEditorAdditionalNamesTableViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorAdditionalNamesTableViewController.mm; sourceTree = "<group>"; };
F6E2FC371E097B9F0083EBEC /* MWMCuisineEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCuisineEditorViewController.h; sourceTree = "<group>"; };
@ -2163,8 +2162,6 @@
F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlaceDoesntExistAlert.xib; sourceTree = "<group>"; };
F6FEA82B1C58E89B007223CC /* MWMButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMButton.h; sourceTree = "<group>"; };
F6FEA82C1C58E89B007223CC /* MWMButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMButton.m; sourceTree = "<group>"; };
FA054610155C465E001F4E37 /* SelectSetVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SelectSetVC.h; path = Bookmarks/SelectSetVC.h; sourceTree = SOURCE_ROOT; };
FA054611155C465E001F4E37 /* SelectSetVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SelectSetVC.mm; path = Bookmarks/SelectSetVC.mm; sourceTree = SOURCE_ROOT; };
FA36B80515403A4F004560CC /* BookmarksVC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = BookmarksVC.h; path = Bookmarks/BookmarksVC.h; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FA36B80615403A4F004560CC /* BookmarksVC.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; name = BookmarksVC.mm; path = Bookmarks/BookmarksVC.mm; sourceTree = SOURCE_ROOT; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */ = {isa = PBXFileReference; lastKnownFileType = file; name = WorldCoasts.mwm; path = ../../data/WorldCoasts.mwm; sourceTree = "<group>"; };
@ -4488,14 +4485,12 @@
F6E2FC291E097B9F0083EBEC /* EditBookmark */ = {
isa = PBXGroup;
children = (
F6E2FC2A1E097B9F0083EBEC /* MWMBookmarkColorViewController.h */,
F6E2FC2B1E097B9F0083EBEC /* MWMBookmarkColorViewController.mm */,
F6E2FC2C1E097B9F0083EBEC /* MWMBookmarkColorViewController.xib */,
F6E2FC2D1E097B9F0083EBEC /* MWMBookmarkTitleCell.h */,
F6E2FC2E1E097B9F0083EBEC /* MWMBookmarkTitleCell.m */,
F6E2FC2F1E097B9F0083EBEC /* MWMBookmarkTitleCell.xib */,
F6E2FC301E097B9F0083EBEC /* MWMEditBookmarkController.h */,
F6E2FC311E097B9F0083EBEC /* MWMEditBookmarkController.mm */,
F6E2FC2A1E097B9F0083EBEC /* legacy_bookmark_colors.h */,
471A7BBF2481C82500A0D4C1 /* BookmarkTitleCell.swift */,
471A7BC12481C9B700A0D4C1 /* BookmarkTitleCell.xib */,
471A7BBD2481A3D000A0D4C1 /* EditBookmarkViewController.swift */,
471A7BC3248471BE00A0D4C1 /* BookmarkUIUtils.swift */,
4715273424907F8200E91BBA /* BookmarkColorViewController.swift */,
);
path = EditBookmark;
sourceTree = "<group>";
@ -4925,8 +4920,6 @@
B33D21AA20DA515800BAD749 /* MWMCategoryInfoCell.mm */,
B33D21AB20DA515800BAD749 /* MWMCategoryInfoCell.xib */,
3404F4A02028A6C00090E401 /* Categories */,
FA054610155C465E001F4E37 /* SelectSetVC.h */,
FA054611155C465E001F4E37 /* SelectSetVC.mm */,
B33D21B720E130D000BAD749 /* BookmarksTabViewController.swift */,
BBED27002292F42000788143 /* BookmarksSection.h */,
BBED27012292F6C000788143 /* BookmarksSection.mm */,
@ -4935,6 +4928,7 @@
BB87BF8922FAF1CA008A8A72 /* TracksSection.mm */,
BB87BF8B22FAF3B8008A8A72 /* InfoSection.h */,
BB87BF8C22FAF435008A8A72 /* InfoSection.mm */,
471527362491C20500E91BBA /* BookmarkGroupViewController.swift */,
);
path = Bookmarks;
sourceTree = "<group>";
@ -5061,6 +5055,7 @@
34AB66801FC5AA330078E451 /* MWMiPhoneRoutePreview.xib in Resources */,
F61757F11FC731F5000AD0D0 /* DiscoveryOnlineTemplateCell.xib in Resources */,
6741A95B1BF340DE002C974C /* 06_code2000.ttf in Resources */,
471A7BC22481D44B00A0D4C1 /* BookmarkTitleCell.xib in Resources */,
F603E05E1FDE9703006B84D6 /* DiscoverySearchCollectionHolderCell.xib in Resources */,
6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */,
F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */,
@ -5097,8 +5092,6 @@
F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */,
6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */,
B366130B20D5E2E000E7DC3E /* CatalogCategoryCell.xib in Resources */,
F6E2FD951E097BA00083EBEC /* MWMBookmarkColorViewController.xib in Resources */,
F6E2FD9B1E097BA00083EBEC /* MWMBookmarkTitleCell.xib in Resources */,
4501B1942077C35A001B9173 /* resources-xxxhdpi_clear in Resources */,
3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */,
99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */,
@ -5484,6 +5477,7 @@
3DBD7BE42425015C00ED9FE8 /* ParntersStyleSheet.swift in Sources */,
F6E2FF631E097BA00083EBEC /* MWMTTSLanguageViewController.mm in Sources */,
342EE4121C43DAA7009F6A49 /* MWMAuthorizationWebViewLoginViewController.mm in Sources */,
4715273524907F8200E91BBA /* BookmarkColorViewController.swift in Sources */,
47E3C7292111E614008B3B27 /* FadeInAnimatedTransitioning.swift in Sources */,
34AB667D1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */,
993DF11B23F6BDB100AC231A /* UIViewRenderer.swift in Sources */,
@ -5499,6 +5493,7 @@
99A906DE23F6F7030005872B /* PlacePageBookmarkViewController.swift in Sources */,
F6791B141C43DF0B007A8A6E /* MWMStartButton.m in Sources */,
9977E6A12480E1EE0073780C /* BottomMenuLayerButton.swift in Sources */,
471527372491C20500E91BBA /* BookmarkGroupViewController.swift in Sources */,
479D306522C664CE00D18278 /* MWMDownloadBannerViewController.m in Sources */,
F6E2FEDF1E097BA00083EBEC /* MWMSearchManager+Layout.m in Sources */,
F64D9CA01C899C350063FA30 /* MWMEditorViralAlert.mm in Sources */,
@ -5625,7 +5620,6 @@
9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */,
99B6A77F23684573002C94CB /* PromoDiscoveryBuilder.swift in Sources */,
4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */,
F6E2FD981E097BA00083EBEC /* MWMBookmarkTitleCell.m in Sources */,
33E905462180C40900868CAC /* UIViewController+Authorization.swift in Sources */,
CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */,
349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */,
@ -5701,7 +5695,6 @@
F6E2FF3C1E097BA00083EBEC /* MWMSearchTableView.m in Sources */,
F6E2FF661E097BA00083EBEC /* MWMTTSSettingsViewController.mm in Sources */,
3454D7C21E07F045004AF2AD /* NSString+Categories.m in Sources */,
6741A9FE1BF340DE002C974C /* SelectSetVC.mm in Sources */,
34E7761F1F14DB48003040B3 /* PlacePageArea.swift in Sources */,
346DB82E1E5C4F6700E3123E /* GalleryItemViewController.swift in Sources */,
4728F69322CF89A400E00028 /* GradientView.swift in Sources */,
@ -5822,7 +5815,6 @@
993F5510237C622700545511 /* DeepLinkRouteStrategy.swift in Sources */,
99F3EB0323F4178200C713F8 /* PlacePageCommonLayout.swift in Sources */,
344BEAF61F66BDC30045DC45 /* RatingSummaryViewSettings.swift in Sources */,
F6E2FD921E097BA00083EBEC /* MWMBookmarkColorViewController.mm in Sources */,
CD96C71C22A8113100DB7CFE /* MWMDiscoveryControllerViewModel.mm in Sources */,
470F0B7F2388431E006AEC94 /* StarRatingView.swift in Sources */,
99C6532223F2F506004322F3 /* IPlacePageLayout.swift in Sources */,
@ -5835,6 +5827,7 @@
99E2B01E23698B0800FFABC5 /* WelcomeProtocols.swift in Sources */,
471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */,
993F550F237C622700545511 /* DeepLinkMapStrategy.swift in Sources */,
471A7BC02481C82500A0D4C1 /* BookmarkTitleCell.swift in Sources */,
34AB661A1FC5AA330078E451 /* MWMTaxiCollectionLayout.m in Sources */,
33F8BA4E2199AB9500ECA8EE /* TagsDataSource.swift in Sources */,
993F5507237C622700545511 /* DeepLinkSearchStrategy.swift in Sources */,
@ -5881,6 +5874,7 @@
6741AA1D1BF340DE002C974C /* MWMDownloadTransitMapAlert.mm in Sources */,
346B42AC1DD5E3D20094EBEE /* MWMLocationNotFoundAlert.mm in Sources */,
340475091E08199E00C92850 /* MWMMyTarget.mm in Sources */,
471A7BBE2481A3D000A0D4C1 /* EditBookmarkViewController.swift in Sources */,
340416501E7C086000E2B6D6 /* PhotoViewController.swift in Sources */,
470B3632244E2DE200C0EA9E /* GuidesGalleryCityCell.swift in Sources */,
993DF0C923F6BD0600AC231A /* ElevationDetailsBuilder.swift in Sources */,
@ -5942,7 +5936,6 @@
34B846A32029DFEB0081ECCD /* BMCPermissionsHeader.swift in Sources */,
99A906E023F6F7030005872B /* RatingSummaryViewController.swift in Sources */,
993F550D237C622700545511 /* DeepLinkLeadStrategy.swift in Sources */,
F6E2FD9E1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
337F98B221D3BAE600C8AC27 /* SearchCategoriesViewController.swift in Sources */,
47B06DED21B696C20094CCAD /* GeoTracker.swift in Sources */,
349FC54B1F680DAE00968C9F /* ExpandableReviewSettings.swift in Sources */,
@ -5963,6 +5956,7 @@
47C7F9732191E15A00C2760C /* InAppBilling.swift in Sources */,
F5BD2CA4DBEFACBC48195F39 /* DiscoveryCollectionHolderCell.swift in Sources */,
4796037524482E3900F3BDD0 /* KeychainStorage.swift in Sources */,
471A7BC4248471BE00A0D4C1 /* BookmarkUIUtils.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

2
iphone/Maps/UI/Authorization/AuthorizationViewController.swift
View file

@ -97,7 +97,7 @@ final class AuthorizationViewController: MWMViewController {
@IBAction private func phoneSignIn() {
let authVC = PhoneNumberAuthorizationViewController(success: { [unowned self] token in
self.dismiss(animated: true)
self.process(token: token!, type: .phone)
self.process(token: token, type: .phone)
}, failure: { [unowned self] in
self.dismiss(animated: true)
self.process(error: NSError(domain: kMapsmeErrorDomain, code: 0), type: .phone)

48
iphone/Maps/UI/EditBookmark/BookmarkColorViewController.swift Normal file
View file

@ -0,0 +1,48 @@
import UIKit
protocol BookmarkColorViewControllerDelegate: AnyObject {
func bookmarkColorViewController(_ viewController: BookmarkColorViewController, didSelect color: BookmarkColor)
}
final class BookmarkColorViewController: MWMTableViewController {
weak var delegate: BookmarkColorViewControllerDelegate?
private let bookmarkColor: BookmarkColor
private let colors: [BookmarkColor] = [.red, .pink, .purple, .deepPurple, .blue, .lightBlue, .cyan, .teal, .green,
.lime, .yellow, .orange, .deepOrange, .brown, .gray, .blueGray]
init(bookmarkColor: BookmarkColor) {
self.bookmarkColor = bookmarkColor
super.init(style: .grouped)
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override func viewDidLoad() {
super.viewDidLoad()
title = L("bookmark_color")
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
colors.count
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueDefaultCell(for: indexPath)
let color = colors[indexPath.row]
let selected = color == bookmarkColor
cell.textLabel?.text = color.title
cell.imageView?.image = color.image(selected)
cell.accessoryType = selected ? .checkmark : .none
return cell
}
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let color = colors[indexPath.row]
delegate?.bookmarkColorViewController(self, didSelect: color)
Statistics.logEvent(kStatEventName(kStatPlacePage, kStatChangeBookmarkColor),
withParameters: [kStatValue : color.title])
}
}

21
iphone/Maps/UI/EditBookmark/BookmarkTitleCell.swift Normal file
View file

@ -0,0 +1,21 @@
import UIKit
protocol BookmarkTitleCellDelegate: AnyObject {
func didFinishEditingTitle(_ title: String)
}
final class BookmarkTitleCell: MWMTableViewCell {
@IBOutlet var textField: UITextField!
weak var delegate: BookmarkTitleCellDelegate?
func configure(name: String, delegate: BookmarkTitleCellDelegate) {
textField.text = name
self.delegate = delegate
}
}
extension BookmarkTitleCell: UITextFieldDelegate {
func textFieldDidEndEditing(_ textField: UITextField) {
delegate?.didFinishEditingTitle(textField.text ?? "")
}
}

7
iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.xib → iphone/Maps/UI/EditBookmark/BookmarkTitleCell.xib
View file

@ -2,14 +2,13 @@
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="oz5-CE-QZ8" customClass="MWMBookmarkTitleCell">
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="oz5-CE-QZ8" customClass="BookmarkTitleCell" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<autoresizingMask key="autoresizingMask"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oz5-CE-QZ8" id="v5X-p8-TtT">
@ -25,7 +24,7 @@
<userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="placepage_bookmark_name_hint"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="delegate" destination="oz5-CE-QZ8" id="xG2-C9-gMT"/>
<outlet property="delegate" destination="oz5-CE-QZ8" id="d6l-ER-j3P"/>
</connections>
</textField>
</subviews>
@ -37,7 +36,7 @@
</constraints>
</tableViewCellContentView>
<connections>
<outlet property="name" destination="Ykx-ep-qjo" id="mtb-ib-ktf"/>
<outlet property="textField" destination="Ykx-ep-qjo" id="Vsa-Aq-FNB"/>
</connections>
<point key="canvasLocation" x="234" y="339"/>
</tableViewCell>

93
iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift Normal file
View file

@ -0,0 +1,93 @@
import Foundation
extension BookmarkColor {
var title: String {
localizedTitleForBookmarkColor(self)
}
var color: UIColor {
uiColorForBookmarkColor(self)
}
func image(_ selected: Bool) -> UIImage {
if selected {
return circleImageForColor(self, frameSize: 22, iconName: "ic_bm_none")
} else {
return circleImageForColor(self, frameSize: 22, diameter: 14)
}
}
}
fileprivate func titleForBookmarkColor(_ color: BookmarkColor) -> String {
switch color {
case .red: return "red"
case .blue: return "blue"
case .purple: return "purple"
case .yellow: return "yellow"
case .pink: return "pink"
case .brown: return "brown"
case .green: return "green"
case .orange: return "orange"
case .deepPurple: return "deep_purple"
case .lightBlue: return "light_blue"
case .cyan: return "cyan"
case .teal: return "teal"
case .lime: return "lime"
case .deepOrange: return "deep_orange"
case .gray: return "gray"
case .blueGray: return "blue_gray"
case .none, .count: return ""
@unknown default:
fatalError()
}
}
func localizedTitleForBookmarkColor(_ color: BookmarkColor) -> String {
L(titleForBookmarkColor(color))
}
fileprivate func rgbColor(_ r: CGFloat, _ g: CGFloat, _ b: CGFloat) -> UIColor {
UIColor(red: r / 255, green: g / 255, blue: b / 255, alpha: 0.8)
}
func uiColorForBookmarkColor(_ color: BookmarkColor) -> UIColor {
switch color {
case .red: return rgbColor(229, 27, 35);
case .pink: return rgbColor(255, 65, 130);
case .purple: return rgbColor(155, 36, 178);
case .deepPurple: return rgbColor(102, 57, 191);
case .blue: return rgbColor(0, 102, 204);
case .lightBlue: return rgbColor(36, 156, 242);
case .cyan: return rgbColor(20, 190, 205);
case .teal: return rgbColor(0, 165, 140);
case .green: return rgbColor(60, 140, 60);
case .lime: return rgbColor(147, 191, 57);
case .yellow: return rgbColor(255, 200, 0);
case .orange: return rgbColor(255, 150, 0);
case .deepOrange: return rgbColor(240, 100, 50);
case .brown: return rgbColor(128, 70, 51);
case .gray: return rgbColor(115, 115, 115);
case .blueGray: return rgbColor(89, 115, 128);
case .none, .count:
fatalError()
@unknown default:
fatalError()
}
}
func circleImageForColor(_ color: BookmarkColor,
frameSize: CGFloat,
diameter: CGFloat? = nil,
iconName: String? = nil) -> UIImage {
let renderer = UIGraphicsImageRenderer(size: CGSize(width: frameSize, height: frameSize))
return renderer.image { context in
let d = diameter ?? frameSize
let rect = CGRect(x: (frameSize - d) / 2, y: (frameSize - d) / 2, width: d, height: d)
context.cgContext.addEllipse(in: rect)
context.cgContext.setFillColor(color.color.cgColor)
context.cgContext.fillPath()
guard let iconName = iconName, let image = UIImage(named: iconName) else { return }
image.draw(in: rect.insetBy(dx: 3, dy: 3))
}
}

195
iphone/Maps/UI/EditBookmark/EditBookmarkViewController.swift Normal file
View file

@ -0,0 +1,195 @@
import UIKit
@objc(MWMEditBookmarkController)
final class EditBookmarkViewController: MWMTableViewController {
private enum Sections: Int {
case info
case description
case delete
case count
}
private enum InfoSectionRows: Int {
case title
case color
case bookmarkGroup
case count
}
@objc var placePageData: PlacePageData!
private var noteCell: MWMNoteCell?
private var bookmarkTitle: String?
private var bookmarkDescription: String?
private var bookmarkGroupTitle: String?
private var bookmarkId = FrameworkHelper.invalidBookmarkId()
private var bookmarkGroupId = FrameworkHelper.invalidCategoryId()
private var newBookmarkGroupId = FrameworkHelper.invalidCategoryId()
private var bookmarkColor: BookmarkColor!
override func viewDidLoad() {
super.viewDidLoad()
guard placePageData != nil, let bookmarkData = placePageData.bookmarkData else {
fatalError("placePageData and bookmarkData can't be nil")
}
bookmarkTitle = placePageData.previewData.title
bookmarkDescription = bookmarkData.bookmarkDescription
bookmarkGroupTitle = bookmarkData.bookmarkCategory
bookmarkId = bookmarkData.bookmarkId
bookmarkGroupId = bookmarkData.bookmarkGroupId
bookmarkColor = bookmarkData.color
title = L("bookmark").capitalized
navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .save,
target: self,
action: #selector(onSave))
tableView.registerNib(cell: BookmarkTitleCell.self)
tableView.registerNib(cell: MWMButtonCell.self)
tableView.registerNib(cell: MWMNoteCell.self)
}
// MARK: - Table view data source
override func numberOfSections(in tableView: UITableView) -> Int {
Sections.count.rawValue
}
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
switch Sections(rawValue: section) {
case .info:
return InfoSectionRows.count.rawValue
case .description, .delete:
return 1
default:
fatalError()
}
}
override func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
switch Sections(rawValue: indexPath.section) {
case .info:
switch InfoSectionRows(rawValue: indexPath.row) {
case .title:
let cell = tableView.dequeueReusableCell(cell: BookmarkTitleCell.self, indexPath: indexPath)
cell.configure(name: bookmarkTitle ?? "", delegate: self)
return cell
case .color:
let cell = tableView.dequeueDefaultCell(for: indexPath)
cell.accessoryType = .disclosureIndicator
cell.textLabel?.text = bookmarkColor.title
cell.imageView?.image = circleImageForColor(bookmarkColor, frameSize: 28, diameter: 22, iconName: "ic_bm_none")
return cell
case .bookmarkGroup:
let cell = tableView.dequeueDefaultCell(for: indexPath)
cell.textLabel?.text = bookmarkGroupTitle
cell.imageView?.image = UIImage(named: "ic_folder")
cell.imageView?.styleName = "MWMBlack";
cell.accessoryType = .disclosureIndicator;
return cell;
default:
fatalError()
}
case .description:
if let noteCell = noteCell {
return noteCell
} else {
let cell = tableView.dequeueReusableCell(cell: MWMNoteCell.self, indexPath: indexPath)
cell.config(with: self, noteText: bookmarkDescription ?? "", placeholder: L("placepage_personal_notes_hint"))
noteCell = cell
return cell
}
case .delete:
let cell = tableView.dequeueReusableCell(cell: MWMButtonCell.self, indexPath: indexPath)
cell.configure(with: self, title: L("placepage_delete_bookmark_button"))
return cell
default:
fatalError()
}
}
override func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
switch InfoSectionRows(rawValue: indexPath.row) {
case .color:
let colorViewController = BookmarkColorViewController(bookmarkColor: bookmarkColor)
colorViewController.delegate = self
navigationController?.pushViewController(colorViewController, animated: true)
case .bookmarkGroup:
let groupViewController = BookmarkGroupViewController(groupName: bookmarkGroupTitle ?? "", groupId: bookmarkGroupId)
groupViewController.delegate = self
navigationController?.pushViewController(groupViewController, animated: true)
default:
break
}
}
// MARK: - Private
@objc private func onSave() {
view.endEditing(true)
BookmarksManager.shared().updateBookmark(bookmarkId,
setGroupId: bookmarkGroupId,
title: bookmarkTitle ?? "",
color: bookmarkColor,
description: bookmarkDescription ?? "")
FrameworkHelper.updatePlacePageData()
placePageData.updateBookmarkStatus()
goBack()
}
}
extension EditBookmarkViewController: BookmarkTitleCellDelegate {
func didFinishEditingTitle(_ title: String) {
bookmarkTitle = title
tableView.reloadRows(at: [IndexPath(row: InfoSectionRows.title.rawValue, section: Sections.info.rawValue)],
with: .none)
}
}
extension EditBookmarkViewController: MWMNoteCellDelegate {
func cell(_ cell: MWMNoteCell, didChangeSizeAndText text: String) {
UIView.setAnimationsEnabled(false)
tableView.refresh()
UIView.setAnimationsEnabled(true)
tableView.scrollToRow(at: IndexPath(item: 0, section: Sections.description.rawValue),
at: .bottom,
animated: true)
}
func cell(_ cell: MWMNoteCell, didFinishEditingWithText text: String) {
bookmarkDescription = text
}
}
extension EditBookmarkViewController: MWMButtonCellDelegate {
func cellDidPressButton(_ cell: UITableViewCell) {
BookmarksManager.shared().deleteBookmark(bookmarkId)
FrameworkHelper.updatePlacePageData()
placePageData.updateBookmarkStatus()
goBack()
}
}
extension EditBookmarkViewController: BookmarkColorViewControllerDelegate {
func bookmarkColorViewController(_ viewController: BookmarkColorViewController, didSelect color: BookmarkColor) {
goBack()
bookmarkColor = color
tableView.reloadRows(at: [IndexPath(row: InfoSectionRows.color.rawValue, section: Sections.info.rawValue)],
with: .none)
}
}
extension EditBookmarkViewController: BookmarkGroupViewControllerDelegate {
func bookmarkGroupViewController(_ viewController: BookmarkGroupViewController,
didSelect groupTitle: String,
groupId: MWMMarkGroupID) {
goBack()
bookmarkGroupTitle = groupTitle
bookmarkGroupId = groupId
tableView.reloadRows(at: [IndexPath(row: InfoSectionRows.bookmarkGroup.rawValue, section: Sections.info.rawValue)],
with: .none)
}
}

87
iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.mm
View file

@ -1,87 +0,0 @@
#import "MWMBookmarkColorViewController.h"
#import "Statistics.h"
#import "SwiftBridge.h"
namespace
{
std::array<kml::PredefinedColor, 16> const kBookmarkColorsVariant
{{
kml::PredefinedColor::Red,
kml::PredefinedColor::Pink,
kml::PredefinedColor::Purple,
kml::PredefinedColor::DeepPurple,
kml::PredefinedColor::Blue,
kml::PredefinedColor::LightBlue,
kml::PredefinedColor::Cyan,
kml::PredefinedColor::Teal,
kml::PredefinedColor::Green,
kml::PredefinedColor::Lime,
kml::PredefinedColor::Yellow,
kml::PredefinedColor::Orange,
kml::PredefinedColor::DeepOrange,
kml::PredefinedColor::Brown,
kml::PredefinedColor::Gray,
kml::PredefinedColor::BlueGray
}};
} // namespace
@interface MWMBookmarkColorViewController ()
@property (nonatomic) kml::PredefinedColor bookmarkColor;
@property (weak, nonatomic) id<MWMBookmarkColorDelegate> delegate;
@end
@implementation MWMBookmarkColorViewController
- (instancetype)initWithColor:(kml::PredefinedColor)color delegate:(id<MWMBookmarkColorDelegate>)delegate
{
self = [super init];
if (self)
{
_bookmarkColor = color;
_delegate = delegate;
}
return self;
}
- (void)viewDidLoad
{
[super viewDidLoad];
NSAssert(self.bookmarkColor != kml::PredefinedColor::None, @"Color can't be None!");
NSAssert(self.delegate, @"Delegate can't be nil!");
self.title = L(@"bookmark_color");
}
@end
@implementation MWMBookmarkColorViewController (TableView)
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
auto cell =
[tableView dequeueReusableCellWithCellClass:[UITableViewCell class] indexPath:indexPath];
auto currentColor = kBookmarkColorsVariant[indexPath.row];
cell.textLabel.text = ios_bookmark_ui_helper::LocalizedTitleForBookmarkColor(currentColor);
BOOL const isSelected = currentColor == self.bookmarkColor;
cell.imageView.image = ios_bookmark_ui_helper::ImageForBookmarkColor(currentColor, isSelected);
cell.accessoryType = isSelected ? UITableViewCellAccessoryCheckmark : UITableViewCellAccessoryNone;
return cell;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
return kBookmarkColorsVariant.size();
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
auto bookmarkColor = kBookmarkColorsVariant[indexPath.row];
[Statistics logEvent:kStatEventName(kStatPlacePage, kStatChangeBookmarkColor)
withParameters:@{kStatValue : ios_bookmark_ui_helper::LocalizedTitleForBookmarkColor(bookmarkColor)}];
[self.delegate didSelectColor:bookmarkColor];
[self goBack];
}
@end

25
iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.xib
View file

@ -1,25 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait">
<adaptation id="fullscreen"/>
</device>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="MWMBookmarkColorViewController">
<connections>
<outlet property="view" destination="TDK-os-A99" id="sVU-ZA-N7j"/>
</connections>
</placeholder>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="TDK-os-A99" propertyAccessControl="all">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
<point key="canvasLocation" x="877" y="211"/>
</tableView>
</objects>
</document>

13
iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.h
View file

@ -1,13 +0,0 @@
#import "MWMTableViewCell.h"
@protocol MWMBookmarkTitleDelegate <NSObject>
- (void)didFinishEditingBookmarkTitle:(NSString *)title;
@end
@interface MWMBookmarkTitleCell : MWMTableViewCell
- (void)configureWithName:(NSString *)name delegate:(id<MWMBookmarkTitleDelegate>)delegate;
@end

23
iphone/Maps/UI/EditBookmark/MWMBookmarkTitleCell.m
View file

@ -1,23 +0,0 @@
#import "MWMBookmarkTitleCell.h"
@interface MWMBookmarkTitleCell () <UITextFieldDelegate>
@property (weak, nonatomic) IBOutlet UITextField * name;
@property (weak, nonatomic) id<MWMBookmarkTitleDelegate> delegate;
@end
@implementation MWMBookmarkTitleCell
- (void)configureWithName:(NSString *)name delegate:(id<MWMBookmarkTitleDelegate>)delegate
{
self.name.text = name;
self.delegate = delegate;
}
- (void)textFieldDidEndEditing:(UITextField *)textField
{
[self.delegate didFinishEditingBookmarkTitle:textField.text];
}
@end

9
iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.h
View file

@ -1,9 +0,0 @@
#import "MWMTableViewController.h"
@class PlacePageData;
@interface MWMEditBookmarkController : MWMTableViewController
@property(strong, nonatomic) PlacePageData *placePageData;
@end

301
iphone/Maps/UI/EditBookmark/MWMEditBookmarkController.mm
View file

@ -1,301 +0,0 @@
#import "MWMEditBookmarkController.h"
#import "MWMBookmarkColorViewController.h"
#import "MWMBookmarkTitleCell.h"
#import "MWMButtonCell.h"
#import "MWMNoteCell.h"
#import "SelectSetVC.h"
#import "SwiftBridge.h"
#import <CoreApi/PlacePageData.h>
#import <CoreApi/PlacePageBookmarkData+Core.h>
#import <CoreApi/PlacePagePreviewData.h>
#include <CoreApi/Framework.h>
namespace
{
enum Sections
{
MetaInfo,
Description,
Delete,
SectionsCount
};
enum RowInMetaInfo
{
Title,
Color,
Categori,
RowsInMetaInfoCount
};
} // namespace
@interface MWMEditBookmarkController () <MWMButtonCellDelegate, MWMNoteCelLDelegate, MWMBookmarkColorDelegate,
MWMSelectSetDelegate, MWMBookmarkTitleDelegate>
{
kml::MarkId m_cachedBookmarkId;
kml::MarkGroupId m_cachedBookmarkCatId;
}
@property (nonatomic) MWMNoteCell * cachedNote;
@property (copy, nonatomic) NSString * cachedDescription;
@property (copy, nonatomic) NSString * cachedTitle;
@property (nonatomic) kml::PredefinedColor cachedColor;
@property (copy, nonatomic) NSString * cachedCategory;
@property(nonatomic) kml::MarkGroupId cachedNewBookmarkCatId;
@end
@implementation MWMEditBookmarkController
- (void)viewDidLoad
{
[super viewDidLoad];
self.cachedNewBookmarkCatId = kml::kInvalidMarkGroupId;
self.cachedDescription = self.placePageData.bookmarkData.bookmarkDescription;
self.cachedTitle = self.placePageData.previewData.title;
self.cachedCategory = self.placePageData.bookmarkData.bookmarkCategory;
self.cachedColor = [self.placePageData.bookmarkData kmlColor].m_predefinedColor;
m_cachedBookmarkId = self.placePageData.bookmarkData.bookmarkId;
m_cachedBookmarkCatId = self.placePageData.bookmarkData.bookmarkGroupId;
[self configNavBar];
[self registerCells];
}
- (void)viewDidAppear:(BOOL)animated
{
[super viewDidAppear:animated];
[self.cachedNote updateTextViewForHeight:self.cachedNote.textViewContentHeight];
}
- (void)configNavBar
{
self.title = L(@"bookmark").capitalizedString;
self.navigationItem.rightBarButtonItem =
[[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemSave
target:self
action:@selector(onSave)];
}
- (void)registerCells
{
UITableView * tv = self.tableView;
[tv registerNibWithCellClass:[MWMButtonCell class]];
[tv registerNibWithCellClass:[MWMBookmarkTitleCell class]];
[tv registerNibWithCellClass:[MWMNoteCell class]];
}
- (void)onSave
{
[self.view endEditing:YES];
auto & f = GetFramework();
BookmarkManager & bmManager = f.GetBookmarkManager();
auto editSession = bmManager.GetEditSession();
if (self.cachedNewBookmarkCatId != kml::kInvalidMarkGroupId)
{
editSession.MoveBookmark(m_cachedBookmarkId, m_cachedBookmarkCatId, self.cachedNewBookmarkCatId);
m_cachedBookmarkCatId = self.cachedNewBookmarkCatId;
}
auto bookmark = editSession.GetBookmarkForEdit(m_cachedBookmarkId);
if (!bookmark)
return;
if (self.cachedColor != bookmark->GetColor())
bmManager.SetLastEditedBmColor(self.cachedColor);
bookmark->SetColor(self.cachedColor);
bookmark->SetDescription(self.cachedDescription.UTF8String);
if (self.cachedTitle.UTF8String != bookmark->GetPreferredName())
bookmark->SetCustomName(self.cachedTitle.UTF8String);
f.UpdatePlacePageInfoForCurrentSelection();
[self.placePageData updateBookmarkStatus];
[self goBack];
}
#pragma mark - UITableView
- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
{
return SectionsCount;
}
- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section
{
switch (section)
{
case MetaInfo:
return RowsInMetaInfoCount;
case Description:
case Delete:
return 1;
default:
NSAssert(false, @"Incorrect section!");
return 0;
}
}
- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.section)
{
case MetaInfo:
switch (indexPath.row)
{
case Title:
{
Class cls = [MWMBookmarkTitleCell class];
auto cell = static_cast<MWMBookmarkTitleCell *>(
[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
[cell configureWithName:self.cachedTitle delegate:self];
return cell;
}
case Color:
{
Class cls = [UITableViewCell class];
auto cell = [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath];
cell.textLabel.text = ios_bookmark_ui_helper::LocalizedTitleForBookmarkColor(self.cachedColor);
cell.imageView.image = ios_bookmark_ui_helper::ImageForBookmarkColor(self.cachedColor, YES);
cell.imageView.layer.cornerRadius = cell.imageView.width / 2;
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
return cell;
}
case Categori:
{
Class cls = [UITableViewCell class];
auto cell = [tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath];
cell.textLabel.text = self.cachedCategory;
cell.imageView.image = [UIImage imageNamed:@"ic_folder"];
cell.imageView.styleName = @"MWMBlack";
cell.accessoryType = UITableViewCellAccessoryDisclosureIndicator;
return cell;
}
default:
NSAssert(false, @"Incorrect row!");
return nil;
}
case Description:
{
NSAssert(indexPath.row == 0, @"Incorrect row!");
if (self.cachedNote)
{
return self.cachedNote;
}
else
{
Class cls = [MWMNoteCell class];
self.cachedNote = static_cast<MWMNoteCell *>(
[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
[self.cachedNote configWithDelegate:self noteText:self.cachedDescription
placeholder:L(@"placepage_personal_notes_hint")];
return self.cachedNote;
}
}
case Delete:
{
NSAssert(indexPath.row == 0, @"Incorrect row!");
Class cls = [MWMButtonCell class];
auto cell = static_cast<MWMButtonCell *>(
[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
[cell configureWithDelegate:self title:L(@"placepage_delete_bookmark_button")];
return cell;
}
default:
NSAssert(false, @"Incorrect section!");
return nil;
}
return nil;
}
- (CGFloat)tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
{
if (indexPath.section == Description)
{
NSAssert(indexPath.row == 0, @"Incorrect row!");
return self.cachedNote ? self.cachedNote.cellHeight : [MWMNoteCell minimalHeight];
}
return self.tableView.rowHeight;
}
- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath
{
switch (indexPath.row)
{
case Color:
{
MWMBookmarkColorViewController * cvc = [[MWMBookmarkColorViewController alloc] initWithColor:self.cachedColor
delegate:self];
[self.navigationController pushViewController:cvc animated:YES];
break;
}
case Categori:
{
kml::MarkGroupId categoryId = self.cachedNewBookmarkCatId;
if (categoryId == kml::kInvalidMarkGroupId)
categoryId = m_cachedBookmarkCatId;
SelectSetVC * svc = [[SelectSetVC alloc] initWithCategory:self.cachedCategory
categoryId:categoryId
delegate:self];
[self.navigationController pushViewController:svc animated:YES];
break;
}
default:
break;
}
}
#pragma mark - MWMButtonCellDelegate
- (void)cellSelect:(UITableViewCell *)cell
{
[[MWMBookmarksManager sharedManager] deleteBookmark:m_cachedBookmarkId];
GetFramework().UpdatePlacePageInfoForCurrentSelection();
[self.placePageData updateBookmarkStatus];
[self goBack];
}
#pragma mark - MWMNoteCellDelegate
- (void)cell:(MWMNoteCell *)cell didFinishEditingWithText:(NSString *)text
{
self.cachedDescription = text;
}
- (void)cellShouldChangeSize:(MWMNoteCell *)cell text:(NSString *)text
{
self.cachedDescription = text;
[self.tableView refresh];
NSIndexPath * ip = [self.tableView indexPathForCell:cell];
[self.tableView scrollToRowAtIndexPath:ip
atScrollPosition:UITableViewScrollPositionBottom
animated:YES];
}
#pragma mark - MWMBookmarkColorDelegate
- (void)didSelectColor:(kml::PredefinedColor)color
{
self.cachedColor = color;
[self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:Color inSection:MetaInfo]] withRowAnimation:UITableViewRowAnimationAutomatic];
}
#pragma mark - MWMSelectSetDelegate
- (void)didSelectCategory:(NSString *)category withCategoryId:(kml::MarkGroupId)categoryId
{
self.cachedCategory = category;
self.cachedNewBookmarkCatId = categoryId;
[self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:Categori inSection:MetaInfo]] withRowAnimation:UITableViewRowAnimationAutomatic];
}
#pragma mark - MWMBookmarkTitleDelegate
- (void)didFinishEditingBookmarkTitle:(NSString *)title
{
self.cachedTitle = title;
[self.tableView reloadRowsAtIndexPaths:@[[NSIndexPath indexPathForRow:Title inSection:MetaInfo]] withRowAnimation:UITableViewRowAnimationAutomatic];
}
@end

63
iphone/Maps/UI/EditBookmark/MWMBookmarkColorViewController.h → iphone/Maps/UI/EditBookmark/legacy_bookmark_colors.h
View file

@ -1,40 +1,9 @@
#import "MWMTableViewController.h"
#import "CircleView.h"
#include "kml/types.hpp"
namespace ios_bookmark_ui_helper
{
inline NSString * TitleForBookmarkColor(kml::PredefinedColor color)
{
switch (color)
{
case kml::PredefinedColor::Red: return @"red";
case kml::PredefinedColor::Pink: return @"pink";
case kml::PredefinedColor::Purple: return @"purple";
case kml::PredefinedColor::DeepPurple: return @"deep_purple";
case kml::PredefinedColor::Blue: return @"blue";
case kml::PredefinedColor::LightBlue: return @"light_blue";
case kml::PredefinedColor::Cyan: return @"cyan";
case kml::PredefinedColor::Teal: return @"teal";
case kml::PredefinedColor::Green: return @"green";
case kml::PredefinedColor::Lime: return @"lime";
case kml::PredefinedColor::Yellow: return @"yellow";
case kml::PredefinedColor::Orange: return @"orange";
case kml::PredefinedColor::DeepOrange: return @"deep_orange";
case kml::PredefinedColor::Brown: return @"brown";
case kml::PredefinedColor::Gray: return @"gray";
case kml::PredefinedColor::BlueGray: return @"blue_gray";
case kml::PredefinedColor::None:
case kml::PredefinedColor::Count: return @"";
}
}
inline NSString * LocalizedTitleForBookmarkColor(kml::PredefinedColor color)
{
return L(TitleForBookmarkColor(color));
}
inline UIColor * UIColorForRGB(int red, int green, int blue)
{
return [UIColor colorWithRed:red/255.f green:green/255.f blue:blue/255.f alpha:0.8];
@ -68,31 +37,14 @@ inline UIColor * UIColorForBookmarkColor(kml::PredefinedColor color)
inline UIImage * ImageForBookmark(kml::PredefinedColor color, kml::BookmarkIcon icon)
{
CGFloat const kPinDiameter = 22;
NSString *imageName = [NSString stringWithFormat:@"%@%@", @"ic_bm_", [@(kml::ToString(icon).c_str()) lowercaseString]];
return [CircleView createCircleImageWithDiameter:kPinDiameter
andColor:UIColorForBookmarkColor(color)
andImageName:imageName];
}
inline UIImage * ImageForBookmarkColor(kml::PredefinedColor color, BOOL isSelected)
{
CGFloat const kPinDiameterSelected = 22;
CGFloat const kPinDiameter = 14;
if (isSelected)
{
return [CircleView createCircleImageWithDiameter:kPinDiameterSelected
andColor:UIColorForBookmarkColor(color)
andImageName:@"ic_bm_none"];
}
return [CircleView createCircleImageWithFrameSize:kPinDiameterSelected
andDiameter:kPinDiameter
andColor:UIColorForBookmarkColor(color)];
}
inline UIImage * ImageForTrack(float red, float green, float blue)
{
CGFloat const kPinDiameter = 22;
@ -104,14 +56,3 @@ inline UIImage * ImageForTrack(float red, float green, float blue)
}
} // namespace ios_bookmark_ui_helper
@protocol MWMBookmarkColorDelegate <NSObject>
- (void)didSelectColor:(kml::PredefinedColor)color;
@end
@interface MWMBookmarkColorViewController : MWMTableViewController
- (instancetype)initWithColor:(kml::PredefinedColor)color delegate:(id<MWMBookmarkColorDelegate>)delegate;
@end

8
iphone/Maps/UI/Editor/Cells/MWMButtonCell.h
View file

@ -1,8 +1,10 @@
#import "MWMTableViewCell.h"
@protocol MWMButtonCellDelegate<NSObject>
NS_ASSUME_NONNULL_BEGIN
- (void)cellSelect:(UITableViewCell *)cell;
@protocol MWMButtonCellDelegate <NSObject>
- (void)cellDidPressButton:(UITableViewCell *)cell;
@end
@ -11,3 +13,5 @@
- (void)configureWithDelegate:(id<MWMButtonCellDelegate>)delegate title:(NSString *)title;
@end
NS_ASSUME_NONNULL_END

10
iphone/Maps/UI/Editor/Cells/MWMButtonCell.m
View file

@ -2,18 +2,20 @@
@interface MWMButtonCell ()
@property(weak, nonatomic) IBOutlet UIButton * button;
@property(nonatomic) IBOutlet UIButton *button;
@property(weak, nonatomic) id<MWMButtonCellDelegate> delegate;
@end
@implementation MWMButtonCell
- (void)configureWithDelegate:(id<MWMButtonCellDelegate>)delegate title:(NSString *)title
{
- (void)configureWithDelegate:(id<MWMButtonCellDelegate>)delegate title:(NSString *)title {
[self.button setTitle:title forState:UIControlStateNormal];
self.delegate = delegate;
}
- (IBAction)buttonTap { [self.delegate cellSelect:self]; }
- (IBAction)buttonTap {
[self.delegate cellDidPressButton:self];
}
@end

7
iphone/Maps/UI/Editor/Cells/MWMButtonCell.xib
View file

@ -17,7 +17,10 @@
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="c7Y-Nr-P4C">
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="Z6u-ES-sTJ"/>
</constraints>
<state key="normal" title="Button">
<color key="titleColor" red="0.95686274510000002" green="0.26274509800000001" blue="0.21176470589999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</state>
@ -31,7 +34,7 @@
</subviews>
<constraints>
<constraint firstAttribute="trailing" secondItem="c7Y-Nr-P4C" secondAttribute="trailing" id="AVP-GR-W7u"/>
<constraint firstAttribute="bottom" secondItem="c7Y-Nr-P4C" secondAttribute="bottom" constant="0.5" id="F3N-Zb-tnQ"/>
<constraint firstAttribute="bottom" secondItem="c7Y-Nr-P4C" secondAttribute="bottom" id="F3N-Zb-tnQ"/>
<constraint firstItem="c7Y-Nr-P4C" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="JQx-63-Ane"/>
<constraint firstItem="c7Y-Nr-P4C" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="fTj-1o-vWJ"/>
</constraints>

18
iphone/Maps/UI/Editor/Cells/MWMNoteCell.h
View file

@ -2,22 +2,26 @@
@class MWMNoteCell;
@protocol MWMNoteCelLDelegate<NSObject>
NS_ASSUME_NONNULL_BEGIN
- (void)cellShouldChangeSize:(MWMNoteCell *)cell text:(NSString *)text;
@protocol MWMNoteCellDelegate <NSObject>
- (void)cell:(MWMNoteCell *)cell didChangeSizeAndText:(NSString *)text;
- (void)cell:(MWMNoteCell *)cell didFinishEditingWithText:(NSString *)text;
@end
@interface MWMNoteCell : MWMTableViewCell
- (void)configWithDelegate:(id<MWMNoteCelLDelegate>)delegate
@property(nonatomic, readonly, class) CGFloat minimalHeight;
@property(nonatomic, readonly) CGFloat cellHeight;
@property(nonatomic, readonly) CGFloat textViewContentHeight;
- (void)configWithDelegate:(id<MWMNoteCellDelegate>)delegate
noteText:(NSString *)text
placeholder:(NSString *)placeholder;
- (CGFloat)cellHeight;
- (void)updateTextViewForHeight:(CGFloat)height;
- (CGFloat)textViewContentHeight;
+ (CGFloat)minimalHeight;
- (void)registerObserver;
@end
NS_ASSUME_NONNULL_END

82
iphone/Maps/UI/Editor/Cells/MWMNoteCell.m
View file

@ -2,48 +2,33 @@
#import "MWMTextView.h"
static CGFloat const kTopTextViewOffset = 12.;
static NSString * const kTextViewContentSizeKeyPath = @"contentSize";
static NSString *const kTextViewContentSizeKeyPath = @"contentSize";
static CGFloat const kMinimalTextViewHeight = 104.;
static void *kContext = &kContext;
@interface MWMNoteCell ()<UITextViewDelegate>
@interface MWMNoteCell () <UITextViewDelegate>
@property(weak, nonatomic) IBOutlet MWMTextView * textView;
@property(weak, nonatomic) IBOutlet NSLayoutConstraint * textViewHeight;
@property(weak, nonatomic) id<MWMNoteCelLDelegate> delegate;
@property(nonatomic) IBOutlet MWMTextView *textView;
@property(nonatomic) IBOutlet NSLayoutConstraint *textViewHeight;
@property(weak, nonatomic) id<MWMNoteCellDelegate> delegate;
@end
static void * kContext = &kContext;
@implementation MWMNoteCell
- (void)configWithDelegate:(id<MWMNoteCelLDelegate>)delegate
- (void)configWithDelegate:(id<MWMNoteCellDelegate>)delegate
noteText:(NSString *)text
placeholder:(NSString *)placeholder
{
placeholder:(NSString *)placeholder {
self.delegate = delegate;
self.textView.text = text;
self.textView.keyboardAppearance =
[UIColor isNightMode] ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault;
self.textView.keyboardAppearance = [UIColor isNightMode] ? UIKeyboardAppearanceDark : UIKeyboardAppearanceDefault;
self.textView.placeholder = placeholder;
}
- (void)updateTextViewForHeight:(CGFloat)height
{
id<MWMNoteCelLDelegate> delegate = self.delegate;
if (height > kMinimalTextViewHeight)
{
self.textViewHeight.constant = height;
[delegate cellShouldChangeSize:self text:self.textView.text];
}
else
{
CGFloat currentHeight = self.textViewHeight.constant;
if (currentHeight > kMinimalTextViewHeight)
{
self.textViewHeight.constant = kMinimalTextViewHeight;
[delegate cellShouldChangeSize:self text:self.textView.text];
}
- (void)updateTextViewForHeight:(CGFloat)height {
id<MWMNoteCellDelegate> delegate = self.delegate;
if (height > kMinimalTextViewHeight) {
[delegate cell:self didChangeSizeAndText:self.textView.text];
}
[self setNeedsLayout];
@ -52,11 +37,9 @@ static void * kContext = &kContext;
- (void)observeValueForKeyPath:(NSString *)keyPath
ofObject:(id)object
change:(NSDictionary *)change
context:(void *)context
{
if (context == kContext)
{
NSValue * s = change[@"new"];
context:(void *)context {
if (context == kContext) {
NSValue *s = change[NSKeyValueChangeNewKey];
CGFloat height = s.CGSizeValue.height;
[self updateTextViewForHeight:height];
return;
@ -65,23 +48,36 @@ static void * kContext = &kContext;
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
}
- (CGFloat)cellHeight { return self.textViewHeight.constant + 2 * kTopTextViewOffset; }
- (CGFloat)textViewContentHeight { return self.textView.contentSize.height; }
+ (CGFloat)minimalHeight { return kMinimalTextViewHeight; }
- (void)textViewDidEndEditing:(UITextView *)textView
{
- (CGFloat)cellHeight {
return self.textViewHeight.constant + 2 * kTopTextViewOffset;
}
- (CGFloat)textViewContentHeight {
return self.textView.contentSize.height;
}
+ (CGFloat)minimalHeight {
return kMinimalTextViewHeight;
}
- (void)textViewDidEndEditing:(UITextView *)textView {
[self.delegate cell:self didFinishEditingWithText:textView.text];
[self unregisterObserver];
}
- (void)textViewDidBeginEditing:(UITextView *)textView { [self registerObserver]; }
- (void)unregisterObserver
{
- (void)textViewDidBeginEditing:(UITextView *)textView {
[self registerObserver];
}
- (void)textViewDidChange:(UITextView *)textView {
[textView sizeToFit];
}
- (void)unregisterObserver {
[self.textView removeObserver:self forKeyPath:kTextViewContentSizeKeyPath context:kContext];
}
- (void)registerObserver
{
- (void)registerObserver {
[self.textView addObserver:self
forKeyPath:kTextViewContentSizeKeyPath
options:NSKeyValueObservingOptionNew

4
iphone/Maps/UI/Editor/Cells/MWMNoteCell.xib
View file

@ -16,11 +16,11 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="129"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="d32-xF-MvW" customClass="MWMTextView">
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="d32-xF-MvW" customClass="MWMTextView">
<rect key="frame" x="16" y="12" width="288" height="105"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" priority="750" constant="104" id="J3M-HG-f2p"/>
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="104" id="J3M-HG-f2p"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>

10
iphone/Maps/UI/Editor/MWMEditorViewController.mm
View file

@ -158,7 +158,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> const & cells, UIT
@interface MWMEditorViewController ()<
UITableViewDelegate, UITableViewDataSource, UITextFieldDelegate, MWMOpeningHoursEditorProtocol,
MWMPlacePageOpeningHoursCellProtocol, MWMEditorCellProtocol, MWMCuisineEditorProtocol,
MWMStreetEditorProtocol, MWMObjectsCategorySelectorDelegate, MWMNoteCelLDelegate,
MWMStreetEditorProtocol, MWMObjectsCategorySelectorDelegate, MWMNoteCellDelegate,
MWMEditorAdditionalName, MWMButtonCellDelegate, MWMEditorAdditionalNamesProtocol>
@property(nonatomic) NSMutableDictionary<Class, UITableViewCell *> * offscreenCells;
@ -710,7 +710,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> const & cells, UIT
case MWMEditorCellTypeOpenHours: return ((MWMPlacePageOpeningHoursCell *)cell).cellHeight;
case MWMEditorCellTypeCategory:
case MWMEditorCellTypeReportButton: return self.tableView.rowHeight;
case MWMEditorCellTypeNote: return static_cast<MWMNoteCell *>(cell).cellHeight;
case MWMEditorCellTypeNote: return UITableViewAutomaticDimension;
default:
{
[cell setNeedsUpdateConstraints];
@ -811,11 +811,13 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> const & cells, UIT
#pragma mark - MWMNoteCellDelegate
- (void)cellShouldChangeSize:(MWMNoteCell *)cell text:(NSString *)text
- (void)cell:(MWMNoteCell *)cell didChangeSizeAndText:(NSString *)text
{
self.offscreenCells[cellClass(MWMEditorCellTypeNote)] = cell;
self.note = text;
[UIView setAnimationsEnabled:NO];
[self.tableView refresh];
[UIView setAnimationsEnabled:YES];
NSIndexPath * ip = [self.tableView indexPathForCell:cell];
[self.tableView scrollToRowAtIndexPath:ip
atScrollPosition:UITableViewScrollPositionBottom
@ -918,7 +920,7 @@ void registerCellsForTableView(std::vector<MWMEditorCellType> const & cells, UIT
#pragma mark - MWMEditorCellProtocol && MWMButtonCellDelegate
- (void)cellSelect:(UITableViewCell *)cell
- (void)cellDidPressButton:(UITableViewCell *)cell
{
NSIndexPath * indexPath = [self.tableView indexPathForCell:cell];
MWMEditorCellType const cellType = [self cellTypeForIndexPath:indexPath];

8
iphone/Maps/UI/PlacePage/Components/ElevationProfile/ElevationProfilePresenter.swift
View file

@ -49,8 +49,8 @@ class ElevationProfilePresenter: NSObject {
}
deinit {
MWMBookmarksManager.shared().resetElevationActivePointChanged()
MWMBookmarksManager.shared().resetElevationMyPositionChanged()
BookmarksManager.shared().resetElevationActivePointChanged()
BookmarksManager.shared().resetElevationMyPositionChanged()
}
}
@ -80,10 +80,10 @@ extension ElevationProfilePresenter: ElevationProfilePresenterProtocol {
view?.setActivePoint(data.activePoint)
view?.setMyPosition(data.myPosition)
MWMBookmarksManager.shared().setElevationActivePointChanged(data.trackId) { [weak self] distance in
BookmarksManager.shared().setElevationActivePointChanged(data.trackId) { [weak self] distance in
self?.view?.setActivePoint(distance)
}
MWMBookmarksManager.shared().setElevationMyPositionChanged(data.trackId) { [weak self] distance in
BookmarksManager.shared().setElevationMyPositionChanged(data.trackId) { [weak self] distance in
self?.view?.setMyPosition(distance)
}
}

10
iphone/Maps/UI/PlacePage/Components/GuidesGallery/GuidesGalleryInteractor.swift
View file

@ -20,17 +20,17 @@ extension GuidesGalleryInteractor: IGuidesGalleryInteractor {
}
func toggleItemVisibility(_ item: GuidesGalleryItem) {
let groupId = MWMBookmarksManager.shared().getGroupId(item.guideId)
let visible = MWMBookmarksManager.shared().isCategoryVisible(groupId)
MWMBookmarksManager.shared().setCategory(groupId, isVisible: !visible)
let groupId = BookmarksManager.shared().getGroupId(item.guideId)
let visible = BookmarksManager.shared().isCategoryVisible(groupId)
BookmarksManager.shared().setCategory(groupId, isVisible: !visible)
Statistics.logEvent(kStatBookmarkVisibilityChange, withParameters: [kStatFrom : kStatMapGallery,
kStatAction : visible ? kStatHide : kStatShow,
kStatServerId : item.guideId])
}
func isGalleryItemVisible(_ item: GuidesGalleryItem) -> Bool {
let groupId = MWMBookmarksManager.shared().getGroupId(item.guideId)
return MWMBookmarksManager.shared().isCategoryVisible(groupId)
let groupId = BookmarksManager.shared().getGroupId(item.guideId)
return BookmarksManager.shared().isCategoryVisible(groupId)
}
func setActiveItem(_ item: GuidesGalleryItem) {

2
iphone/Maps/UI/PlacePage/PlacePageInteractor.swift
View file

@ -260,7 +260,7 @@ extension PlacePageInteractor: ElevationProfileViewControllerDelegate {
}
func updateMapPoint(_ distance: Double) {
MWMBookmarksManager.shared().setElevationActivePoint(distance, trackId: placePageData.elevationProfileData!.trackId)
BookmarksManager.shared().setElevationActivePoint(distance, trackId: placePageData.elevationProfileData!.trackId)
}
}

3
iphone/Maps/UI/PlacePage/PlacePageManager/MWMPlacePageManager.mm
View file

@ -1,7 +1,6 @@
#import "MWMPlacePageManager.h"
#import "CLLocation+Mercator.h"
#import "MWMActivityViewController.h"
#import "MWMEditBookmarkController.h"
#import "MWMLocationHelpers.h"
#import "MWMLocationObserver.h"
#import "MWMRoutePoint+CPP.h"
@ -17,8 +16,6 @@
#include "platform/downloader_defines.hpp"
#include "geometry/distance_on_sphere.hpp"
using namespace storage;
namespace

6
iphone/Maps/UI/Storyboard/Main.storyboard
View file

@ -318,7 +318,7 @@
<scene sceneID="jjY-Mo-EIt">
<objects>
<tableViewController storyboardIdentifier="MWMEditBookmarkController" id="lFr-lA-JTW" customClass="MWMEditBookmarkController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rb3-ea-7LJ">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="Rb3-ea-7LJ">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -354,7 +354,7 @@
<scene sceneID="XbW-Wc-ZB3">
<objects>
<tableViewController id="Lfa-Zp-orR" customClass="MWMEditorViewController" sceneMemberID="viewController">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1">
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="interactive" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@ -1183,7 +1183,7 @@
</resources>
<inferredMetricsTieBreakers>
<segue reference="sMq-pa-AId"/>
<segue reference="4Cc-99-mlN"/>
<segue reference="urr-1u-jhn"/>
<segue reference="OEF-kR-jKi"/>
<segue reference="0A8-4b-0A2"/>
</inferredMetricsTieBreakers>