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

[ios] refactor: unify cells for tracks and bookmarks

Browse source 
Signed-off-by: Kiryl Kaveryn <kirylkaveryn@gmail.com>
This commit is contained in:
Kiryl Kaveryn 2024-03-02 14:15:04 +04:00 • committed by Alexander Borsuk
parent 20005c12f6
commit 2bd9e02d34
8 changed files with 66 additions and 206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.swift
View file

@ -1,24 +0,0 @@
final class BookmarkCell: UITableViewCell {
@IBOutlet private var bookmarkImageView: UIImageView!
@IBOutlet private var bookmarkTitleLabel: UILabel!
@IBOutlet private var bookmarkSubtitleLabel: UILabel!
private var bookmarkColorDidTapAction: (() -> Void)?
override func awakeFromNib() {
super.awakeFromNib()
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(colorDidTapAction(_:)))
bookmarkImageView.addGestureRecognizer(tapGesture)
}
func config(_ bookmark: IBookmarkViewModel) {
bookmarkImageView.image = bookmark.image
bookmarkTitleLabel.text = bookmark.bookmarkName
bookmarkSubtitleLabel.text = bookmark.subtitle
bookmarkColorDidTapAction = bookmark.colorDidTapAction
}
@objc private func colorDidTapAction(_ sender: UITapGestureRecognizer) {
bookmarkColorDidTapAction?()
}
}

69
iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarkCell.xib
View file

@ -1,69 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="64" id="KGk-i7-Jjw" customClass="BookmarkCell" customModule="OMaps" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="J5x-wl-wyb">
<rect key="frame" x="0.0" y="0.0" width="56" height="64"/>
<gestureRecognizers/>
<constraints>
<constraint firstAttribute="width" constant="56" id="cgW-tP-nDZ"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gva-mw-R4X">
<rect key="frame" x="56" y="10" width="256" height="19.5"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="CTi-lg-1FN">
<rect key="frame" x="56" y="33.5" width="256" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<constraints>
<constraint firstItem="gva-mw-R4X" firstAttribute="leading" secondItem="J5x-wl-wyb" secondAttribute="trailing" id="4Sj-TL-tLw"/>
<constraint firstItem="CTi-lg-1FN" firstAttribute="top" secondItem="gva-mw-R4X" secondAttribute="bottom" constant="4" id="CE8-tu-n8c"/>
<constraint firstItem="CTi-lg-1FN" firstAttribute="leading" secondItem="J5x-wl-wyb" secondAttribute="trailing" id="ICk-ht-M4I"/>
<constraint firstItem="gva-mw-R4X" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="IfL-W5-xFk"/>
<constraint firstItem="J5x-wl-wyb" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="LWq-t1-ard"/>
<constraint firstAttribute="bottom" secondItem="J5x-wl-wyb" secondAttribute="bottom" id="MHK-OI-xbC"/>
<constraint firstAttribute="trailing" secondItem="CTi-lg-1FN" secondAttribute="trailing" constant="8" id="Tfx-e5-f4F"/>
<constraint firstAttribute="trailing" secondItem="gva-mw-R4X" secondAttribute="trailing" constant="8" id="be0-aI-UnF"/>
<constraint firstAttribute="bottom" secondItem="CTi-lg-1FN" secondAttribute="bottom" constant="10" id="fhv-wI-3Wc"/>
<constraint firstItem="J5x-wl-wyb" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="wdu-mK-q0j"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<gestureRecognizers/>
<connections>
<outlet property="bookmarkImageView" destination="J5x-wl-wyb" id="JIb-pt-prZ"/>
<outlet property="bookmarkSubtitleLabel" destination="CTi-lg-1FN" id="5IW-bp-l8N"/>
<outlet property="bookmarkTitleLabel" destination="gva-mw-R4X" id="qkC-rD-C0N"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="104.12946428571428"/>
</tableViewCell>
</objects>
</document>

8
iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.swift Normal file
View file

