forked from organicmaps/organicmaps
[MAPSME-4614] [ios] Updated place page taxi cell.
This commit is contained in:
Ilya Grechuhin
Sergey Yershov
parent
41af0c0abe
commit
98c810e7ba
6 changed files with 90 additions and 77 deletions
|
|
@ -164,6 +164,9 @@
|
|||
344D63171E795A2D006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; };
|
||||
344D63181E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; };
|
||||
344D63191E795A3C006F17CB /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 344D63161E795A2D006F17CB /* SystemConfiguration.framework */; };
|
||||
3451F4ED1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */; };
|
||||
3451F4EE1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */; };
|
||||
3451F4EF1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */; };
|
||||
3454D7B81E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; };
|
||||
3454D7B91E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; };
|
||||
3454D7BA1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */; };
|
||||
|
|
@ -1257,12 +1260,9 @@
|
|||
F6E2FE8D1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC51E097B9F0083EBEC /* MWMPlacePageLinkCell.xib */; };
|
||||
F6E2FE8E1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC51E097B9F0083EBEC /* MWMPlacePageLinkCell.xib */; };
|
||||
F6E2FE8F1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC51E097B9F0083EBEC /* MWMPlacePageLinkCell.xib */; };
|
||||
F6E2FE901E097BA00083EBEC /* MWMPlacePageTaxiCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCC81E097B9F0083EBEC /* MWMPlacePageTaxiCell.mm */; };
|
||||
F6E2FE911E097BA00083EBEC /* MWMPlacePageTaxiCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCC81E097B9F0083EBEC /* MWMPlacePageTaxiCell.mm */; };
|
||||
F6E2FE921E097BA00083EBEC /* MWMPlacePageTaxiCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCC81E097B9F0083EBEC /* MWMPlacePageTaxiCell.mm */; };
|
||||
F6E2FE931E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* MWMPlacePageTaxiCell.xib */; };
|
||||
F6E2FE941E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* MWMPlacePageTaxiCell.xib */; };
|
||||
F6E2FE951E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* MWMPlacePageTaxiCell.xib */; };
|
||||
F6E2FE931E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */; };
|
||||
F6E2FE941E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */; };
|
||||
F6E2FE951E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */; };
|
||||
F6E2FE961E097BA00083EBEC /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */; };
|
||||
F6E2FE971E097BA00083EBEC /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */; };
|
||||
F6E2FE981E097BA00083EBEC /* ContextViews.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */; };
|
||||
|
|
@ -1676,6 +1676,7 @@
|
|||
3446C6761DDCA9A200146687 /* libtraffic.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libtraffic.a; path = "../../../omim-build/xcode/Debug/libtraffic.a"; sourceTree = "<group>"; };
|
||||
344D63161E795A2D006F17CB /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
|
||||
345050211E028B8000A8DC59 /* Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Bridging-Header.h"; sourceTree = "<group>"; };
|
||||
3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PlacePageTaxiCell.swift; sourceTree = "<group>"; };
|
||||
3454D7991E07F045004AF2AD /* CALayer+RuntimeAttributes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+RuntimeAttributes.h"; sourceTree = "<group>"; };
|
||||
3454D79A1E07F045004AF2AD /* CALayer+RuntimeAttributes.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "CALayer+RuntimeAttributes.mm"; sourceTree = "<group>"; };
|
||||
3454D79B1E07F045004AF2AD /* CLLocation+Mercator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CLLocation+Mercator.h"; sourceTree = "<group>"; };
|
||||
|
|
@ -2281,9 +2282,7 @@
|
|||
F6E2FCC31E097B9F0083EBEC /* MWMPlacePageRegularCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageRegularCell.mm; sourceTree = "<group>"; };
|
||||
F6E2FCC41E097B9F0083EBEC /* MWMPlacePageInfoCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageInfoCell.xib; sourceTree = "<group>"; };
|
||||
F6E2FCC51E097B9F0083EBEC /* MWMPlacePageLinkCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageLinkCell.xib; sourceTree = "<group>"; };
|
||||
F6E2FCC71E097B9F0083EBEC /* MWMPlacePageTaxiCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageTaxiCell.h; sourceTree = "<group>"; };
|
||||
F6E2FCC81E097B9F0083EBEC /* MWMPlacePageTaxiCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageTaxiCell.mm; sourceTree = "<group>"; };
|
||||
F6E2FCC91E097B9F0083EBEC /* MWMPlacePageTaxiCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMPlacePageTaxiCell.xib; sourceTree = "<group>"; };
|
||||
F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageTaxiCell.xib; sourceTree = "<group>"; };
|
||||
F6E2FCCA1E097B9F0083EBEC /* ContextViews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContextViews.h; sourceTree = "<group>"; };
|
||||
F6E2FCCB1E097B9F0083EBEC /* ContextViews.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ContextViews.mm; sourceTree = "<group>"; };
|
||||
F6E2FCCC1E097B9F0083EBEC /* MWMiPadPlacePageLayoutImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMiPadPlacePageLayoutImpl.h; sourceTree = "<group>"; };
|
||||
|
|
@ -4004,9 +4003,8 @@
|
|||
F6E2FCC61E097B9F0083EBEC /* TaxiCell */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
F6E2FCC71E097B9F0083EBEC /* MWMPlacePageTaxiCell.h */,
|
||||
F6E2FCC81E097B9F0083EBEC /* MWMPlacePageTaxiCell.mm */,
|
||||
F6E2FCC91E097B9F0083EBEC /* MWMPlacePageTaxiCell.xib */,
|
||||
F6E2FCC91E097B9F0083EBEC /* PlacePageTaxiCell.xib */,
|
||||
3451F4EC1F026DAF00A981F2 /* PlacePageTaxiCell.swift */,
|
||||
);
|
||||
path = TaxiCell;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -4594,7 +4592,7 @@
|
|||
F6E2FE8D1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
|
||||
F6E2FE7E1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
|
||||
F6E2FE841E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
|
||||
F6E2FE931E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FE931E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FEA51E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
F69CE8D91E5C5088002B5881 /* PPHotelCarouselCell.xib in Resources */,
|
||||
F61579361AC2CEB60032D8E9 /* MWMRateAlert.xib in Resources */,
|
||||
|
|
@ -4765,7 +4763,7 @@
|
|||
F6E2FE8E1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
|
||||
F6E2FE7F1E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
|
||||
F6E2FE851E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
|
||||
F6E2FE941E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FE941E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FEA61E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
6741A9811BF340DE002C974C /* MWMRateAlert.xib in Resources */,
|
||||
6741A96E1BF340DE002C974C /* MWMRoutePreview.xib in Resources */,
|
||||
|
|
@ -4936,7 +4934,7 @@
|
|||
F6E2FE8F1E097BA00083EBEC /* MWMPlacePageLinkCell.xib in Resources */,
|
||||
F6E2FE801E097BA00083EBEC /* MWMPlacePageOpeningHoursCell.xib in Resources */,
|
||||
F6E2FE861E097BA00083EBEC /* MWMPlacePageOpeningHoursWeekDayView.xib in Resources */,
|
||||
F6E2FE951E097BA00083EBEC /* MWMPlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FE951E097BA00083EBEC /* PlacePageTaxiCell.xib in Resources */,
|
||||
F6E2FEA71E097BA00083EBEC /* MWMPPView.xib in Resources */,
|
||||
849CF6511DE842290024A8A5 /* MWMRateAlert.xib in Resources */,
|
||||
849CF6311DE842290024A8A5 /* MWMRoutePreview.xib in Resources */,
|
||||
|
|
@ -5226,7 +5224,6 @@
|
|||
F6E2FF471E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
|
||||
349D1ACE1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */,
|
||||
F6E2FF261E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
|
||||
F6E2FE901E097BA00083EBEC /* MWMPlacePageTaxiCell.mm in Sources */,
|
||||
F6E2FF441E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
|
||||
F607C18E1C047FDC00B53A87 /* MWMSegue.mm in Sources */,
|
||||
F6E2FE301E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */,
|
||||
|
|
@ -5404,6 +5401,7 @@
|
|||
F6E2FEEA1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
|
||||
F6664C121E645A4100E703C2 /* MWMPPReviewCell.mm in Sources */,
|
||||
F68FCB8A1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm in Sources */,
|
||||
3451F4ED1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */,
|
||||
34EE25A91EFA726400F870AB /* ViatorItemModel.swift in Sources */,
|
||||
3454D7D91E07F045004AF2AD /* UILabel+RuntimeAttributes.mm in Sources */,
|
||||
F6E2FD9D1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
|
||||
|
|
@ -5520,7 +5518,6 @@
|
|||
F6E2FF481E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
|
||||
F6E2FF271E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
|
||||
F6558DA21E642CC0002203AE /* MWMFacilitiesController.mm in Sources */,
|
||||
F6E2FE911E097BA00083EBEC /* MWMPlacePageTaxiCell.mm in Sources */,
|
||||
349D1ACF1E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */,
|
||||
F6E2FF451E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
|
||||
34C9BD0A1C6DBCDA000DC38D /* MWMNavigationController.mm in Sources */,
|
||||
|
|
@ -5702,6 +5699,7 @@
|
|||
6741AA2B1BF340DE002C974C /* CircleView.mm in Sources */,
|
||||
F6E2FEEB1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
|
||||
F68FCB8B1DA7BD20007CC7D7 /* MWMTaxiPreviewCell.mm in Sources */,
|
||||
3451F4EE1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */,
|
||||
34EE25AA1EFA726400F870AB /* ViatorItemModel.swift in Sources */,
|
||||
F6E2FD9E1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
|
||||
F6E2FE0A1E097BA00083EBEC /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */,
|
||||
|
|
@ -5822,7 +5820,6 @@
|
|||
F6E2FF491E097BA00083EBEC /* SettingsTableViewSelectableCell.swift in Sources */,
|
||||
349D1AD01E2E325B004A2006 /* MWMBottomMenuCollectionViewCell.mm in Sources */,
|
||||
F6E2FF281E097BA00083EBEC /* MWMSearchTabButtonsView.mm in Sources */,
|
||||
F6E2FE921E097BA00083EBEC /* MWMPlacePageTaxiCell.mm in Sources */,
|
||||
F6E2FF461E097BA00083EBEC /* SettingsTableViewLinkCell.swift in Sources */,
|
||||
3404756C1E081A4600C92850 /* MWMSearch+CoreSpotlight.mm in Sources */,
|
||||
F6E2FE321E097BA00083EBEC /* MWMStreetEditorViewController.mm in Sources */,
|
||||
|
|
@ -6000,6 +5997,7 @@
|
|||
F6E2FEEC1E097BA00083EBEC /* MWMSearchTextField.mm in Sources */,
|
||||
F6664C141E645A4100E703C2 /* MWMPPReviewCell.mm in Sources */,
|
||||
3454D7DE1E07F045004AF2AD /* UISwitch+RuntimeAttributes.m in Sources */,
|
||||
3451F4EF1F026DAF00A981F2 /* PlacePageTaxiCell.swift in Sources */,
|
||||
34EE25AB1EFA726400F870AB /* ViatorItemModel.swift in Sources */,
|
||||
849CF7671DE842290024A8A5 /* CircleView.mm in Sources */,
|
||||
F6E2FD9F1E097BA00083EBEC /* MWMEditBookmarkController.mm in Sources */,
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
#import "MWMTableViewCell.h"
|
||||
|
||||
@protocol MWMPlacePageButtonsProtocol;
|
||||
|
||||
@interface MWMPlacePageTaxiCell : MWMTableViewCell
|
||||
|
||||
- (void)setDelegate:(id<MWMPlacePageButtonsProtocol>)delegate;
|
||||
|
||||
@end
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
#import "MWMPlacePageTaxiCell.h"
|
||||
#import "MWMPlacePageProtocol.h"
|
||||
|
||||
@interface MWMPlacePageTaxiCell()
|
||||
|
||||
@property(weak, nonatomic) id<MWMPlacePageButtonsProtocol> delegate;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMPlacePageTaxiCell
|
||||
|
||||
- (IBAction)orderTaxi { [self.delegate taxiTo]; }
|
||||
|
||||
@end
|
||||
|
|
@ -0,0 +1,51 @@
|
|||
@objc
|
||||
enum PlacePageTaxiCellType: Int {
|
||||
case taxi
|
||||
case uber
|
||||
case yandex
|
||||
}
|
||||
|
||||
@objc
|
||||
final class PlacePageTaxiCell: MWMTableViewCell {
|
||||
|
||||
@IBOutlet private weak var icon: UIImageView!
|
||||
@IBOutlet private weak var title: UILabel! {
|
||||
didSet {
|
||||
title.font = UIFont.bold14()
|
||||
title.textColor = UIColor.blackPrimaryText()
|
||||
}
|
||||
}
|
||||
@IBOutlet private weak var orderButton: UIButton! {
|
||||
didSet {
|
||||
let l = orderButton.layer
|
||||
l.cornerRadius = 6
|
||||
l.borderColor = UIColor.linkBlue().cgColor
|
||||
l.borderWidth = 1
|
||||
orderButton.setTitle(L("taxi_order"), for: .normal)
|
||||
orderButton.setTitleColor(UIColor.white, for: .normal)
|
||||
orderButton.titleLabel?.font = UIFont.bold14()
|
||||
orderButton.backgroundColor = UIColor.linkBlue()
|
||||
}
|
||||
}
|
||||
|
||||
private weak var delegate: MWMPlacePageButtonsProtocol!
|
||||
|
||||
func config(type: PlacePageTaxiCellType, delegate: MWMPlacePageButtonsProtocol) {
|
||||
self.delegate = delegate
|
||||
switch type {
|
||||
case .taxi:
|
||||
icon.image = #imageLiteral(resourceName: "icTaxiTaxi")
|
||||
title.text = L("taxi")
|
||||
case .uber:
|
||||
icon.image = #imageLiteral(resourceName: "icTaxiUber")
|
||||
title.text = L("taxi_uber")
|
||||
case .yandex:
|
||||
icon.image = #imageLiteral(resourceName: "icTaxiYandex")
|
||||
title.text = L("taxi_yandex")
|
||||
}
|
||||
}
|
||||
|
||||
@IBAction func orderAction() {
|
||||
delegate.taxiTo()
|
||||
}
|
||||
}
|
||||
|
|
@ -1,61 +1,48 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11542" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12121" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait">
|
||||
<adaptation id="fullscreen"/>
|
||||
</device>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="MWMPlacePageTaxiCell" rowHeight="66" id="16z-3Y-tuS" customClass="MWMPlacePageTaxiCell">
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="PlacePageTaxiCell" rowHeight="66" id="16z-3Y-tuS" customClass="PlacePageTaxiCell" customModule="cm_beta" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="64"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="16z-3Y-tuS" id="5rg-b2-ZRm">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="63"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="63.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_placepage_taxi" translatesAutoresizingMaskIntoConstraints="NO" id="Y6E-Lj-WUA">
|
||||
<rect key="frame" x="16" y="18" width="28" height="28"/>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Y6E-Lj-WUA">
|
||||
<rect key="frame" x="16" y="12" width="40" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="28" id="00V-V7-7X3"/>
|
||||
<constraint firstAttribute="width" constant="28" id="H0O-6d-RuH"/>
|
||||
<constraint firstAttribute="height" constant="40" id="00V-V7-7X3"/>
|
||||
<constraint firstAttribute="width" constant="40" id="H0O-6d-RuH"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Uber" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bRB-nP-rFu">
|
||||
<rect key="frame" x="60" y="22" width="38" height="21"/>
|
||||
<rect key="frame" x="72" y="22" width="38" height="21"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="501" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zWn-ti-hGb">
|
||||
<rect key="frame" x="305" y="13" width="56" height="38"/>
|
||||
<rect key="frame" x="281" y="13" width="80" height="38"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="80" id="EU9-cY-PfD"/>
|
||||
</constraints>
|
||||
<inset key="contentEdgeInsets" minX="8" minY="10" maxX="8" maxY="10"/>
|
||||
<state key="normal" title="Order"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="4"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
|
||||
<color key="value" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
|
||||
<integer key="value" value="1"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="taxi_order"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="linkBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="orderAction" destination="16z-3Y-tuS" eventType="touchUpInside" id="aaO-oV-60G"/>
|
||||
<action selector="orderTaxi" destination="16z-3Y-tuS" eventType="touchUpInside" id="Yhy-5a-CZU"/>
|
||||
</connections>
|
||||
</button>
|
||||
|
|
@ -72,10 +59,12 @@
|
|||
<constraint firstAttribute="bottom" secondItem="zWn-ti-hGb" secondAttribute="bottom" constant="12.5" id="vno-dE-n9V"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="icon" destination="Y6E-Lj-WUA" id="5DU-q1-nkj"/>
|
||||
<outlet property="orderButton" destination="zWn-ti-hGb" id="ziE-A2-hMD"/>
|
||||
<outlet property="title" destination="bRB-nP-rFu" id="Bvt-kl-cgG"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="18.5" y="45"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="ic_placepage_taxi" width="28" height="28"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
@ -9,7 +9,6 @@
|
|||
#import "MWMPlacePageData.h"
|
||||
#import "MWMPlacePageLayoutImpl.h"
|
||||
#import "MWMPlacePageRegularCell.h"
|
||||
#import "MWMPlacePageTaxiCell.h"
|
||||
#import "MWMiPadPlacePageLayoutImpl.h"
|
||||
#import "MWMiPhonePlacePageLayoutImpl.h"
|
||||
#import "SwiftBridge.h"
|
||||
|
|
@ -102,7 +101,7 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
|
|||
[tv registerWithCellClass:[MWMPPReviewHeaderCell class]];
|
||||
[tv registerWithCellClass:[MWMPPReviewCell class]];
|
||||
[tv registerWithCellClass:[MWMPPFacilityCell class]];
|
||||
[tv registerWithCellClass:[MWMPlacePageTaxiCell class]];
|
||||
[tv registerWithCellClass:[PlacePageTaxiCell class]];
|
||||
|
||||
// Register all meta info cells.
|
||||
for (auto const & pair : kMetaInfoCells)
|
||||
|
|
@ -391,10 +390,9 @@ map<MetainfoRows, Class> const kMetaInfoCells = {
|
|||
}
|
||||
case Sections::Ad:
|
||||
{
|
||||
Class cls = [MWMPlacePageTaxiCell class];
|
||||
auto c = static_cast<MWMPlacePageTaxiCell *>(
|
||||
[tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
c.delegate = delegate;
|
||||
Class cls = [PlacePageTaxiCell class];
|
||||
auto c = static_cast<PlacePageTaxiCell *>([tableView dequeueReusableCellWithCellClass:cls indexPath:indexPath]);
|
||||
[c configWithType:PlacePageTaxiCellTypeTaxi delegate:delegate];
|
||||
return c;
|
||||
}
|
||||
case Sections::Buttons:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue