diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h index f82add8a4a..a38abce067 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.h @@ -34,6 +34,8 @@ NS_SWIFT_NAME(BookmarkGroup) @property(nonatomic, readonly) MWMBookmarkGroupAccessStatus accessStatus; @property(nonatomic, readonly) NSArray *bookmarks; @property(nonatomic, readonly) NSArray *tracks; +@property(nonatomic, readonly) NSArray *collections; +@property(nonatomic, readonly) NSArray *categories; @end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m index f6d251a3d9..4cb01af7cb 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarkGroup.m @@ -88,4 +88,12 @@ return [self.manager tracksForGroup:self.categoryId]; } +- (NSArray *)collections { + return [self.manager collectionsForGroup:self.categoryId]; +} + +- (NSArray *)categories { + return [self.manager categoriesForGroup:self.categoryId]; +} + @end diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h index d1f5152e93..30c344ae21 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.h @@ -77,6 +77,8 @@ NS_SWIFT_NAME(BookmarksManager) - (void)deleteBookmark:(MWMMarkID)bookmarkId; - (NSArray *)bookmarksForGroup:(MWMMarkGroupID)groupId; - (NSArray *)tracksForGroup:(MWMMarkGroupID)groupId; +- (NSArray *)collectionsForGroup:(MWMMarkGroupID)groupId; +- (NSArray *)categoriesForGroup:(MWMMarkGroupID)groupId; - (void)searchBookmarksGroup:(MWMMarkGroupID)groupId text:(NSString *)text completion:(SearchBookmarksCompletionBlock)completion; diff --git a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm index 5c66b5d728..8456ba9235 100644 --- a/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm +++ b/iphone/CoreApi/CoreApi/Bookmarks/MWMBookmarksManager.mm @@ -633,6 +633,24 @@ static BookmarkManager::SortingType convertSortingTypeToCore(MWMBookmarksSorting return [result copy]; } +- (NSArray *)collectionsForGroup:(MWMMarkGroupID)groupId { + auto const &collectionIds = self.bm.GetChildrenCollections(groupId); + NSMutableArray *result = [NSMutableArray array]; + for (auto collectionId : collectionIds) { + [result addObject:[[MWMBookmarkGroup alloc] initWithCategoryId:collectionId bookmarksManager:self]]; + } + return [result copy]; +} + +- (NSArray *)categoriesForGroup:(MWMMarkGroupID)groupId { + auto const &categoryIds = self.bm.GetChildrenCategories(groupId); + NSMutableArray *result = [NSMutableArray array]; + for (auto categoryId : categoryIds) { + [result addObject:[[MWMBookmarkGroup alloc] initWithCategoryId:categoryId bookmarksManager:self]]; + } + return [result copy]; +} + #pragma mark - Category sharing - (void)shareCategory:(MWMMarkGroupID)groupId diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift index 332a6c67bd..cb4f98d0d6 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInfoViewController.swift @@ -14,7 +14,13 @@ protocol BookmarksListInfoViewControllerDelegate: AnyObject { } class BookmarksListInfoViewController: UIViewController { - var info: IBookmakrsListInfoViewModel! + var info: IBookmakrsListInfoViewModel? { + didSet { + guard isViewLoaded, let info = info else { return } + updateInfo(info) + } + } + weak var delegate: BookmarksListInfoViewControllerDelegate? @IBOutlet var titleImageView: UIImageView! @@ -32,6 +38,11 @@ class BookmarksListInfoViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() descriptionButton.setTitle(L("description_guide").uppercased(), for: .normal) + guard let info = info else { return } + updateInfo(info) + } + + private func updateInfo(_ info: IBookmakrsListInfoViewModel) { titleLabel.text = info.title authorLabel.text = String(coreFormat: L("author_name_by_prefix"), arguments: [info.author]) authorImageView.isHidden = !info.hasLogo diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift index 5f4b7ecf65..72d0c20408 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListInteractor.swift @@ -7,6 +7,7 @@ protocol IBookmarksListInteractor { func viewOnMap() func viewBookmarkOnMap(_ bookmarkId: MWMMarkID) func viewTrackOnMap(_ trackId: MWMTrackID) + func setGroup(_ groupId: MWMMarkGroupID, visible: Bool) func sort(_ sortingType: BookmarksListSortingType, location: CLLocation?, completion: @escaping ([BookmarksSection]) -> Void) @@ -127,6 +128,10 @@ extension BookmarksListInteractor: IBookmarksListInteractor { FrameworkHelper.showTrack(trackId) } + func setGroup(_ groupId: MWMMarkGroupID, visible: Bool) { + bookmarksManager.setCategory(groupId, isVisible: visible) + } + func sort(_ sortingType: BookmarksListSortingType, location: CLLocation?, completion: @escaping ([BookmarksSection]) -> Void) { diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift index df4a57ac64..165ce6b2d3 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListPresenter.swift @@ -7,7 +7,8 @@ protocol IBookmarksListPresenter { func sort() func more() func deleteBookmark(in section: IBookmarksListSectionViewModel, at index: Int) - func viewOnMap(in section: IBookmarksListSectionViewModel, at index: Int) + func selectItem(in section: IBookmarksListSectionViewModel, at index: Int) + func checkItem(in section: IBookmarksListSectionViewModel, at index: Int, checked: Bool) func showDescription() } @@ -57,6 +58,17 @@ final class BookmarksListPresenter { if !tracks.isEmpty { sections.append(TracksSectionViewModel(tracks: tracks)) } + + let collections = bookmarkGroup.collections.map { SubgroupViewModel($0) } + if !collections.isEmpty { + sections.append(SubgroupsSectionViewModel(title: L("collections"), subgroups: collections)) + } + + let categories = bookmarkGroup.categories.map { SubgroupViewModel($0)} + if !categories.isEmpty { + sections.append(SubgroupsSectionViewModel(title: L("categories"), subgroups: categories)) + } + let bookmarks = mapBookmarks(bookmarkGroup.bookmarks) if !bookmarks.isEmpty { sections.append(BookmarksSectionViewModel(title: L("bookmarks"), bookmarks: bookmarks)) @@ -243,7 +255,7 @@ extension BookmarksListPresenter: IBookmarksListPresenter { reload() } - func viewOnMap(in section: IBookmarksListSectionViewModel, at index: Int) { + func selectItem(in section: IBookmarksListSectionViewModel, at index: Int) { switch section { case let bookmarksSection as IBookmarksSectionViewModel: let bookmark = bookmarksSection.bookmarks[index] as! BookmarkViewModel @@ -255,8 +267,8 @@ extension BookmarksListPresenter: IBookmarksListPresenter { withParameters: [kStatServerId : bookmarkGroup.serverId], with: .realtime) } - case let trackSection as ITracksSectionViewModel: - let track = trackSection.tracks[index] as! TrackViewModel + case let tracksSection as ITracksSectionViewModel: + let track = tracksSection.tracks[index] as! TrackViewModel interactor.viewTrackOnMap(track.trackId) router.viewOnMap(bookmarkGroup) if bookmarkGroup.isGuide { @@ -264,6 +276,19 @@ extension BookmarksListPresenter: IBookmarksListPresenter { withParameters: [kStatServerId : bookmarkGroup.serverId], with: .realtime) } + case let subgroupsSection as ISubgroupsSectionViewModel: + let subgroup = subgroupsSection.subgroups[index] as! SubgroupViewModel + router.showSubgroup(subgroup.groupId) + default: + fatalError("Wrong section type: \(section.self)") + } + } + + func checkItem(in section: IBookmarksListSectionViewModel, at index: Int, checked: Bool) { + switch section { + case let subgroupsSection as ISubgroupsSectionViewModel: + let subgroup = subgroupsSection.subgroups[index] as! SubgroupViewModel + interactor.setGroup(subgroup.groupId, visible: checked) default: fatalError("Wrong section type: \(section.self)") } @@ -276,13 +301,23 @@ extension BookmarksListPresenter: IBookmarksListPresenter { extension BookmarksListPresenter: BookmarksSharingViewControllerDelegate { func didShareCategory() { - // TODO: update description + let info = BookmarksListInfo(title: bookmarkGroup.title, + author: bookmarkGroup.author, + hasDescription: bookmarkGroup.hasDescription, + imageUrl: bookmarkGroup.imageUrl, + hasLogo: bookmarkGroup.isLonelyPlanet) + view.setInfo(info) } } extension BookmarksListPresenter: CategorySettingsViewControllerDelegate { func categorySettingsController(_ viewController: CategorySettingsViewController, didEndEditing categoryId: MWMMarkGroupID) { - // TODO: update description + let info = BookmarksListInfo(title: bookmarkGroup.title, + author: bookmarkGroup.author, + hasDescription: bookmarkGroup.hasDescription, + imageUrl: bookmarkGroup.imageUrl, + hasLogo: bookmarkGroup.isLonelyPlanet) + view.setInfo(info) } func categorySettingsController(_ viewController: CategorySettingsViewController, didDelete categoryId: MWMMarkGroupID) { @@ -328,6 +363,20 @@ fileprivate struct TrackViewModel: ITrackViewModel { } } +fileprivate struct SubgroupViewModel: ISubgroupViewModel { + let groupId: MWMMarkGroupID + let subgroupName: String + let subtitle: String + let isVisible: Bool + + init(_ bookmarkGroup: BookmarkGroup) { + groupId = bookmarkGroup.categoryId + subgroupName = bookmarkGroup.title + subtitle = bookmarkGroup.placesCountTitle() + isVisible = bookmarkGroup.isVisible + } +} + fileprivate struct BookmarksSectionViewModel: IBookmarksSectionViewModel { let sectionTitle: String let bookmarks: [IBookmarkViewModel] @@ -339,13 +388,23 @@ fileprivate struct BookmarksSectionViewModel: IBookmarksSectionViewModel { } fileprivate struct TracksSectionViewModel: ITracksSectionViewModel { - var tracks: [ITrackViewModel] + let tracks: [ITrackViewModel] init(tracks: [ITrackViewModel]) { self.tracks = tracks } } +fileprivate struct SubgroupsSectionViewModel: ISubgroupsSectionViewModel { + let subgroups: [ISubgroupViewModel] + let sectionTitle: String + + init(title: String, subgroups: [ISubgroupViewModel]) { + sectionTitle = title + self.subgroups = subgroups + } +} + fileprivate struct BookmarksListMenuItem: IBookmarksListMenuItem { let title: String let destructive: Bool diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift index d12a025574..7818451708 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListRouter.swift @@ -3,6 +3,7 @@ protocol IBookmarksListRouter { func sharingOptions(_ bookmarkGroup: BookmarkGroup) func viewOnMap(_ bookmarkGroup: BookmarkGroup) func showDescription(_ bookmarkGroup: BookmarkGroup) + func showSubgroup(_ subgroupId: MWMMarkGroupID) } final class BookmarksListRouter { @@ -37,4 +38,10 @@ extension BookmarksListRouter: IBookmarksListRouter { let descriptionViewController = GuideDescriptionViewController(category: bookmarkGroup) mapViewController.navigationController?.pushViewController(descriptionViewController, animated: true) } + + func showSubgroup(_ subgroupId: MWMMarkGroupID) { + let bookmarksListViewController = BookmarksListBuilder.build(markGroupId: subgroupId, + bookmarksCoordinator: coordinator) + mapViewController.navigationController?.pushViewController(bookmarksListViewController, animated: true) + } } diff --git a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift index 9e007be61e..38ffbef73c 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/BookmarksListViewController.swift @@ -26,6 +26,16 @@ extension ITracksSectionViewModel { var canEdit: Bool { true } } +protocol ISubgroupsSectionViewModel: IBookmarksListSectionViewModel { + var subgroups: [ISubgroupViewModel] { get } +} + +extension ISubgroupsSectionViewModel { + var numberOfItems: Int { subgroups.count } + var hasVisibilityButton: Bool { true } + var canEdit: Bool { false } +} + protocol IBookmarkViewModel { var bookmarkName: String { get } var subtitle: String { get } @@ -38,6 +48,12 @@ protocol ITrackViewModel { var image: UIImage { get } } +protocol ISubgroupViewModel { + var subgroupName: String { get } + var subtitle: String { get } + var isVisible: Bool { get } +} + protocol IBookmarksListMenuItem { var title: String { get } var destructive: Bool { get } @@ -70,7 +86,14 @@ final class BookmarksListViewController: MWMViewController { @IBOutlet var sortToolbarItem: UIBarButtonItem! @IBOutlet var moreToolbarItem: UIBarButtonItem! - private var infoViewController: BookmarksListInfoViewController? + private lazy var infoViewController: BookmarksListInfoViewController = { + let infoViewController = BookmarksListInfoViewController() + infoViewController.delegate = self + addChild(infoViewController) + tableView.tableHeaderView = infoViewController.view + infoViewController.didMove(toParent: self) + return infoViewController + }() override func viewDidLoad() { super.viewDidLoad() @@ -83,6 +106,9 @@ final class BookmarksListViewController: MWMViewController { sortToolbarItem.title = L("sort") searchBar.placeholder = L("search_in_the_list") cellStrategy.registerCells(tableView) + cellStrategy.cellCheckHandler = { [weak self] (viewModel, index, checked) in + self?.presenter.checkItem(in: viewModel, at: index, checked: checked) + } presenter.viewDidLoad() } @@ -92,9 +118,7 @@ final class BookmarksListViewController: MWMViewController { } private func updateInfoSize() { - guard let infoView = infoViewController?.view else { - return - } + guard let infoView = infoViewController.view else { return } let infoViewSize = infoView.systemLayoutSizeFitting(CGSize(width: view.width, height: 0), withHorizontalFittingPriority: .required, verticalFittingPriority: .fittingSizeLevel) @@ -149,7 +173,7 @@ extension BookmarksListViewController: UITableViewDelegate { 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) + presenter.selectItem(in: section, at: indexPath.row) } func tableView(_ tableView: UITableView, canEditRowAt indexPath: IndexPath) -> Bool { @@ -208,13 +232,8 @@ extension BookmarksListViewController: IBookmarksListView { } func setInfo(_ info: IBookmakrsListInfoViewModel) { - let infoViewController = BookmarksListInfoViewController() infoViewController.info = info - infoViewController.delegate = self - addChild(infoViewController) - tableView.tableHeaderView = infoViewController.view - infoViewController.didMove(toParent: self) - self.infoViewController = infoViewController + updateInfoSize() } func setSections(_ sections: [IBookmarksListSectionViewModel]) { diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift index 4f446a4766..23c6bd001e 100644 --- a/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift @@ -2,12 +2,17 @@ final class BookmarksListCellStrategy { private enum CellId { static let track = "TrackCell" static let bookmark = "BookmarkCell" + static let subgroup = "SubgroupCell" static let sectionHeader = "SectionHeader" } + typealias CheckHandlerClosure = (IBookmarksListSectionViewModel, Int, Bool) -> Void + var cellCheckHandler: CheckHandlerClosure? + 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: "SubgroupCell", bundle: nil), forCellReuseIdentifier: CellId.subgroup) tableView.register(UINib(nibName: "BookmarksListSectionHeader", bundle: nil), forHeaderFooterViewReuseIdentifier: CellId.sectionHeader) } @@ -26,6 +31,14 @@ final class BookmarksListCellStrategy { let cell = tableView.dequeueReusableCell(withIdentifier: CellId.track, for: indexPath) as! TrackCell cell.config(track) return cell + case let subgroupsSection as ISubgroupsSectionViewModel: + let subgroup = subgroupsSection.subgroups[indexPath.row] + let cell = tableView.dequeueReusableCell(withIdentifier: CellId.subgroup, for: indexPath) as! SubgroupCell + cell.config(subgroup) + cell.checkHandler = { [weak self] checked in + self?.cellCheckHandler?(viewModel, indexPath.row, checked) + } + return cell default: fatalError("Unexpected item") } diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.swift b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.swift new file mode 100644 index 0000000000..e245d54c42 --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.swift @@ -0,0 +1,18 @@ +final class SubgroupCell: UITableViewCell { + @IBOutlet var subgroupTitleLabel: UILabel! + @IBOutlet var subgroupSubtitleLabel: UILabel! + @IBOutlet var subgroupVisibleMark: Checkmark! + + typealias CheckHandlerClosure = (Bool) -> Void + var checkHandler: CheckHandlerClosure? + + func config(_ subgroup: ISubgroupViewModel) { + subgroupTitleLabel.text = subgroup.subgroupName + subgroupSubtitleLabel.text = subgroup.subtitle + subgroupVisibleMark.isChecked = subgroup.isVisible + } + + @IBAction func onCheck(_ sender: Checkmark) { + checkHandler?(sender.isChecked) + } +} diff --git a/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib new file mode 100644 index 0000000000..c64cda6c9b --- /dev/null +++ b/iphone/Maps/Bookmarks/BookmarksList/Cells/SubgroupCell.xib @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/iphone/Maps/Classes/Components/Checkmark.swift b/iphone/Maps/Classes/Components/Checkmark.swift index e9814f211b..7777bd32d4 100644 --- a/iphone/Maps/Classes/Components/Checkmark.swift +++ b/iphone/Maps/Classes/Components/Checkmark.swift @@ -1,4 +1,3 @@ -@IBDesignable class Checkmark: UIControl { private let imageView = UIImageView(frame: .zero) diff --git a/iphone/Maps/Images.xcassets/Bookmarks/Contents.json b/iphone/Maps/Images.xcassets/Bookmarks/Contents.json index da4a164c91..73c00596a7 100644 --- a/iphone/Maps/Images.xcassets/Bookmarks/Contents.json +++ b/iphone/Maps/Images.xcassets/Bookmarks/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/iphone/Maps/Images.xcassets/Catalog/ic_disclosure.imageset/Contents.json b/iphone/Maps/Images.xcassets/Catalog/ic_disclosure.imageset/Contents.json new file mode 100644 index 0000000000..7da078d5e6 --- /dev/null +++ b/iphone/Maps/Images.xcassets/Catalog/ic_disclosure.imageset/Contents.json @@ -0,0 +1,15 @@ +{ + "images" : [ + { + "filename" : "Icon.pdf", + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/iphone/Maps/Images.xcassets/Catalog/ic_disclosure.imageset/Icon.pdf b/iphone/Maps/Images.xcassets/Catalog/ic_disclosure.imageset/Icon.pdf new file mode 100644 index 0000000000..63da85895b --- /dev/null +++ b/iphone/Maps/Images.xcassets/Catalog/ic_disclosure.imageset/Icon.pdf @@ -0,0 +1,162 @@ +%PDF-1.7 + +1 0 obj + << /BBox [ 0.000000 0.000000 24.000000 24.000000 ] + /Resources << /ExtGState << /E1 << /ca 0.120000 >> >> >> + /Subtype /Form + /Length 2 0 R + /Group << /Type /Group + /S /Transparency + >> + /Type /XObject + >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +/E1 gs +1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm +0.000000 0.000000 0.000000 scn +0.000000 24.000000 m +24.000000 24.000000 l +24.000000 0.000000 l +0.000000 0.000000 l +0.000000 24.000000 l +h +f* +n +Q + +endstream +endobj + +2 0 obj + 240 +endobj + +3 0 obj + << /BBox [ 0.000000 0.000000 24.000000 24.000000 ] + /Resources << >> + /Subtype /Form + /Length 4 0 R + /Group << /Type /Group + /S /Transparency + >> + /Type /XObject + >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +1.000000 0.000000 -0.000000 1.000000 8.000000 6.632812 cm +0.000000 0.000000 0.000000 scn +0.707106 10.160082 m +0.316582 10.550606 0.316582 11.183770 0.707107 11.574294 c +0.792893 11.660080 l +1.183417 12.050605 1.816582 12.050605 2.207107 11.660081 c +8.000000 5.867188 l +2.207107 0.074295 l +1.816583 -0.316230 1.183418 -0.316230 0.792893 0.074294 c +0.707107 0.160080 l +0.316583 0.550605 0.316583 1.183770 0.707107 1.574294 c +5.000000 5.867188 l +0.707106 10.160082 l +h +f* +n +Q + +endstream +endobj + +4 0 obj + 503 +endobj + +5 0 obj + << /XObject << /X1 1 0 R >> + /ExtGState << /E2 << /SMask << /Type /Mask + /G 3 0 R + /S /Alpha + >> + /Type /ExtGState + >> + /E1 << /ca 0.000025 >> + >> + >> +endobj + +6 0 obj + << /Length 7 0 R >> +stream +/DeviceRGB CS +/DeviceRGB cs +q +/E1 gs +1.000000 0.000000 -0.000000 1.000000 0.000000 0.000000 cm +1.000000 0.152955 0.152955 scn +0.000000 24.000000 m +24.000000 24.000000 l +24.000000 0.000000 l +0.000000 0.000000 l +0.000000 24.000000 l +h +f +n +Q +q +/E2 gs +/X1 Do +Q + +endstream +endobj + +7 0 obj + 257 +endobj + +8 0 obj + << /Annots [] + /Type /Page + /MediaBox [ 0.000000 0.000000 24.000000 24.000000 ] + /Resources 5 0 R + /Contents 6 0 R + /Parent 9 0 R + >> +endobj + +9 0 obj + << /Kids [ 8 0 R ] + /Count 1 + /Type /Pages + >> +endobj + +10 0 obj + << /Type /Catalog + /Pages 9 0 R + >> +endobj + +xref +0 11 +0000000000 65535 f +0000000010 00000 n +0000000538 00000 n +0000000560 00000 n +0000001311 00000 n +0000001333 00000 n +0000001689 00000 n +0000002002 00000 n +0000002024 00000 n +0000002197 00000 n +0000002271 00000 n +trailer +<< /ID [ (some) (id) ] + /Root 10 0 R + /Size 11 +>> +startxref +2331 +%%EOF \ No newline at end of file diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index b807d77a8d..0dd9a0f7ae 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -361,6 +361,8 @@ 475ED78424C7A5400063ADC7 /* GuestsPickerViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 475ED78224C7A5400063ADC7 /* GuestsPickerViewController.xib */; }; 475ED78624C7C7300063ADC7 /* ValueStepperViewRenderer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475ED78524C7C72F0063ADC7 /* ValueStepperViewRenderer.swift */; }; 475ED78824C7D0F30063ADC7 /* ValueStepperView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 475ED78724C7D0F30063ADC7 /* ValueStepperView.swift */; }; + 4761BE2A252D3DB900EE2DE4 /* SubgroupCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4761BE28252D3DB900EE2DE4 /* SubgroupCell.swift */; }; + 4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4761BE29252D3DB900EE2DE4 /* SubgroupCell.xib */; }; 4767CD9F20AAD48A00BD8166 /* Checkmark.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CD9E20AAD48A00BD8166 /* Checkmark.swift */; }; 4767CDA420AAF66B00BD8166 /* NSAttributedString+HTML.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CDA320AAF66B00BD8166 /* NSAttributedString+HTML.swift */; }; 4767CDA620AB1F6200BD8166 /* LeftAlignedIconButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4767CDA520AB1F6200BD8166 /* LeftAlignedIconButton.swift */; }; @@ -1512,6 +1514,8 @@ 475ED78224C7A5400063ADC7 /* GuestsPickerViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GuestsPickerViewController.xib; sourceTree = ""; }; 475ED78524C7C72F0063ADC7 /* ValueStepperViewRenderer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValueStepperViewRenderer.swift; sourceTree = ""; }; 475ED78724C7D0F30063ADC7 /* ValueStepperView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ValueStepperView.swift; sourceTree = ""; }; + 4761BE28252D3DB900EE2DE4 /* SubgroupCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SubgroupCell.swift; sourceTree = ""; }; + 4761BE29252D3DB900EE2DE4 /* SubgroupCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SubgroupCell.xib; sourceTree = ""; }; 4767CD9E20AAD48A00BD8166 /* Checkmark.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Checkmark.swift; sourceTree = ""; }; 4767CDA320AAF66B00BD8166 /* NSAttributedString+HTML.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSAttributedString+HTML.swift"; sourceTree = ""; }; 4767CDA520AB1F6200BD8166 /* LeftAlignedIconButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LeftAlignedIconButton.swift; sourceTree = ""; }; @@ -3625,6 +3629,8 @@ 47CA68F4250B550C00671019 /* TrackCell.xib */, 47CA68F7250F8AB600671019 /* BookmarksListSectionHeader.swift */, 47CA68F9250F8AD100671019 /* BookmarksListSectionHeader.xib */, + 4761BE28252D3DB900EE2DE4 /* SubgroupCell.swift */, + 4761BE29252D3DB900EE2DE4 /* SubgroupCell.xib */, ); path = Cells; sourceTree = ""; @@ -5233,6 +5239,7 @@ B366130B20D5E2E000E7DC3E /* CatalogCategoryCell.xib in Resources */, 4501B1942077C35A001B9173 /* resources-xxxhdpi_clear in Resources */, 3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */, + 4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */, 99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */, 349D1AD51E2E325B004A2006 /* BottomMenuItemCell.xib in Resources */, 349D1AE11E2E325C004A2006 /* BottomTabBarViewController.xib in Resources */, @@ -5758,6 +5765,7 @@ 475ED78824C7D0F30063ADC7 /* ValueStepperView.swift in Sources */, 3454D7E01E07F045004AF2AD /* UITextField+RuntimeAttributes.m in Sources */, 99AAEA78244DA9810039D110 /* BottomMenuTransitioningManager.swift in Sources */, + 4761BE2A252D3DB900EE2DE4 /* SubgroupCell.swift in Sources */, 1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */, 9989273B2449E60200260CE2 /* BottomMenuBuilder.swift in Sources */, 993DF10F23F6BDB100AC231A /* UIActivityIndicatorRenderer.swift in Sources */,