@ -0,0 +1,8 @@
final class BookmarksListCell: UITableViewCell {
func config(_ bookmark: IBookmarksListItemViewModel) {
imageView?.image = bookmark.image
textLabel?.text = bookmark.name
detailTextLabel?.text = bookmark.subtitle
}
}

46
iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCell.xib Normal file
View file

@ -0,0 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22504"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="QgU-jK-sWK" detailTextLabel="zC9-YD-CfS" rowHeight="64" style="IBUITableViewCellStyleSubtitle" id="KGk-i7-Jjw" customClass="BookmarksListCell" customModule="Organic_Maps" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="QgU-jK-sWK">
<rect key="frame" x="16" y="16" width="25" height="14.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="0.0"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Subtitle" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="zC9-YD-CfS">
<rect key="frame" x="16" y="32.5" width="44" height="14.5"/>
<autoresizingMask key="autoresizingMask"/>
<fontDescription key="fontDescription" type="system" pointSize="0.0"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<point key="canvasLocation" x="137.68115942028987" y="104.12946428571428"/>
</tableViewCell>
</objects>
</document>

10
iphone/Maps/Bookmarks/BookmarksList/Cells/BookmarksListCellStrategy.swift
View file

@ -1,7 +1,6 @@
final class BookmarksListCellStrategy {
private enum CellId {
static let track = "TrackCell"
static let bookmark = "BookmarkCell"
static let listItem = "BookmarksListCell"
static let subgroup = "SubgroupCell"
static let sectionHeader = "SectionHeader"
}
@ -13,8 +12,7 @@ final class BookmarksListCellStrategy {
var cellVisibilityHandler: VisibilityHandlerClosure?
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: "BookmarksListCell", bundle: nil), forCellReuseIdentifier: CellId.listItem)
tableView.register(UINib(nibName: "SubgroupCell", bundle: nil), forCellReuseIdentifier: CellId.subgroup)
tableView.register(UINib(nibName: "BookmarksListSectionHeader", bundle: nil),
forHeaderFooterViewReuseIdentifier: CellId.sectionHeader)
@ -26,12 +24,12 @@ final class BookmarksListCellStrategy {
switch viewModel {
case let bookmarksSection as IBookmarksSectionViewModel:
let bookmark = bookmarksSection.bookmarks[indexPath.row]
let cell = tableView.dequeueReusableCell(withIdentifier: CellId.bookmark, for: indexPath) as! BookmarkCell
let cell = tableView.dequeueReusableCell(withIdentifier: CellId.listItem, for: indexPath) as! BookmarksListCell
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
let cell = tableView.dequeueReusableCell(withIdentifier: CellId.listItem, for: indexPath) as! BookmarksListCell
cell.config(track)
return cell
case let subgroupsSection as ISubgroupsSectionViewModel:

24
iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.swift
View file

@ -1,24 +0,0 @@
final class TrackCell: UITableViewCell {
@IBOutlet private var trackImageView: UIImageView!
@IBOutlet private var trackTitleLabel: UILabel!
@IBOutlet private var trackSubtitleLabel: UILabel!
private var trackColorDidTapAction: (() -> Void)?
override func awakeFromNib() {
super.awakeFromNib()
let tapGesture = UITapGestureRecognizer(target: self, action: #selector(colorDidTapAction(_:)))
trackImageView.addGestureRecognizer(tapGesture)
}
func config(_ track: ITrackViewModel) {
trackImageView.image = track.image
trackTitleLabel.text = track.trackName
trackSubtitleLabel.text = track.subtitle
trackColorDidTapAction = track.colorDidTapAction
}
@objc private func colorDidTapAction(_ sender: UITapGestureRecognizer) {
trackColorDidTapAction?()
}
}

67
iphone/Maps/Bookmarks/BookmarksList/Cells/TrackCell.xib
View file

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="64" id="kve-wa-hdM" customClass="TrackCell" customModule="OMaps" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kve-wa-hdM" id="Zyw-OQ-9pw">
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4MZ-Tg-LGR">
<rect key="frame" x="0.0" y="0.0" width="56" height="64"/>
<constraints>
<constraint firstAttribute="width" constant="56" id="DbI-Xy-IiN"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="4U2-bb-KSI">
<rect key="frame" x="56" y="10" width="256" height="19.5"/>
<fontDescription key="fontDescription" type="system" pointSize="16"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nud-Gn-Txa">
<rect key="frame" x="56" y="33.5" width="256" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
</subviews>
<constraints>
<constraint firstItem="4MZ-Tg-LGR" firstAttribute="leading" secondItem="Zyw-OQ-9pw" secondAttribute="leading" id="8Yj-Op-7j2"/>
<constraint firstItem="4U2-bb-KSI" firstAttribute="leading" secondItem="4MZ-Tg-LGR" secondAttribute="trailing" id="Hia-uA-fMu"/>
<constraint firstAttribute="trailing" secondItem="nud-Gn-Txa" secondAttribute="trailing" constant="8" id="Odq-Xk-Y1B"/>
<constraint firstItem="4U2-bb-KSI" firstAttribute="top" secondItem="Zyw-OQ-9pw" secondAttribute="top" constant="10" id="S7K-hG-31d"/>
<constraint firstAttribute="trailing" secondItem="4U2-bb-KSI" secondAttribute="trailing" constant="8" id="dI4-fM-Bc7"/>
<constraint firstAttribute="bottom" secondItem="4MZ-Tg-LGR" secondAttribute="bottom" id="ko3-B6-W2U"/>
<constraint firstItem="4MZ-Tg-LGR" firstAttribute="top" secondItem="Zyw-OQ-9pw" secondAttribute="top" id="ljf-w7-Rsf"/>
<constraint firstItem="nud-Gn-Txa" firstAttribute="top" secondItem="4U2-bb-KSI" secondAttribute="bottom" constant="4" id="qwC-Zj-r1F"/>
<constraint firstAttribute="bottom" secondItem="nud-Gn-Txa" secondAttribute="bottom" constant="10" id="r5u-gD-E7L"/>
<constraint firstItem="nud-Gn-Txa" firstAttribute="leading" secondItem="4MZ-Tg-LGR" secondAttribute="trailing" id="s4g-Ir-X10"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="ebO-9y-Bgo"/>
<connections>
<outlet property="trackImageView" destination="4MZ-Tg-LGR" id="YdR-Oq-5Hy"/>
<outlet property="trackSubtitleLabel" destination="nud-Gn-Txa" id="8Wl-P6-Nna"/>
<outlet property="trackTitleLabel" destination="4U2-bb-KSI" id="1dL-wp-Lh6"/>
</connections>
<point key="canvasLocation" x="137.68115942028987" y="104.12946428571428"/>
</tableViewCell>
</objects>
</document>

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

@ -233,10 +233,8 @@
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 */; };
47CA68F1250B54AF00671019 /* BookmarksListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47CA68EF250B54AE00671019 /* BookmarksListCell.swift */; };
47CA68F2250B54AF00671019 /* BookmarksListCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 47CA68F0250B54AE00671019 /* BookmarksListCell.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 */; };
@ -1111,10 +1109,8 @@
47CA68D52500448D00671019 /* BookmarksListInteractor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListInteractor.swift; sourceTree = "<group>"; };
47CA68D7250044C500671019 /* BookmarksListRouter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListRouter.swift; sourceTree = "<group>"; };
47CA68D92500469400671019 /* BookmarksListBuilder.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListBuilder.swift; sourceTree = "<group>"; };
47CA68EF250B54AE00671019 /* BookmarkCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarkCell.swift; sourceTree = "<group>"; };
47CA68F0250B54AE00671019 /* BookmarkCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarkCell.xib; sourceTree = "<group>"; };
47CA68F3250B550C00671019 /* TrackCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TrackCell.swift; sourceTree = "<group>"; };
47CA68F4250B550C00671019 /* TrackCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TrackCell.xib; sourceTree = "<group>"; };
47CA68EF250B54AE00671019 /* BookmarksListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListCell.swift; sourceTree = "<group>"; };
47CA68F0250B54AE00671019 /* BookmarksListCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksListCell.xib; sourceTree = "<group>"; };
47CA68F7250F8AB600671019 /* BookmarksListSectionHeader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListSectionHeader.swift; sourceTree = "<group>"; };
47CA68F9250F8AD100671019 /* BookmarksListSectionHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = BookmarksListSectionHeader.xib; sourceTree = "<group>"; };
47CA68FB250F99E500671019 /* BookmarksListCellStrategy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BookmarksListCellStrategy.swift; sourceTree = "<group>"; };
@ -2531,10 +2527,8 @@
isa = PBXGroup;
children = (
47CA68FB250F99E500671019 /* BookmarksListCellStrategy.swift */,
47CA68EF250B54AE00671019 /* BookmarkCell.swift */,
47CA68F0250B54AE00671019 /* BookmarkCell.xib */,
47CA68F3250B550C00671019 /* TrackCell.swift */,
47CA68F4250B550C00671019 /* TrackCell.xib */,
47CA68EF250B54AE00671019 /* BookmarksListCell.swift */,
47CA68F0250B54AE00671019 /* BookmarksListCell.xib */,
47CA68F7250F8AB600671019 /* BookmarksListSectionHeader.swift */,
47CA68F9250F8AD100671019 /* BookmarksListSectionHeader.xib */,
4761BE28252D3DB900EE2DE4 /* SubgroupCell.swift */,
@ -3874,10 +3868,9 @@
F6E2FDFB1E097BA00083EBEC /* MWMOpeningHoursAllDayTableViewCell.xib in Resources */,
FA637ED529A500BE00D8921A /* drules_proto_outdoors_dark.bin in Resources */,
4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */,
47CA68F2250B54AF00671019 /* BookmarkCell.xib in Resources */,
47CA68F2250B54AF00671019 /* BookmarksListCell.xib in Resources */,
337F98A321D37B5800C8AC27 /* SearchHistoryViewController.xib in Resources */,
F6E2FE761E097BA00083EBEC /* MWMOpeningHoursCell.xib in Resources */,
47CA68F6250B550C00671019 /* TrackCell.xib in Resources */,
34AB66351FC5AA330078E451 /* RouteManagerCell.xib in Resources */,
F6E2FE011E097BA00083EBEC /* MWMOpeningHoursClosedSpanTableViewCell.xib in Resources */,
F6E2FE071E097BA00083EBEC /* MWMOpeningHoursDaysSelectorTableViewCell.xib in Resources */,
@ -4266,7 +4259,6 @@
34F5E0D41E3F254800B1C415 /* UIView+Hierarchy.swift in Sources */,
6741AA0B1BF340DE002C974C /* MWMMapViewControlsManager.mm in Sources */,
F6E2FED91E097BA00083EBEC /* MWMSearchContentView.m in Sources */,
47CA68F5250B550C00671019 /* TrackCell.swift in Sources */,
EDFDFB4C2B722C9C0013A44C /* InfoTableViewCell.swift in Sources */,
47CA68F8250F8AB700671019 /* BookmarksListSectionHeader.swift in Sources */,
F6BD1D211CA412920047B8E8 /* MWMOsmAuthAlert.mm in Sources */,
@ -4307,7 +4299,7 @@
EDC3573B2B7B5029001AE9CA /* CALayer+SetCorner.swift in Sources */,
47E3C7332111F4D8008B3B27 /* CoverVerticalDismissalAnimator.swift in Sources */,
471AB99423ABA3BD00F56D49 /* SearchMapsDataSource.swift in Sources */,
47CA68F1250B54AF00671019 /* BookmarkCell.swift in Sources */,
47CA68F1250B54AF00671019 /* BookmarksListCell.swift in Sources */,
471A7BC02481C82500A0D4C1 /* BookmarkTitleCell.swift in Sources */,
47F67D1521CAB21B0069754E /* MWMImageCoder.m in Sources */,
34AB66861FC5AA330078E451 /* MWMNavigationInfoView.mm in Sources */,