diff --git a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj index fe6ab9d79c..d3add8b1ad 100644 --- a/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj +++ b/iphone/CoreApi/CoreApi.xcodeproj/project.pbxproj @@ -95,6 +95,13 @@ 47C637D72354AEBE00E12DE0 /* MWMMapOverlayManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47C637DC2354B79B00E12DE0 /* MWMSearchFrameworkHelper.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */; }; 47C637DD2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47CA68DD2502022400671019 /* MWMBookmark.h in Headers */ = {isa = PBXBuildFile; fileRef = 47CA68DB2502022400671019 /* MWMBookmark.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47CA68DE2502022400671019 /* MWMBookmark.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68DC2502022400671019 /* MWMBookmark.mm */; }; + 47CA68E12506C01F00671019 /* MWMBookmark+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47CA68DF2506C01F00671019 /* MWMBookmark+Core.h */; }; + 47CA68E42506D29000671019 /* MWMBookmarkColor.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68E32506D29000671019 /* MWMBookmarkColor.mm */; }; + 47CA68E82506F61300671019 /* MWMTrack.h in Headers */ = {isa = PBXBuildFile; fileRef = 47CA68E62506F61300671019 /* MWMTrack.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47CA68E92506F61400671019 /* MWMTrack.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68E72506F61300671019 /* MWMTrack.mm */; }; + 47CA68EC2506F6F100671019 /* MWMTrack+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47CA68EA2506F6F100671019 /* MWMTrack+Core.h */; }; 47D609DC234FE625008ECC47 /* MWMBookmarksObserver.h in Headers */ = {isa = PBXBuildFile; fileRef = 47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47D9019523AC22E500D9364C /* MWMMapUpdateInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 47D9019323AC22E500D9364C /* MWMMapUpdateInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47D9019623AC22E500D9364C /* MWMMapUpdateInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47D9019423AC22E500D9364C /* MWMMapUpdateInfo.mm */; }; @@ -108,6 +115,8 @@ 47EEAFF72350D060005CF316 /* MWMCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 47EEAFF52350CEF6005CF316 /* MWMCommon.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47EF73F9246E035C00D32AB8 /* MWMGuidesManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 47EF73F7246E035C00D32AB8 /* MWMGuidesManager.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47EF73FA246E035C00D32AB8 /* MWMGuidesManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47EF73F8246E035C00D32AB8 /* MWMGuidesManager.mm */; }; + 47F0D2152516847F00BC685E /* MWMBookmarksSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F0D2132516847F00BC685E /* MWMBookmarksSection.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 47F0D2162516847F00BC685E /* MWMBookmarksSection.m in Sources */ = {isa = PBXBuildFile; fileRef = 47F0D2142516847F00BC685E /* MWMBookmarksSection.m */; }; 47F4F1F923A3336C0022FD56 /* MWMMapNodeAttributes.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F4F1F723A3336B0022FD56 /* MWMMapNodeAttributes.h */; settings = {ATTRIBUTES = (Public, ); }; }; 47F4F1FA23A3336C0022FD56 /* MWMMapNodeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 47F4F1F823A3336C0022FD56 /* MWMMapNodeAttributes.mm */; }; 47F4F1FD23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h in Headers */ = {isa = PBXBuildFile; fileRef = 47F4F1FB23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -238,6 +247,14 @@ 47C637D52354AEBE00E12DE0 /* MWMMapOverlayManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMMapOverlayManager.h; sourceTree = ""; }; 47C637DA2354B79A00E12DE0 /* MWMSearchFrameworkHelper.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMSearchFrameworkHelper.mm; sourceTree = ""; }; 47C637DB2354B79B00E12DE0 /* MWMSearchFrameworkHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSearchFrameworkHelper.h; sourceTree = ""; }; + 47CA68DB2502022400671019 /* MWMBookmark.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmark.h; sourceTree = ""; }; + 47CA68DC2502022400671019 /* MWMBookmark.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmark.mm; sourceTree = ""; }; + 47CA68DF2506C01F00671019 /* MWMBookmark+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMBookmark+Core.h"; sourceTree = ""; }; + 47CA68E32506D29000671019 /* MWMBookmarkColor.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMBookmarkColor.mm; sourceTree = ""; }; + 47CA68E52506D38700671019 /* MWMBookmarkColor+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMBookmarkColor+Core.h"; sourceTree = ""; }; + 47CA68E62506F61300671019 /* MWMTrack.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMTrack.h; sourceTree = ""; }; + 47CA68E72506F61300671019 /* MWMTrack.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMTrack.mm; sourceTree = ""; }; + 47CA68EA2506F6F100671019 /* MWMTrack+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMTrack+Core.h"; sourceTree = ""; }; 47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksObserver.h; sourceTree = ""; }; 47D9019323AC22E500D9364C /* MWMMapUpdateInfo.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMMapUpdateInfo.h; sourceTree = ""; }; 47D9019423AC22E500D9364C /* MWMMapUpdateInfo.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapUpdateInfo.mm; sourceTree = ""; }; @@ -251,6 +268,8 @@ 47EEAFF52350CEF6005CF316 /* MWMCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMCommon.h; sourceTree = ""; }; 47EF73F7246E035C00D32AB8 /* MWMGuidesManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMGuidesManager.h; sourceTree = ""; }; 47EF73F8246E035C00D32AB8 /* MWMGuidesManager.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMGuidesManager.mm; sourceTree = ""; }; + 47F0D2132516847F00BC685E /* MWMBookmarksSection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMBookmarksSection.h; sourceTree = ""; }; + 47F0D2142516847F00BC685E /* MWMBookmarksSection.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MWMBookmarksSection.m; sourceTree = ""; }; 47F4F1F723A3336B0022FD56 /* MWMMapNodeAttributes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMMapNodeAttributes.h; sourceTree = ""; }; 47F4F1F823A3336C0022FD56 /* MWMMapNodeAttributes.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMMapNodeAttributes.mm; sourceTree = ""; }; 47F4F1FB23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MWMMapNodeAttributes+Core.h"; sourceTree = ""; }; @@ -525,6 +544,16 @@ 479F7061234FBC4600011E2E /* MWMCarPlayBookmarkObject.mm */, 47D609DB234FE625008ECC47 /* MWMBookmarksObserver.h */, 471527382491EDA400E91BBA /* MWMBookmarkColor.h */, + 47CA68E52506D38700671019 /* MWMBookmarkColor+Core.h */, + 47CA68E32506D29000671019 /* MWMBookmarkColor.mm */, + 47CA68DB2502022400671019 /* MWMBookmark.h */, + 47CA68DF2506C01F00671019 /* MWMBookmark+Core.h */, + 47CA68DC2502022400671019 /* MWMBookmark.mm */, + 47CA68E62506F61300671019 /* MWMTrack.h */, + 47CA68EA2506F6F100671019 /* MWMTrack+Core.h */, + 47CA68E72506F61300671019 /* MWMTrack.mm */, + 47F0D2132516847F00BC685E /* MWMBookmarksSection.h */, + 47F0D2142516847F00BC685E /* MWMBookmarksSection.m */, ); path = Bookmarks; sourceTree = ""; @@ -728,6 +757,7 @@ 4738A8E0239FACE7007C0F43 /* CoreBanner.h in Headers */, 47942D6D237CC3E300DEFAE3 /* PlacePagePreviewData.h in Headers */, 99D934B324CA0052002E4802 /* MWMTrialEligibility.h in Headers */, + 47CA68DD2502022400671019 /* MWMBookmark.h in Headers */, 9940622023EAC57900493D1A /* ElevationHeightPoint.h in Headers */, 3D40DED523ED9C7F00A0153A /* WebApi.h in Headers */, 47A65CAF235008E100DCD85F /* CoreApi-swift.h in Headers */, @@ -743,12 +773,15 @@ 47F701EF238C86F000D18E95 /* PlacePageButtonsData.h in Headers */, 47942DAE2382ABE100DEFAE3 /* UgcSummaryRating.h in Headers */, 47EEAFF72350D060005CF316 /* MWMCommon.h in Headers */, + 47F0D2152516847F00BC685E /* MWMBookmarksSection.h in Headers */, + 47CA68E82506F61300671019 /* MWMTrack.h in Headers */, 472602A824092C5B00731135 /* MWMGeoUtil.h in Headers */, 47D9019523AC22E500D9364C /* MWMMapUpdateInfo.h in Headers */, 9957FADB237ACB1100855F48 /* DeepLinkSearchData.h in Headers */, 479F7056234FB7F200011E2E /* MWMBookmarksManager.h in Headers */, 47942D83237CC52E00DEFAE3 /* MWMOpeningHours.h in Headers */, 4718C4322355FC3C00640DF1 /* MWMNetworkPolicy.h in Headers */, + 47CA68EC2506F6F100671019 /* MWMTrack+Core.h in Headers */, 99103843237EDFA200893C9F /* DeepLinkData.h in Headers */, 47F4F1FD23A3D1AC0022FD56 /* MWMMapNodeAttributes+Core.h in Headers */, 9974CA2923DF1968003FE824 /* ElevationProfileData.h in Headers */, @@ -774,6 +807,7 @@ 47EEAFF62350CF48005CF316 /* AppInfo.h in Headers */, 47F701F3238C877C00D18E95 /* PlacePageButtonsData+Core.h in Headers */, 99D934B524CA0052002E4802 /* MWMPurchaseValidation.h in Headers */, + 47CA68E12506C01F00671019 /* MWMBookmark+Core.h in Headers */, 471527392491EDAA00E91BBA /* MWMBookmarkColor.h in Headers */, 479F7053234FB7BC00011E2E /* MWMCatalogCommon.h in Headers */, 47942D7A237CC41A00DEFAE3 /* HotelRoom.h in Headers */, @@ -898,6 +932,7 @@ 47942D6C237CC3DE00DEFAE3 /* PlacePageData.mm in Sources */, 47942DAF2382ABE100DEFAE3 /* UgcSummaryRating.mm in Sources */, 479F705E234FBB8C00011E2E /* MWMBookmarkGroup.m in Sources */, + 47F0D2162516847F00BC685E /* MWMBookmarksSection.m in Sources */, 479834EB2342697400724D1E /* MWMTagGroup+Convenience.mm in Sources */, 47EF73FA246E035C00D32AB8 /* MWMGuidesManager.mm in Sources */, 470016082342541100EBF03D /* MWMTagGroup.m in Sources */, @@ -908,6 +943,7 @@ 470016072342541100EBF03D /* MWMTag.m in Sources */, 47D9019623AC22E500D9364C /* MWMMapUpdateInfo.mm in Sources */, 47E8164123B2B98F008FD836 /* MWMUser.mm in Sources */, + 47CA68E42506D29000671019 /* MWMBookmarkColor.mm in Sources */, 471AB98E23AB925D00F56D49 /* MWMMapSearchResult.mm in Sources */, 479834EA2342697400724D1E /* MWMTag+Convenience.mm in Sources */, 99D934B224CA0052002E4802 /* MWMTrialEligibility.mm in Sources */, @@ -915,6 +951,7 @@ 475784C32344B422008291A4 /* Framework.cpp in Sources */, 47942D8D237D634300DEFAE3 /* CatalogPromoData.mm in Sources */, 4718C4332355FC3C00640DF1 /* MWMNetworkPolicy.mm in Sources */, + 47CA68E92506F61400671019 /* MWMTrack.mm in Sources */, 472602A924092C5B00731135 /* MWMGeoUtil.mm in Sources */, 993F54F3237C5D1100545511 /* PromoAfterBookingCampaignAdapter.mm in Sources */, 99D934B424CA0052002E4802 /* MWMPurchaseValidation.mm in Sources */, @@ -922,6 +959,7 @@ 9940622123EAC57900493D1A /* ElevationHeightPoint.m in Sources */, 47EEAFF42350CEDB005CF316 /* AppInfo.mm in Sources */, 47E8163623B1889C008FD836 /* MWMStorage.mm in Sources */, + 47CA68DE2502022400671019 /* MWMBookmark.mm in Sources */, 9957FAE9237AE5B000855F48 /* Logger.mm in Sources */, 999D3A65237B097C00C5F7A8 /* DeepLinkSubscriptionData.mm in Sources */, 47942D7C237CC41A00DEFAE3 /* HotelRoom.mm in Sources */, diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark+Core.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark+Core.h new file mode 100644 index 0000000000..0bee9b9b92 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark+Core.h @@ -0,0 +1,9 @@ +#import "MWMBookmark.h" + +#include + +@interface MWMBookmark (Core) + +- (instancetype)initWithMarkId:(MWMMarkID)markId bookmarkData:(Bookmark const *)bookmark; + +@end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark.h new file mode 100644 index 0000000000..1cac6f39f7 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark.h @@ -0,0 +1,21 @@ +#import +#import + +#import "MWMBookmarkColor.h" +#import "MWMTypes.h" + +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(Bookmark) +@interface MWMBookmark : NSObject + +@property(nonatomic, readonly) MWMMarkID bookmarkId; +@property(nonatomic, readonly) NSString *bookmarkName; +@property(nonatomic, readonly, nullable) NSString *bookmarkType; +@property(nonatomic, readonly) MWMBookmarkColor bookmarkColor; +@property(nonatomic, readonly) NSString *bookmarkIconName; +@property(nonatomic, readonly) CLLocationCoordinate2D locationCoordinate; + +@end + +NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark.mm new file mode 100644 index 0000000000..dfe674d12a --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmark.mm @@ -0,0 +1,29 @@ +#import "MWMBookmark+Core.h" +#import "MWMBookmarkColor+Core.h" + +@implementation MWMBookmark + +@end + +@implementation MWMBookmark (Core) + +- (instancetype)initWithMarkId:(MWMMarkID)markId bookmarkData:(Bookmark const *)bookmark { + self = [super init]; + if (self) { + _bookmarkId = markId; + _bookmarkName = @(bookmark->GetPreferredName().c_str()); + _bookmarkColor = convertKmlColor(bookmark->GetColor()); + _bookmarkIconName = [NSString stringWithFormat:@"%@%@", + @"ic_bm_", + [@(kml::ToString(bookmark->GetData().m_icon).c_str()) lowercaseString]]; + auto const &types = bookmark->GetData().m_featureTypes; + if (!types.empty()) { + _bookmarkType = @(kml::GetLocalizedFeatureType(types).c_str()); + } + auto latlon = bookmark->GetLatLon(); + _locationCoordinate = CLLocationCoordinate2DMake(latlon.m_lat, latlon.m_lon); + } + return self; +} + +@end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor+Core.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor+Core.h new file mode 100644 index 0000000000..086923061c --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor+Core.h @@ -0,0 +1,11 @@ +#import "MWMBookmarkColor.h" + +#include + +#ifdef __cplusplus +extern "C" { +#endif +MWMBookmarkColor convertKmlColor(kml::PredefinedColor kmlColor); +#ifdef __cplusplus +} +#endif diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor.mm new file mode 100644 index 0000000000..346e1ef468 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkColor.mm @@ -0,0 +1,42 @@ +#import "MWMBookmarkColor+Core.h" + +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; + } +} diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h index 4a68043f91..151ab867f1 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h @@ -2,6 +2,9 @@ #import "MWMTypes.h" +@class MWMBookmark; +@class MWMTrack; + NS_ASSUME_NONNULL_BEGIN @class MWMBookmarksManager; @@ -14,17 +17,22 @@ NS_SWIFT_NAME(BookmarkGroup) bookmarksManager:(MWMBookmarksManager *)manager; @property(nonatomic, readonly) MWMMarkGroupID categoryId; -@property(nonatomic, copy) NSString *title; @property(nonatomic, readonly, nullable) NSURL *photoUrl; +@property(nonatomic, readonly) NSString *title; @property(nonatomic, readonly) NSString *author; @property(nonatomic, readonly, nullable) NSString *authorIconPath; @property(nonatomic, readonly) NSString *annotation; -@property(nonatomic, copy) NSString *detailedAnnotation; +@property(nonatomic, readonly) NSString *detailedAnnotation; +@property(nonatomic, readonly) NSString *serverId; @property(nonatomic, readonly) NSInteger bookmarksCount; @property(nonatomic, readonly) NSInteger trackCount; -@property(nonatomic, getter=isVisible) BOOL visible; +@property(nonatomic, readonly, getter=isVisible) BOOL visible; @property(nonatomic, readonly, getter=isEmpty) BOOL empty; +@property(nonatomic, readonly, getter=isEditable) BOOL editable; +@property(nonatomic, readonly, getter=isGuide) BOOL guide; @property(nonatomic, readonly) MWMBookmarkGroupAccessStatus accessStatus; +@property(nonatomic, readonly) NSArray *bookmarks; +@property(nonatomic, readonly) NSArray *tracks; @end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m index 313902dc37..0f37755141 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m @@ -28,10 +28,6 @@ return [self.manager getCategoryPhotoUrl:self.categoryId]; } -- (void)setTitle:(NSString *)title { - [self.manager setCategory:self.categoryId name:title]; -} - - (NSString *)author { return [self.manager getCategoryAuthorName:self.categoryId]; } @@ -49,8 +45,8 @@ return [self.manager getCategoryDescription:self.categoryId]; } -- (void)setDetailedAnnotation:(NSString *)detailedAnnotation { - [self.manager setCategory:self.categoryId description:detailedAnnotation]; +- (NSString *)serverId { + return [self.manager getServerId:self.categoryId]; } - (NSInteger)bookmarksCount { @@ -65,16 +61,28 @@ return [self.manager isCategoryVisible:self.categoryId]; } -- (void)setVisible:(BOOL)visible { - [self.manager setCategory:self.categoryId isVisible:visible]; -} - - (BOOL)isEmpty { return ![self.manager isCategoryNotEmpty:self.categoryId]; } +- (BOOL)isEditable { + return [self.manager isCategoryEditable:self.categoryId]; +} + +- (BOOL)isGuide { + return [self.manager isGuide:self.categoryId]; +} + - (MWMBookmarkGroupAccessStatus)accessStatus { return [self.manager getCategoryAccessStatus:self.categoryId]; } +- (NSArray *)bookmarks { + return [self.manager bookmarksForGroup:self.categoryId]; +} + +- (NSArray *)tracks { + return [self.manager tracksForGroup:self.categoryId]; +} + @end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index ff639f3734..3f3646cb8a 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -5,16 +5,28 @@ #import "MWMUTM.h" #import "PlacePageBookmarkData.h" +@class CLLocation; +@class MWMBookmark; @class MWMBookmarkGroup; +@class MWMBookmarksSection; @class MWMCarPlayBookmarkObject; @class MWMTagGroup; @class MWMTag; +@class MWMTrack; NS_ASSUME_NONNULL_BEGIN +typedef NS_ENUM(NSInteger, MWMBookmarksSortingType) { + MWMBookmarksSortingTypeByType, + MWMBookmarksSortingTypeByDistance, + MWMBookmarksSortingTypeByTime +} NS_SWIFT_NAME(BookmarksSortingType); + typedef void (^LoadTagsCompletionBlock)(NSArray * _Nullable tags, NSInteger maxTagsNumber); typedef void (^PingCompletionBlock)(BOOL success); typedef void (^ElevationPointChangedBlock)(double distance); +typedef void (^SearchBookmarksCompletionBlock)(NSArray *bookmarks); +typedef void (^SortBookmarksCompletionBlock)(NSArray * _Nullable sortedSections); NS_SWIFT_NAME(BookmarksManager) @interface MWMBookmarksManager : NSObject @@ -39,6 +51,7 @@ NS_SWIFT_NAME(BookmarksManager) - (NSString *)getCategoryDescription:(MWMMarkGroupID)groupId; - (NSString *)getCategoryAuthorName:(MWMMarkGroupID)groupId; - (NSURL *)getCategoryPhotoUrl:(MWMMarkGroupID)groupId; +- (NSString *)getCategoryAuthorId:(MWMMarkGroupID)groupId; - (MWMMarkGroupID)createCategoryWithName:(NSString *)name; - (void)setCategory:(MWMMarkGroupID)groupId name:(NSString *)name; @@ -49,10 +62,23 @@ NS_SWIFT_NAME(BookmarksManager) - (void)setCatalogCategoriesVisible:(BOOL)isVisible; - (void)deleteCategory:(MWMMarkGroupID)groupId; - (BOOL)checkCategoryName:(NSString *)name; +- (NSArray *)availableSortingTypes:(MWMMarkGroupID)groupId hasMyPosition:(BOOL)hasMyPosition; +- (void)sortBookmarks:(MWMMarkGroupID)groupId + sortingType:(MWMBookmarksSortingType)sortingType + location:(CLLocation * _Nullable)location + completion:(SortBookmarksCompletionBlock)completionBlock; +- (BOOL)hasLastSortingType:(MWMMarkGroupID)groupId; +- (MWMBookmarksSortingType)lastSortingType:(MWMMarkGroupID)groupId; +- (void)resetLastSortingType:(MWMMarkGroupID)groupId; - (NSArray *)bookmarksForCategory:(MWMMarkGroupID)categoryId; - (MWMMarkIDCollection)bookmarkIdsForCategory:(MWMMarkGroupID)categoryId; - (void)deleteBookmark:(MWMMarkID)bookmarkId; +- (NSArray *)bookmarksForGroup:(MWMMarkGroupID)groupId; +- (NSArray *)tracksForGroup:(MWMMarkGroupID)groupId; +- (void)searchBookmarksGroup:(MWMMarkGroupID)groupId + text:(NSString *)text + completion:(SearchBookmarksCompletionBlock)completion; - (MWMTrackIDCollection)trackIdsForCategory:(MWMMarkGroupID)categoryId; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index 07807cb09f..a7df43b9a3 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -1,14 +1,18 @@ #import "MWMBookmarksManager.h" +#import "MWMBookmark+Core.h" +#import "MWMBookmarksSection.h" #import "MWMBookmarkGroup.h" #import "MWMCarPlayBookmarkObject.h" #import "MWMCatalogObserver.h" #import "MWMTag.h" #import "MWMTagGroup+Convenience.h" +#import "MWMTrack+Core.h" #import "MWMUTM+Core.h" #include "Framework.h" +#include "map/bookmarks_search_params.hpp" #include "map/purchase.hpp" #include "partners_api/utm.hpp" @@ -63,6 +67,28 @@ static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) } } +static MWMBookmarksSortingType convertSortingType(BookmarkManager::SortingType const &sortingType) { + switch (sortingType) { + case BookmarkManager::SortingType::ByType: + return MWMBookmarksSortingTypeByType; + case BookmarkManager::SortingType::ByDistance: + return MWMBookmarksSortingTypeByDistance; + case BookmarkManager::SortingType::ByTime: + return MWMBookmarksSortingTypeByTime; + } +} + +static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSortingType sortingType) { + switch (sortingType) { + case MWMBookmarksSortingTypeByType: + return BookmarkManager::SortingType::ByType; + case MWMBookmarksSortingTypeByDistance: + return BookmarkManager::SortingType::ByDistance; + case MWMBookmarksSortingTypeByTime: + return BookmarkManager::SortingType::ByTime; + } +} + @interface MWMBookmarksManager () @property(nonatomic, readonly) BookmarkManager & bm; @@ -70,6 +96,8 @@ static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) @property(nonatomic) NSHashTable> * observers; @property(nonatomic) BOOL areBookmarksLoaded; @property(nonatomic) NSURL * shareCategoryURL; +@property(nonatomic) NSInteger lastSearchId; +@property(nonatomic) NSInteger lastSortId; @property(nonatomic) NSMutableDictionary * catalogObservers; @@ -368,6 +396,11 @@ static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) return [[NSURL alloc] initWithString:@(self.bm.GetCategoryData(groupId).m_imageUrl.c_str())]; } +- (NSString *)getCategoryAuthorId:(MWMMarkGroupID)groupId +{ + return @(self.bm.GetCategoryData(groupId).m_authorId.c_str()); +} + - (MWMMarkGroupID)createCategoryWithName:(NSString *)name { auto groupId = self.bm.CreateBookmarkCategory(name.UTF8String); @@ -417,6 +450,94 @@ static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) return !self.bm.IsUsedCategoryName(name.UTF8String); } +- (NSArray *)availableSortingTypes:(MWMMarkGroupID)groupId hasMyPosition:(BOOL)hasMyPosition{ + auto const availableTypes = self.bm.GetAvailableSortingTypes(groupId, hasMyPosition); + NSMutableArray *result = [NSMutableArray array]; + for (auto const &sortingType : availableTypes) { + [result addObject:[NSNumber numberWithInteger:convertSortingType(sortingType)]]; + } + return [result copy]; +} + +- (void)sortBookmarks:(MWMMarkGroupID)groupId + sortingType:(MWMBookmarksSortingType)sortingType + location:(CLLocation *)location + completion:(SortBookmarksCompletionBlock)completion { + self.bm.SetLastSortingType(groupId, convertSortingTypeToCore(sortingType)); + m2::PointD myPosition = m2::PointD::Zero(); + + if (sortingType == MWMBookmarksSortingTypeByDistance) { + if (!location) { + completion(nil); + return; + } + myPosition = mercator::FromLatLon(location.coordinate.latitude, location.coordinate.longitude); + } + + auto const sortId = ++self.lastSortId; + __weak auto weakSelf = self; + + BookmarkManager::SortParams sortParams; + sortParams.m_groupId = groupId; + sortParams.m_sortingType = convertSortingTypeToCore(sortingType); + sortParams.m_hasMyPosition = location != nil; + sortParams.m_myPosition = myPosition; + sortParams.m_onResults = [weakSelf, sortId, completion] (BookmarkManager::SortedBlocksCollection &&sortedBlocks, + BookmarkManager::SortParams::Status status) { + __strong auto self = weakSelf; + if (!self || sortId != self.lastSortId) + return; + + switch (status) { + case BookmarkManager::SortParams::Status::Completed: { + NSMutableArray *result = [NSMutableArray array]; + for (auto const &sortedBlock : sortedBlocks) { + NSMutableArray *bookmarks = nil; + if (sortedBlock.m_markIds.size() > 0) { + bookmarks = [NSMutableArray array]; + for (auto const &markId : sortedBlock.m_markIds) { + [bookmarks addObject:[[MWMBookmark alloc] initWithMarkId:markId + bookmarkData:self.bm.GetBookmark(markId)]]; + } + } + NSMutableArray *tracks = nil; + if (sortedBlock.m_trackIds.size() > 0) { + tracks = [NSMutableArray array]; + for (auto const &trackId : sortedBlock.m_trackIds) { + [tracks addObject:[[MWMTrack alloc] initWithTrackId:trackId trackData:self.bm.GetTrack(trackId)]]; + } + } + [result addObject:[[MWMBookmarksSection alloc] initWithTitle:@(sortedBlock.m_blockName.c_str()) + bookmarks:bookmarks + tracks:tracks]]; + } + completion([result copy]); + break; + } + case BookmarkManager::SortParams::Status::Cancelled: + completion(nil); + break; + } + }; + + self.bm.GetSortedCategory(sortParams); +} + +- (BOOL)hasLastSortingType:(MWMMarkGroupID)groupId { + BookmarkManager::SortingType st; + return self.bm.GetLastSortingType(groupId, st); +} + +- (MWMBookmarksSortingType)lastSortingType:(MWMMarkGroupID)groupId { + BookmarkManager::SortingType st; + self.bm.GetLastSortingType(groupId, st); + return convertSortingType(st); +} + +- (void)resetLastSortingType:(MWMMarkGroupID)groupId { + self.bm.ResetLastSortingType(groupId); +} + #pragma mark - Bookmarks - (NSArray *)bookmarksForCategory:(MWMMarkGroupID)categoryId @@ -448,6 +569,45 @@ static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) }]; } +- (NSArray *)bookmarksForGroup:(MWMMarkGroupID)groupId { + auto const &bookmarkIds = self.bm.GetUserMarkIds(groupId); + NSMutableArray *result = [NSMutableArray array]; + for (auto bookmarkId : bookmarkIds) { + [result addObject:[[MWMBookmark alloc] initWithMarkId:bookmarkId bookmarkData:self.bm.GetBookmark(bookmarkId)]]; + } + return [result copy]; +} + +- (void)searchBookmarksGroup:(MWMMarkGroupID)groupId + text:(NSString *)text + completion:(SearchBookmarksCompletionBlock)completion { + search::BookmarksSearchParams searchParams; + searchParams.m_query = text.UTF8String; + searchParams.m_groupId = groupId; + + auto const searchId = ++self.lastSearchId; + __weak auto weakSelf = self; + searchParams.m_onStarted = [] {}; + searchParams.m_onResults = [weakSelf, searchId, completion](search::BookmarksSearchParams::Results const &results, + search::BookmarksSearchParams::Status status) { + __strong auto self = weakSelf; + if (!self || searchId != self.lastSearchId) + return; + + auto filteredResults = results; + self.bm.FilterInvalidBookmarks(filteredResults); + + NSMutableArray *result = [NSMutableArray array]; + for (auto bookmarkId : filteredResults) + [result addObject:[[MWMBookmark alloc] initWithMarkId:bookmarkId bookmarkData:self.bm.GetBookmark(bookmarkId)]]; + + completion([result copy]); + }; + + GetFramework().GetSearchAPI().SearchInBookmarks(searchParams); +} + + #pragma mark - Tracks - (MWMTrackIDCollection)trackIdsForCategory:(MWMMarkGroupID)categoryId { @@ -458,6 +618,15 @@ static kml::PredefinedColor convertBookmarkColor(MWMBookmarkColor bookmarkColor) return [collection copy]; } +- (NSArray *)tracksForGroup:(MWMMarkGroupID)groupId { + auto const &trackIds = self.bm.GetTrackIds(groupId); + NSMutableArray *result = [NSMutableArray array]; + for (auto trackId : trackIds) { + [result addObject:[[MWMTrack alloc] initWithTrackId:trackId trackData:self.bm.GetTrack(trackId)]]; + } + return [result copy]; +} + #pragma mark - Category sharing - (void)shareCategory:(MWMMarkGroupID)groupId diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h index 697e1b6b61..9218b44f92 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksObserver.h @@ -22,6 +22,7 @@ typedef NS_ENUM(NSUInteger, MWMSynchronizationResult) MWMSynchronizationResultInvalidCall }; +NS_SWIFT_NAME(BookmarksObserver) @protocol MWMBookmarksObserver @optional - (void)onConversionFinish:(BOOL)success; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksSection.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksSection.h new file mode 100644 index 0000000000..af76b347ec --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksSection.h @@ -0,0 +1,21 @@ +#import + +@class MWMBookmark; +@class MWMTrack; + +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(BookmarksSection) +@interface MWMBookmarksSection : NSObject + +@property(nonatomic, readonly) NSString *sectionName; +@property(nonatomic, readonly, nullable) NSArray *bookmarks; +@property(nonatomic, readonly, nullable) NSArray *tracks; + +- (instancetype)initWithTitle:(NSString *)title + bookmarks:(nullable NSArray *)bookmarks + tracks:(nullable NSArray *)tracks; + +@end + +NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksSection.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksSection.m new file mode 100644 index 0000000000..b1934959a3 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksSection.m @@ -0,0 +1,19 @@ +#import "MWMBookmarksSection.h" + +@implementation MWMBookmarksSection + +- (instancetype)initWithTitle:(NSString *)title + bookmarks:(NSArray *)bookmarks + tracks:(NSArray *)tracks { + self = [super init]; + if (self) { + _sectionName = title; + _bookmarks = bookmarks; + _tracks = tracks; + } + return self; +} + +@end + + diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack+Core.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack+Core.h new file mode 100644 index 0000000000..c521f8d3a9 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack+Core.h @@ -0,0 +1,9 @@ +#import "MWMTrack.h" + +#include + +@interface MWMTrack (Core) + +- (instancetype)initWithTrackId:(MWMMarkID)markId trackData:(Track const *)track; + +@end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.h new file mode 100644 index 0000000000..2ff56af8ed --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.h @@ -0,0 +1,17 @@ +#import + +#import "MWMTypes.h" + +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(Track) +@interface MWMTrack : NSObject + +@property(nonatomic, readonly) MWMTrackID trackId; +@property(nonatomic, readonly) NSString *trackName; +@property(nonatomic, readonly) NSInteger trackLengthMeters; +@property(nonatomic, readonly) UIColor *trackColor; + +@end + +NS_ASSUME_NONNULL_END diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.mm new file mode 100644 index 0000000000..6650dfe606 --- /dev/null +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMTrack.mm @@ -0,0 +1,21 @@ +#import "MWMTrack+Core.h" + +@implementation MWMTrack + +@end + +@implementation MWMTrack (Core) + +- (instancetype)initWithTrackId:(MWMTrackID)trackId trackData:(Track const *)track { + self = [super init]; + if (self) { + _trackId = trackId; + _trackName = @(track->GetName().c_str()); + _trackLengthMeters = track->GetLengthMeters(); + auto const color = track->GetColor(0); + _trackColor = [UIColor colorWithRed:color.GetRedF() green:color.GetGreenF() blue:color.GetBlueF() alpha:1.f]; + } + return self; +} + +@end diff --git a/iphone/CoreApi/CoreApi/CoreApi-swift.h b/iphone/CoreApi/CoreApi/CoreApi-swift.h index 4390e93b0c..cdb278c1be 100644 --- a/iphone/CoreApi/CoreApi/CoreApi-swift.h +++ b/iphone/CoreApi/CoreApi/CoreApi-swift.h @@ -9,7 +9,9 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import #import +#import #import +#import #import #import #import @@ -28,6 +30,7 @@ FOUNDATION_EXPORT const unsigned char CoreApiVersionString[]; #import #import #import +#import #import #import #import diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h index 367bdd174e..f74ba5f53e 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.h @@ -41,6 +41,8 @@ NS_SWIFT_NAME(FrameworkHelper) completion:(SearchInDownloaderCompletions)completion; + (BOOL)canEditMap; + (void)showOnMap:(MWMMarkGroupID)categoryId; ++ (void)showBookmark:(MWMMarkID)bookmarkId; ++ (void)showTrack:(MWMTrackID)trackId; + (void)updatePlacePageData; @end diff --git a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm index fa6fd0b731..e1bed8b121 100644 --- a/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm +++ b/iphone/CoreApi/CoreApi/Framework/MWMFrameworkHelper.mm @@ -178,6 +178,14 @@ GetFramework().ShowBookmarkCategory(categoryId); } ++ (void)showBookmark:(MWMMarkID)bookmarkId { + GetFramework().ShowBookmark(bookmarkId); +} + ++ (void)showTrack:(MWMTrackID)trackId { + GetFramework().ShowTrack(trackId); +} + + (void)updatePlacePageData { GetFramework().UpdatePlacePageInfoForCurrentSelection(); } diff --git a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData.mm b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData.mm index e7ea4c3e9b..c90c3acaa2 100644 --- a/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData.mm +++ b/iphone/CoreApi/CoreApi/PlacePageData/Common/PlacePageBookmarkData.mm @@ -1,45 +1,5 @@ #import "PlacePageBookmarkData+Core.h" - -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; - } -} +#import "MWMBookmarkColor+Core.h" @implementation PlacePageBookmarkData diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListBuilder.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListBuilder.swift new file mode 100644 index 0000000000..38117421da --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListBuilder.swift @@ -0,0 +1,16 @@ +final class BookmarksListBuilder { + static func build(markGroupId: MWMMarkGroupID, + bookmarksCoordinator: BookmarksCoordinator?, + delegate: BookmarksListDelegate? = nil) -> BookmarksListViewController { + let viewController = BookmarksListViewController() + let router = BookmarksListRouter(MapViewController.shared(), bookmarksCoordinator: bookmarksCoordinator) + let interactor = BookmarksListInteractor(markGroupId: markGroupId) + let presenter = BookmarksListPresenter(view: viewController, + router: router, + delegate: delegate, + interactor: interactor, + imperialUnits: Settings.measurementUnits() == .imperial) + viewController.presenter = presenter + return viewController + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift new file mode 100644 index 0000000000..2882b3f160 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift @@ -0,0 +1,186 @@ +protocol IBookmarksListInteractor { + func getBookmarkGroup() -> BookmarkGroup + func prepareForSearch() + func search(_ text: String, completion: @escaping ([Bookmark]) -> Void) + func availableSortingTypes(hasMyPosition: Bool) -> [BookmarksListSortingType] + func viewOnMap() + func viewBookmarkOnMap(_ bookmarkId: MWMMarkID) + func viewTrackOnMap(_ trackId: MWMTrackID) + func sort(_ sortingType: BookmarksListSortingType, + location: CLLocation?, + completion: @escaping ([BookmarksSection]) -> Void) + func resetSort() + func lastSortingType() -> BookmarksListSortingType? + func deleteBookmark(_ bookmarkId: MWMMarkID) + func deleteBookmarksGroup() + func canDeleteGroup() -> Bool + func exportFile(_ completion: @escaping (URL?, ExportFileStatus) -> Void) + func finishExportFile() +} + +enum BookmarksListSortingType { + case distance + case date + case type +} + +extension BookmarksListSortingType { + init(_ sortingType: BookmarksSortingType) { + switch sortingType { + case .byType: + self = .type + case .byDistance: + self = .distance + case .byTime: + self = .date + @unknown default: + fatalError() + } + } +} + +enum ExportFileStatus { + case success + case empty + case error +} + +fileprivate final class BookmarksManagerListener: NSObject { + private var callback: (ExportFileStatus) -> Void + + init(_ callback: @escaping (ExportFileStatus) -> Void) { + self.callback = callback + } +} + +extension BookmarksManagerListener: BookmarksObserver { + func onBookmarksCategoryFilePrepared(_ status: BookmarksShareStatus) { + switch status { + case .success: + callback(.success) + case .emptyCategory: + callback(.empty) + case .archiveError, .fileError: + callback(.error) + @unknown default: + fatalError() + } + } +} + +final class BookmarksListInteractor { + private let markGroupId: MWMMarkGroupID + private var bookmarksManager: BookmarksManager { BookmarksManager.shared() } + private var bookmarksManagerListener: BookmarksManagerListener? + + init(markGroupId: MWMMarkGroupID) { + self.markGroupId = markGroupId + } +} + +extension BookmarksListInteractor: IBookmarksListInteractor { + func getBookmarkGroup() -> BookmarkGroup { + bookmarksManager.category(withId: markGroupId) + } + + func prepareForSearch() { + bookmarksManager.prepare(forSearch: markGroupId) + } + + func search(_ text: String, completion: @escaping ([Bookmark]) -> Void) { + bookmarksManager.searchBookmarksGroup(markGroupId, text: text) { + completion($0) + } + } + + func availableSortingTypes(hasMyPosition: Bool) -> [BookmarksListSortingType] { + bookmarksManager.availableSortingTypes(markGroupId, hasMyPosition: hasMyPosition).map { + BookmarksSortingType(rawValue: $0.intValue)! + }.map { + switch $0 { + case .byType: + return BookmarksListSortingType.type + case .byDistance: + return BookmarksListSortingType.distance + case .byTime: + return BookmarksListSortingType.date + @unknown default: + fatalError() + } + } + } + + func viewOnMap() { + FrameworkHelper.show(onMap: markGroupId) + } + + func viewBookmarkOnMap(_ bookmarkId: MWMMarkID) { + FrameworkHelper.showBookmark(bookmarkId) + } + + func viewTrackOnMap(_ trackId: MWMTrackID) { + FrameworkHelper.showTrack(trackId) + } + + func sort(_ sortingType: BookmarksListSortingType, + location: CLLocation?, + completion: @escaping ([BookmarksSection]) -> Void) { + let coreSortingType: BookmarksSortingType + switch sortingType { + case .distance: + coreSortingType = .byDistance + case .date: + coreSortingType = .byTime + case .type: + coreSortingType = .byType + } + + bookmarksManager.sortBookmarks(markGroupId, + sortingType: coreSortingType, + location: location) { sections in + guard let sections = sections else { return } + completion(sections) + } + } + + func resetSort() { + bookmarksManager.resetLastSortingType(markGroupId) + } + + func lastSortingType() -> BookmarksListSortingType? { + guard bookmarksManager.hasLastSortingType(markGroupId) else { + return nil + } + return BookmarksListSortingType(bookmarksManager.lastSortingType(markGroupId)) + } + + func deleteBookmark(_ bookmarkId: MWMMarkID) { + bookmarksManager.deleteBookmark(bookmarkId) + } + + func deleteBookmarksGroup() { + bookmarksManager.deleteCategory(markGroupId) + } + + func canDeleteGroup() -> Bool { + bookmarksManager.userCategories().count > 1 + } + + func exportFile(_ completion: @escaping (URL?, ExportFileStatus) -> Void) { + bookmarksManagerListener = BookmarksManagerListener({ [weak self] status in + guard let self = self else { return } + self.bookmarksManager.remove(self.bookmarksManagerListener!) + var url: URL? = nil + if status == .success { + url = self.bookmarksManager.shareCategoryURL() + } + completion(url, status) + }) + bookmarksManager.add(bookmarksManagerListener!) + bookmarksManager.shareCategory(markGroupId) + } + + func finishExportFile() { + bookmarksManager.finishShareCategory() + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift new file mode 100644 index 0000000000..9014dfc47a --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift @@ -0,0 +1,349 @@ +protocol IBookmarksListPresenter { + func viewDidLoad() + func activateSearch() + func deactivateSearch() + func cancelSearch() + func search(_ text: String) + func sort() + func more() + func deleteBookmark(in section: IBookmarksListSectionViewModel, at index: Int) + func viewOnMap(in section: IBookmarksListSectionViewModel, at index: Int) +} + +protocol BookmarksListDelegate: AnyObject { + func bookmarksListDidDeleteGroup() +} + +final class BookmarksListPresenter { + private unowned let view: IBookmarksListView + private let router: IBookmarksListRouter + private let interactor: IBookmarksListInteractor + private weak var delegate: BookmarksListDelegate? + + private let distanceFormatter = MeasurementFormatter() + private let imperialUnits: Bool + private let bookmarkGroup: BookmarkGroup + + init(view: IBookmarksListView, + router: IBookmarksListRouter, + delegate: BookmarksListDelegate?, + interactor: IBookmarksListInteractor, + imperialUnits: Bool) { + self.view = view + self.router = router + self.delegate = delegate + self.interactor = interactor + self.imperialUnits = imperialUnits + + bookmarkGroup = interactor.getBookmarkGroup() + distanceFormatter.unitOptions = [.providedUnit] + } + + private func reload() { + guard let sortingType = interactor.lastSortingType() else { + setDefaultSections() + return + } + sort(sortingType) + } + + private func setDefaultSections() { + interactor.resetSort() + var sections: [IBookmarksListSectionViewModel] = [] + let tracks = bookmarkGroup.tracks.map { track in + TrackViewModel(track, formattedDistance: formatDistance(Double(track.trackLengthMeters))) + } + if !tracks.isEmpty { + sections.append(TracksSectionViewModel(tracks: tracks)) + } + let bookmarks = mapBookmarks(bookmarkGroup.bookmarks) + if !bookmarks.isEmpty { + sections.append(BookmarksSectionViewModel(title: L("bookmarks"), bookmarks: bookmarks)) + } + view.setSections(sections) + } + + private func mapBookmarks(_ bookmarks: [Bookmark]) -> [BookmarkViewModel] { + let location = LocationManager.lastLocation() + return bookmarks.map { + let formattedDistance: String? + if let location = location { + let distance = location.distance(from: CLLocation(latitude: $0.locationCoordinate.latitude, + longitude: $0.locationCoordinate.longitude)) + formattedDistance = formatDistance(distance) + } else { + formattedDistance = nil + } + return BookmarkViewModel($0, formattedDistance: formattedDistance) + } + } + + private func formatDistance(_ distance: Double) -> String { + let unit = imperialUnits ? UnitLength.miles : UnitLength.kilometers + let distanceInUnits = unit.converter.value(fromBaseUnitValue: distance) + let measurement = Measurement(value: distanceInUnits.rounded(), unit: unit) + return distanceFormatter.string(from: measurement) + } + + private func showSortMenu() { + var sortItems = interactor.availableSortingTypes(hasMyPosition: LocationManager.lastLocation() != nil) + .map { sortingType -> BookmarksListMenuItem in + switch sortingType { + case .distance: + return BookmarksListMenuItem(title: L("sort_distance"), action: { [weak self] in + self?.sort(.distance) + Statistics.logEvent(kStatBookmarksListSort, withParameters: [kStatOption : kStatSortByDistance]) + }) + case .date: + return BookmarksListMenuItem(title: L("sort_date"), action: { [weak self] in + self?.sort(.date) + Statistics.logEvent(kStatBookmarksListSort, withParameters: [kStatOption : kStatSortByDate]) + }) + case .type: + return BookmarksListMenuItem(title: L("sort_type"), action: { [weak self] in + self?.sort(.type) + Statistics.logEvent(kStatBookmarksListSort, withParameters: [kStatOption : kStatSortByType]) + }) + } + } + sortItems.append(BookmarksListMenuItem(title: L("sort_default"), action: { [weak self] in + self?.setDefaultSections() + Statistics.logEvent(kStatBookmarksListSort, withParameters: [kStatOption : kStatSortByDefault]) + })) + view.showMenu(sortItems) + } + + private func showMoreMenu() { + var moreItems: [BookmarksListMenuItem] = [] + moreItems.append(BookmarksListMenuItem(title: L("sharing_options"), action: { [weak self] in + guard let self = self else { return } + self.router.sharingOptions(self.bookmarkGroup) + Statistics.logEvent(kStatBookmarksListItemSettings, withParameters: [kStatOption : kStatSharingOptions]) + })) + moreItems.append(BookmarksListMenuItem(title: L("search_show_on_map"), action: { [weak self] in + self?.viewOnMap() + Statistics.logEvent(kStatBookmarksListItemMoreClick, withParameters: [kStatOption : kStatViewOnMap]) + })) + moreItems.append(BookmarksListMenuItem(title: L("list_settings"), action: { [weak self] in + guard let self = self else { return } + self.router.listSettings(self.bookmarkGroup, delegate: self) + Statistics.logEvent(kStatBookmarksListItemMoreClick, withParameters: [kStatOption : kStatSettings]) + })) + moreItems.append(BookmarksListMenuItem(title: L("export_file"), action: { [weak self] in + self?.interactor.exportFile { (url, status) in + switch status { + case .success: + guard let url = url else { fatalError() } + self?.view.share(url) { + self?.interactor.finishExportFile() + } + case .empty: + self?.view.showError(title: L("bookmarks_error_title_share_empty"), + message: L("bookmarks_error_message_share_empty")) + case .error: + self?.view.showError(title: L("dialog_routing_system_error"), + message: L("bookmarks_error_message_share_general")) + } + } + Statistics.logEvent(kStatBookmarksListItemMoreClick, withParameters: [kStatOption : kStatSendAsFile]) + })) + moreItems.append(BookmarksListMenuItem(title: L("delete_list"), + destructive: true, + enabled: interactor.canDeleteGroup(), + action: { [weak self] in + self?.interactor.deleteBookmarksGroup() + self?.delegate?.bookmarksListDidDeleteGroup() + Statistics.logEvent(kStatBookmarksListItemMoreClick, + withParameters: [kStatOption : kStatDelete]) + + })) + view.showMenu(moreItems) + Statistics.logEvent(kStatBookmarksListItemSettings, withParameters: [kStatOption : kStatMore]) + } + + private func viewOnMap() { + interactor.viewOnMap() + router.viewOnMap(bookmarkGroup) + } + + private func sort(_ sortingType: BookmarksListSortingType) { + interactor.sort(sortingType, location: LocationManager.lastLocation()) { [weak self] sortedSections in + let sections = sortedSections.map { (bookmarksSection) -> IBookmarksListSectionViewModel in + if let bookmarks = bookmarksSection.bookmarks, let self = self { + return BookmarksSectionViewModel(title: bookmarksSection.sectionName, bookmarks: self.mapBookmarks(bookmarks)) + } + if let tracks = bookmarksSection.tracks, let self = self { + return TracksSectionViewModel(tracks: tracks.map { track in + TrackViewModel(track, formattedDistance: self.formatDistance(Double(track.trackLengthMeters))) + }) + } + fatalError() + } + self?.view.setSections(sections) + } + } +} + +extension BookmarksListPresenter: IBookmarksListPresenter { + func viewDidLoad() { + reload() + view.setTitle(bookmarkGroup.title) + view.setMoreItemTitle(bookmarkGroup.isEditable ? L("placepage_more_button") : L("view_on_map_bookmarks")) + view.enableEditing(bookmarkGroup.isEditable) + } + + func activateSearch() { + interactor.prepareForSearch() + } + + func deactivateSearch() { + + } + + func cancelSearch() { + reload() + } + + func search(_ text: String) { + interactor.search(text) { [weak self] in + guard let self = self else { return } + let bookmarks = self.mapBookmarks($0) + self.view.setSections(bookmarks.isEmpty ? [] : [BookmarksSectionViewModel(title: L("bookmarks"), + bookmarks: bookmarks)]) + Statistics.logEvent(kStatBookmarksSearch, withParameters: [kStatFrom : kStatBookmarksList]) + } + } + + func more() { + if bookmarkGroup.isEditable { + showMoreMenu() + } else { + viewOnMap() + } + } + + func sort() { + showSortMenu() + } + + func deleteBookmark(in section: IBookmarksListSectionViewModel, at index: Int) { + guard let bookmarksSection = section as? BookmarksSectionViewModel else { + fatalError("It's only possible to delete a bookmark") + } + guard let bookmark = bookmarksSection.bookmarks[index] as? BookmarkViewModel else { fatalError() } + interactor.deleteBookmark(bookmark.bookmarkId) + reload() + } + + func viewOnMap(in section: IBookmarksListSectionViewModel, at index: Int) { + switch section { + case let bookmarksSection as IBookmarksSectionViewModel: + let bookmark = bookmarksSection.bookmarks[index] as! BookmarkViewModel + interactor.viewBookmarkOnMap(bookmark.bookmarkId) + router.viewOnMap(bookmarkGroup) + Statistics.logEvent(kStatEventName(kStatBookmarks, kStatShowOnMap)) + if bookmarkGroup.isGuide { + Statistics.logEvent(kStatGuidesBookmarkSelect, + withParameters: [kStatServerId : bookmarkGroup.serverId], + with: .realtime) + } + case let trackSection as ITracksSectionViewModel: + let track = trackSection.tracks[index] as! TrackViewModel + interactor.viewTrackOnMap(track.trackId) + router.viewOnMap(bookmarkGroup) + if bookmarkGroup.isGuide { + Statistics.logEvent(kStatGuidesTrackSelect, + withParameters: [kStatServerId : bookmarkGroup.serverId], + with: .realtime) + } + default: + fatalError("Wrong section type: \(section.self)") + } + } +} + +extension BookmarksListPresenter: BookmarksSharingViewControllerDelegate { + func didShareCategory() { + // TODO: update description + } +} + +extension BookmarksListPresenter: CategorySettingsViewControllerDelegate { + func categorySettingsController(_ viewController: CategorySettingsViewController, didEndEditing categoryId: MWMMarkGroupID) { + // TODO: update description + } + + func categorySettingsController(_ viewController: CategorySettingsViewController, didDelete categoryId: MWMMarkGroupID) { + delegate?.bookmarksListDidDeleteGroup() + } +} + +fileprivate struct BookmarkViewModel: IBookmarkViewModel { + let bookmarkId: MWMMarkID + let bookmarkName: String + let subtitle: String + var image: UIImage { + bookmarkColor.image(bookmarkIconName) + } + + private let bookmarkColor: BookmarkColor + private let bookmarkIconName: String + + init(_ bookmark: Bookmark, formattedDistance: String?) { + bookmarkId = bookmark.bookmarkId + bookmarkName = bookmark.bookmarkName + bookmarkColor = bookmark.bookmarkColor + bookmarkIconName = bookmark.bookmarkIconName + subtitle = [formattedDistance, bookmark.bookmarkType].compactMap { $0 }.joined(separator: " • ") + } +} + +fileprivate struct TrackViewModel: ITrackViewModel { + let trackId: MWMTrackID + let trackName: String + let subtitle: String + var image: UIImage { + circleImageForColor(trackColor, frameSize: 22) + } + + private let trackColor: UIColor + + init(_ track: Track, formattedDistance: String) { + trackId = track.trackId + trackName = track.trackName + subtitle = "\(L("length")) \(formattedDistance)" + trackColor = track.trackColor + } +} + +fileprivate struct BookmarksSectionViewModel: IBookmarksSectionViewModel { + let sectionTitle: String + let bookmarks: [IBookmarkViewModel] + + init(title: String, bookmarks: [IBookmarkViewModel]) { + sectionTitle = title + self.bookmarks = bookmarks + } +} + +fileprivate struct TracksSectionViewModel: ITracksSectionViewModel { + var tracks: [ITrackViewModel] + + init(tracks: [ITrackViewModel]) { + self.tracks = tracks + } +} + +fileprivate struct BookmarksListMenuItem: IBookmarksListMenuItem { + let title: String + let destructive: Bool + let enabled: Bool + let action: () -> Void + + init(title: String, destructive: Bool = false, enabled: Bool = true, action: @escaping () -> Void) { + self.title = title + self.destructive = destructive + self.enabled = enabled + self.action = action + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift new file mode 100644 index 0000000000..4ef67006d8 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift @@ -0,0 +1,34 @@ +protocol IBookmarksListRouter { + func listSettings(_ bookmarkGroup: BookmarkGroup, delegate: CategorySettingsViewControllerDelegate?) + func sharingOptions(_ bookmarkGroup: BookmarkGroup) + func viewOnMap(_ bookmarkGroup: BookmarkGroup) +} + +final class BookmarksListRouter { + private let mapViewController: MapViewController + private weak var coordinator: BookmarksCoordinator? + + init(_ mapViewController: MapViewController, bookmarksCoordinator: BookmarksCoordinator?) { + self.mapViewController = mapViewController + self.coordinator = bookmarksCoordinator + } +} + +extension BookmarksListRouter: IBookmarksListRouter { + func listSettings(_ bookmarkGroup: BookmarkGroup, delegate: CategorySettingsViewControllerDelegate?) { + let listSettingsController = CategorySettingsViewController(bookmarkGroup: bookmarkGroup) + listSettingsController.delegate = delegate + mapViewController.navigationController?.pushViewController(listSettingsController, animated: true) + } + + func sharingOptions(_ bookmarkGroup: BookmarkGroup) { + let storyboard = UIStoryboard.instance(.sharing) + let shareController = storyboard.instantiateInitialViewController() as! BookmarksSharingViewController + shareController.category = bookmarkGroup + mapViewController.navigationController?.pushViewController(shareController, animated: true) + } + + func viewOnMap(_ bookmarkGroup: BookmarkGroup) { + coordinator?.hide(categoryId: bookmarkGroup.categoryId) + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift new file mode 100644 index 0000000000..d9d122edc7 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift @@ -0,0 +1,230 @@ +protocol IBookmarksListSectionViewModel { + var numberOfItems: Int { get } + var sectionTitle: String { get } + var hasVisibilityButton: Bool { get } + var canEdit: Bool { get } +} + +protocol IBookmarksSectionViewModel: IBookmarksListSectionViewModel { + var bookmarks: [IBookmarkViewModel] { get } +} + +extension IBookmarksSectionViewModel { + var numberOfItems: Int { bookmarks.count } + var hasVisibilityButton: Bool { false } + var canEdit: Bool { true } +} + +protocol ITracksSectionViewModel: IBookmarksListSectionViewModel { + var tracks: [ITrackViewModel] { get } +} + +extension ITracksSectionViewModel { + var numberOfItems: Int { tracks.count } + var sectionTitle: String { L("tracks_title") } + var hasVisibilityButton: Bool { false } + var canEdit: Bool { true } +} + +protocol IBookmarkViewModel { + var bookmarkName: String { get } + var subtitle: String { get } + var image: UIImage { get } +} + +protocol ITrackViewModel { + var trackName: String { get } + var subtitle: String { get } + var image: UIImage { get } +} + +protocol IBookmarksListMenuItem { + var title: String { get } + var destructive: Bool { get } + var enabled: Bool { get } + var action: () -> Void { get } +} + +protocol IBookmarksListView: AnyObject { + func setTitle(_ title: String) + func setSections(_ sections: [IBookmarksListSectionViewModel]) + func setMoreItemTitle(_ itemTitle: String) + func showMenu(_ items: [IBookmarksListMenuItem]) + func enableEditing(_ enable: Bool) + func share(_ url: URL, completion: @escaping () -> Void) + func showError(title: String, message: String) +} + +final class BookmarksListViewController: MWMViewController { + var presenter: IBookmarksListPresenter! + + private var sections: [IBookmarksListSectionViewModel]? + private let cellStrategy = BookmarksListCellStrategy() + + private var canEdit = false + + @IBOutlet var tableView: UITableView! + @IBOutlet var searchBar: UISearchBar! + @IBOutlet var toolBar: UIToolbar! + @IBOutlet var sortToolbarItem: UIBarButtonItem! + @IBOutlet var moreToolbarItem: UIBarButtonItem! + + override func viewDidLoad() { + super.viewDidLoad() + + let toolbarItemAttributes = [NSAttributedString.Key.font: UIFont.medium16(), + NSAttributedString.Key.foregroundColor: UIColor.linkBlue()] + + sortToolbarItem.setTitleTextAttributes(toolbarItemAttributes, for: .normal) + moreToolbarItem.setTitleTextAttributes(toolbarItemAttributes, for: .normal) + sortToolbarItem.title = L("sort") + searchBar.placeholder = L("search_in_the_list") + cellStrategy.registerCells(tableView) + presenter.viewDidLoad() + } + + @IBAction func onSortItem(_ sender: UIBarButtonItem) { + presenter.sort() + } + + @IBAction func onMoreItem(_ sender: UIBarButtonItem) { + presenter.more() + } + + override func setEditing(_ editing: Bool, animated: Bool) { + super.setEditing(editing, animated: animated) + tableView.setEditing(editing, animated: animated) + } +} + +extension BookmarksListViewController: UITableViewDataSource { + func numberOfSections(in tableView: UITableView) -> Int { + sections?.count ?? 0 + } + + func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { + guard let section = sections?[section] else { fatalError() } + return section.numberOfItems + } + + func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { + guard let section = sections?[indexPath.section] else { fatalError() } + return cellStrategy.tableCell(tableView, for: section, at: indexPath) + } +} + +extension BookmarksListViewController: UITableViewDelegate { + func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { + 48 + } + + func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? { + guard let section = sections?[section] else { fatalError() } + return cellStrategy.headerView(tableView, for: section) + } + + func tableView(_ tableView: UITableView, willSelectRowAt indexPath: IndexPath) -> IndexPath? { + return indexPath + } + + func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { + tableView.deselectRow(at: indexPath, animated: true) + guard let section = sections?[indexPath.section] else { fatalError() } + presenter.viewOnMap(in: section, at: indexPath.row) + } + + func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { + guard let section = sections?[indexPath.section] else { fatalError() } + return canEdit && section.canEdit + } + + func tableView(_ tableView: UITableView, willBeginEditingRowAt indexPath: IndexPath) { + isEditing = true + } + + func tableView(_ tableView: UITableView, didEndEditingRowAt indexPath: IndexPath?) { + isEditing = false + } + + func tableView(_ tableView: UITableView, + commit editingStyle: UITableViewCell.EditingStyle, + forRowAt indexPath: IndexPath) { + guard let section = sections?[indexPath.section] else { fatalError() } + presenter.deleteBookmark(in: section, at: indexPath.row) + } +} + +extension BookmarksListViewController: UISearchBarDelegate { + func searchBarTextDidBeginEditing(_ searchBar: UISearchBar) { + searchBar.setShowsCancelButton(true, animated: true) + navigationController?.setNavigationBarHidden(true, animated: true) + presenter.activateSearch() + } + + func searchBarTextDidEndEditing(_ searchBar: UISearchBar) { + searchBar.setShowsCancelButton(false, animated: true) + navigationController?.setNavigationBarHidden(false, animated: true) + presenter.deactivateSearch() + } + + func searchBarCancelButtonClicked(_ searchBar: UISearchBar) { + searchBar.text = nil + searchBar.resignFirstResponder() + presenter.cancelSearch() + } + + func searchBar(_ searchBar: UISearchBar, textDidChange searchText: String) { + guard !searchText.isEmpty else { + presenter.cancelSearch() + return + } + + presenter.search(searchText) + } +} + +extension BookmarksListViewController: IBookmarksListView { + func setTitle(_ title: String) { + self.title = title + } + + func setSections(_ sections: [IBookmarksListSectionViewModel]) { + self.sections = sections + tableView.reloadData() + } + + func setMoreItemTitle(_ itemTitle: String) { + moreToolbarItem.title = itemTitle + } + + func showMenu(_ items: [IBookmarksListMenuItem]) { + let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) + items.forEach { item in + let action = UIAlertAction(title: item.title, style: item.destructive ? .destructive : .default) { _ in + item.action() + } + action.isEnabled = item.enabled + actionSheet.addAction(action) + } + actionSheet.addAction(UIAlertAction(title: L("cancel"), style: .cancel, handler: nil)) + actionSheet.popoverPresentationController?.barButtonItem = sortToolbarItem + present(actionSheet, animated: true) + } + + func enableEditing(_ enable: Bool) { + canEdit = enable + navigationItem.rightBarButtonItem = enable ? editButtonItem : nil + } + + func share(_ url: URL, completion: @escaping () -> Void) { + let shareController = ActivityViewController.share(for: url, + message: L("share_bookmarks_email_body")) { (_, _, _, _) in + completion() + } + shareController?.present(inParentViewController: self, anchorView: self.view) + } + + func showError(title: String, message: String) { + MWMAlertViewController.activeAlert().presentInfoAlert(title, text: message) + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib new file mode 100644 index 0000000000..0232a7e1d6 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.xib @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.swift b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.swift new file mode 100644 index 0000000000..a321f5339a --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.swift @@ -0,0 +1,11 @@ +final class BookmarkCell: UITableViewCell { + @IBOutlet var bookmarkImageView: UIImageView! + @IBOutlet var bookmarkTitleLabel: UILabel! + @IBOutlet var bookmarkSubtitleLabel: UILabel! + + func config(_ bookmark: IBookmarkViewModel) { + bookmarkImageView.image = bookmark.image + bookmarkTitleLabel.text = bookmark.bookmarkName + bookmarkSubtitleLabel.text = bookmark.subtitle + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.xib new file mode 100644 index 0000000000..3cfb94fb81 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.xib @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift new file mode 100644 index 0000000000..4f446a4766 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift @@ -0,0 +1,41 @@ +final class BookmarksListCellStrategy { + private enum CellId { + static let track = "TrackCell" + static let bookmark = "BookmarkCell" + static let sectionHeader = "SectionHeader" + } + + func registerCells(_ tableView: UITableView) { + tableView.register(UINib(nibName: "BookmarkCell", bundle: nil), forCellReuseIdentifier: CellId.bookmark) + tableView.register(UINib(nibName: "TrackCell", bundle: nil), forCellReuseIdentifier: CellId.track) + tableView.register(UINib(nibName: "BookmarksListSectionHeader", bundle: nil), + forHeaderFooterViewReuseIdentifier: CellId.sectionHeader) + } + + func tableCell(_ tableView: UITableView, + for viewModel: IBookmarksListSectionViewModel, + at indexPath: IndexPath) -> UITableViewCell { + switch viewModel { + case let bookmarksSection as IBookmarksSectionViewModel: + let bookmark = bookmarksSection.bookmarks[indexPath.row] + let cell = tableView.dequeueReusableCell(withIdentifier: CellId.bookmark, for: indexPath) as! BookmarkCell + cell.config(bookmark) + return cell + case let tracksSection as ITracksSectionViewModel: + let track = tracksSection.tracks[indexPath.row] + let cell = tableView.dequeueReusableCell(withIdentifier: CellId.track, for: indexPath) as! TrackCell + cell.config(track) + return cell + default: + fatalError("Unexpected item") + } + } + + func headerView(_ tableView: UITableView, + for viewModel: IBookmarksListSectionViewModel) -> UITableViewHeaderFooterView { + let headerView = tableView.dequeueReusableHeaderFooterView(withIdentifier: CellId.sectionHeader) + as! BookmarksListSectionHeader + headerView.config(viewModel) + return headerView + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.swift b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.swift new file mode 100644 index 0000000000..a110fc367c --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.swift @@ -0,0 +1,13 @@ +final class BookmarksListSectionHeader: UITableViewHeaderFooterView { + @IBOutlet var titleLabel: UILabel! + @IBOutlet var visibilityButton: UIButton! + + @IBAction func onVisibilityButton(_ sender: UIButton) { + + } + + func config(_ section: IBookmarksListSectionViewModel) { + titleLabel.text = section.sectionTitle + visibilityButton.isHidden = !section.hasVisibilityButton + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib new file mode 100644 index 0000000000..33235bbc7e --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListSectionHeader.xib @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.swift b/iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.swift new file mode 100644 index 0000000000..26cd7cc49e --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.swift @@ -0,0 +1,11 @@ +final class TrackCell: UITableViewCell { + @IBOutlet var trackImageView: UIImageView! + @IBOutlet var trackTitleLabel: UILabel! + @IBOutlet var trackSubtitleLabel: UILabel! + + func config(_ track: ITrackViewModel) { + trackImageView.image = track.image + trackTitleLabel.text = track.trackName + trackSubtitleLabel.text = track.subtitle + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.xib new file mode 100644 index 0000000000..71d0e077fc --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.xib @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Bookmarks/BookmarksSection.h b/iphone/Maps/Bookmarks/BookmarksSection.h deleted file mode 100644 index dbf3c8802c..0000000000 --- a/iphone/Maps/Bookmarks/BookmarksSection.h +++ /dev/null @@ -1,14 +0,0 @@ -#import -#import "TableSectionDataSource.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface BookmarksSection : NSObject - -- (instancetype)initWithTitle:(nullable NSString *)title - markIds:(MWMMarkIDCollection)markIds - isEditable:(BOOL)isEditable; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/BookmarksSection.mm b/iphone/Maps/Bookmarks/BookmarksSection.mm deleted file mode 100644 index cd10d9b3c3..0000000000 --- a/iphone/Maps/Bookmarks/BookmarksSection.mm +++ /dev/null @@ -1,127 +0,0 @@ -#import "BookmarksSection.h" -#import "legacy_bookmark_colors.h" -#import "MWMLocationHelpers.h" -#import "MWMLocationManager.h" -#import "MWMSearchManager.h" -#import "Statistics.h" - -#import - -#include "geometry/distance_on_sphere.hpp" - -@interface BookmarksSection () - -@property(copy, nonatomic, nullable) NSString *sectionTitle; -@property(strong, nonatomic) NSMutableArray *markIds; -@property(nonatomic) BOOL isEditable; - -@end - -@implementation BookmarksSection - -- (instancetype)initWithTitle:(nullable NSString *)title - markIds:(MWMMarkIDCollection)markIds - isEditable:(BOOL)isEditable { - self = [super init]; - if (self) { - _sectionTitle = [title copy]; - _markIds = [markIds mutableCopy]; - _isEditable = isEditable; - } - return self; -} - -- (kml::MarkId)markIdForRow:(NSInteger)row { - return static_cast(self.markIds[row].unsignedLongLongValue); -} - -- (NSInteger)numberOfRows { - return [self.markIds count]; -} - -- (nullable NSString *)title { - return self.sectionTitle; -} - -- (BOOL)canEdit { - return self.isEditable; -} - -- (BOOL)canSelect { - return YES; -} - -- (void)fillCell:(UITableViewCell *)cell - withBookmarkDetails:(Bookmark const *)bookmark - andLocation:(CLLocation *)location { - std::vector details; - - if (location) { - m2::PointD const pos = bookmark->GetPivot(); - double const meters = ms::DistanceOnEarth(location.coordinate.latitude, location.coordinate.longitude, - mercator::YToLat(pos.y), mercator::XToLon(pos.x)); - details.push_back(location_helpers::formattedDistance(meters).UTF8String); - } - - auto const &types = bookmark->GetData().m_featureTypes; - if (!types.empty()) - details.push_back(kml::GetLocalizedFeatureType(types)); - - auto const detailText = strings::JoinStrings(details, " • "); - if (!detailText.empty()) - cell.detailTextLabel.text = @(detailText.c_str()); - else - cell.detailTextLabel.text = nil; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"BookmarksVCBookmarkItemCell"]; - if (!cell) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle - reuseIdentifier:@"BookmarksVCBookmarkItemCell"]; - } - - auto const bmId = [self markIdForRow:row]; - auto const &bm = GetFramework().GetBookmarkManager(); - Bookmark const *bookmark = bm.GetBookmark(bmId); - cell.textLabel.text = @(bookmark->GetPreferredName().c_str()); - cell.imageView.image = ios_bookmark_ui_helper::ImageForBookmark(bookmark->GetColor(), bookmark->GetData().m_icon); - - CLLocation *lastLocation = [MWMLocationManager lastLocation]; - - [self fillCell:cell withBookmarkDetails:bookmark andLocation:lastLocation]; - return cell; -} - -- (void)updateCell:(UITableViewCell *)cell forRow:(NSInteger)row withNewLocation:(CLLocation *)location { - auto const bmId = [self markIdForRow:row]; - auto const &bm = GetFramework().GetBookmarkManager(); - Bookmark const *bookmark = bm.GetBookmark(bmId); - if (!bookmark) - return; - [self fillCell:cell withBookmarkDetails:bookmark andLocation:location]; -} - -- (void)didSelectRow:(NSInteger)row { - auto const bmId = [self markIdForRow:row]; - [Statistics logEvent:kStatEventName(kStatBookmarks, kStatShowOnMap)]; - - auto const bookmark = GetFramework().GetBookmarkManager().GetBookmark(bmId); - if (bookmark != nullptr && [[MWMBookmarksManager sharedManager] isGuide:bookmark->GetGroupId()]) { - [Statistics logEvent:kStatGuidesBookmarkSelect - withParameters:@{kStatServerId: [[MWMBookmarksManager sharedManager] getServerId:bookmark->GetGroupId()]} - withChannel:StatisticsChannelRealtime]; - } - - // Same as "Close". - [MWMSearchManager manager].state = MWMSearchManagerStateHidden; - GetFramework().ShowBookmark(bmId); -} - -- (void)deleteRow:(NSInteger)row { - auto const bmId = [self markIdForRow:row]; - [[MWMBookmarksManager sharedManager] deleteBookmark:bmId]; - [self.markIds removeObjectAtIndex:row]; -} - -@end diff --git a/iphone/Maps/Bookmarks/BookmarksVC.h b/iphone/Maps/Bookmarks/BookmarksVC.h deleted file mode 100644 index 83e6a7c778..0000000000 --- a/iphone/Maps/Bookmarks/BookmarksVC.h +++ /dev/null @@ -1,25 +0,0 @@ -#import -#import "MWMViewController.h" - -NS_ASSUME_NONNULL_BEGIN - -@class BookmarksVC; - -@protocol BookmarksVCDelegate - -- (void)bookmarksVCdidUpdateCategory:(BookmarksVC *)viewController; -- (void)bookmarksVCdidDeleteCategory:(BookmarksVC *)viewController; -- (void)bookmarksVCdidViewOnMap:(BookmarksVC *)viewController categoryId:(MWMMarkGroupID)categoryId; - -@end - -@interface BookmarksVC : MWMViewController - -@property(nonatomic) MWMMarkGroupID categoryId; -@property(weak, nonatomic) id delegate; - -- (instancetype)initWithCategory:(MWMMarkGroupID)categoryId; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/BookmarksVC.mm b/iphone/Maps/Bookmarks/BookmarksVC.mm deleted file mode 100644 index 3df95d3187..0000000000 --- a/iphone/Maps/Bookmarks/BookmarksVC.mm +++ /dev/null @@ -1,825 +0,0 @@ -#import "BookmarksVC.h" -#import "BookmarksSection.h" -#import "InfoSection.h" -#import "MWMCategoryInfoCell.h" -#import "SwiftBridge.h" - -#import "MWMKeyboard.h" -#import "MWMLocationObserver.h" -#import "MWMSearchNoResults.h" -#import "TracksSection.h" -#import "MapViewController.h" - -#import - -#include "map/bookmarks_search_params.hpp" - -#include "geometry/mercator.hpp" - -#include "coding/zip_creator.hpp" -#include "coding/internal/file_data.hpp" - -#include -#include -#include - -using namespace std; - -@interface BookmarksVC () - -@property(strong, nonatomic) NSMutableArray> *defaultSections; -@property(strong, nonatomic) NSMutableArray> *searchSections; -@property(strong, nonatomic) InfoSection *infoSection; - -@property(nonatomic) NSUInteger lastSearchId; -@property(nonatomic) NSUInteger lastSortId; - -@property(weak, nonatomic) IBOutlet UIView *statusBarBackground; -@property(weak, nonatomic) IBOutlet UISearchBar *searchBar; -@property(weak, nonatomic) IBOutlet UIView *noResultsContainer; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint *noResultsBottom; -@property(nonatomic) MWMSearchNoResults *noResultsView; - -@property(nonatomic) UIActivityIndicatorView *spinner; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint *hideSearchBar; -@property(weak, nonatomic) IBOutlet NSLayoutConstraint *showSearchBar; - -@property(weak, nonatomic) IBOutlet UITableView * tableView; - -@property(weak, nonatomic) IBOutlet UIToolbar * myCategoryToolbar; -@property(weak, nonatomic) IBOutlet UIToolbar * downloadedCategoryToolbar; -@property(weak, nonatomic) IBOutlet UIBarButtonItem * viewOnMapItem; - -@property(nonatomic) UIActivityIndicatorView *sortSpinner; - -@property(weak, nonatomic) IBOutlet UIBarButtonItem *sortItem; -@property(weak, nonatomic) IBOutlet UIBarButtonItem *sortSpinnerItem; - -@property(weak, nonatomic) IBOutlet UIBarButtonItem *sortDownloadedItem; -@property(weak, nonatomic) IBOutlet UIBarButtonItem *sortDownloadedSpinnerItem; - -@property(weak, nonatomic) IBOutlet UIBarButtonItem * moreItem; -@end - -@implementation BookmarksVC - -- (instancetype)initWithCategory:(MWMMarkGroupID)categoryId { - self = [super init]; - if (self) - { - _categoryId = categoryId; - } - return self; -} - -- (BOOL)isEditable { - return [[MWMBookmarksManager sharedManager] isCategoryEditable:self.categoryId]; -} - -- (BOOL)hasInfo { - auto const &categoryData = GetFramework().GetBookmarkManager().GetCategoryData(_categoryId); - return !GetPreferredBookmarkStr(categoryData.m_description).empty() || - !GetPreferredBookmarkStr(categoryData.m_annotation).empty(); -} - -- (InfoSection *)cachedInfoSection -{ - if (self.infoSection == nil) - { - self.infoSection = [[InfoSection alloc] initWithCategoryId:self.categoryId - expanded:NO - observer:self]; - } - return self.infoSection; -} - -- (NSMutableArray> *)currentSections { - if (self.searchSections != nil) - return self.searchSections; - return self.defaultSections; -} - -- (void)setCategorySections { - if (self.defaultSections == nil) - self.defaultSections = [[NSMutableArray alloc] init]; - else - [self.defaultSections removeAllObjects]; - - self.infoSection = nil; - if ([self hasInfo]) - [self.defaultSections addObject:[self cachedInfoSection]]; - - MWMTrackIDCollection trackIds = [[MWMBookmarksManager sharedManager] trackIdsForCategory:self.categoryId]; - if (trackIds.count > 0) { - [self.defaultSections addObject:[[TracksSection alloc] - initWithTitle:L(@"tracks_title") - trackIds:trackIds - isEditable:[self isEditable]]]; - } - - MWMMarkIDCollection markIds = [[MWMBookmarksManager sharedManager] bookmarkIdsForCategory:self.categoryId]; - if (markIds.count > 0) { - [self.defaultSections addObject:[[BookmarksSection alloc] initWithTitle:L(@"bookmarks") - markIds:markIds - isEditable:[self isEditable]]]; - } -} - -- (void)setSortedSections:(BookmarkManager::SortedBlocksCollection const &)sortResults { - if (self.defaultSections == nil) - self.defaultSections = [[NSMutableArray alloc] init]; - else - [self.defaultSections removeAllObjects]; - - if ([self hasInfo]) - [self.defaultSections addObject:[self cachedInfoSection]]; - - for (auto const &block : sortResults) { - if (!block.m_markIds.empty()) { - [self.defaultSections addObject:[[BookmarksSection alloc] initWithTitle:@(block.m_blockName.c_str()) - markIds:[BookmarksVC bookmarkIds:block.m_markIds] - isEditable:[self isEditable]]]; - } else if (!block.m_trackIds.empty()) { - [self.defaultSections addObject:[[TracksSection alloc] initWithTitle:@(block.m_blockName.c_str()) - trackIds:[BookmarksVC trackIds:block.m_trackIds] - isEditable:[self isEditable]]]; - } - } -} - -- (void)setSearchSection:(search::BookmarksSearchParams::Results const &)searchResults { - if (self.searchSections == nil) { - self.searchSections = [[NSMutableArray alloc] init]; - } else { - [self.searchSections removeAllObjects]; - } - - [self.searchSections addObject:[[BookmarksSection alloc] initWithTitle:nil - markIds:[BookmarksVC bookmarkIds:searchResults] - isEditable:[self isEditable]]]; -} - -- (void)refreshDefaultSections { - [self setCategorySections]; - [self updateControlsVisibility]; - - auto const &bm = GetFramework().GetBookmarkManager(); - BookmarkManager::SortingType lastSortingType; - if (bm.GetLastSortingType(self.categoryId, lastSortingType)) { - auto const availableSortingTypes = [self availableSortingTypes]; - for (auto availableType : availableSortingTypes) { - if (availableType == lastSortingType) { - [self sort:lastSortingType]; - break; - } - } - } -} - -- (void)enableSortButton:(BOOL)enable -{ - if ([self isEditable]) - self.sortItem.enabled = enable; - else - self.sortDownloadedSpinnerItem.enabled = enable; -} - -- (void)updateControlsVisibility { - if ([[MWMBookmarksManager sharedManager] isCategoryNotEmpty:self.categoryId]) { - if ([self isEditable]) - self.navigationItem.rightBarButtonItem = self.editButtonItem; - [self enableSortButton:YES]; - } else { - self.navigationItem.rightBarButtonItem = nil; - [self enableSortButton:NO]; - } -} - -- (void)viewDidLoad { - [super viewDidLoad]; - - self.searchBar.delegate = self; - self.searchBar.placeholder = L(@"search_in_the_list"); - - [self.noResultsView setTranslatesAutoresizingMaskIntoConstraints:NO]; - - self.tableView.estimatedRowHeight = 44; - [self.tableView registerNibWithCellClass:MWMCategoryInfoCell.class]; - - auto regularTitleAttributes = @{ NSFontAttributeName: [UIFont regular16], - NSForegroundColorAttributeName: [UIColor linkBlue] }; - auto moreTitleAttributes = @{ NSFontAttributeName: [UIFont medium16], - NSForegroundColorAttributeName: [UIColor linkBlue] }; - - [self.moreItem setTitleTextAttributes:moreTitleAttributes forState:UIControlStateNormal]; - [self.sortItem setTitleTextAttributes:regularTitleAttributes forState:UIControlStateNormal]; - [self.sortDownloadedItem setTitleTextAttributes:regularTitleAttributes forState:UIControlStateNormal]; - [self.viewOnMapItem setTitleTextAttributes:regularTitleAttributes forState:UIControlStateNormal]; - - self.moreItem.title = L(@"placepage_more_button"); - self.sortItem.title = L(@"sort"); - self.sortDownloadedItem.title = L(@"sort"); - if ([self isEditable]) - self.sortSpinnerItem.customView = self.sortSpinner; - else - self.sortDownloadedSpinnerItem.customView = self.sortSpinner; - - self.viewOnMapItem.title = L(@"view_on_map_bookmarks"); - - self.myCategoryToolbar.barTintColor = [UIColor white]; - self.downloadedCategoryToolbar.barTintColor = [UIColor white]; -} - -- (void)viewWillAppear:(BOOL)animated { - [MWMLocationManager addObserver:self]; - - BOOL searchAllowed = [[MWMBookmarksManager sharedManager] isCategoryNotEmpty:self.categoryId] && - [[MWMBookmarksManager sharedManager] isSearchAllowed:self.categoryId]; - - if ([self isEditable]) { - self.myCategoryToolbar.hidden = NO; - self.downloadedCategoryToolbar.hidden = YES; - } else { - self.myCategoryToolbar.hidden = YES; - self.downloadedCategoryToolbar.hidden = NO; - } - self.showSearchBar.priority = searchAllowed ? UILayoutPriorityRequired - 1 : UILayoutPriorityDefaultLow; - self.hideSearchBar.priority = searchAllowed ? UILayoutPriorityDefaultLow : UILayoutPriorityRequired - 1; - - [super viewWillAppear:animated]; - - auto const &bm = GetFramework().GetBookmarkManager(); - self.title = @(bm.GetCategoryName(self.categoryId).c_str()); - - [self refreshDefaultSections]; - [self.tableView reloadData]; -} - -- (void)viewWillDisappear:(BOOL)animated { - [MWMLocationManager removeObserver:self]; - - // Save possibly edited set name - [super viewWillDisappear:animated]; -} - -- (void)viewDidAppear:(BOOL)animated { - // Disable all notifications in BM on appearance of this view. - // It allows to significantly improve performance in case of bookmarks - // modification. All notifications will be sent on controller's disappearance. - [[MWMBookmarksManager sharedManager] setNotificationsEnabled: NO]; - - [super viewDidAppear:animated]; -} - -- (void)viewDidDisappear:(BOOL)animated { - // Allow to send all notifications in BM. - [[MWMBookmarksManager sharedManager] setNotificationsEnabled: YES]; - - [super viewDidDisappear:animated]; -} - -- (IBAction)onMore:(UIBarButtonItem *)sender { - MWMTrackIDCollection trackIds = [[MWMBookmarksManager sharedManager] trackIdsForCategory:self.categoryId]; - MWMMarkIDCollection bookmarkdsIds = [[MWMBookmarksManager sharedManager] bookmarkIdsForCategory:self.categoryId]; - - auto actionSheet = [UIAlertController alertControllerWithTitle:nil - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; - - if (trackIds.count > 0 || bookmarkdsIds.count > 0) { - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"sharing_options") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [self shareCategory]; - [Statistics logEvent:kStatBookmarksListItemSettings - withParameters:@{kStatOption: kStatSharingOptions}]; - }]]; - } - - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"search_show_on_map") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction * _Nonnull action) - { - [self viewOnMap]; - [Statistics logEvent:kStatBookmarksListItemMoreClick withParameters:@{kStatOption : kStatViewOnMap}]; - }]]; - - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"list_settings") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction * _Nonnull action) - { - [self openCategorySettings]; - [Statistics logEvent:kStatBookmarksListItemMoreClick withParameters:@{kStatOption : kStatSettings}]; - }]]; - - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"export_file") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction * _Nonnull action) - { - [self exportFile]; - [Statistics logEvent:kStatBookmarksListItemMoreClick withParameters:@{kStatOption : kStatSendAsFile}]; - }]]; - - auto deleteAction = [UIAlertAction actionWithTitle:L(@"delete_list") - style:UIAlertActionStyleDestructive - handler:^(UIAlertAction * _Nonnull action) - { - [[MWMBookmarksManager sharedManager] deleteCategory:self.categoryId]; - [self.delegate bookmarksVCdidDeleteCategory:self]; - [Statistics logEvent:kStatBookmarksListItemMoreClick withParameters:@{kStatOption : kStatDelete}]; - }]; - deleteAction.enabled = [[MWMBookmarksManager sharedManager] userCategories].count > 1; - [actionSheet addAction:deleteAction]; - - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"cancel") - style:UIAlertActionStyleCancel - handler:nil]]; - - actionSheet.popoverPresentationController.barButtonItem = self.moreItem; - [self presentViewController:actionSheet animated:YES completion:^{ - actionSheet.popoverPresentationController.passthroughViews = nil; - }]; - [Statistics logEvent:kStatBookmarksListItemSettings withParameters:@{kStatOption : kStatMore}]; -} - -- (IBAction)onViewOnMap:(UIBarButtonItem *)sender { - [self viewOnMap]; -} - -- (void)openCategorySettings { - auto settingsController = [[CategorySettingsViewController alloc] - initWithBookmarkGroup:[[MWMBookmarksManager sharedManager] categoryWithId:self.categoryId]]; - settingsController.delegate = self; - [self.navigationController pushViewController:settingsController animated:YES]; -} - -- (void)exportFile { - [[MWMBookmarksManager sharedManager] addObserver:self]; - [[MWMBookmarksManager sharedManager] shareCategory:self.categoryId]; -} - -- (void)shareCategory { - auto storyboard = [UIStoryboard instance:MWMStoryboardSharing]; - auto shareController = (BookmarksSharingViewController *)[storyboard instantiateInitialViewController]; - shareController.delegate = self; - shareController.category = [[MWMBookmarksManager sharedManager] categoryWithId:self.categoryId]; - [self.navigationController pushViewController:shareController animated:YES]; -} - -- (void)viewOnMap { - GetFramework().ShowBookmarkCategory(self.categoryId); - [self.delegate bookmarksVCdidViewOnMap:self categoryId:self.categoryId]; -} - -- (IBAction)onSort:(UIBarButtonItem *)sender { - auto actionSheet = [UIAlertController alertControllerWithTitle:nil - message:nil - preferredStyle:UIAlertControllerStyleActionSheet]; - - auto const sortingTypes = [self availableSortingTypes]; - - for (auto type : sortingTypes) { - [actionSheet addAction:[UIAlertAction actionWithTitle:[BookmarksVC localizedSortingType:type] - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - auto &bm = GetFramework().GetBookmarkManager(); - bm.SetLastSortingType(self.categoryId, type); - auto const option = [BookmarksVC statisticsSortingOption:type]; - [Statistics logEvent:kStatBookmarksListSort - withParameters:@{kStatOption: option}]; - [self sort:type]; - }]]; - } - - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"sort_default") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *_Nonnull action) { - [Statistics logEvent:kStatBookmarksListSort - withParameters:@{kStatOption: kStatSortByDefault}]; - [self sortDefault]; - }]]; - - [actionSheet addAction:[UIAlertAction actionWithTitle:L(@"cancel") style:UIAlertActionStyleCancel handler:nil]]; - - actionSheet.popoverPresentationController.barButtonItem = [self isEditable] ? self.sortItem - : self.sortDownloadedItem; - [self presentViewController:actionSheet - animated:YES - completion:^{ - actionSheet.popoverPresentationController.passthroughViews = nil; - }]; -} - -- (std::vector)availableSortingTypes { - CLLocation *lastLocation = [MWMLocationManager lastLocation]; - bool const hasMyPosition = lastLocation != nil; - auto const &bm = GetFramework().GetBookmarkManager(); - auto const sortingTypes = bm.GetAvailableSortingTypes(self.categoryId, hasMyPosition); - return sortingTypes; -} - -- (void)sortDefault { - auto &bm = GetFramework().GetBookmarkManager(); - bm.ResetLastSortingType(self.categoryId); - [self setCategorySections]; - [self.tableView reloadData]; -} - -- (void)sort:(BookmarkManager::SortingType)type { - bool hasMyPosition = false; - m2::PointD myPosition = m2::PointD::Zero(); - - if (type == BookmarkManager::SortingType::ByDistance) { - CLLocation *lastLocation = [MWMLocationManager lastLocation]; - if (!lastLocation) - return; - hasMyPosition = true; - myPosition = mercator::FromLatLon(lastLocation.coordinate.latitude, lastLocation.coordinate.longitude); - } - - auto const sortId = ++self.lastSortId; - __weak auto weakSelf = self; - - auto &bm = GetFramework().GetBookmarkManager(); - BookmarkManager::SortParams sortParams; - sortParams.m_groupId = self.categoryId; - sortParams.m_sortingType = type; - sortParams.m_hasMyPosition = hasMyPosition; - sortParams.m_myPosition = myPosition; - sortParams.m_onResults = [weakSelf, sortId](BookmarkManager::SortedBlocksCollection &&sortedBlocks, - BookmarkManager::SortParams::Status status) { - __strong auto self = weakSelf; - if (!self || sortId != self.lastSortId) - return; - - [self showSortSpinner:NO]; - [self enableSortButton:YES]; - - if (status == BookmarkManager::SortParams::Status::Completed) { - [self setSortedSections:sortedBlocks]; - [self.tableView reloadData]; - } - }; - - [self showSortSpinner:YES]; - [self enableSortButton:NO]; - - bm.GetSortedCategory(sortParams); -} - -- (UIActivityIndicatorView *)sortSpinner { - if (!_sortSpinner) { - _sortSpinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - _sortSpinner.hidesWhenStopped = YES; - } - return _sortSpinner; -} - -- (void)showSortSpinner:(BOOL)show { - if (show) - [self.sortSpinner startAnimating]; - else - [self.sortSpinner stopAnimating]; -} - -- (void)cancelSearch { - GetFramework().GetSearchAPI().CancelSearch(search::Mode::Bookmarks); - - [self showNoResultsView:NO]; - self.searchSections = nil; - [self refreshDefaultSections]; - [self.tableView reloadData]; -} - -- (MWMSearchNoResults *)noResultsView { - if (!_noResultsView) { - _noResultsView = [MWMSearchNoResults viewWithImage:[UIImage imageNamed:@"img_search_not_found"] - title:L(@"search_not_found") - text:L(@"search_not_found_query")]; - } - return _noResultsView; -} - -- (void)showNoResultsView:(BOOL)show { - if (!show) { - self.tableView.hidden = NO; - self.noResultsContainer.hidden = YES; - [self.noResultsView removeFromSuperview]; - } else { - self.tableView.hidden = YES; - self.noResultsContainer.hidden = NO; - [self.noResultsContainer addSubview:self.noResultsView]; - self.noResultsView.translatesAutoresizingMaskIntoConstraints = NO; - [NSLayoutConstraint activateConstraints:@[ - [self.noResultsView.topAnchor constraintEqualToAnchor:self.noResultsContainer.topAnchor], - [self.noResultsView.leftAnchor constraintEqualToAnchor:self.noResultsContainer.leftAnchor], - [self.noResultsView.bottomAnchor constraintEqualToAnchor:self.noResultsContainer.bottomAnchor], - [self.noResultsView.rightAnchor constraintEqualToAnchor:self.noResultsContainer.rightAnchor], - ]]; - [self onKeyboardAnimation]; - } -} - -- (UIActivityIndicatorView *)spinner { - if (!_spinner) { - _spinner = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleGray]; - _spinner.autoresizingMask = UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleBottomMargin; - _spinner.hidesWhenStopped = YES; - } - return _spinner; -} - -- (NSString *)categoryFileName { - return @(GetFramework().GetBookmarkManager().GetCategoryFileName(self.categoryId).c_str()); -} - -- (UIStatusBarStyle)preferredStatusBarStyle { - return UIStatusBarStyleLightContent; -} - -- (void)setEditing:(BOOL)editing animated:(BOOL)animated { - [super setEditing:editing animated:animated]; - [self.tableView setEditing:editing animated:animated]; -} - -#pragma mark - MWMBookmarkVC - -+ (MWMMarkIDCollection)bookmarkIds:(std::vector const &)markIds { - NSMutableArray *collection = [[NSMutableArray alloc] initWithCapacity:markIds.size()]; - for (auto const &markId : markIds) { - [collection addObject:@(markId)]; - } - return collection.copy; -} - -+ (MWMTrackIDCollection)trackIds:(std::vector const &)trackIds { - NSMutableArray *collection = [[NSMutableArray alloc] initWithCapacity:trackIds.size()]; - for (auto const &trackId : trackIds) { - [collection addObject:@(trackId)]; - } - return collection.copy; -} - -+ (NSString *)localizedSortingType:(BookmarkManager::SortingType)type { - switch (type) { - case BookmarkManager::SortingType::ByTime: - return L(@"sort_date"); - case BookmarkManager::SortingType::ByDistance: - return L(@"sort_distance"); - case BookmarkManager::SortingType::ByType: - return L(@"sort_type"); - } - UNREACHABLE(); -} - -+ (NSString *)statisticsSortingOption:(BookmarkManager::SortingType)type { - switch (type) { - case BookmarkManager::SortingType::ByTime: - return kStatSortByDate; - case BookmarkManager::SortingType::ByDistance: - return kStatSortByDistance; - case BookmarkManager::SortingType::ByType: - return kStatSortByType; - } - UNREACHABLE(); -} - -#pragma mark - UISearchBarDelegate - -- (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar { - [self.searchBar setShowsCancelButton:YES animated:YES]; - [self.navigationController setNavigationBarHidden:YES animated:YES]; - self.tableView.contentInset = self.tableView.scrollIndicatorInsets = {}; - - // Allow to send all notifications in BM. - [[MWMBookmarksManager sharedManager] setNotificationsEnabled:YES]; - [[MWMBookmarksManager sharedManager] prepareForSearch:self.categoryId]; - - return YES; -} - -- (BOOL)searchBarShouldEndEditing:(UISearchBar *)searchBar { - [self.searchBar setShowsCancelButton:NO animated:YES]; - [self.navigationController setNavigationBarHidden:NO animated:YES]; - self.tableView.contentInset = self.tableView.scrollIndicatorInsets = {}; - - // Disable all notifications in BM. - [[MWMBookmarksManager sharedManager] setNotificationsEnabled:NO]; - - return YES; -} - -- (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar { - self.searchBar.text = @""; - [self.searchBar resignFirstResponder]; - [self cancelSearch]; -} - -- (void)searchBar:(UISearchBar *)searchBar textDidChange:(NSString *)searchText { - if (!searchText || searchText.length == 0) { - [self cancelSearch]; - return; - } - - search::BookmarksSearchParams searchParams; - searchParams.m_query = searchText.UTF8String; - searchParams.m_groupId = self.categoryId; - - auto const searchId = ++self.lastSearchId; - __weak auto weakSelf = self; - searchParams.m_onStarted = [] {}; - searchParams.m_onResults = [weakSelf, searchId](search::BookmarksSearchParams::Results const &results, - search::BookmarksSearchParams::Status status) { - __strong auto self = weakSelf; - if (!self || searchId != self.lastSearchId) - return; - - auto const &bm = GetFramework().GetBookmarkManager(); - auto filteredResults = results; - bm.FilterInvalidBookmarks(filteredResults); - [self setSearchSection:filteredResults]; - - if (status == search::BookmarksSearchParams::Status::Completed) { - [self showNoResultsView:results.empty()]; - } - - [self.tableView reloadData]; - - [Statistics logEvent:kStatBookmarksSearch withParameters:@{kStatFrom : kStatBookmarksList}]; - }; - - GetFramework().GetSearchAPI().SearchInBookmarks(searchParams); -} - -#pragma mark - UITableViewDataSource - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return [[self currentSections] count]; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return [[self currentSections][section] numberOfRows]; -} - -- (nullable NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section { - return [[self currentSections][section] title]; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [[self currentSections][indexPath.section] tableView:tableView cellForRow:indexPath.row]; - return cell; -} - -- (nullable NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath { - if ([[self currentSections][indexPath.section] canSelect]) - return indexPath; - return nil; -} - -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { - // Remove cell selection - [self.tableView deselectRowAtIndexPath:indexPath animated:YES]; - id currentSection = [self currentSections][indexPath.section]; - [currentSection didSelectRow:indexPath.row]; - if (self.searchSections != nil) - [Statistics logEvent:kStatBookmarksSearchResultSelected withParameters:@{kStatFrom : kStatBookmarksList}]; - [self.searchBar resignFirstResponder]; - - [self.delegate bookmarksVCdidViewOnMap:self categoryId:self.categoryId]; -} - -- (BOOL)tableView:(UITableView *)tableView canEditRowAtIndexPath:(NSIndexPath *)indexPath { - return [[self currentSections][indexPath.section] canEdit]; -} - -- (void)tableView:(UITableView *)tableView willBeginEditingRowAtIndexPath:(NSIndexPath *)indexPath { - self.editing = YES; -} - -- (void)tableView:(UITableView *)tableView didEndEditingRowAtIndexPath:(nullable NSIndexPath *)indexPath { - self.editing = NO; -} - -- (void)tableView:(UITableView *)tableView - commitEditingStyle:(UITableViewCellEditingStyle)editingStyle - forRowAtIndexPath:(NSIndexPath *)indexPath { - if (![[self currentSections][indexPath.section] canEdit]) - return; - - if (editingStyle == UITableViewCellEditingStyleDelete) { - [[self currentSections][indexPath.section] deleteRow:indexPath.row]; - // In the case of search section editing reset cached default sections. - if (self.searchSections != nil) - self.defaultSections = nil; - [self updateControlsVisibility]; - } - - if ([[self currentSections][indexPath.section] numberOfRows] == 0) { - [[self currentSections] removeObjectAtIndex:indexPath.section]; - auto indexSet = [NSIndexSet indexSetWithIndex:indexPath.section]; - [self.tableView deleteSections:indexSet withRowAnimation:UITableViewRowAnimationFade]; - } else { - [self.tableView deleteRowsAtIndexPaths:@[indexPath] withRowAnimation:UITableViewRowAnimationFade]; - } - - auto const &bm = GetFramework().GetBookmarkManager(); - if (bm.GetUserMarkIds(self.categoryId).size() + bm.GetTrackIds(self.categoryId).size() == 0) { - self.navigationItem.rightBarButtonItem = nil; - [self setEditing:NO animated:YES]; - } -} - -#pragma mark - InfoSectionDelegate - -- (void)infoSectionUpdates:(void (^)(void))updates { - [self.tableView update:updates]; -} - -#pragma mark - MWMLocationObserver - -- (void)onLocationUpdate:(CLLocation *)location { - [self.tableView.visibleCells enumerateObjectsUsingBlock:^(UITableViewCell *cell, NSUInteger idx, BOOL *stop) { - auto const indexPath = [self.tableView indexPathForCell:cell]; - auto const §ion = [self currentSections][indexPath.section]; - if ([section respondsToSelector:@selector(updateCell:forRow:withNewLocation:)]) - [section updateCell:cell forRow:indexPath.row withNewLocation:location]; - }]; -} - -#pragma mark - MWMBookmarksObserver - -- (void)onBookmarksCategoryFilePrepared:(MWMBookmarksShareStatus)status { - switch (status) { - case MWMBookmarksShareStatusSuccess: { - auto shareController = [MWMActivityViewController - shareControllerForURL:[MWMBookmarksManager sharedManager].shareCategoryURL - message:L(@"share_bookmarks_email_body") - completionHandler:^(UIActivityType _Nullable activityType, BOOL completed, NSArray *_Nullable returnedItems, - NSError *_Nullable activityError) { - [[MWMBookmarksManager sharedManager] finishShareCategory]; - }]; - [shareController presentInParentViewController:self anchorView:self.view]; - break; - } - case MWMBookmarksShareStatusEmptyCategory: - [[MWMAlertViewController activeAlertController] presentInfoAlert:L(@"bookmarks_error_title_share_empty") - text:L(@"bookmarks_error_message_share_empty")]; - break; - case MWMBookmarksShareStatusArchiveError: - case MWMBookmarksShareStatusFileError: - [[MWMAlertViewController activeAlertController] presentInfoAlert:L(@"dialog_routing_system_error") - text:L(@"bookmarks_error_message_share_general")]; - break; - } - [[MWMBookmarksManager sharedManager] removeObserver:self]; -} - -#pragma mark - BookmarksSharingViewControllerDelegate - -- (void)didShareCategory { - [self.tableView reloadData]; -} - -#pragma mark - CategorySettingsViewControllerDelegate - -- (void)categorySettingsController:(CategorySettingsViewController *)viewController - didDelete:(MWMMarkGroupID)categoryId { - [self.delegate bookmarksVCdidDeleteCategory:self]; -} - -- (void)categorySettingsController:(CategorySettingsViewController *)viewController - didEndEditing:(MWMMarkGroupID)categoryId { - [self.navigationController popViewControllerAnimated:YES]; - [self.delegate bookmarksVCdidUpdateCategory:self]; - [self refreshDefaultSections]; - [self.tableView reloadData]; -} - -#pragma mark - MWMKeyboard - -- (void)onKeyboardAnimation { - self.noResultsBottom.constant = 0; - CGFloat const keyboardHeight = [MWMKeyboard keyboardHeight]; - if (keyboardHeight >= self.noResultsContainer.height) - return; - - self.noResultsBottom.constant = -keyboardHeight; -} - -#pragma mark - UIScrollViewDelegate - -- (void)scrollViewWillBeginDragging:(UIScrollView *)scrollView -{ - [self.searchBar resignFirstResponder]; -} - -@end diff --git a/iphone/Maps/Bookmarks/BookmarksVC.xib b/iphone/Maps/Bookmarks/BookmarksVC.xib deleted file mode 100644 index af322d1c52..0000000000 --- a/iphone/Maps/Bookmarks/BookmarksVC.xib +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift index 1291f48a45..0cd6d7b09b 100644 --- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift +++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksDataSource.swift @@ -38,7 +38,7 @@ class DownloadedBookmarksDataSource { func setCategory(visible: Bool, at index: Int) { let category = categories[index] - category.isVisible = visible + BookmarksManager.shared().setCategory(category.categoryId, isVisible: visible) } func deleteCategory(at index: Int) { diff --git a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift index 894905cd19..b826ac5e24 100644 --- a/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift +++ b/iphone/Maps/Bookmarks/Catalog/DownloadedBookmarksViewController.swift @@ -102,8 +102,7 @@ class DownloadedBookmarksViewController: MWMViewController { } private func openCategory(category: BookmarkGroup) { - let bmViewController = BookmarksVC(category: category.categoryId) - bmViewController.delegate = self + let bmViewController = BookmarksListBuilder.build(markGroupId: category.categoryId, bookmarksCoordinator: coordinator) MapViewController.topViewController().navigationController?.pushViewController(bmViewController, animated: true) } @@ -189,13 +188,3 @@ extension DownloadedBookmarksViewController: BMCCategoriesHeaderDelegate { tableView.reloadData() } } - -extension DownloadedBookmarksViewController: BookmarksVCDelegate { - func bookmarksVCdidUpdateCategory(_ viewController: BookmarksVC) { } - - func bookmarksVCdidDeleteCategory(_ viewController: BookmarksVC) { } - - func bookmarksVCdidView(onMap viewController: BookmarksVC, categoryId: MWMMarkGroupID) { - coordinator?.hide(categoryId: categoryId) - } -} diff --git a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift index de074d2939..079d90dc7b 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCView/BMCViewController.swift @@ -85,7 +85,7 @@ final class BMCViewController: MWMViewController { viewModel.shareCategoryFile(at: index) { switch $0 { case let .success(url): - let shareController = MWMActivityViewController.share(for: url, + let shareController = ActivityViewController.share(for: url, message: L("share_bookmarks_email_body")) { [weak self] _, _, _, _ in self?.viewModel?.finishShareCategory() @@ -115,15 +115,16 @@ final class BMCViewController: MWMViewController { } private func openCategory(category: BookmarkGroup) { - let bmViewController = BookmarksVC(category: category.categoryId) - bmViewController.delegate = self + let bmViewController = BookmarksListBuilder.build(markGroupId: category.categoryId, + bookmarksCoordinator: coordinator, + delegate: self) MapViewController.topViewController().navigationController?.pushViewController(bmViewController, animated: true) } private func setCategoryVisible(_ visible: Bool, at index: Int) { let category = viewModel.category(at: index) - category.isVisible = visible + BookmarksManager.shared().setCategory(category.categoryId, isVisible: visible) if let categoriesHeader = tableView.headerView(forSection: viewModel.sectionIndex(section: .categories)) as? BMCCategoriesHeader { categoriesHeader.isShowAll = viewModel.areAllCategoriesHidden() } @@ -382,17 +383,9 @@ extension BMCViewController: CategorySettingsViewControllerDelegate { } } -extension BMCViewController: BookmarksVCDelegate { - func bookmarksVCdidUpdateCategory(_ viewController: BookmarksVC) { - // for now we did necessary interface update in -viewWillAppear - } - - func bookmarksVCdidDeleteCategory(_ viewController: BookmarksVC) { +extension BMCViewController: BookmarksListDelegate { + func bookmarksListDidDeleteGroup() { guard let parentVC = parent else { return } navigationController?.popToViewController(parentVC, animated: true) } - - func bookmarksVCdidView(onMap viewController: BookmarksVC, categoryId: MWMMarkGroupID) { - coordinator?.hide(categoryId: categoryId) - } } diff --git a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift index 47669b2b4b..8459db1661 100644 --- a/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift +++ b/iphone/Maps/Bookmarks/Categories/BMCViewModel/BMCDefaultViewModel.swift @@ -263,7 +263,7 @@ extension BMCDefaultViewModel { } } -extension BMCDefaultViewModel: MWMBookmarksObserver { +extension BMCDefaultViewModel: BookmarksObserver { func onBackupStarted() { Statistics.logEvent(kStatBookmarksSyncStarted) } diff --git a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift index 09735f6b1a..df6b5b1a23 100644 --- a/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Category settings/CategorySettingsViewController.swift @@ -124,12 +124,12 @@ final class CategorySettingsViewController: MWMTableViewController { @objc func onSave() { view.endEditing(true) if let newName = newName, !newName.isEmpty { - bookmarkGroup.title = newName + BookmarksManager.shared().setCategory(bookmarkGroup.categoryId, name: newName) changesMade = true } if let newAnnotation = newAnnotation, !newAnnotation.isEmpty { - bookmarkGroup.detailedAnnotation = newAnnotation + BookmarksManager.shared().setCategory(bookmarkGroup.categoryId, description: newAnnotation) changesMade = true } diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift index 4a7e1fcb1a..7585de0bbb 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/BookmarksSharingViewController.swift @@ -468,7 +468,7 @@ extension BookmarksSharingViewController: UploadActionCellDelegate { Statistics.logEvent(kStatSharingOptionsClick, withParameters: [kStatItem : kStatCopyLink]) let message = String(coreFormat: L("share_bookmarks_email_body_link"), arguments: [url.absoluteString]) - let shareController = MWMActivityViewController.share(for: nil, message: message) { + let shareController = ActivityViewController.share(for: nil, message: message) { _, success, _, _ in if success { Statistics.logEvent(kStatSharingLinkSuccess, withParameters: [kStatFrom : kStatSharingOptions]) @@ -506,14 +506,14 @@ extension BookmarksSharingViewController: EditOnWebViewControllerDelegate { extension BookmarksSharingViewController: GuideSharingNameViewControllerDelegate { func viewController(_ viewController: GuideSharingNameViewController, didFinishEditing text: String) { - category.title = text + manager.setCategory(category.categoryId, name: text) showEditDescr() } } extension BookmarksSharingViewController: GuideSharingDescriptionViewControllerDelegate { func viewController(_ viewController: GuideSharingDescriptionViewController, didFinishEditing text: String) { - category.detailedAnnotation = text + manager.setCategory(category.categoryId, description: text) showSelectProperties() } } diff --git a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift index f29f05d8ed..851473478c 100644 --- a/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift +++ b/iphone/Maps/Bookmarks/Categories/Sharing/EditOnWebViewController.swift @@ -100,7 +100,7 @@ final class EditOnWebViewController: MWMViewController { let message = String(coreFormat: L("share_bookmarks_email_body_link"), arguments: [url.absoluteString]) - let shareController = MWMActivityViewController.share(for: nil, message: message) { + let shareController = ActivityViewController.share(for: nil, message: message) { [weak self] _, success, _, _ in if success { Statistics.logEvent(kStatSharingLinkSuccess, withParameters: [kStatFrom : kStatEditOnWeb]) diff --git a/iphone/Maps/Bookmarks/InfoSection.h b/iphone/Maps/Bookmarks/InfoSection.h deleted file mode 100644 index 3e0b02a33e..0000000000 --- a/iphone/Maps/Bookmarks/InfoSection.h +++ /dev/null @@ -1,19 +0,0 @@ -#import "TableSectionDataSource.h" - -NS_ASSUME_NONNULL_BEGIN - -@protocol InfoSectionDelegate - -- (void)infoSectionUpdates:(void (^)(void))updates; - -@end - -@interface InfoSection : NSObject - -- (instancetype)initWithCategoryId:(MWMMarkGroupID)categoryId - expanded:(BOOL)expanded - observer:(id)observer; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/InfoSection.mm b/iphone/Maps/Bookmarks/InfoSection.mm deleted file mode 100644 index 261d757a47..0000000000 --- a/iphone/Maps/Bookmarks/InfoSection.mm +++ /dev/null @@ -1,79 +0,0 @@ -#import "InfoSection.h" -#import "MWMCategoryInfoCell.h" - -#include - -@interface InfoSection () { - kml::MarkGroupId _categoryId; -} - -@property(nonatomic) BOOL infoExpanded; -@property(weak, nonatomic) id observer; -@property(strong, nonatomic) MWMCategoryInfoCell *infoCell; -@end - -@implementation InfoSection - -- (instancetype)initWithCategoryId:(MWMMarkGroupID)categoryId - expanded:(BOOL)expanded - observer:(id)observer { - self = [super init]; - if (self) { - _categoryId = categoryId; - _infoExpanded = expanded; - _observer = observer; - } - return self; -} - -- (NSInteger)numberOfRows { - return 1; -} - -- (nullable NSString *)title { - return L(@"placepage_place_description"); -} - -- (BOOL)canEdit { - return NO; -} - -- (BOOL)canSelect { - return NO; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row { - if (self.infoCell != nil) - return self.infoCell; - - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"MWMCategoryInfoCell"]; - CHECK(cell, ("Invalid category info cell.")); - - auto &bm = GetFramework().GetBookmarkManager(); - bool const categoryExists = bm.HasBmCategory(_categoryId); - CHECK(categoryExists, ("Nonexistent category")); - - self.infoCell = (MWMCategoryInfoCell *)cell; - auto const &categoryData = bm.GetCategoryData(_categoryId); - [self.infoCell updateWithCategoryData:categoryData delegate:self]; - self.infoCell.expanded = self.infoExpanded; - - return cell; -} - -- (void)didSelectRow:(NSInteger)row { -} - -- (void)deleteRow:(NSInteger)row { -} - -#pragma mark - InfoSectionDelegate - -- (void)categoryInfoCellDidPressMore:(MWMCategoryInfoCell *)cell { - _infoExpanded = YES; - [self.observer infoSectionUpdates:^{ - cell.expanded = YES; - }]; -} - -@end diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.h b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.h deleted file mode 100644 index 402b4d7cb8..0000000000 --- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.h +++ /dev/null @@ -1,27 +0,0 @@ -#import "MWMTableViewCell.h" - -NS_ASSUME_NONNULL_BEGIN - -namespace kml -{ -struct CategoryData; -} - -@class MWMCategoryInfoCell; - -@protocol MWMCategoryInfoCellDelegate - -- (void)categoryInfoCellDidPressMore:(MWMCategoryInfoCell *)cell; - -@end - -@interface MWMCategoryInfoCell : MWMTableViewCell - -@property (nonatomic) BOOL expanded; - -- (void)updateWithCategoryData:(kml::CategoryData const &)data - delegate:(id)delegate; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm deleted file mode 100644 index fb3b43aafe..0000000000 --- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.mm +++ /dev/null @@ -1,109 +0,0 @@ -#import "MWMCategoryInfoCell.h" -#import "SwiftBridge.h" - -#include "map/bookmark_helpers.hpp" - -#include "kml/types.hpp" -#include "kml/type_utils.hpp" - -@interface MWMCategoryInfoCell() - -@property (weak, nonatomic) IBOutlet UILabel * titleLabel; -@property (weak, nonatomic) IBOutlet UILabel * authorLabel; -@property (weak, nonatomic) IBOutlet UIButton * moreButton; -@property (weak, nonatomic) IBOutlet UITextView * infoTextView; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * infoToBottomConstraint; -@property (weak, nonatomic) IBOutlet NSLayoutConstraint * infoHeightConstraint; - -@property(copy, nonatomic) NSAttributedString *info; -@property(copy, nonatomic) NSAttributedString *shortInfo; -@property (weak, nonatomic) id delegate; - -@end - -@implementation MWMCategoryInfoCell - -- (void)awakeFromNib -{ - [super awakeFromNib]; - self.titleLabel.text = nil; - self.authorLabel.text = nil; - self.infoTextView.text = nil; -} - -- (void)setExpanded:(BOOL)expanded -{ - _expanded = expanded; - if (self.shortInfo.length > 0 && self.info.length > 0) - { - if (expanded) - self.infoTextView.attributedText = self.info; - else - self.infoTextView.attributedText = self.shortInfo; - } - - self.infoToBottomConstraint.active = expanded; - self.infoHeightConstraint.active = !expanded; - self.moreButton.hidden = expanded; -} - -- (void)updateWithCategoryData:(kml::CategoryData const &)data - delegate:(id)delegate -{ - self.delegate = delegate; - self.titleLabel.text = @(GetPreferredBookmarkStr(data.m_name).c_str()); - self.authorLabel.text = [NSString stringWithCoreFormat:L(@"author_name_by_prefix") - arguments:@[@(data.m_authorName.c_str())]]; - - auto infoHtml = @((GetPreferredBookmarkStr(data.m_description)).c_str()); - auto info = [[NSMutableAttributedString alloc] initWithHtmlString:infoHtml - baseFont:[UIFont regular14] - estimatedWidth:[UIScreen mainScreen].bounds.size.width - 32.0f]; - [info addAttribute: NSForegroundColorAttributeName - value:[UIColor blackPrimaryText] - range:NSMakeRange(0, [info length])]; - - auto shortInfoHtml = @(GetPreferredBookmarkStr(data.m_annotation).c_str()); - auto shortInfo = [[NSMutableAttributedString alloc] initWithHtmlString:[NSString stringWithFormat:@"%@", shortInfoHtml] - baseFont:[UIFont bold14] - estimatedWidth:[UIScreen mainScreen].bounds.size.width - 32.0f]; - [shortInfo addAttribute: NSForegroundColorAttributeName - value:[UIColor blackPrimaryText] - range:NSMakeRange(0, [shortInfo length])]; - - if (infoHtml.length > 0 && shortInfoHtml.length > 0) - { - [info insertAttributedString:shortInfo atIndex:0]; - self.info = info; - self.shortInfo = shortInfo; - self.infoTextView.attributedText = shortInfo; - } - else if (infoHtml.length > 0) - { - self.infoTextView.attributedText = info; - } - else - { - self.infoTextView.attributedText = shortInfo; - self.expanded = YES; - } -} - -- (void)prepareForReuse -{ - [super prepareForReuse]; - self.titleLabel.text = nil; - self.authorLabel.text = nil; - self.infoTextView.text = nil; - self.expanded = NO; - self.info = nil; - self.shortInfo = nil; - self.delegate = nil; -} - -- (IBAction)onMoreButton:(UIButton *)sender -{ - [self.delegate categoryInfoCellDidPressMore:self]; -} - -@end diff --git a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib b/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib deleted file mode 100644 index cea2fcb376..0000000000 --- a/iphone/Maps/Bookmarks/MWMCategoryInfoCell.xib +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/iphone/Maps/Bookmarks/TableSectionDataSource.h b/iphone/Maps/Bookmarks/TableSectionDataSource.h deleted file mode 100644 index e555fe8ce2..0000000000 --- a/iphone/Maps/Bookmarks/TableSectionDataSource.h +++ /dev/null @@ -1,23 +0,0 @@ -NS_ASSUME_NONNULL_BEGIN - -@class CLLocation; - -@protocol TableSectionDataSource - -- (NSInteger)numberOfRows; -- (nullable NSString *)title; -- (BOOL)canEdit; -- (BOOL)canSelect; - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row; - -- (void)didSelectRow:(NSInteger)row; -- (void)deleteRow:(NSInteger)row; - -@optional - -- (void)updateCell:(UITableViewCell *)cell forRow:(NSInteger)row withNewLocation:(CLLocation *)location; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/TracksSection.h b/iphone/Maps/Bookmarks/TracksSection.h deleted file mode 100644 index 98b7aa590a..0000000000 --- a/iphone/Maps/Bookmarks/TracksSection.h +++ /dev/null @@ -1,14 +0,0 @@ -#import -#import "TableSectionDataSource.h" - -NS_ASSUME_NONNULL_BEGIN - -@interface TracksSection : NSObject - -- (instancetype)initWithTitle:(nullable NSString *)title - trackIds:(MWMTrackIDCollection)trackIds - isEditable:(BOOL)isEditable; - -@end - -NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Bookmarks/TracksSection.mm b/iphone/Maps/Bookmarks/TracksSection.mm deleted file mode 100644 index 2bf94e8ab8..0000000000 --- a/iphone/Maps/Bookmarks/TracksSection.mm +++ /dev/null @@ -1,95 +0,0 @@ -#import "TracksSection.h" -#import -#import "legacy_bookmark_colors.h" -#import "Statistics.h" - -#include - -namespace { -CGFloat const kPinDiameter = 22.0f; -} // namespace - -@interface TracksSection () - -@property(copy, nonatomic, nullable) NSString *sectionTitle; -@property(strong, nonatomic) NSMutableArray *trackIds; -@property(nonatomic) BOOL isEditable; - -@end - -@implementation TracksSection - -- (instancetype)initWithTitle:(nullable NSString *)title - trackIds:(MWMTrackIDCollection)trackIds - isEditable:(BOOL)isEditable { - self = [super init]; - if (self) { - _sectionTitle = [title copy]; - _trackIds = [trackIds mutableCopy]; - _isEditable = isEditable; - } - return self; -} - -- (kml::TrackId)trackIdForRow:(NSInteger)row { - return static_cast(self.trackIds[row].unsignedLongLongValue); -} - -- (NSInteger)numberOfRows { - return [self.trackIds count]; -} - -- (nullable NSString *)title { - return self.sectionTitle; -} - -- (BOOL)canEdit { - return self.isEditable; -} - -- (BOOL)canSelect { - return YES; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRow:(NSInteger)row { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"TrackCell"]; - if (!cell) - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"TrackCell"]; - CHECK(cell, ("Invalid track cell.")); - - auto const &bm = GetFramework().GetBookmarkManager(); - - auto const trackId = [self trackIdForRow:row]; - Track const *track = bm.GetTrack(trackId); - cell.textLabel.text = @(track->GetName().c_str()); - std::string dist; - if (measurement_utils::FormatDistance(track->GetLengthMeters(), dist)) - cell.detailTextLabel.text = [NSString stringWithFormat:@"%@ %@", L(@"length"), @(dist.c_str())]; - else - cell.detailTextLabel.text = nil; - dp::Color const c = track->GetColor(0); - cell.imageView.image = ios_bookmark_ui_helper::ImageForTrack(c.GetRedF(), c.GetGreenF(), c.GetBlueF()); - return cell; -} - -- (void)didSelectRow:(NSInteger)row { - auto const trackId = [self trackIdForRow:row]; - - auto const track = GetFramework().GetBookmarkManager().GetTrack(trackId); - if (track != nullptr && [[MWMBookmarksManager sharedManager] isGuide:track->GetGroupId()]) { - [Statistics logEvent:kStatGuidesTrackSelect - withParameters:@{kStatServerId: [[MWMBookmarksManager sharedManager] getServerId:track->GetGroupId()]} - withChannel:StatisticsChannelRealtime]; - } - - GetFramework().ShowTrack(trackId); -} - -- (void)deleteRow:(NSInteger)row { - auto const trackId = [self trackIdForRow:row]; - auto &bm = GetFramework().GetBookmarkManager(); - bm.GetEditSession().DeleteTrack(trackId); - [self.trackIds removeObjectAtIndex:row]; -} - -@end diff --git a/iphone/Maps/Bridging-Header.h b/iphone/Maps/Bridging-Header.h index e4abbbeb54..95bf81782c 100644 --- a/iphone/Maps/Bridging-Header.h +++ b/iphone/Maps/Bridging-Header.h @@ -22,7 +22,6 @@ #import -#import "BookmarksVC.h" #import "CoreNotificationWrapper.h" #import "DeepLinkRouteStrategyAdapter.h" #import "EAGLView.h" diff --git a/iphone/Maps/Classes/MapViewController.mm b/iphone/Maps/Classes/MapViewController.mm index b625661344..d692bcef85 100644 --- a/iphone/Maps/Classes/MapViewController.mm +++ b/iphone/Maps/Classes/MapViewController.mm @@ -1,6 +1,5 @@ #import "MapViewController.h" #import -#import "BookmarksVC.h" #import "EAGLView.h" #import "MWMAuthorizationCommon.h" #import "MWMAuthorizationWebViewLoginViewController.h" diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.h b/iphone/Maps/Classes/Share/MWMActivityViewController.h index b86ae1dfa7..77fa4dc097 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.h +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.h @@ -1,21 +1,23 @@ @protocol MWMPlacePageObject; @class PlacePageData; +NS_ASSUME_NONNULL_BEGIN + +NS_SWIFT_NAME(ActivityViewController) @interface MWMActivityViewController : UIActivityViewController -+ (instancetype)shareControllerForEditorViral; ++ (nullable instancetype)shareControllerForEditorViral; -+ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location; ++ (nullable instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location; -+ (instancetype)shareControllerForPlacePageObject:(id)object; ++ (nullable instancetype)shareControllerForPlacePage:(PlacePageData *)data; -+ (instancetype)shareControllerForPlacePage:(PlacePageData *)data; - -+ (instancetype)shareControllerForURL:(NSURL * _Nullable)url ++ (nullable instancetype)shareControllerForURL:(nullable NSURL *)url message:(NSString *)message - completionHandler: - (_Nullable UIActivityViewControllerCompletionWithItemsHandler)completionHandler; + completionHandler:(nullable UIActivityViewControllerCompletionWithItemsHandler)completionHandler; -- (void)presentInParentViewController:(UIViewController *)parentVC anchorView:(UIView *)anchorView; +- (void)presentInParentViewController:(UIViewController *)parentVC anchorView:(nullable UIView *)anchorView; @end + +NS_ASSUME_NONNULL_END diff --git a/iphone/Maps/Classes/Share/MWMActivityViewController.mm b/iphone/Maps/Classes/Share/MWMActivityViewController.mm index 846b355da5..224a6f5306 100644 --- a/iphone/Maps/Classes/Share/MWMActivityViewController.mm +++ b/iphone/Maps/Classes/Share/MWMActivityViewController.mm @@ -4,81 +4,68 @@ @interface MWMActivityViewController () -@property (weak, nonatomic) UIViewController * ownerViewController; -@property (weak, nonatomic) UIView * anchorView; +@property(weak, nonatomic) UIViewController *ownerViewController; +@property(weak, nonatomic) UIView *anchorView; @end @implementation MWMActivityViewController -- (instancetype)initWithActivityItem:(id)activityItem -{ +- (instancetype)initWithActivityItem:(id)activityItem { return [self initWithActivityItems:@[activityItem]]; } -- (instancetype)initWithActivityItems:(NSArray *)activityItems -{ +- (instancetype)initWithActivityItems:(NSArray *)activityItems { self = [super initWithActivityItems:activityItems applicationActivities:nil]; if (self) - self.excludedActivityTypes = @[UIActivityTypePrint, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll, - UIActivityTypeAddToReadingList, UIActivityTypePostToFlickr, - UIActivityTypePostToVimeo]; + self.excludedActivityTypes = @[ + UIActivityTypePrint, UIActivityTypeAssignToContact, UIActivityTypeSaveToCameraRoll, + UIActivityTypeAddToReadingList, UIActivityTypePostToFlickr, UIActivityTypePostToVimeo + ]; return self; } -+ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location -{ - MWMShareActivityItem * item = [[MWMShareActivityItem alloc] initForMyPositionAtLocation:location]; ++ (instancetype)shareControllerForMyPosition:(CLLocationCoordinate2D)location { + MWMShareActivityItem *item = [[MWMShareActivityItem alloc] initForMyPositionAtLocation:location]; MWMActivityViewController *shareVC = [[self alloc] initWithActivityItem:item]; shareVC.excludedActivityTypes = [shareVC.excludedActivityTypes arrayByAddingObject:UIActivityTypeAirDrop]; return shareVC; } + (instancetype)shareControllerForPlacePage:(PlacePageData *)data { - MWMShareActivityItem * item = [[MWMShareActivityItem alloc] initForPlacePage:data]; + MWMShareActivityItem *item = [[MWMShareActivityItem alloc] initForPlacePage:data]; MWMActivityViewController *shareVC = [[self alloc] initWithActivityItem:item]; shareVC.excludedActivityTypes = [shareVC.excludedActivityTypes arrayByAddingObject:UIActivityTypeAirDrop]; return shareVC; } -+ (instancetype)shareControllerForPlacePageObject:(id)object -{ - NSAssert(false, @"deprecated"); - return nil; -} - + (instancetype)shareControllerForURL:(NSURL *)url message:(NSString *)message - completionHandler: - (UIActivityViewControllerCompletionWithItemsHandler)completionHandler -{ - NSMutableArray * items = [NSMutableArray arrayWithObject:message]; - if (url) [items addObject:url]; - MWMActivityViewController * shareVC = [[self alloc] initWithActivityItems:items.copy]; + completionHandler:(UIActivityViewControllerCompletionWithItemsHandler)completionHandler { + NSMutableArray *items = [NSMutableArray arrayWithObject:message]; + if (url) { + [items addObject:url]; + } + + MWMActivityViewController *shareVC = [[self alloc] initWithActivityItems:items.copy]; shareVC.excludedActivityTypes = [shareVC.excludedActivityTypes arrayByAddingObject:UIActivityTypePostToFacebook]; shareVC.completionWithItemsHandler = completionHandler; return shareVC; } -+ (instancetype)shareControllerForEditorViral -{ - MWMEditorViralActivityItem * item = [[MWMEditorViralActivityItem alloc] init]; - UIImage * image = [UIImage imageNamed:@"img_sharing_editor"]; - MWMActivityViewController * vc = [[self alloc] initWithActivityItems:@[item, image]]; - if ([vc respondsToSelector:@selector(popoverPresentationController)]) - vc.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionDown; ++ (instancetype)shareControllerForEditorViral { + MWMEditorViralActivityItem *item = [[MWMEditorViralActivityItem alloc] init]; + UIImage *image = [UIImage imageNamed:@"img_sharing_editor"]; + MWMActivityViewController *vc = [[self alloc] initWithActivityItems:@[item, image]]; + vc.popoverPresentationController.permittedArrowDirections = UIPopoverArrowDirectionDown; return vc; } -- (void)presentInParentViewController:(UIViewController *)parentVC anchorView:(UIView *)anchorView -{ +- (void)presentInParentViewController:(UIViewController *)parentVC anchorView:(UIView *)anchorView { self.ownerViewController = parentVC; self.anchorView = anchorView; - if ([self respondsToSelector:@selector(popoverPresentationController)]) - { - self.popoverPresentationController.sourceView = anchorView; - self.popoverPresentationController.sourceRect = anchorView.bounds; - } + self.popoverPresentationController.sourceView = anchorView; + self.popoverPresentationController.sourceRect = anchorView.bounds; [parentVC presentViewController:self animated:YES completion:nil]; } diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index c4edf6b11e..db4bf84795 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -321,7 +321,6 @@ 4715273524907F8200E91BBA /* BookmarkColorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4715273424907F8200E91BBA /* BookmarkColorViewController.swift */; }; 471527372491C20500E91BBA /* SelectBookmarkGroupViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 471527362491C20500E91BBA /* SelectBookmarkGroupViewController.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 */; }; 4719A645219CBD65009F9AA7 /* IPendingTransactionsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A644219CBD65009F9AA7 /* IPendingTransactionsHandler.swift */; }; 4719A647219CBD7F009F9AA7 /* IBillingPendingTransaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4719A646219CBD7F009F9AA7 /* IBillingPendingTransaction.swift */; }; @@ -407,6 +406,19 @@ 47C8789A22DF622400A772DA /* SubscriptionFailViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47C8789822DF622400A772DA /* SubscriptionFailViewController.xib */; }; 47C8789D22DF662700A772DA /* SubscriptionExpiredViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47C8789B22DF662700A772DA /* SubscriptionExpiredViewController.swift */; }; 47C8789E22DF662700A772DA /* SubscriptionExpiredViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47C8789C22DF662700A772DA /* SubscriptionExpiredViewController.xib */; }; + 47CA68D12500435E00671019 /* BookmarksListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68CF2500435D00671019 /* BookmarksListViewController.swift */; }; + 47CA68D22500435E00671019 /* BookmarksListViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47CA68D02500435D00671019 /* BookmarksListViewController.xib */; }; + 47CA68D4250043C000671019 /* BookmarksListPresenter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68D3250043C000671019 /* BookmarksListPresenter.swift */; }; + 47CA68D62500448D00671019 /* BookmarksListInteractor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68D52500448D00671019 /* BookmarksListInteractor.swift */; }; + 47CA68D8250044C500671019 /* BookmarksListRouter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68D7250044C500671019 /* BookmarksListRouter.swift */; }; + 47CA68DA2500469400671019 /* BookmarksListBuilder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68D92500469400671019 /* BookmarksListBuilder.swift */; }; + 47CA68F1250B54AF00671019 /* BookmarkCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68EF250B54AE00671019 /* BookmarkCell.swift */; }; + 47CA68F2250B54AF00671019 /* BookmarkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47CA68F0250B54AE00671019 /* BookmarkCell.xib */; }; + 47CA68F5250B550C00671019 /* TrackCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68F3250B550C00671019 /* TrackCell.swift */; }; + 47CA68F6250B550C00671019 /* TrackCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47CA68F4250B550C00671019 /* TrackCell.xib */; }; + 47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68F7250F8AB600671019 /* BookmarksListSectionHeader.swift */; }; + 47CA68FA250F8AD100671019 /* BookmarksListSectionHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47CA68F9250F8AD100671019 /* BookmarksListSectionHeader.xib */; }; + 47CA68FC250F99E500671019 /* BookmarksListCellStrategy.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68FB250F99E500671019 /* BookmarksListCellStrategy.swift */; }; 47CF2E6123BA090400D11C30 /* FacilitiesController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CF2E6023BA090400D11C30 /* FacilitiesController.swift */; }; 47CF2E6323BA0DD500D11C30 /* CopyLabel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CF2E6223BA0DD500D11C30 /* CopyLabel.swift */; }; 47D0026721999DA900F651A2 /* PendingTransactionsHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47D0026621999DA900F651A2 /* PendingTransactionsHandler.swift */; }; @@ -500,7 +512,6 @@ 6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = F64F4B731B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm */; }; 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 */; }; 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 */; }; @@ -735,8 +746,6 @@ B32FE74020D2844600EF7446 /* DownloadedBookmarksViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32FE73E20D2844600EF7446 /* DownloadedBookmarksViewController.swift */; }; B32FE74120D2844600EF7446 /* DownloadedBookmarksViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */; }; B32FE74320D2B09600EF7446 /* CatalogWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */; }; - B33D21AC20DA515800BAD749 /* MWMCategoryInfoCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = B33D21AA20DA515800BAD749 /* MWMCategoryInfoCell.mm */; }; - B33D21AD20DA515800BAD749 /* MWMCategoryInfoCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = B33D21AB20DA515800BAD749 /* MWMCategoryInfoCell.xib */; }; B33D21AF20DAF9F000BAD749 /* Toast.swift in Sources */ = {isa = PBXBuildFile; fileRef = B33D21AE20DAF9F000BAD749 /* Toast.swift */; }; B33D21B820E130D000BAD749 /* BookmarksTabViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B33D21B720E130D000BAD749 /* BookmarksTabViewController.swift */; }; B366130A20D5E2E000E7DC3E /* CatalogCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = B366130820D5E2E000E7DC3E /* CatalogCategoryCell.swift */; }; @@ -749,9 +758,6 @@ BB8123CF212C264700ADE512 /* Metal.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB8123CD212C264700ADE512 /* Metal.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; BB8123D0212C264700ADE512 /* MetalKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = BB8123CE212C264700ADE512 /* MetalKit.framework */; settings = {ATTRIBUTES = (Weak, ); }; }; BB8123D62130427E00ADE512 /* MetalContextFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB8123D52130427E00ADE512 /* MetalContextFactory.mm */; }; - BB87BF8A22FAF1CA008A8A72 /* TracksSection.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB87BF8922FAF1CA008A8A72 /* TracksSection.mm */; }; - BB87BF8D22FAF435008A8A72 /* InfoSection.mm in Sources */ = {isa = PBXBuildFile; fileRef = BB87BF8C22FAF435008A8A72 /* InfoSection.mm */; }; - BBED27022292F6C000788143 /* BookmarksSection.mm in Sources */ = {isa = PBXBuildFile; fileRef = BBED27012292F6C000788143 /* BookmarksSection.mm */; }; CD08887422B7ABB400C1368D /* MWMDiscoveryCollectionView.mm in Sources */ = {isa = PBXBuildFile; fileRef = CD08887322B7ABB400C1368D /* MWMDiscoveryCollectionView.mm */; }; CD4A1F132305872700F2A6B6 /* PromoBookingPresentationController.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD4A1F122305872700F2A6B6 /* PromoBookingPresentationController.swift */; }; CD4A1F1A230EADC100F2A6B6 /* CatalogConnectionErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD4A1F19230EADC100F2A6B6 /* CatalogConnectionErrorView.swift */; }; @@ -1459,7 +1465,6 @@ 4715273424907F8200E91BBA /* BookmarkColorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkColorViewController.swift; sourceTree = ""; }; 471527362491C20500E91BBA /* SelectBookmarkGroupViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelectBookmarkGroupViewController.swift; sourceTree = ""; }; 4716EAB921A325310029B886 /* IPaidRouteStatistics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPaidRouteStatistics.swift; sourceTree = ""; }; - 4716EAC021A6E0570029B886 /* BookmarksVC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksVC.xib; sourceTree = ""; }; 4716EACA21B01C270029B886 /* MWMUGCReviewSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMUGCReviewSource.h; sourceTree = ""; }; 4719A642219CB61D009F9AA7 /* BillingPendingTransaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BillingPendingTransaction.swift; sourceTree = ""; }; 4719A644219CBD65009F9AA7 /* IPendingTransactionsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IPendingTransactionsHandler.swift; sourceTree = ""; }; @@ -1558,6 +1563,19 @@ 47C8789822DF622400A772DA /* SubscriptionFailViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubscriptionFailViewController.xib; sourceTree = ""; }; 47C8789B22DF662700A772DA /* SubscriptionExpiredViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubscriptionExpiredViewController.swift; sourceTree = ""; }; 47C8789C22DF662700A772DA /* SubscriptionExpiredViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubscriptionExpiredViewController.xib; sourceTree = ""; }; + 47CA68CF2500435D00671019 /* BookmarksListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListViewController.swift; sourceTree = ""; }; + 47CA68D02500435D00671019 /* BookmarksListViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksListViewController.xib; sourceTree = ""; }; + 47CA68D3250043C000671019 /* BookmarksListPresenter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListPresenter.swift; sourceTree = ""; }; + 47CA68D52500448D00671019 /* BookmarksListInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListInteractor.swift; sourceTree = ""; }; + 47CA68D7250044C500671019 /* BookmarksListRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListRouter.swift; sourceTree = ""; }; + 47CA68D92500469400671019 /* BookmarksListBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListBuilder.swift; sourceTree = ""; }; + 47CA68EF250B54AE00671019 /* BookmarkCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkCell.swift; sourceTree = ""; }; + 47CA68F0250B54AE00671019 /* BookmarkCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarkCell.xib; sourceTree = ""; }; + 47CA68F3250B550C00671019 /* TrackCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackCell.swift; sourceTree = ""; }; + 47CA68F4250B550C00671019 /* TrackCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TrackCell.xib; sourceTree = ""; }; + 47CA68F7250F8AB600671019 /* BookmarksListSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListSectionHeader.swift; sourceTree = ""; }; + 47CA68F9250F8AD100671019 /* BookmarksListSectionHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksListSectionHeader.xib; sourceTree = ""; }; + 47CA68FB250F99E500671019 /* BookmarksListCellStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListCellStrategy.swift; sourceTree = ""; }; 47CF2E6023BA090400D11C30 /* FacilitiesController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FacilitiesController.swift; sourceTree = ""; }; 47CF2E6223BA0DD500D11C30 /* CopyLabel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CopyLabel.swift; sourceTree = ""; }; 47D0026621999DA900F651A2 /* PendingTransactionsHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PendingTransactionsHandler.swift; sourceTree = ""; }; @@ -1875,9 +1893,6 @@ B32FE73E20D2844600EF7446 /* DownloadedBookmarksViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadedBookmarksViewController.swift; sourceTree = ""; }; B32FE73F20D2844600EF7446 /* DownloadedBookmarksViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadedBookmarksViewController.xib; sourceTree = ""; }; B32FE74220D2B09600EF7446 /* CatalogWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogWebViewController.swift; sourceTree = ""; }; - B33D21A920DA515800BAD749 /* MWMCategoryInfoCell.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMCategoryInfoCell.h; sourceTree = ""; }; - B33D21AA20DA515800BAD749 /* MWMCategoryInfoCell.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMCategoryInfoCell.mm; sourceTree = ""; }; - B33D21AB20DA515800BAD749 /* MWMCategoryInfoCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MWMCategoryInfoCell.xib; sourceTree = ""; }; B33D21AE20DAF9F000BAD749 /* Toast.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Toast.swift; sourceTree = ""; }; B33D21B720E130D000BAD749 /* BookmarksTabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksTabViewController.swift; sourceTree = ""; }; B366130820D5E2E000E7DC3E /* CatalogCategoryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatalogCategoryCell.swift; sourceTree = ""; }; @@ -1891,13 +1906,6 @@ BB8123CE212C264700ADE512 /* MetalKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MetalKit.framework; path = System/Library/Frameworks/MetalKit.framework; sourceTree = SDKROOT; }; BB8123D42130427E00ADE512 /* MetalContextFactory.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MetalContextFactory.h; sourceTree = ""; }; BB8123D52130427E00ADE512 /* MetalContextFactory.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MetalContextFactory.mm; sourceTree = ""; }; - BB87BF8722FAEC82008A8A72 /* TableSectionDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TableSectionDataSource.h; sourceTree = ""; }; - BB87BF8822FAF125008A8A72 /* TracksSection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TracksSection.h; sourceTree = ""; }; - BB87BF8922FAF1CA008A8A72 /* TracksSection.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = TracksSection.mm; sourceTree = ""; }; - BB87BF8B22FAF3B8008A8A72 /* InfoSection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InfoSection.h; sourceTree = ""; }; - BB87BF8C22FAF435008A8A72 /* InfoSection.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = InfoSection.mm; sourceTree = ""; }; - BBED27002292F42000788143 /* BookmarksSection.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BookmarksSection.h; sourceTree = ""; }; - BBED27012292F6C000788143 /* BookmarksSection.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = BookmarksSection.mm; sourceTree = ""; }; CD08887222B7ABB400C1368D /* MWMDiscoveryCollectionView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MWMDiscoveryCollectionView.h; sourceTree = ""; }; CD08887322B7ABB400C1368D /* MWMDiscoveryCollectionView.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMDiscoveryCollectionView.mm; sourceTree = ""; }; CD08888322BCF1C800C1368D /* maps.me rel.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = "maps.me rel.entitlements"; sourceTree = ""; }; @@ -2199,8 +2207,6 @@ F6FE3C3A1CC5106500A73196 /* MWMPlaceDoesntExistAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlaceDoesntExistAlert.xib; sourceTree = ""; }; F6FEA82B1C58E89B007223CC /* MWMButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMButton.h; sourceTree = ""; }; F6FEA82C1C58E89B007223CC /* MWMButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMButton.m; sourceTree = ""; }; - 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 = ""; }; FA46DA2B12D4166E00968C36 /* countries.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = countries.txt; path = ../../data/countries.txt; sourceTree = SOURCE_ROOT; }; FA64D9A813F975AD00350ECF /* types.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = types.txt; path = ../../data/types.txt; sourceTree = SOURCE_ROOT; }; @@ -3589,6 +3595,34 @@ path = Dialogs; sourceTree = ""; }; + 47CA68CE2500425900671019 /* BookmarksList */ = { + isa = PBXGroup; + children = ( + 47CA68EE250B545C00671019 /* Cells */, + 47CA68CF2500435D00671019 /* BookmarksListViewController.swift */, + 47CA68D02500435D00671019 /* BookmarksListViewController.xib */, + 47CA68D3250043C000671019 /* BookmarksListPresenter.swift */, + 47CA68D52500448D00671019 /* BookmarksListInteractor.swift */, + 47CA68D7250044C500671019 /* BookmarksListRouter.swift */, + 47CA68D92500469400671019 /* BookmarksListBuilder.swift */, + ); + path = BookmarksList; + sourceTree = ""; + }; + 47CA68EE250B545C00671019 /* Cells */ = { + isa = PBXGroup; + children = ( + 47CA68FB250F99E500671019 /* BookmarksListCellStrategy.swift */, + 47CA68EF250B54AE00671019 /* BookmarkCell.swift */, + 47CA68F0250B54AE00671019 /* BookmarkCell.xib */, + 47CA68F3250B550C00671019 /* TrackCell.swift */, + 47CA68F4250B550C00671019 /* TrackCell.xib */, + 47CA68F7250F8AB600671019 /* BookmarksListSectionHeader.swift */, + 47CA68F9250F8AD100671019 /* BookmarksListSectionHeader.xib */, + ); + path = Cells; + sourceTree = ""; + }; 47E3C7232111E2F8008B3B27 /* Modal */ = { isa = PBXGroup; children = ( @@ -5021,22 +5055,10 @@ isa = PBXGroup; children = ( 991A726D250F6C320075348C /* GuideDescription */, + 47CA68CE2500425900671019 /* BookmarksList */, B32FE73D20D283D600EF7446 /* Catalog */, - FA36B80515403A4F004560CC /* BookmarksVC.h */, - FA36B80615403A4F004560CC /* BookmarksVC.mm */, - 4716EAC021A6E0570029B886 /* BookmarksVC.xib */, - B33D21A920DA515800BAD749 /* MWMCategoryInfoCell.h */, - B33D21AA20DA515800BAD749 /* MWMCategoryInfoCell.mm */, - B33D21AB20DA515800BAD749 /* MWMCategoryInfoCell.xib */, 3404F4A02028A6C00090E401 /* Categories */, B33D21B720E130D000BAD749 /* BookmarksTabViewController.swift */, - BBED27002292F42000788143 /* BookmarksSection.h */, - BBED27012292F6C000788143 /* BookmarksSection.mm */, - BB87BF8722FAEC82008A8A72 /* TableSectionDataSource.h */, - BB87BF8822FAF125008A8A72 /* TracksSection.h */, - BB87BF8922FAF1CA008A8A72 /* TracksSection.mm */, - BB87BF8B22FAF3B8008A8A72 /* InfoSection.h */, - BB87BF8C22FAF435008A8A72 /* InfoSection.mm */, 996D108924E3DBF2002DD0E2 /* BookmarksCoordinator.swift */, ); path = Bookmarks; @@ -5170,11 +5192,11 @@ 6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */, F6E2FE6D1E097BA00083EBEC /* _MWMOHHeaderCell.xib in Resources */, F6E2FE701E097BA00083EBEC /* _MWMOHSubCell.xib in Resources */, - 4716EAC121A6E0570029B886 /* BookmarksVC.xib in Resources */, F60C8BEF1FCED15A00DCF5FB /* DiscoverySearchCell.xib in Resources */, CD4A1F1C230EB43B00F2A6B6 /* CatalogConnectionErrorView.xib in Resources */, F65D1E1A20E4F11600FE31DD /* ugc_migration in Resources */, 4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */, + 47CA68D22500435E00671019 /* BookmarksListViewController.xib in Resources */, 34AB66141FC5AA320078E451 /* MWMNavigationInfoView.xib in Resources */, F61757E91FC72CDE000AD0D0 /* DiscoverySpinnerCell.xib in Resources */, 340E1EEC1E2F614400CE49BF /* Authorization.storyboard in Resources */, @@ -5249,6 +5271,7 @@ F6E2FD6E1E097BA00083EBEC /* MWMMapDownloaderSubplaceTableViewCell.xib in Resources */, 3477528B1F725002000D46A3 /* UGCAddReviewRatingCell.xib in Resources */, 471C448D2322A7C800C307EC /* SubscriptionGoToCatalogViewController.xib in Resources */, + 47CA68FA250F8AD100671019 /* BookmarksListSectionHeader.xib in Resources */, F6E2FD741E097BA00083EBEC /* MWMMapDownloaderTableViewCell.xib in Resources */, 349A13851DEC138C00C7DB60 /* MWMMobileInternetAlert.xib in Resources */, 34D3B04B1E389D05004100F9 /* MWMNoteCell.xib in Resources */, @@ -5261,9 +5284,11 @@ F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */, 342639361EA0E60A0025EB89 /* local_ads_symbols.txt in Resources */, 4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */, + 47CA68F2250B54AF00671019 /* BookmarkCell.xib in Resources */, 479D305722C627CB00D18278 /* PartnerBannerViewController.xib in Resources */, 337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */, F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */, + 47CA68F6250B550C00671019 /* TrackCell.xib in Resources */, 34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */, 33BCD61621777A7400CA30B4 /* BookmarksSharingFlow.storyboard in Resources */, F6E2FE011E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */, @@ -5337,7 +5362,6 @@ 6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */, 340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */, B32FE74120D2844600EF7446 /* DownloadedBookmarksViewController.xib in Resources */, - B33D21AD20DA515800BAD749 /* MWMCategoryInfoCell.xib in Resources */, 340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */, 6741A9421BF340DE002C974C /* sound-strings in Resources */, F69018BD1E9F7CB600B3C10B /* MWMAutoupdateController.xib in Resources */, @@ -5558,6 +5582,7 @@ 3404F49D2028A2430090E401 /* BMCActionsCreateCell.swift in Sources */, F6E2FD8F1E097BA00083EBEC /* MWMNoMapsViewController.mm in Sources */, 993DF12C23F6BDB100AC231A /* Theme.swift in Sources */, + 47CA68D8250044C500671019 /* BookmarksListRouter.swift in Sources */, F63AF50B1EA6213F00A1DB98 /* FilterRatingCell.swift in Sources */, 34D3B0421E389D05004100F9 /* MWMEditorTextTableViewCell.m in Sources */, 99F3EB1223F418C900C713F8 /* PlacePageInteractor.swift in Sources */, @@ -5620,7 +5645,6 @@ 34AB667D1FC5AA330078E451 /* MWMRoutePreview.mm in Sources */, 993DF11B23F6BDB100AC231A /* UIViewRenderer.swift in Sources */, 99C964302428C27A00E41723 /* PlacePageHeaderView.swift in Sources */, - B33D21AC20DA515800BAD749 /* MWMCategoryInfoCell.mm in Sources */, 9989273A2449E60200260CE2 /* BottomMenuViewController.swift in Sources */, 473CBF9B2164DD470059BD54 /* SettingsTableViewSelectableProgressCell.swift in Sources */, 99BFEF0224B48D7600A65F5B /* SubscriptionRouter.swift in Sources */, @@ -5642,7 +5666,6 @@ 6741A9CF1BF340DE002C974C /* MWMLocationAlert.m in Sources */, 474AC76C2139E4F2002F9BF9 /* RemoveAdsViewController.swift in Sources */, 34ABA62D1C2D57D500FE1BEC /* MWMInputPasswordValidator.m in Sources */, - BBED27022292F6C000788143 /* BookmarksSection.mm in Sources */, F6E2FDA11E097BA00083EBEC /* MWMEditorAdditionalNamesTableViewController.mm in Sources */, 999D3A67237BFA4600C5F7A8 /* SubscriptionViewBuilder.swift in Sources */, 4767CDA620AB1F6200BD8166 /* LeftAlignedIconButton.swift in Sources */, @@ -5689,6 +5712,7 @@ 99A906E523F6F7030005872B /* ActionBarViewController.swift in Sources */, 47B9065421C7FA400079C85E /* UIImageView+WebImage.m in Sources */, F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */, + 47CA68D4250043C000671019 /* BookmarksListPresenter.swift in Sources */, 34BBD6581F826F810070CA50 /* AuthorizationTransitioningManager.swift in Sources */, 33F7668F21A57CDF00A88B16 /* EditOnWebViewController.swift in Sources */, B366130A20D5E2E000E7DC3E /* CatalogCategoryCell.swift in Sources */, @@ -5756,12 +5780,12 @@ 6741A9E71BF340DE002C974C /* MWMCircularProgressView.m in Sources */, 34AC8FDB1EFC07FE00E7F910 /* UILabel+NumberOfVisibleLines.swift in Sources */, 9959C75C24599CCD008FD4FD /* DirectionView.swift in Sources */, + 47CA68D62500448D00671019 /* BookmarksListInteractor.swift in Sources */, 99B6A77F23684573002C94CB /* PromoDiscoveryBuilder.swift in Sources */, 4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */, 33E905462180C40900868CAC /* UIViewController+Authorization.swift in Sources */, CDCA2745223FCFD200167D87 /* SearchResultInfo.swift in Sources */, 349A13831DEC138C00C7DB60 /* MWMMobileInternetAlert.m in Sources */, - BB87BF8A22FAF1CA008A8A72 /* TracksSection.mm in Sources */, 6741A9EC1BF340DE002C974C /* MWMCircularProgress.m in Sources */, 478F6FA423C447E500054A53 /* ReviewView.swift in Sources */, 99A906EC23F6F7030005872B /* HotelDescriptionViewController.swift in Sources */, @@ -5796,7 +5820,7 @@ 56C74C391C74A3BC00B71B9F /* MWMInputEmailValidator.m in Sources */, 479603732446F17C00F3BDD0 /* User+AppleId.swift in Sources */, 993DF0CB23F6BD0600AC231A /* ElevationDetailsRouter.swift in Sources */, - 6741A9F51BF340DE002C974C /* BookmarksVC.mm in Sources */, + 47CA68FC250F99E500671019 /* BookmarksListCellStrategy.swift in Sources */, B33D21B820E130D000BAD749 /* BookmarksTabViewController.swift in Sources */, 3358607E217632A2006D11F2 /* BookmarksSharingViewController.swift in Sources */, 99CB34C5236B00FD001D28AD /* WelcomeStorage.swift in Sources */, @@ -5805,7 +5829,6 @@ 993F5508237C622700545511 /* DeepLinkRouteStrategyAdapter.mm in Sources */, 99A906ED23F6F7030005872B /* PlacePagePreviewViewController.swift in Sources */, 993DF10223F6BDB100AC231A /* Colors.swift in Sources */, - BB87BF8D22FAF435008A8A72 /* InfoSection.mm in Sources */, 34AB66201FC5AA330078E451 /* RouteStartButton.swift in Sources */, 34F4072C1E9E1AFF00E57AC0 /* Banner.swift in Sources */, 99DEF9D723E420F6006BFD21 /* ElevationProfileDescriptionCell.swift in Sources */, @@ -5915,8 +5938,11 @@ 9948ADB424E14517003A826A /* PartnerBannerBuilder.swift in Sources */, F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */, 99EBF73024B4C89000FE1F1F /* AllPassSubscriptionBuilder.swift in Sources */, + 47CA68F5250B550C00671019 /* TrackCell.swift in Sources */, + 47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */, F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */, 47CF2E6323BA0DD500D11C30 /* CopyLabel.swift in Sources */, + 47CA68D12500435E00671019 /* BookmarksListViewController.swift in Sources */, 34AB66321FC5AA330078E451 /* RouteManagerHeaderView.swift in Sources */, 347040301EA6470700038379 /* BorderedButton.swift in Sources */, F6E2FF4B1E097BA00083EBEC /* SettingsTableViewSwitchCell.swift in Sources */, @@ -5958,6 +5984,7 @@ F6E2FE221E097BA00083EBEC /* MWMOpeningHoursEditorViewController.mm in Sources */, 999FC12B23ABB4B800B0E6F9 /* FontStyleSheet.swift in Sources */, 34943BBB1E2626B200B14F84 /* WelcomePageController.swift in Sources */, + 47CA68DA2500469400671019 /* BookmarksListBuilder.swift in Sources */, 34D3AFE21E376F7E004100F9 /* UITableView+Updates.swift in Sources */, 3404164C1E7BF42E00E2B6D6 /* UIView+Coordinates.swift in Sources */, 993F5510237C622700545511 /* DeepLinkRouteStrategy.swift in Sources */, @@ -5974,6 +6001,7 @@ 47E3C7332111F4D8008B3B27 /* CoverVerticalDismissalAnimator.swift in Sources */, 99E2B01E23698B0800FFABC5 /* WelcomeProtocols.swift in Sources */, 471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */, + 47CA68F1250B54AF00671019 /* BookmarkCell.swift in Sources */, 993F550F237C622700545511 /* DeepLinkMapStrategy.swift in Sources */, 471A7BC02481C82500A0D4C1 /* BookmarkTitleCell.swift in Sources */, 34AB661A1FC5AA330078E451 /* MWMTaxiCollectionLayout.m in Sources */, diff --git a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift index 121459f08b..c9b439b80f 100644 --- a/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift +++ b/iphone/Maps/UI/BottomMenu/Menu/BottomMenuInteractor.swift @@ -73,7 +73,8 @@ extension BottomMenuInteractor: BottomMenuInteractorProtocol { cancelButtonTitle: L("ok")).show() return; } - let vc = MWMActivityViewController.share(forMyPosition: coordinates) + guard let viewController = viewController else { return } + let vc = ActivityViewController.share(forMyPosition: coordinates) vc?.present(inParentViewController: viewController, anchorView: cell.anchorView) } } diff --git a/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift b/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift index 0a5c263ae3..1c12eb55d4 100644 --- a/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift +++ b/iphone/Maps/UI/EditBookmark/BookmarkUIUtils.swift @@ -11,11 +11,15 @@ extension BookmarkColor { func image(_ selected: Bool) -> UIImage { if selected { - return circleImageForColor(self, frameSize: 22, iconName: "ic_bm_none") + return circleImageForColor(color, frameSize: 22, iconName: "ic_bm_none") } else { - return circleImageForColor(self, frameSize: 22, diameter: 14) + return circleImageForColor(color, frameSize: 22, diameter: 14) } } + + func image(_ iconName: String) -> UIImage { + circleImageForColor(color, frameSize: 22, iconName: iconName) + } } fileprivate func titleForBookmarkColor(_ color: BookmarkColor) -> String { @@ -75,7 +79,7 @@ fileprivate func uiColorForBookmarkColor(_ color: BookmarkColor) -> UIColor { } } -func circleImageForColor(_ color: BookmarkColor, +func circleImageForColor(_ color: UIColor, frameSize: CGFloat, diameter: CGFloat? = nil, iconName: String? = nil) -> UIImage { @@ -84,7 +88,7 @@ func circleImageForColor(_ color: BookmarkColor, 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.setFillColor(color.cgColor) context.cgContext.fillPath() guard let iconName = iconName, let image = UIImage(named: iconName) else { return } diff --git a/iphone/Maps/UI/EditBookmark/EditBookmarkViewController.swift b/iphone/Maps/UI/EditBookmark/EditBookmarkViewController.swift index cc59ca2c77..9b1ba67ae3 100644 --- a/iphone/Maps/UI/EditBookmark/EditBookmarkViewController.swift +++ b/iphone/Maps/UI/EditBookmark/EditBookmarkViewController.swift @@ -80,7 +80,7 @@ final class EditBookmarkViewController: MWMTableViewController { 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") + cell.imageView?.image = circleImageForColor(bookmarkColor.color, frameSize: 28, diameter: 22, iconName: "ic_bm_none") return cell case .bookmarkGroup: let cell = tableView.dequeueDefaultCell(for: indexPath) diff --git a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift index 34f650fb45..4eafc4d967 100644 --- a/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift +++ b/iphone/Maps/UI/PlacePage/PlacePageInteractor.swift @@ -235,7 +235,7 @@ extension PlacePageInteractor: ActionBarViewControllerDelegate { case .routeTo: MWMPlacePageManagerHelper.route(to: placePageData) case .share: - let shareVC = MWMActivityViewController.share(forPlacePage: placePageData) + let shareVC = ActivityViewController.share(forPlacePage: placePageData) shareVC!.present(inParentViewController: MapViewController.shared(), anchorView: actionBar.popoverSourceView) Statistics.logEvent(kStatEventName(kStatPlacePage, kStatShare)) case .avoidToll: