forked from organicmaps/organicmaps
[ios] Refactored editor controller.
This commit is contained in:
VladiMihaylenko
Sergey Yershov
parent
490a0f2c79
commit
adfb45b29b
54 changed files with 343 additions and 769 deletions
|
|
@ -12,8 +12,7 @@
|
|||
@interface MWMPlacePageOpeningHoursCell : UITableViewCell
|
||||
|
||||
- (void)configWithDelegate:(id<MWMPlacePageOpeningHoursCellProtocol>)delegate
|
||||
info:(NSString *)info
|
||||
lastCell:(BOOL)lastCell;
|
||||
info:(NSString *)info;
|
||||
|
||||
- (CGFloat)cellHeight;
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ using WeekDayView = MWMPlacePageOpeningHoursDayView *;
|
|||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * weekDaysViewHeight;
|
||||
@property (nonatomic) CGFloat weekDaysViewEstimatedHeight;
|
||||
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * bottomSeparatorLeadingOffset;
|
||||
@property (weak, nonatomic) id<MWMPlacePageOpeningHoursCellProtocol> delegate;
|
||||
|
||||
@property (nonatomic) BOOL isClosed;
|
||||
|
|
@ -64,7 +63,6 @@ WeekDayView getWeekDayView()
|
|||
|
||||
- (void)configWithDelegate:(id<MWMPlacePageOpeningHoursCellProtocol>)delegate
|
||||
info:(NSString *)info
|
||||
lastCell:(BOOL)lastCell
|
||||
{
|
||||
self.delegate = delegate;
|
||||
WeekDayView cd = self.currentDay;
|
||||
|
|
@ -74,7 +72,6 @@ WeekDayView getWeekDayView()
|
|||
self.expandImage.hidden = !delegate.forcedButton;
|
||||
self.expandImage.image = [UIImage imageNamed:@"ic_arrow_gray"];
|
||||
self.expandImage.mwm_coloring = MWMImageColoringGray;
|
||||
self.bottomSeparatorLeadingOffset.constant = lastCell ? 0.0 : 60.0;
|
||||
NSAssert(info, @"Schedule can not be empty");
|
||||
osmoh::OpeningHours oh(info.UTF8String);
|
||||
if (MakeTimeTableSet(oh, timeTableSet))
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="249"/>
|
||||
<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="248.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="248"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="swk-um-XzG" customClass="MWMPlacePageOpeningHoursDayView">
|
||||
|
|
@ -164,16 +164,15 @@
|
|||
<outlet property="openTime" destination="oTF-IZ-Un1" id="oSf-bK-Va1"/>
|
||||
</connections>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="q9R-jU-fIk" userLabel="Middle Separator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="0kQ-hh-2Cy">
|
||||
<rect key="frame" x="60" y="126" width="228" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="5pG-41-JyY"/>
|
||||
<constraint firstAttribute="height" constant="1" id="5lV-kq-jGM"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fNU-1q-AiR">
|
||||
<rect key="frame" x="0.0" y="127" width="320" height="122"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
|
|
@ -181,43 +180,30 @@
|
|||
<constraint firstAttribute="height" constant="122" id="Ifb-EB-LIb"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9WP-gb-0Hl" userLabel="Bottom Separator">
|
||||
<rect key="frame" x="60" y="248" width="260" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="ISb-za-hzz"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="08I-np-9jr"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fNU-1q-AiR" secondAttribute="trailing" id="2Hz-cA-KuN"/>
|
||||
<constraint firstAttribute="trailing" secondItem="q9R-jU-fIk" secondAttribute="trailing" constant="32" id="GqM-0e-qyu"/>
|
||||
<constraint firstItem="q9R-jU-fIk" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="HNR-8z-cc0"/>
|
||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="q9R-jU-fIk" secondAttribute="bottom" id="JFR-YU-rAy"/>
|
||||
<constraint firstAttribute="bottom" secondItem="9WP-gb-0Hl" secondAttribute="bottom" id="LMU-EI-Vr9"/>
|
||||
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="KwF-TF-PmH"/>
|
||||
<constraint firstAttribute="trailing" secondItem="0kQ-hh-2Cy" secondAttribute="trailing" constant="32" id="RqH-0b-AyG"/>
|
||||
<constraint firstItem="swk-um-XzG" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="VsQ-qI-dIi"/>
|
||||
<constraint firstItem="q9R-jU-fIk" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="eUW-RI-gaa"/>
|
||||
<constraint firstItem="9WP-gb-0Hl" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="fCK-Qq-Hci"/>
|
||||
<constraint firstItem="0kQ-hh-2Cy" firstAttribute="top" secondItem="swk-um-XzG" secondAttribute="bottom" id="Xrh-Vg-VYg"/>
|
||||
<constraint firstItem="swk-um-XzG" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p14-Mi-kcR"/>
|
||||
<constraint firstAttribute="trailing" secondItem="9WP-gb-0Hl" secondAttribute="trailing" id="vof-Qq-rXP"/>
|
||||
<constraint firstItem="fNU-1q-AiR" firstAttribute="top" secondItem="0kQ-hh-2Cy" secondAttribute="bottom" id="uKD-bb-yHT"/>
|
||||
<constraint firstAttribute="trailing" secondItem="swk-um-XzG" secondAttribute="trailing" id="zir-No-59Q"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCellContentView>
|
||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="bottomSeparatorLeadingOffset" destination="fCK-Qq-Hci" id="i0F-nq-2jd"/>
|
||||
<outlet property="currentDay" destination="swk-um-XzG" id="CJG-LQ-Pu8"/>
|
||||
<outlet property="expandImage" destination="mGc-k4-uvQ" id="ohq-Yq-hLX"/>
|
||||
<outlet property="middleSeparator" destination="q9R-jU-fIk" id="vcZ-Lb-HgY"/>
|
||||
<outlet property="middleSeparator" destination="0kQ-hh-2Cy" id="TJM-Ch-7E0"/>
|
||||
<outlet property="openTime" destination="oTF-IZ-Un1" id="hsY-uV-wWE"/>
|
||||
<outlet property="openTimeLeadingOffset" destination="KGY-T0-s0P" id="rHG-56-gHg"/>
|
||||
<outlet property="toggleButton" destination="3Fa-V6-tC5" id="8FI-Je-uFy"/>
|
||||
|
|
@ -229,5 +215,6 @@
|
|||
<resources>
|
||||
<image name="ic_arrow_gray_down" width="28" height="28"/>
|
||||
<image name="ic_placepage_open_hours" width="28" height="28"/>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="264" translatesAutoresizingMaskIntoConstraints="NO" id="hOY-VB-nFg">
|
||||
|
|
@ -34,16 +34,6 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lOz-Wd-phb" userLabel="Bottom Separator">
|
||||
<rect key="frame" x="16" y="43" width="304" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="Z6O-bd-0y9"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3Pe-AU-T9A">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<connections>
|
||||
|
|
@ -55,11 +45,8 @@
|
|||
<constraint firstItem="3Pe-AU-T9A" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="0AO-q7-CzE"/>
|
||||
<constraint firstAttribute="trailing" secondItem="hOY-VB-nFg" secondAttribute="trailing" constant="40" id="2gu-wq-Y7B"/>
|
||||
<constraint firstItem="mIn-6M-GtU" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="5ie-0h-fd1"/>
|
||||
<constraint firstAttribute="bottom" secondItem="lOz-Wd-phb" secondAttribute="bottom" id="7QM-4d-uCH"/>
|
||||
<constraint firstAttribute="bottom" secondItem="hOY-VB-nFg" secondAttribute="bottom" constant="12" id="8e2-Vf-KRD"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lOz-Wd-phb" secondAttribute="trailing" id="RpO-Ou-auC"/>
|
||||
<constraint firstAttribute="bottom" secondItem="3Pe-AU-T9A" secondAttribute="bottom" id="SBx-de-g1Q"/>
|
||||
<constraint firstItem="lOz-Wd-phb" firstAttribute="leading" secondItem="hOY-VB-nFg" secondAttribute="leading" id="ZKA-PM-NZB"/>
|
||||
<constraint firstItem="3Pe-AU-T9A" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="dMo-wQ-AZ7"/>
|
||||
<constraint firstItem="hOY-VB-nFg" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="fqp-n8-snv"/>
|
||||
<constraint firstItem="hOY-VB-nFg" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="jFG-ai-aHe"/>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
#import "MWMCuisineEditorTableViewCell.h"
|
||||
#import "MWMCuisineEditorViewController.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
|
||||
namespace
|
||||
{
|
||||
|
|
@ -19,6 +20,11 @@ namespace
|
|||
|
||||
@implementation MWMCuisineEditorViewController
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
self.tableView.separatorColor = [UIColor blackDividers];
|
||||
}
|
||||
|
||||
- (void)viewDidLoad
|
||||
{
|
||||
[super viewDidLoad];
|
||||
|
|
|
|||
|
|
@ -1,119 +1,64 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15D21" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
<capability name="Constraints to layout margins" minToolsVersion="6.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="default" indentationWidth="10" id="uUF-rL-Jcn" customClass="MWMEditorTextTableViewCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="112"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="44" id="uUF-rL-Jcn" customClass="MWMEditorTextTableViewCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uUF-rL-Jcn" id="U0n-vz-Mf1">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="112"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mvz-Ot-27A">
|
||||
<rect key="frame" x="0.0" y="36" width="320" height="44"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jB4-CQ-ibl" userLabel="Top Separator">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="DRU-0z-Uzg"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xKX-yy-Dlc">
|
||||
<rect key="frame" x="16" y="12" width="60" height="21"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="Vyq-1r-IrP"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="place_name"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XnK-GX-uDn">
|
||||
<rect key="frame" x="88" y="0.0" width="224" height="44"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="name"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="validatorName" value="MWMInputValidator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="uUF-rL-Jcn" id="7W6-iy-j9O"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yj2-am-tAr" userLabel="Bottom Separator">
|
||||
<rect key="frame" x="0.0" y="43" width="320" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="mFs-Yj-2wW"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xKX-yy-Dlc">
|
||||
<rect key="frame" x="24" y="11" width="60" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="yj2-am-tAr" secondAttribute="trailing" id="5Kt-WX-rMl"/>
|
||||
<constraint firstAttribute="trailing" secondItem="XnK-GX-uDn" secondAttribute="trailing" constant="8" id="9uI-f9-Oiq"/>
|
||||
<constraint firstAttribute="bottom" secondItem="XnK-GX-uDn" secondAttribute="bottom" id="Ddy-aD-2X8"/>
|
||||
<constraint firstItem="jB4-CQ-ibl" firstAttribute="top" secondItem="mvz-Ot-27A" secondAttribute="top" id="FTL-HS-pKm"/>
|
||||
<constraint firstItem="yj2-am-tAr" firstAttribute="leading" secondItem="mvz-Ot-27A" secondAttribute="leading" id="JRR-dE-cYG"/>
|
||||
<constraint firstItem="jB4-CQ-ibl" firstAttribute="leading" secondItem="mvz-Ot-27A" secondAttribute="leading" id="Jfv-Vz-USn"/>
|
||||
<constraint firstItem="XnK-GX-uDn" firstAttribute="top" secondItem="mvz-Ot-27A" secondAttribute="top" id="PhE-q8-q9Q"/>
|
||||
<constraint firstItem="XnK-GX-uDn" firstAttribute="leading" secondItem="xKX-yy-Dlc" secondAttribute="trailing" constant="12" id="PlX-hV-AJE"/>
|
||||
<constraint firstItem="xKX-yy-Dlc" firstAttribute="leading" secondItem="mvz-Ot-27A" secondAttribute="leading" constant="16" id="QdJ-7J-og8"/>
|
||||
<constraint firstItem="xKX-yy-Dlc" firstAttribute="centerY" secondItem="mvz-Ot-27A" secondAttribute="centerY" id="Ss3-Uz-Ovp"/>
|
||||
<constraint firstAttribute="height" constant="44" id="XaU-he-xkw"/>
|
||||
<constraint firstAttribute="trailing" secondItem="jB4-CQ-ibl" secondAttribute="trailing" id="ZO2-sv-umx"/>
|
||||
<constraint firstAttribute="bottom" secondItem="yj2-am-tAr" secondAttribute="bottom" id="lno-2T-DLA"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="Vyq-1r-IrP"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="288" translatesAutoresizingMaskIntoConstraints="NO" id="6Xp-Mt-Mzp">
|
||||
<rect key="frame" x="16" y="88" width="288" height="16"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="13"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="place_name_caption"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="place_name"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="XnK-GX-uDn">
|
||||
<rect key="frame" x="92" y="11" width="212" height="21"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<textInputTraits key="textInputTraits"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedPlaceholder" value="name"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="validatorName" value="MWMInputValidator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="delegate" destination="uUF-rL-Jcn" id="7W6-iy-j9O"/>
|
||||
</connections>
|
||||
</textField>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="mvz-Ot-27A" firstAttribute="top" secondItem="U0n-vz-Mf1" secondAttribute="top" constant="36" id="5Yg-mR-YMS"/>
|
||||
<constraint firstItem="mvz-Ot-27A" firstAttribute="leading" secondItem="U0n-vz-Mf1" secondAttribute="leading" id="DTj-Ds-uaw"/>
|
||||
<constraint firstItem="6Xp-Mt-Mzp" firstAttribute="leading" secondItem="U0n-vz-Mf1" secondAttribute="leading" constant="16" id="Jew-S0-JY1"/>
|
||||
<constraint firstAttribute="bottom" secondItem="6Xp-Mt-Mzp" secondAttribute="bottom" constant="8" id="Wik-xx-1sJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="6Xp-Mt-Mzp" secondAttribute="trailing" constant="16" id="hmb-PM-mSv"/>
|
||||
<constraint firstAttribute="trailing" secondItem="mvz-Ot-27A" secondAttribute="trailing" id="uTb-ax-txd"/>
|
||||
<constraint firstItem="6Xp-Mt-Mzp" firstAttribute="top" secondItem="mvz-Ot-27A" secondAttribute="bottom" constant="8" id="xaf-Qk-OCK"/>
|
||||
<constraint firstItem="xKX-yy-Dlc" firstAttribute="centerY" secondItem="U0n-vz-Mf1" secondAttribute="centerY" id="FGO-0q-Qkt"/>
|
||||
<constraint firstAttribute="trailingMargin" secondItem="XnK-GX-uDn" secondAttribute="trailing" constant="8" id="bQK-iT-hix"/>
|
||||
<constraint firstItem="XnK-GX-uDn" firstAttribute="centerY" secondItem="U0n-vz-Mf1" secondAttribute="centerY" id="kXs-TY-hUe"/>
|
||||
<constraint firstItem="XnK-GX-uDn" firstAttribute="leading" secondItem="xKX-yy-Dlc" secondAttribute="trailing" constant="8" id="lPz-pZ-7dI"/>
|
||||
<constraint firstItem="XnK-GX-uDn" firstAttribute="top" secondItem="U0n-vz-Mf1" secondAttribute="topMargin" constant="3" id="o7O-MA-LIA"/>
|
||||
<constraint firstItem="xKX-yy-Dlc" firstAttribute="leading" secondItem="U0n-vz-Mf1" secondAttribute="leadingMargin" constant="16" id="z6t-dN-99D"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<connections>
|
||||
<outlet property="textField" destination="XnK-GX-uDn" id="vHi-Y7-IKE"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="205" y="325"/>
|
||||
<point key="canvasLocation" x="205" y="291"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
- (void)configWithDelegate:(id<MWMEditorCellProtocol>)delegate
|
||||
icon:(UIImage *)icon
|
||||
text:(NSString *)text
|
||||
placeholder:(NSString *)placeholder
|
||||
lastCell:(BOOL)lastCell;
|
||||
placeholder:(NSString *)placeholder;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@
|
|||
@property (weak, nonatomic) IBOutlet UILabel * label;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * labelLeadingOffset;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * labelTrailingOffset;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * bottomSeparatorLeadingOffset;
|
||||
|
||||
@property (weak, nonatomic) id<MWMEditorCellProtocol> delegate;
|
||||
|
||||
|
|
@ -20,7 +19,6 @@
|
|||
icon:(UIImage *)icon
|
||||
text:(NSString *)text
|
||||
placeholder:(NSString *)placeholder
|
||||
lastCell:(BOOL)lastCell
|
||||
{
|
||||
self.delegate = delegate;
|
||||
self.icon.hidden = NO;
|
||||
|
|
@ -37,7 +35,6 @@
|
|||
self.label.textColor = [UIColor blackSecondaryText];
|
||||
}
|
||||
self.label.preferredMaxLayoutWidth = self.width - self.labelLeadingOffset.constant - self.labelTrailingOffset.constant;
|
||||
self.bottomSeparatorLeadingOffset.priority = lastCell ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow;
|
||||
}
|
||||
|
||||
- (IBAction)selectAction
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="xiI-ev-aU2" id="V1p-K9-KlE">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xur-tJ-HA9">
|
||||
|
|
@ -47,16 +47,6 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3QW-i5-g6A" userLabel="Bottom Separator">
|
||||
<rect key="frame" x="60" y="43" width="260" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="8eX-zg-i6S"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="nq9-KC-Ujh">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<connections>
|
||||
|
|
@ -66,17 +56,13 @@
|
|||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="jLw-GA-z3y" secondAttribute="trailing" constant="6" id="3Bg-20-t7E"/>
|
||||
<constraint firstAttribute="bottom" secondItem="3QW-i5-g6A" secondAttribute="bottom" id="437-dg-x06"/>
|
||||
<constraint firstAttribute="trailing" secondItem="nq9-KC-Ujh" secondAttribute="trailing" id="5gd-06-ZOC"/>
|
||||
<constraint firstItem="MBe-6r-IsA" firstAttribute="top" secondItem="V1p-K9-KlE" secondAttribute="top" constant="8" id="6FB-in-VCz"/>
|
||||
<constraint firstAttribute="bottom" secondItem="MBe-6r-IsA" secondAttribute="bottom" constant="8" id="CG0-ar-vx9"/>
|
||||
<constraint firstItem="xur-tJ-HA9" firstAttribute="leading" secondItem="V1p-K9-KlE" secondAttribute="leading" constant="16" id="DlR-yh-2JK"/>
|
||||
<constraint firstItem="3QW-i5-g6A" firstAttribute="leading" secondItem="V1p-K9-KlE" secondAttribute="leading" priority="250" id="Ghg-3J-hYK"/>
|
||||
<constraint firstItem="MBe-6r-IsA" firstAttribute="leading" secondItem="V1p-K9-KlE" secondAttribute="leading" constant="60" id="RGA-XL-gLq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="3QW-i5-g6A" secondAttribute="trailing" id="T8x-8A-gMo"/>
|
||||
<constraint firstItem="xur-tJ-HA9" firstAttribute="centerY" secondItem="V1p-K9-KlE" secondAttribute="centerY" id="agx-Kf-DpK"/>
|
||||
<constraint firstAttribute="bottom" secondItem="nq9-KC-Ujh" secondAttribute="bottom" id="fK8-AO-JKa"/>
|
||||
<constraint firstItem="3QW-i5-g6A" firstAttribute="leading" secondItem="MBe-6r-IsA" secondAttribute="leading" priority="500" id="hrP-6I-Brp"/>
|
||||
<constraint firstItem="nq9-KC-Ujh" firstAttribute="top" secondItem="V1p-K9-KlE" secondAttribute="top" id="ibI-hy-19F"/>
|
||||
<constraint firstItem="jLw-GA-z3y" firstAttribute="centerY" secondItem="V1p-K9-KlE" secondAttribute="centerY" id="nY0-7m-bcZ"/>
|
||||
<constraint firstItem="nq9-KC-Ujh" firstAttribute="leading" secondItem="V1p-K9-KlE" secondAttribute="leading" id="tyN-aq-pC1"/>
|
||||
|
|
@ -86,11 +72,11 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCellContentView>
|
||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="bottomSeparatorLeadingOffset" destination="Ghg-3J-hYK" id="ngd-hB-ReB"/>
|
||||
<outlet property="icon" destination="xur-tJ-HA9" id="ObZ-fc-tbA"/>
|
||||
<outlet property="label" destination="MBe-6r-IsA" id="mvf-Q3-vMz"/>
|
||||
<outlet property="labelLeadingOffset" destination="RGA-XL-gLq" id="Tb4-Ew-iDe"/>
|
||||
|
|
|
|||
|
|
@ -1,3 +0,0 @@
|
|||
@interface MWMEditorSpacerCell : UITableViewCell
|
||||
|
||||
@end
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
#import "MWMEditorSpacerCell.h"
|
||||
|
||||
@implementation MWMEditorSpacerCell
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
self.backgroundColor = [UIColor clearColor];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,37 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="YVz-dp-XE1" customClass="MWMEditorSpacerCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="16"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="YVz-dp-XE1" id="XSE-UM-CqW">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="15"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="eYv-33-2sa">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="16"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" priority="750" constant="16" id="uvV-YT-vSy"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="eYv-33-2sa" firstAttribute="leading" secondItem="XSE-UM-CqW" secondAttribute="leading" id="Zby-0d-0cZ"/>
|
||||
<constraint firstAttribute="bottom" secondItem="eYv-33-2sa" secondAttribute="bottom" id="cW7-kR-Gy9"/>
|
||||
<constraint firstAttribute="trailing" secondItem="eYv-33-2sa" secondAttribute="trailing" id="z06-NB-mia"/>
|
||||
<constraint firstItem="eYv-33-2sa" firstAttribute="top" secondItem="XSE-UM-CqW" secondAttribute="top" id="zyx-yA-Pwl"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<point key="canvasLocation" x="230" y="252"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -5,7 +5,6 @@
|
|||
- (void)configWithDelegate:(id<MWMEditorCellProtocol>)delegate
|
||||
icon:(UIImage *)icon
|
||||
text:(NSString *)text
|
||||
on:(BOOL)on
|
||||
lastCell:(BOOL)lastCell;
|
||||
on:(BOOL)on;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@
|
|||
@property (weak, nonatomic) IBOutlet UIImageView * icon;
|
||||
@property (weak, nonatomic) IBOutlet UILabel * label;
|
||||
@property (weak, nonatomic) IBOutlet UISwitch * switchControl;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * bottomSeparatorLeadingOffset;
|
||||
|
||||
@property (weak, nonatomic) id<MWMEditorCellProtocol> delegate;
|
||||
|
||||
|
|
@ -18,14 +17,12 @@
|
|||
icon:(UIImage *)icon
|
||||
text:(NSString *)text
|
||||
on:(BOOL)on
|
||||
lastCell:(BOOL)lastCell
|
||||
{
|
||||
self.delegate = delegate;
|
||||
self.icon.image = icon;
|
||||
self.icon.mwm_coloring = MWMImageColoringBlack;
|
||||
self.label.text = text;
|
||||
self.switchControl.on = on;
|
||||
self.bottomSeparatorLeadingOffset.priority = lastCell ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow;
|
||||
}
|
||||
|
||||
- (IBAction)valueChanged
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="qme-9J-aMf" id="fpo-VO-awT">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="j3u-fF-pG6">
|
||||
|
|
@ -48,27 +48,13 @@
|
|||
<action selector="valueChanged" destination="qme-9J-aMf" eventType="valueChanged" id="sak-SB-Nvi"/>
|
||||
</connections>
|
||||
</switch>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ztq-3s-Oo8" userLabel="Bottom Separator">
|
||||
<rect key="frame" x="60" y="43" width="260" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="nN0-hv-vOT"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="QFf-wR-pPw" firstAttribute="top" secondItem="fpo-VO-awT" secondAttribute="top" id="3mH-Ua-EUl"/>
|
||||
<constraint firstItem="j3u-fF-pG6" firstAttribute="centerY" secondItem="fpo-VO-awT" secondAttribute="centerY" id="4xr-PJ-Dl2"/>
|
||||
<constraint firstItem="Ztq-3s-Oo8" firstAttribute="leading" secondItem="fpo-VO-awT" secondAttribute="leading" priority="250" id="6dM-c2-MTO"/>
|
||||
<constraint firstItem="Ztq-3s-Oo8" firstAttribute="leading" secondItem="QFf-wR-pPw" secondAttribute="leading" priority="500" id="MOz-01-ymI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Ztq-3s-Oo8" secondAttribute="trailing" id="RV1-LZ-lJp"/>
|
||||
<constraint firstAttribute="trailing" secondItem="qvr-u3-nNo" secondAttribute="trailing" constant="16" id="T2E-Dp-9aj"/>
|
||||
<constraint firstItem="j3u-fF-pG6" firstAttribute="leading" secondItem="fpo-VO-awT" secondAttribute="leading" constant="16" id="TFM-QG-P2e"/>
|
||||
<constraint firstAttribute="bottom" secondItem="QFf-wR-pPw" secondAttribute="bottom" id="YAg-Wx-DLo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Ztq-3s-Oo8" secondAttribute="bottom" id="kkO-W7-ngX"/>
|
||||
<constraint firstItem="qvr-u3-nNo" firstAttribute="leading" secondItem="QFf-wR-pPw" secondAttribute="trailing" constant="8" id="m7G-DT-9Wm"/>
|
||||
<constraint firstItem="QFf-wR-pPw" firstAttribute="leading" secondItem="fpo-VO-awT" secondAttribute="leading" constant="60" id="mNR-IV-cek"/>
|
||||
<constraint firstItem="qvr-u3-nNo" firstAttribute="centerY" secondItem="fpo-VO-awT" secondAttribute="centerYWithinMargins" id="opz-Nt-Q5b"/>
|
||||
|
|
@ -77,11 +63,11 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCellContentView>
|
||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="bottomSeparatorLeadingOffset" destination="6dM-c2-MTO" id="Xub-cK-CiJ"/>
|
||||
<outlet property="icon" destination="j3u-fF-pG6" id="nIz-cY-MCW"/>
|
||||
<outlet property="label" destination="QFf-wR-pPw" id="1MO-Vf-bt6"/>
|
||||
<outlet property="switchControl" destination="qvr-u3-nNo" id="hfe-x6-0cw"/>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
@interface MWMEditorTableViewHeader : UIView
|
||||
|
||||
- (void)config:(NSString *)title;
|
||||
|
||||
@end
|
||||
|
|
@ -1,16 +0,0 @@
|
|||
#import "MWMEditorTableViewHeader.h"
|
||||
|
||||
@interface MWMEditorTableViewHeader ()
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UILabel * title;
|
||||
|
||||
@end
|
||||
|
||||
@implementation MWMEditorTableViewHeader
|
||||
|
||||
- (void)config:(NSString *)title
|
||||
{
|
||||
self.title.text = title;
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" id="njl-yL-80j" customClass="MWMEditorTableViewHeader">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="40"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Address" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="160" translatesAutoresizingMaskIntoConstraints="NO" id="we9-bu-Oc9">
|
||||
<rect key="frame" x="16" y="13.5" width="47.5" height="14.5"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue-Bold" family="Helvetica Neue" pointSize="12"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="fwS-WS-ihG" userLabel="Top Separator">
|
||||
<rect key="frame" x="0.0" y="39" width="375" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="fTI-A6-J7W"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="fwS-WS-ihG" firstAttribute="leading" secondItem="njl-yL-80j" secondAttribute="leading" id="2Vn-4G-BTa"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fwS-WS-ihG" secondAttribute="trailing" id="KFR-10-Lic"/>
|
||||
<constraint firstAttribute="bottom" secondItem="fwS-WS-ihG" secondAttribute="bottom" id="RhG-3r-sZL"/>
|
||||
<constraint firstItem="we9-bu-Oc9" firstAttribute="leading" secondItem="njl-yL-80j" secondAttribute="leading" priority="750" constant="16" id="bfh-Fc-4NV"/>
|
||||
<constraint firstAttribute="bottom" secondItem="we9-bu-Oc9" secondAttribute="bottom" priority="750" constant="12" id="pMh-yt-QKq"/>
|
||||
</constraints>
|
||||
<nil key="simulatedStatusBarMetrics"/>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="title" destination="we9-bu-Oc9" id="jy0-Sj-KuJ"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="179" y="357"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
#import "MWMEditorCommon.h"
|
||||
@protocol MWMEditorCellProtocol;
|
||||
|
||||
@interface MWMEditorTextTableViewCell : UITableViewCell
|
||||
|
||||
|
|
@ -6,7 +6,6 @@
|
|||
icon:(UIImage *)icon
|
||||
text:(NSString *)text
|
||||
placeholder:(NSString *)placeholder
|
||||
keyboardType:(UIKeyboardType)keyboardType
|
||||
lastCell:(BOOL)lastCell;
|
||||
keyboardType:(UIKeyboardType)keyboardType;
|
||||
|
||||
@end
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#import "MWMEditorCommon.h"
|
||||
#import "MWMEditorTextTableViewCell.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
#import "UIImageView+Coloring.h"
|
||||
|
|
@ -7,7 +8,6 @@
|
|||
|
||||
@property (weak, nonatomic) IBOutlet UIImageView * icon;
|
||||
@property (weak, nonatomic) IBOutlet UITextField * textField;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * bottomSeparatorLeadingOffset;
|
||||
|
||||
@property (weak, nonatomic) id<MWMEditorCellProtocol> delegate;
|
||||
|
||||
|
|
@ -15,24 +15,25 @@
|
|||
|
||||
@implementation MWMEditorTextTableViewCell
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
self.backgroundColor = [UIColor white];
|
||||
}
|
||||
|
||||
- (void)configWithDelegate:(id<MWMEditorCellProtocol>)delegate
|
||||
icon:(UIImage *)icon
|
||||
text:(NSString *)text
|
||||
placeholder:(NSString *)placeholder
|
||||
keyboardType:(UIKeyboardType)keyboardType
|
||||
lastCell:(BOOL)lastCell
|
||||
{
|
||||
self.delegate = delegate;
|
||||
self.icon.image = icon;
|
||||
self.icon.mwm_coloring = MWMImageColoringBlack;
|
||||
BOOL isNameCell = (icon == nil);
|
||||
self.icon.hidden = isNameCell;
|
||||
self.backgroundColor = isNameCell ? [UIColor clearColor] : [UIColor white];
|
||||
self.icon.hidden = (icon == nil);
|
||||
self.textField.text = text;
|
||||
self.textField.attributedPlaceholder = [[NSAttributedString alloc] initWithString:placeholder attributes:
|
||||
@{NSForegroundColorAttributeName : [UIColor blackHintText]}];
|
||||
self.textField.keyboardType = keyboardType;
|
||||
self.bottomSeparatorLeadingOffset.priority = lastCell ? UILayoutPriorityDefaultHigh : UILayoutPriorityDefaultLow;
|
||||
}
|
||||
|
||||
#pragma mark - UITextFieldDelegate
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMEditorTextTableViewCell">
|
||||
<tableViewCell contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" id="KGk-i7-Jjw" customClass="MWMEditorTextTableViewCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="5uK-5Q-cg0">
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlack"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="krN-k2-9qO">
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="krN-k2-9qO">
|
||||
<rect key="frame" x="60" y="0.0" width="252" height="44"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="750" constant="44" id="RYF-oc-ZOx"/>
|
||||
|
|
@ -41,25 +41,11 @@
|
|||
<outlet property="delegate" destination="KGk-i7-Jjw" id="GO4-EB-MG9"/>
|
||||
</connections>
|
||||
</textField>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yfK-ST-aDJ" userLabel="Bottom Separator">
|
||||
<rect key="frame" x="60" y="43" width="260" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="Uiq-GY-b3X"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="5uK-5Q-cg0" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="6CB-Dy-pnd"/>
|
||||
<constraint firstItem="krN-k2-9qO" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="M6R-qw-860"/>
|
||||
<constraint firstAttribute="trailing" secondItem="krN-k2-9qO" secondAttribute="trailing" constant="8" id="O2l-xa-4ZO"/>
|
||||
<constraint firstItem="yfK-ST-aDJ" firstAttribute="leading" secondItem="krN-k2-9qO" secondAttribute="leading" priority="500" id="PIx-U4-iav"/>
|
||||
<constraint firstAttribute="trailing" secondItem="yfK-ST-aDJ" secondAttribute="trailing" id="d9m-E2-LLW"/>
|
||||
<constraint firstItem="yfK-ST-aDJ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" priority="250" id="jNX-Rx-eHb"/>
|
||||
<constraint firstAttribute="bottom" secondItem="yfK-ST-aDJ" secondAttribute="bottom" id="lH1-Vh-Ioo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="krN-k2-9qO" secondAttribute="bottom" id="mfl-oM-QaP"/>
|
||||
<constraint firstItem="5uK-5Q-cg0" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="ufn-3T-MOd"/>
|
||||
<constraint firstItem="krN-k2-9qO" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="60" id="w8z-Hi-yGr"/>
|
||||
|
|
@ -68,11 +54,11 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCellContentView>
|
||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="bottomSeparatorLeadingOffset" destination="jNX-Rx-eHb" id="BAI-td-cnF"/>
|
||||
<outlet property="icon" destination="5uK-5Q-cg0" id="5du-LU-RmA"/>
|
||||
<outlet property="textField" destination="krN-k2-9qO" id="Fqg-H9-JpU"/>
|
||||
</connections>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#import "MWMOpeningHoursEditorViewController.h"
|
||||
#import "MWMPlacePageEntity.h"
|
||||
#import "ViewController.h"
|
||||
#import "TableViewController.h"
|
||||
|
||||
@interface MWMEditorViewController : ViewController <MWMOpeningHoursEditorProtocol>
|
||||
@interface MWMEditorViewController : TableViewController <MWMOpeningHoursEditorProtocol>
|
||||
|
||||
@property (nonatomic) MWMPlacePageEntity * entity;
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
#import "MWMEditorCommon.h"
|
||||
#import "MWMEditorSelectTableViewCell.h"
|
||||
#import "MWMEditorSwitchTableViewCell.h"
|
||||
#import "MWMEditorTableViewHeader.h"
|
||||
#import "MWMEditorTextTableViewCell.h"
|
||||
#import "MWMEditorViewController.h"
|
||||
#import "MWMOpeningHoursEditorViewController.h"
|
||||
|
|
@ -29,12 +28,11 @@ typedef NS_ENUM(NSUInteger, MWMEditorSection)
|
|||
vector<MWMPlacePageCellType> const gSectionNameCellTypes{MWMPlacePageCellTypeName};
|
||||
|
||||
vector<MWMPlacePageCellType> const gSectionAddressCellTypes{
|
||||
{MWMPlacePageCellTypeStreet, MWMPlacePageCellTypeBuilding, MWMPlacePageCellTypeSpacer}};
|
||||
{MWMPlacePageCellTypeStreet, MWMPlacePageCellTypeBuilding}};
|
||||
|
||||
vector<MWMPlacePageCellType> const gSectionDetailsCellTypes{
|
||||
{MWMPlacePageCellTypeOpenHours, MWMPlacePageCellTypePhoneNumber, MWMPlacePageCellTypeWebsite,
|
||||
MWMPlacePageCellTypeEmail, MWMPlacePageCellTypeCuisine, MWMPlacePageCellTypeWiFi,
|
||||
MWMPlacePageCellTypeSpacer}};
|
||||
MWMPlacePageCellTypeEmail, MWMPlacePageCellTypeCuisine, MWMPlacePageCellTypeWiFi}};
|
||||
|
||||
using CellTypesSectionMap = pair<vector<MWMPlacePageCellType>, MWMEditorSection>;
|
||||
|
||||
|
|
@ -52,8 +50,7 @@ MWMPlacePageCellTypeValueMap const gCellType2ReuseIdentifier{
|
|||
{MWMPlacePageCellTypeWebsite, "MWMEditorTextTableViewCell"},
|
||||
{MWMPlacePageCellTypeEmail, "MWMEditorTextTableViewCell"},
|
||||
{MWMPlacePageCellTypeCuisine, "MWMEditorSelectTableViewCell"},
|
||||
{MWMPlacePageCellTypeWiFi, "MWMEditorSwitchTableViewCell"},
|
||||
{MWMPlacePageCellTypeSpacer, "MWMEditorSpacerCell"}};
|
||||
{MWMPlacePageCellTypeWiFi, "MWMEditorSwitchTableViewCell"}};
|
||||
|
||||
NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
||||
{
|
||||
|
|
@ -64,14 +61,11 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
}
|
||||
} // namespace
|
||||
|
||||
@interface MWMEditorViewController ()<UITableViewDelegate, UITableViewDataSource,
|
||||
@interface MWMEditorViewController() <UITableViewDelegate, UITableViewDataSource,
|
||||
UITextFieldDelegate, MWMPlacePageOpeningHoursCellProtocol,
|
||||
MWMEditorCellProtocol, MWMCuisineEditorProtocol,
|
||||
MWMStreetEditorProtocol>
|
||||
|
||||
@property (weak, nonatomic) IBOutlet UITableView * tableView;
|
||||
@property (weak, nonatomic) IBOutlet NSLayoutConstraint * tableViewBottomOffset;
|
||||
|
||||
@property (nonatomic) NSMutableDictionary<NSString *, UITableViewCell *> * offscreenCells;
|
||||
@property (weak, nonatomic) UITableViewCell * editCell;
|
||||
|
||||
|
|
@ -92,7 +86,6 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
[super viewDidLoad];
|
||||
[self configTable];
|
||||
[self configNavBar];
|
||||
[self configKeyboardObserver];
|
||||
}
|
||||
|
||||
- (void)viewWillAppear:(BOOL)animated
|
||||
|
|
@ -117,42 +110,6 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
self.navigationController.navigationBar.barStyle = UIBarStyleBlack;
|
||||
}
|
||||
|
||||
- (void)configKeyboardObserver
|
||||
{
|
||||
[[NSNotificationCenter defaultCenter] addObserver:self
|
||||
selector:@selector(keyboardWillChangeFrame:)
|
||||
name:UIKeyboardWillChangeFrameNotification
|
||||
object:nil];
|
||||
}
|
||||
|
||||
#pragma mark - Observers
|
||||
|
||||
- (void)keyboardWillChangeFrame:(NSNotification *)aNotification
|
||||
{
|
||||
NSDictionary * info = [aNotification userInfo];
|
||||
CGFloat const kbYEnd = [info[UIKeyboardFrameEndUserInfoKey] CGRectValue].origin.y;
|
||||
CGFloat const kbYBeg = [info[UIKeyboardFrameBeginUserInfoKey] CGRectValue].origin.y;
|
||||
UIViewAnimationCurve const curve =
|
||||
static_cast<UIViewAnimationCurve>([info[UIKeyboardAnimationCurveUserInfoKey] integerValue]);
|
||||
NSTimeInterval const duration = [info[UIKeyboardAnimationDurationUserInfoKey] doubleValue];
|
||||
[self.view layoutIfNeeded];
|
||||
UITableView * tv = self.tableView;
|
||||
NSIndexPath * cellPath = [tv indexPathForCell:self.editCell];
|
||||
[tv scrollToRowAtIndexPath:cellPath atScrollPosition:UITableViewScrollPositionNone animated:YES];
|
||||
if (kbYEnd < kbYBeg)
|
||||
self.tableViewBottomOffset.constant = kbYBeg - kbYEnd;
|
||||
else if (kbYEnd > kbYBeg)
|
||||
self.tableViewBottomOffset.constant = 0.0;
|
||||
[UIView animateWithDuration:duration delay:0.0 options:curve animations:^
|
||||
{
|
||||
[self.view layoutIfNeeded];
|
||||
}
|
||||
completion:^(BOOL finished)
|
||||
{
|
||||
[tv scrollToRowAtIndexPath:cellPath atScrollPosition:UITableViewScrollPositionNone animated:YES];
|
||||
}];
|
||||
}
|
||||
|
||||
#pragma mark - Actions
|
||||
|
||||
- (void)onCancel
|
||||
|
|
@ -255,29 +212,12 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
return reuseIdentifier(cellType);
|
||||
}
|
||||
|
||||
- (BOOL)isLastCellInSection:(NSIndexPath *)indexPath
|
||||
{
|
||||
NSUInteger const row = indexPath.row;
|
||||
NSUInteger const section = indexPath.section;
|
||||
NSUInteger const rowsInSection = m_cells[m_sections[section]].size();
|
||||
BOOL const isLastCell = rowsInSection - 1 == row;
|
||||
if (isLastCell)
|
||||
return YES;
|
||||
BOOL const isPenultimateCell = rowsInSection - 2 == row;
|
||||
if (!isPenultimateCell)
|
||||
return NO;
|
||||
NSIndexPath * lastIndexPath = [NSIndexPath indexPathForRow:row + 1 inSection:section];
|
||||
BOOL const isLastCellSeparator = ([self cellTypeForIndexPath:lastIndexPath] == MWMPlacePageCellTypeSpacer);
|
||||
return isLastCellSeparator;
|
||||
}
|
||||
|
||||
#pragma mark - Fill cells with data
|
||||
|
||||
- (void)fillCell:(UITableViewCell * _Nonnull)cell atIndexPath:(NSIndexPath * _Nonnull)indexPath
|
||||
{
|
||||
MWMPlacePageCellType const cellType = [self cellTypeForIndexPath:indexPath];
|
||||
NSString * entityValue = [self getCellValue:cellType];
|
||||
BOOL const lastCell = [self isLastCellInSection:indexPath];
|
||||
switch (cellType)
|
||||
{
|
||||
case MWMPlacePageCellTypePhoneNumber:
|
||||
|
|
@ -287,8 +227,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
icon:[UIImage imageNamed:@"ic_placepage_phone_number"]
|
||||
text:entityValue
|
||||
placeholder:L(@"phone")
|
||||
keyboardType:UIKeyboardTypePhonePad
|
||||
lastCell:lastCell];
|
||||
keyboardType:UIKeyboardTypePhonePad];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeWebsite:
|
||||
|
|
@ -298,8 +237,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
icon:[UIImage imageNamed:@"ic_placepage_website"]
|
||||
text:entityValue
|
||||
placeholder:L(@"website")
|
||||
keyboardType:UIKeyboardTypeURL
|
||||
lastCell:lastCell];
|
||||
keyboardType:UIKeyboardTypeURL];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeEmail:
|
||||
|
|
@ -309,15 +247,14 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
icon:[UIImage imageNamed:@"ic_placepage_email"]
|
||||
text:entityValue
|
||||
placeholder:L(@"email")
|
||||
keyboardType:UIKeyboardTypeEmailAddress
|
||||
lastCell:lastCell];
|
||||
keyboardType:UIKeyboardTypeEmailAddress];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeOpenHours:
|
||||
{
|
||||
MWMPlacePageOpeningHoursCell * tCell = (MWMPlacePageOpeningHoursCell *)cell;
|
||||
NSString * text = entityValue ? entityValue : L(@"add_opening_hours");
|
||||
[tCell configWithDelegate:self info:text lastCell:lastCell];
|
||||
[tCell configWithDelegate:self info:text];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeWiFi:
|
||||
|
|
@ -327,8 +264,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
[tCell configWithDelegate:self
|
||||
icon:[UIImage imageNamed:@"ic_placepage_wifi"]
|
||||
text:L(@"wifi")
|
||||
on:on
|
||||
lastCell:lastCell];
|
||||
on:on];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeName:
|
||||
|
|
@ -338,8 +274,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
icon:nil
|
||||
text:entityValue
|
||||
placeholder:L(@"name")
|
||||
keyboardType:UIKeyboardTypeDefault
|
||||
lastCell:lastCell];
|
||||
keyboardType:UIKeyboardTypeDefault];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeStreet:
|
||||
|
|
@ -348,8 +283,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
[tCell configWithDelegate:self
|
||||
icon:[UIImage imageNamed:@"ic_placepage_adress"]
|
||||
text:entityValue
|
||||
placeholder:L(@"add_street")
|
||||
lastCell:lastCell];
|
||||
placeholder:L(@"add_street")];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeBuilding:
|
||||
|
|
@ -359,8 +293,7 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
icon:nil
|
||||
text:entityValue
|
||||
placeholder:L(@"house")
|
||||
keyboardType:UIKeyboardTypeDefault
|
||||
lastCell:lastCell];
|
||||
keyboardType:UIKeyboardTypeDefault];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeCuisine:
|
||||
|
|
@ -370,12 +303,9 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
[tCell configWithDelegate:self
|
||||
icon:[UIImage imageNamed:@"ic_placepage_cuisine"]
|
||||
text:text
|
||||
placeholder:L(@"select_cuisine")
|
||||
lastCell:lastCell];
|
||||
placeholder:L(@"select_cuisine")];
|
||||
break;
|
||||
}
|
||||
case MWMPlacePageCellTypeSpacer:
|
||||
break;
|
||||
default:
|
||||
NSAssert(false, @"Invalid field for editor");
|
||||
break;
|
||||
|
|
@ -431,35 +361,28 @@ NSString * reuseIdentifier(MWMPlacePageCellType cellType)
|
|||
[self fillCell:cell atIndexPath:indexPath];
|
||||
}
|
||||
|
||||
- (UIView * _Nullable)tableView:(UITableView * _Nonnull)tableView viewForHeaderInSection:(NSInteger)section
|
||||
- (NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
|
||||
{
|
||||
MWMEditorTableViewHeader * headerView =
|
||||
[[[NSBundle mainBundle] loadNibNamed:@"MWMEditorTableViewHeader"
|
||||
owner:nil
|
||||
options:nil] firstObject];
|
||||
switch (m_sections[section])
|
||||
{
|
||||
case MWMEditorSectionName:
|
||||
return nil;
|
||||
case MWMEditorSectionAddress:
|
||||
[headerView config:L(@"address")];
|
||||
break;
|
||||
case MWMEditorSectionDetails:
|
||||
[headerView config:L(@"details")];
|
||||
break;
|
||||
case MWMEditorSectionName:
|
||||
return nil;
|
||||
case MWMEditorSectionAddress:
|
||||
return L(@"address");
|
||||
case MWMEditorSectionDetails:
|
||||
return L(@"details");
|
||||
}
|
||||
return headerView;
|
||||
}
|
||||
|
||||
- (CGFloat)tableView:(UITableView * _Nonnull)tableView heightForHeaderInSection:(NSInteger)section
|
||||
- (NSString *)tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section
|
||||
{
|
||||
switch (m_sections[section])
|
||||
{
|
||||
case MWMEditorSectionName:
|
||||
return 0.0;
|
||||
case MWMEditorSectionAddress:
|
||||
case MWMEditorSectionDetails:
|
||||
return 36.0;
|
||||
case MWMEditorSectionName:
|
||||
return L(@"place_name_caption");
|
||||
case MWMEditorSectionAddress:
|
||||
case MWMEditorSectionDetails:
|
||||
return nil;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DPW-UE-5UN">
|
||||
|
|
@ -31,25 +31,24 @@
|
|||
<action selector="addClosedTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="HxR-3Y-SiG"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lhy-0r-XYI" userLabel="Separator">
|
||||
<rect key="frame" x="0.0" y="42" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="6P1-ZO-JMA">
|
||||
<rect key="frame" x="0.0" y="43" width="320" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="naN-vv-7Hw"/>
|
||||
<constraint firstAttribute="height" constant="1" id="ckb-Sc-MTJ"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="DPW-UE-5UN" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="4Li-Xr-b3S"/>
|
||||
<constraint firstItem="DPW-UE-5UN" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Ng6-qX-haA"/>
|
||||
<constraint firstItem="lhy-0r-XYI" firstAttribute="top" secondItem="DPW-UE-5UN" secondAttribute="bottom" id="Nip-7c-kmh"/>
|
||||
<constraint firstAttribute="bottom" secondItem="lhy-0r-XYI" secondAttribute="bottom" id="ZK2-xr-mlC"/>
|
||||
<constraint firstItem="6P1-ZO-JMA" firstAttribute="top" secondItem="DPW-UE-5UN" secondAttribute="bottom" constant="1" id="b8H-yj-uLc"/>
|
||||
<constraint firstAttribute="trailing" secondItem="DPW-UE-5UN" secondAttribute="trailing" id="bAd-QF-f1s"/>
|
||||
<constraint firstItem="lhy-0r-XYI" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="cMf-sJ-a11"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lhy-0r-XYI" secondAttribute="trailing" id="vWV-47-g9W"/>
|
||||
<constraint firstAttribute="bottom" secondItem="6P1-ZO-JMA" secondAttribute="bottom" constant="-0.5" id="edX-pE-hpk"/>
|
||||
<constraint firstAttribute="trailing" secondItem="6P1-ZO-JMA" secondAttribute="trailing" id="uJU-yO-Xeh"/>
|
||||
<constraint firstItem="6P1-ZO-JMA" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="yxQ-et-0D2"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
|
|
@ -63,4 +62,7 @@
|
|||
</connections>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="84"/>
|
||||
<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="83.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="83"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Rja-9J-5hA">
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="All Day (24 hours)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="223" translatesAutoresizingMaskIntoConstraints="NO" id="0Ni-TD-6Ia">
|
||||
|
|
@ -26,8 +26,8 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0BP-HJ-Tdq">
|
||||
<rect key="frame" x="255" y="7" width="51" height="31"/>
|
||||
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="0BP-HJ-Tdq">
|
||||
<rect key="frame" x="255" y="6" width="51" height="30"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="onTintColorName" value="linkBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
|
|
@ -35,26 +35,26 @@
|
|||
<action selector="onSwitch" destination="KGk-i7-Jjw" eventType="valueChanged" id="qZA-HV-PB6"/>
|
||||
</connections>
|
||||
</switch>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="72V-nI-evJ" userLabel="Separator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="lbK-kB-c4p">
|
||||
<rect key="frame" x="0.0" y="43" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="qaa-Np-Mlw"/>
|
||||
<constraint firstAttribute="height" constant="1" id="JvF-ZU-maq"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="0BP-HJ-Tdq" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerYWithinMargins" id="1kG-H0-QmS"/>
|
||||
<constraint firstItem="0Ni-TD-6Ia" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="4y2-py-cgM"/>
|
||||
<constraint firstItem="72V-nI-evJ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="6oD-sE-c88"/>
|
||||
<constraint firstAttribute="bottom" secondItem="72V-nI-evJ" secondAttribute="bottom" id="9S8-o4-dMI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lbK-kB-c4p" secondAttribute="trailing" id="797-Uf-0Jb"/>
|
||||
<constraint firstItem="lbK-kB-c4p" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Dv4-Kj-kii"/>
|
||||
<constraint firstAttribute="trailing" secondItem="0BP-HJ-Tdq" secondAttribute="trailing" constant="16" id="Ejw-wu-5pE"/>
|
||||
<constraint firstItem="lbK-kB-c4p" firstAttribute="top" secondItem="0BP-HJ-Tdq" secondAttribute="bottom" constant="7" id="KIL-OP-roj"/>
|
||||
<constraint firstItem="0BP-HJ-Tdq" firstAttribute="leading" secondItem="0Ni-TD-6Ia" secondAttribute="trailing" constant="16" id="cgf-7m-Kki"/>
|
||||
<constraint firstItem="0Ni-TD-6Ia" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="gZM-Zt-RId"/>
|
||||
<constraint firstAttribute="trailing" secondItem="72V-nI-evJ" secondAttribute="trailing" id="sWi-1h-Y7Z"/>
|
||||
<constraint firstAttribute="bottom" secondItem="lbK-kB-c4p" secondAttribute="bottom" constant="-0.5" id="jbG-hH-bln"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
|
|
@ -68,4 +68,7 @@
|
|||
</connections>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eHW-h6-k3U" userLabel="Cancel Button" customClass="MWMButton">
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="14:00-15:00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="170" translatesAutoresizingMaskIntoConstraints="NO" id="hOg-Ps-YH4">
|
||||
<rect key="frame" x="134" y="12" width="170" height="20"/>
|
||||
<rect key="frame" x="134" y="11" width="170" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="170" id="lQt-Xw-FNV"/>
|
||||
</constraints>
|
||||
|
|
@ -56,34 +56,34 @@
|
|||
<action selector="expandTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Fva-H8-Hgd"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tXB-EA-A1F" userLabel="Separator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="fZN-J3-A1c">
|
||||
<rect key="frame" x="0.0" y="43" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="g9p-ER-4LZ"/>
|
||||
<constraint firstAttribute="height" constant="1" id="Vyg-vJ-QBa"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="fZN-J3-A1c" secondAttribute="trailing" id="4ix-Pa-jem"/>
|
||||
<constraint firstAttribute="bottom" secondItem="3cC-7h-Nyb" secondAttribute="bottom" id="8WG-92-rMW"/>
|
||||
<constraint firstItem="3cC-7h-Nyb" firstAttribute="leading" secondItem="eHW-h6-k3U" secondAttribute="trailing" id="9Bn-Ln-6Kp"/>
|
||||
<constraint firstItem="lia-DA-sOa" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="9iu-Vt-ehV"/>
|
||||
<constraint firstAttribute="trailing" secondItem="tXB-EA-A1F" secondAttribute="trailing" id="CiK-04-ApA"/>
|
||||
<constraint firstAttribute="bottom" secondItem="tXB-EA-A1F" secondAttribute="bottom" id="CkO-DB-meo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="eHW-h6-k3U" secondAttribute="bottom" id="EBf-Wx-e3F"/>
|
||||
<constraint firstItem="eHW-h6-k3U" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="F0P-mc-NEh"/>
|
||||
<constraint firstItem="eHW-h6-k3U" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Plg-3V-wwv"/>
|
||||
<constraint firstItem="fZN-J3-A1c" firstAttribute="top" secondItem="hOg-Ps-YH4" secondAttribute="bottom" constant="12" id="Pyv-5m-MMc"/>
|
||||
<constraint firstAttribute="bottom" secondItem="fZN-J3-A1c" secondAttribute="bottom" constant="-0.5" id="Yi4-tf-i9O"/>
|
||||
<constraint firstItem="3cC-7h-Nyb" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ZM1-oj-Ttu"/>
|
||||
<constraint firstItem="hOg-Ps-YH4" firstAttribute="leading" secondItem="lia-DA-sOa" secondAttribute="trailing" priority="500" constant="4" id="bUD-vp-CsK"/>
|
||||
<constraint firstAttribute="trailing" secondItem="3cC-7h-Nyb" secondAttribute="trailing" id="dwl-rT-xgr"/>
|
||||
<constraint firstAttribute="trailing" secondItem="hOg-Ps-YH4" secondAttribute="trailing" priority="500" constant="16" id="jzD-AQ-ZIp"/>
|
||||
<constraint firstItem="hOg-Ps-YH4" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" priority="500" id="kba-LF-TBE"/>
|
||||
<constraint firstItem="hOg-Ps-YH4" firstAttribute="leading" secondItem="lia-DA-sOa" secondAttribute="leading" priority="250" id="mU9-yf-vga"/>
|
||||
<constraint firstItem="fZN-J3-A1c" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="nVn-y5-wFx"/>
|
||||
<constraint firstItem="hOg-Ps-YH4" firstAttribute="top" secondItem="lia-DA-sOa" secondAttribute="bottom" priority="250" constant="4" id="ne6-qS-gOV"/>
|
||||
<constraint firstItem="tXB-EA-A1F" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="peH-Wj-qJb"/>
|
||||
<constraint firstItem="lia-DA-sOa" firstAttribute="leading" secondItem="eHW-h6-k3U" secondAttribute="trailing" id="sEk-K9-5ox"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lia-DA-sOa" secondAttribute="trailing" priority="250" constant="8" id="zjM-Hg-INM"/>
|
||||
</constraints>
|
||||
|
|
@ -105,5 +105,6 @@
|
|||
</objects>
|
||||
<resources>
|
||||
<image name="ic_clear_sys" width="28" height="28"/>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="76"/>
|
||||
<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="75.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="75"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CCr-vZ-lZV" userLabel="Day#1">
|
||||
|
|
@ -60,16 +60,16 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="d7U-Vz-ZXn" userLabel="Day#2">
|
||||
<rect key="frame" x="57" y="0.0" width="42" height="76"/>
|
||||
<rect key="frame" x="57" y="0.0" width="41" height="76"/>
|
||||
<subviews>
|
||||
<button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7fE-x8-2Vl">
|
||||
<rect key="frame" x="0.0" y="0.0" width="42" height="76"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="41" height="76"/>
|
||||
<connections>
|
||||
<action selector="selectDay:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="zPb-wt-0Cz"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" tag="1" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Su" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="40" translatesAutoresizingMaskIntoConstraints="NO" id="TX4-wv-r7d">
|
||||
<rect key="frame" x="0.0" y="12" width="42" height="20"/>
|
||||
<rect key="frame" x="0.0" y="12" width="41" height="20"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" tag="1" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="radioBtnOff" highlightedImage="radioBtnOn" translatesAutoresizingMaskIntoConstraints="NO" id="PA6-gY-SsH">
|
||||
<rect key="frame" x="10" y="40" width="22" height="22"/>
|
||||
<rect key="frame" x="9" y="40" width="22" height="22"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="22" id="ACp-b4-BbL"/>
|
||||
<constraint firstAttribute="width" constant="22" id="PHS-nj-MJ1"/>
|
||||
|
|
@ -105,7 +105,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="J8L-sr-yWu" userLabel="Day#3">
|
||||
<rect key="frame" x="99" y="0.0" width="41" height="76"/>
|
||||
<rect key="frame" x="98" y="0.0" width="41" height="76"/>
|
||||
<subviews>
|
||||
<button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ocy-4H-ZwH">
|
||||
<rect key="frame" x="0.0" y="0.0" width="41" height="76"/>
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="8q8-c5-QBM" userLabel="Day#4">
|
||||
<rect key="frame" x="140" y="0.0" width="41" height="76"/>
|
||||
<rect key="frame" x="139" y="0.0" width="41" height="76"/>
|
||||
<subviews>
|
||||
<button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pmq-0T-6ND">
|
||||
<rect key="frame" x="0.0" y="0.0" width="41" height="76"/>
|
||||
|
|
@ -195,7 +195,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="15A-tH-C45" userLabel="Day#5">
|
||||
<rect key="frame" x="181" y="0.0" width="41" height="76"/>
|
||||
<rect key="frame" x="180" y="0.0" width="41" height="76"/>
|
||||
<subviews>
|
||||
<button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Otc-DJ-XJQ">
|
||||
<rect key="frame" x="0.0" y="0.0" width="41" height="76"/>
|
||||
|
|
@ -240,16 +240,16 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Tqf-QU-RCZ" userLabel="Day#6">
|
||||
<rect key="frame" x="222" y="0.0" width="41" height="76"/>
|
||||
<rect key="frame" x="221" y="0.0" width="41" height="76"/>
|
||||
<subviews>
|
||||
<button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Kid-OJ-nOc">
|
||||
<rect key="frame" x="0.0" y="0.0" width="42" height="76"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="41" height="76"/>
|
||||
<connections>
|
||||
<action selector="selectDay:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Viw-8h-SMl"/>
|
||||
</connections>
|
||||
</button>
|
||||
<label opaque="NO" userInteractionEnabled="NO" tag="5" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Su" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="40" translatesAutoresizingMaskIntoConstraints="NO" id="F0Z-Fk-0s9">
|
||||
<rect key="frame" x="0.0" y="12" width="42" height="20"/>
|
||||
<rect key="frame" x="0.0" y="12" width="41" height="20"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -329,16 +329,15 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="k47-ei-lEk" userLabel="Separator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="i4V-yS-NEg">
|
||||
<rect key="frame" x="0.0" y="75" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="dUK-Gg-fgg"/>
|
||||
<constraint firstAttribute="height" constant="1" id="ebA-bw-LdR"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="Tqf-QU-RCZ" firstAttribute="leading" secondItem="15A-tH-C45" secondAttribute="trailing" id="1zj-Fh-hEJ"/>
|
||||
|
|
@ -347,6 +346,7 @@
|
|||
<constraint firstAttribute="trailing" secondItem="lBL-06-25g" secondAttribute="trailing" constant="16" id="684-Mj-MPT"/>
|
||||
<constraint firstItem="d7U-Vz-ZXn" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="7Kd-9C-rrI"/>
|
||||
<constraint firstItem="d7U-Vz-ZXn" firstAttribute="leading" secondItem="CCr-vZ-lZV" secondAttribute="trailing" id="9BW-il-aHi"/>
|
||||
<constraint firstAttribute="bottom" secondItem="i4V-yS-NEg" secondAttribute="bottom" constant="-0.5" id="Ai5-Rm-yCG"/>
|
||||
<constraint firstItem="8q8-c5-QBM" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Bc6-d7-0np"/>
|
||||
<constraint firstItem="lBL-06-25g" firstAttribute="leading" secondItem="Tqf-QU-RCZ" secondAttribute="trailing" id="Cjw-Ap-AU1"/>
|
||||
<constraint firstItem="Tqf-QU-RCZ" firstAttribute="width" secondItem="lBL-06-25g" secondAttribute="width" id="EOh-Xy-asn"/>
|
||||
|
|
@ -355,12 +355,12 @@
|
|||
<constraint firstAttribute="bottom" secondItem="lBL-06-25g" secondAttribute="bottom" id="Mif-uK-Glu"/>
|
||||
<constraint firstItem="8q8-c5-QBM" firstAttribute="leading" secondItem="J8L-sr-yWu" secondAttribute="trailing" id="OhY-sz-5EG"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Tqf-QU-RCZ" secondAttribute="bottom" id="PLc-Et-DgL"/>
|
||||
<constraint firstAttribute="trailing" secondItem="k47-ei-lEk" secondAttribute="trailing" id="Pe6-xg-QN4"/>
|
||||
<constraint firstAttribute="trailing" secondItem="i4V-yS-NEg" secondAttribute="trailing" id="QQ4-vc-HVH"/>
|
||||
<constraint firstItem="lBL-06-25g" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Qst-JA-vhN"/>
|
||||
<constraint firstAttribute="bottom" secondItem="15A-tH-C45" secondAttribute="bottom" id="Rt0-jf-VSs"/>
|
||||
<constraint firstItem="15A-tH-C45" firstAttribute="width" secondItem="Tqf-QU-RCZ" secondAttribute="width" id="StI-Qm-Vr2"/>
|
||||
<constraint firstItem="J8L-sr-yWu" firstAttribute="width" secondItem="8q8-c5-QBM" secondAttribute="width" id="Y8q-0K-tpN"/>
|
||||
<constraint firstAttribute="bottom" secondItem="k47-ei-lEk" secondAttribute="bottom" id="YMS-rp-JT4"/>
|
||||
<constraint firstItem="i4V-yS-NEg" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="dCf-tV-y5Z"/>
|
||||
<constraint firstAttribute="bottom" secondItem="J8L-sr-yWu" secondAttribute="bottom" id="eO5-aC-qFU"/>
|
||||
<constraint firstItem="15A-tH-C45" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="gOd-8i-R7q"/>
|
||||
<constraint firstItem="15A-tH-C45" firstAttribute="leading" secondItem="8q8-c5-QBM" secondAttribute="trailing" id="hBC-FV-co6"/>
|
||||
|
|
@ -371,7 +371,6 @@
|
|||
<constraint firstItem="8q8-c5-QBM" firstAttribute="width" secondItem="15A-tH-C45" secondAttribute="width" id="tLl-N7-MHZ"/>
|
||||
<constraint firstItem="J8L-sr-yWu" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="y7s-Ip-YCm"/>
|
||||
<constraint firstAttribute="bottom" secondItem="CCr-vZ-lZV" secondAttribute="bottom" id="zPu-9q-ZMS"/>
|
||||
<constraint firstItem="k47-ei-lEk" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ze5-IH-JYq"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
|
|
@ -408,5 +407,6 @@
|
|||
<resources>
|
||||
<image name="radioBtnOff" width="22" height="22"/>
|
||||
<image name="radioBtnOn" width="22" height="22"/>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="6sA-sN-4Dk">
|
||||
|
|
@ -31,25 +31,24 @@
|
|||
<action selector="deleteScheduleTap" destination="KGk-i7-Jjw" eventType="touchUpInside" id="Wrd-G9-gDM"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ruz-hb-yNT" userLabel="Separator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="pwt-wM-TFm">
|
||||
<rect key="frame" x="0.0" y="43" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="jzr-EO-Xyw"/>
|
||||
<constraint firstAttribute="height" constant="1" id="uj7-UU-MSZ"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="Ruz-hb-yNT" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="2Qw-h7-SDr"/>
|
||||
<constraint firstAttribute="bottom" secondItem="6sA-sN-4Dk" secondAttribute="bottom" id="HqD-nd-D5C"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Ruz-hb-yNT" secondAttribute="bottom" id="Zqm-NG-5hj"/>
|
||||
<constraint firstAttribute="trailing" secondItem="6sA-sN-4Dk" secondAttribute="trailing" id="ajb-sy-7f6"/>
|
||||
<constraint firstItem="6sA-sN-4Dk" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="fyt-5F-eSU"/>
|
||||
<constraint firstItem="pwt-wM-TFm" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="jD1-ee-pdn"/>
|
||||
<constraint firstAttribute="bottom" secondItem="pwt-wM-TFm" secondAttribute="bottom" constant="-0.5" id="jr1-UN-iiO"/>
|
||||
<constraint firstAttribute="trailing" secondItem="pwt-wM-TFm" secondAttribute="trailing" id="uAP-Dw-Gir"/>
|
||||
<constraint firstItem="6sA-sN-4Dk" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="ywG-MR-eI2"/>
|
||||
<constraint firstAttribute="trailing" secondItem="Ruz-hb-yNT" secondAttribute="trailing" id="zb8-8w-hsL"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
|
|
@ -60,4 +59,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#import "MWMOpeningHoursTableViewCell.h"
|
||||
|
||||
@interface MWMOpeningHoursSpacerTableViewCell : MWMOpeningHoursTableViewCell
|
||||
|
||||
@end
|
||||
|
|
@ -1,15 +0,0 @@
|
|||
#import "MWMOpeningHoursSpacerTableViewCell.h"
|
||||
|
||||
@implementation MWMOpeningHoursSpacerTableViewCell
|
||||
|
||||
+ (CGFloat)heightForWidth:(CGFloat)width
|
||||
{
|
||||
return 40.0;
|
||||
}
|
||||
|
||||
- (void)awakeFromNib
|
||||
{
|
||||
self.backgroundColor = [UIColor clearColor];
|
||||
}
|
||||
|
||||
@end
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="9531" systemVersion="15A284" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES">
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="9529"/>
|
||||
</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" id="KGk-i7-Jjw" customClass="MWMOpeningHoursSpacerTableViewCell">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</tableViewCellContentView>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="180"/>
|
||||
<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="179.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="179"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="time" minuteInterval="5" translatesAutoresizingMaskIntoConstraints="NO" id="GQP-ns-cE1">
|
||||
|
|
@ -68,34 +68,33 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cAz-Sc-ynR" userLabel="BottomSeparator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="rOS-aO-0gb">
|
||||
<rect key="frame" x="0.0" y="179" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="ARD-HS-urF"/>
|
||||
<constraint firstAttribute="height" constant="1" id="etc-9t-7gU"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="MQr-gL-ImO" firstAttribute="centerX" secondItem="w7f-Rh-vzg" secondAttribute="centerX" constant="-4" id="1aM-UN-taw"/>
|
||||
<constraint firstAttribute="bottom" secondItem="rOS-aO-0gb" secondAttribute="bottom" constant="-0.5" id="48x-fh-WrH"/>
|
||||
<constraint firstItem="6b2-fN-HrU" firstAttribute="centerY" secondItem="GQP-ns-cE1" secondAttribute="centerY" id="CFO-NC-K5i"/>
|
||||
<constraint firstItem="MQr-gL-ImO" firstAttribute="centerY" secondItem="w7f-Rh-vzg" secondAttribute="centerY" id="IAa-cP-AKa"/>
|
||||
<constraint firstItem="cAz-Sc-ynR" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="IMq-wC-qsF"/>
|
||||
<constraint firstItem="ArA-iX-w8F" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="Jwt-Hj-rB5"/>
|
||||
<constraint firstAttribute="trailing" secondItem="cAz-Sc-ynR" secondAttribute="trailing" id="LaU-d6-0eM"/>
|
||||
<constraint firstAttribute="bottom" secondItem="GQP-ns-cE1" secondAttribute="bottom" id="MD6-2s-qbb"/>
|
||||
<constraint firstItem="GQP-ns-cE1" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" multiplier="1:2" id="TAR-AD-a1X"/>
|
||||
<constraint firstItem="GQP-ns-cE1" firstAttribute="width" secondItem="H2p-sc-9uM" secondAttribute="width" multiplier="0.4" id="TeT-Yf-UeO"/>
|
||||
<constraint firstAttribute="trailing" secondItem="rOS-aO-0gb" secondAttribute="trailing" id="W3v-cq-ONy"/>
|
||||
<constraint firstItem="w7f-Rh-vzg" firstAttribute="width" secondItem="H2p-sc-9uM" secondAttribute="width" multiplier="0.4" id="fYI-wR-woS"/>
|
||||
<constraint firstAttribute="bottom" secondItem="w7f-Rh-vzg" secondAttribute="bottom" id="hf6-7a-fuy"/>
|
||||
<constraint firstItem="GQP-ns-cE1" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="jAC-6F-GVz"/>
|
||||
<constraint firstItem="w7f-Rh-vzg" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" multiplier="3:2" id="kaE-sT-Ycx"/>
|
||||
<constraint firstItem="w7f-Rh-vzg" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ke4-wU-x0k"/>
|
||||
<constraint firstAttribute="bottom" secondItem="cAz-Sc-ynR" secondAttribute="bottom" id="ndI-s1-MZS"/>
|
||||
<constraint firstItem="6b2-fN-HrU" firstAttribute="centerX" secondItem="GQP-ns-cE1" secondAttribute="centerX" constant="-4" id="nzt-Rr-b0u"/>
|
||||
<constraint firstItem="rOS-aO-0gb" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="t8r-sp-fRg"/>
|
||||
<constraint firstItem="ArA-iX-w8F" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="zKO-lN-XyI"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
|
|
@ -111,4 +110,7 @@
|
|||
</connections>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
<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="63.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="63"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Open time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="128" translatesAutoresizingMaskIntoConstraints="NO" id="CgC-lU-buo">
|
||||
<rect key="frame" x="16" y="12" width="131" height="17"/>
|
||||
<rect key="frame" x="16" y="12" width="131" height="16"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="8:00" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="128" translatesAutoresizingMaskIntoConstraints="NO" id="CuG-0G-4pB">
|
||||
<rect key="frame" x="16" y="33" width="131" height="17"/>
|
||||
<rect key="frame" x="16" y="32" width="131" height="17"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Close time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="127" translatesAutoresizingMaskIntoConstraints="NO" id="cGX-Q7-Ddh">
|
||||
<rect key="frame" x="176" y="12" width="128" height="17"/>
|
||||
<rect key="frame" x="176" y="12" width="128" height="16"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="20:30" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="127" translatesAutoresizingMaskIntoConstraints="NO" id="o59-Hp-LIf">
|
||||
<rect key="frame" x="176" y="33" width="128" height="17"/>
|
||||
<rect key="frame" x="176" y="32" width="128" height="17"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -64,16 +64,15 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular17"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AP7-ej-suj" userLabel="HorizontalSeparator">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="qsf-WG-QJW">
|
||||
<rect key="frame" x="0.0" y="63" width="320" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="vVV-ol-Y2y"/>
|
||||
<constraint firstAttribute="height" constant="1" id="Pfd-8E-gxy"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jNP-mE-elz" userLabel="Expand Button">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="64"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
|
|
@ -86,7 +85,7 @@
|
|||
<constraint firstAttribute="bottom" secondItem="oux-nC-xpk" secondAttribute="bottom" id="5IL-Ia-kot"/>
|
||||
<constraint firstItem="oux-nC-xpk" firstAttribute="leading" secondItem="CgC-lU-buo" secondAttribute="trailing" constant="12" id="6mt-ZU-wDQ"/>
|
||||
<constraint firstItem="o59-Hp-LIf" firstAttribute="top" secondItem="cGX-Q7-Ddh" secondAttribute="bottom" constant="4" id="9lg-5H-iWb"/>
|
||||
<constraint firstAttribute="bottom" secondItem="AP7-ej-suj" secondAttribute="bottom" id="DWO-nN-3qs"/>
|
||||
<constraint firstItem="qsf-WG-QJW" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="AD8-yB-pdV"/>
|
||||
<constraint firstAttribute="bottom" secondItem="jNP-mE-elz" secondAttribute="bottom" id="FLC-q7-gpV"/>
|
||||
<constraint firstAttribute="trailing" secondItem="jNP-mE-elz" secondAttribute="trailing" id="HAn-uc-gIX"/>
|
||||
<constraint firstItem="jNP-mE-elz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="Jaw-Pm-p8E"/>
|
||||
|
|
@ -98,10 +97,10 @@
|
|||
<constraint firstItem="CuG-0G-4pB" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="VZc-gy-4dr"/>
|
||||
<constraint firstItem="jNP-mE-elz" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="Y32-SZ-Ap1"/>
|
||||
<constraint firstItem="o59-Hp-LIf" firstAttribute="leading" secondItem="oux-nC-xpk" secondAttribute="trailing" constant="16" id="cvy-Bd-TWo"/>
|
||||
<constraint firstAttribute="bottom" secondItem="qsf-WG-QJW" secondAttribute="bottom" constant="-0.5" id="fwf-rw-9k6"/>
|
||||
<constraint firstItem="cGX-Q7-Ddh" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="12" id="jXv-Nx-MES"/>
|
||||
<constraint firstAttribute="trailing" secondItem="qsf-WG-QJW" secondAttribute="trailing" id="mle-r1-uUX"/>
|
||||
<constraint firstAttribute="trailing" secondItem="o59-Hp-LIf" secondAttribute="trailing" constant="16" id="oYK-KJ-Asi"/>
|
||||
<constraint firstItem="AP7-ej-suj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="p2n-ce-8ho"/>
|
||||
<constraint firstAttribute="trailing" secondItem="AP7-ej-suj" secondAttribute="trailing" id="pVi-aL-gSa"/>
|
||||
<constraint firstItem="oux-nC-xpk" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" id="qpb-DW-pu0"/>
|
||||
<constraint firstItem="CgC-lU-buo" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="16" id="rji-cJ-629"/>
|
||||
<constraint firstItem="cGX-Q7-Ddh" firstAttribute="leading" secondItem="oux-nC-xpk" secondAttribute="trailing" constant="16" id="xCE-ly-lub"/>
|
||||
|
|
@ -119,4 +118,7 @@
|
|||
</connections>
|
||||
</tableViewCell>
|
||||
</objects>
|
||||
<resources>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,5 @@ typedef NS_ENUM (NSUInteger, MWMOpeningHoursEditorCells)
|
|||
MWMOpeningHoursEditorClosedSpanCell,
|
||||
MWMOpeningHoursEditorAddClosedCell,
|
||||
MWMOpeningHoursEditorDeleteScheduleCell,
|
||||
MWMOpeningHoursEditorSpacerCell,
|
||||
MWMOpeningHoursEditorAddScheduleCell
|
||||
};
|
||||
|
|
|
|||
|
|
@ -12,7 +12,6 @@ extern NSDictionary * const kMWMOpeningHoursEditorTableCells = @{
|
|||
@(MWMOpeningHoursEditorClosedSpanCell) : @"MWMOpeningHoursClosedSpanTableViewCell",
|
||||
@(MWMOpeningHoursEditorAddClosedCell) : @"MWMOpeningHoursAddClosedTableViewCell",
|
||||
@(MWMOpeningHoursEditorDeleteScheduleCell) : @"MWMOpeningHoursDeleteScheduleTableViewCell",
|
||||
@(MWMOpeningHoursEditorSpacerCell) : @"MWMOpeningHoursSpacerTableViewCell",
|
||||
@(MWMOpeningHoursEditorAddScheduleCell) : @"MWMOpeningHoursAddScheduleTableViewCell",
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -61,13 +61,11 @@ using namespace osmoh;
|
|||
NSUInteger const numberOfRows = self.numberOfRows;
|
||||
BOOL const firstSection = (self.index == 0);
|
||||
|
||||
if (row == numberOfRows - 1)
|
||||
return MWMOpeningHoursEditorSpacerCell;
|
||||
else if (firstSection && row == numberOfRows - 2)
|
||||
if (firstSection && row == numberOfRows - 1)
|
||||
return MWMOpeningHoursEditorAddClosedCell;
|
||||
else if (!firstSection && row == numberOfRows - 2)
|
||||
else if (!firstSection && row == numberOfRows - 1)
|
||||
return MWMOpeningHoursEditorDeleteScheduleCell;
|
||||
else if (!firstSection && row == numberOfRows - 3)
|
||||
else if (!firstSection && row == numberOfRows - 2)
|
||||
return MWMOpeningHoursEditorAddClosedCell;
|
||||
else if (row == 2)
|
||||
return MWMOpeningHoursEditorTimeSpanCell;
|
||||
|
|
@ -80,7 +78,7 @@ using namespace osmoh;
|
|||
|
||||
- (NSUInteger)numberOfRowsForAllDay:(BOOL)allDay
|
||||
{
|
||||
NSUInteger rowsCount = 3; // MWMOpeningHoursDaysSelectorTableViewCell, MWMOpeningHoursAllDayTableViewCell, MWMOpeningHoursSpacerTableViewCell
|
||||
NSUInteger rowsCount = 2; // MWMOpeningHoursDaysSelectorTableViewCell, MWMOpeningHoursAllDayTableViewCell
|
||||
if (!allDay)
|
||||
{
|
||||
rowsCount += 2; // MWMOpeningHoursTimeSpanTableViewCell, MWMOpeningHoursAddClosedTableViewCell
|
||||
|
|
@ -278,7 +276,7 @@ using namespace osmoh;
|
|||
for (NSUInteger row = minRows; row < maxRows; ++row)
|
||||
[indexes addObject:[NSIndexPath indexPathForRow:row inSection:self.index]];
|
||||
|
||||
NSUInteger const reloadRow = [self firstRowForKey:MWMOpeningHoursEditorAllDayCell] + 1;
|
||||
NSUInteger const reloadRow = [self firstRowForKey:MWMOpeningHoursEditorAllDayCell];
|
||||
NSIndexPath * reloadPath = [NSIndexPath indexPathForRow:reloadRow inSection:self.index];
|
||||
MWMOpeningHoursTableViewCell * reloadCell = [tableView cellForRowAtIndexPath:reloadPath];
|
||||
[reloadCell hide];
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<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="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="264" translatesAutoresizingMaskIntoConstraints="NO" id="hOY-VB-nFg">
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8Pj-WT-J59">
|
||||
<textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="8Pj-WT-J59">
|
||||
<rect key="frame" x="16" y="12" width="288" height="20"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" priority="750" constant="44" id="bRV-YH-9xE"/>
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#import "MWMPlacePageTypeDescription.h"
|
||||
#import "MWMPlacePageViewManager.h"
|
||||
#import "Statistics.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
|
||||
extern CGFloat const kBottomPlacePageOffset = 15.;
|
||||
extern CGFloat const kLabelsBetweenOffset = 8.;
|
||||
|
|
@ -76,6 +77,7 @@ enum class AttributePosition
|
|||
[super awakeFromNib];
|
||||
self.featureTable.delegate = self;
|
||||
self.featureTable.dataSource = self;
|
||||
self.featureTable.separatorColor = [UIColor blackDividers];
|
||||
for (auto const & type : gCellType2ReuseIdentifier)
|
||||
{
|
||||
NSString * identifier = @(type.second.c_str());
|
||||
|
|
@ -371,7 +373,7 @@ enum class AttributePosition
|
|||
[(MWMPlacePageBookmarkCell *)cell config:self.ownerPlacePage forHeight:NO];
|
||||
break;
|
||||
case MWMPlacePageCellTypeOpenHours:
|
||||
[(MWMPlacePageOpeningHoursCell *)cell configWithDelegate:self info:[entity getCellValue:cellType] lastCell:NO];
|
||||
[(MWMPlacePageOpeningHoursCell *)cell configWithDelegate:self info:[entity getCellValue:cellType]];
|
||||
break;
|
||||
case MWMPlacePageCellTypeEditButton:
|
||||
[(MWMPlacePageButtonCell *)cell config:self.ownerPlacePage];
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ typedef NS_ENUM(NSUInteger, MWMPlacePageCellType)
|
|||
MWMPlacePageCellTypeStreet,
|
||||
MWMPlacePageCellTypeBuilding,
|
||||
MWMPlacePageCellTypeCuisine,
|
||||
MWMPlacePageCellTypeSpacer,
|
||||
MWMPlacePageCellTypeCount
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,6 @@ void initFieldsMap()
|
|||
ASSERT_EQUAL(kMetaFieldsMap[MWMPlacePageCellTypeWebsite], Metadata::FMD_WEBSITE, ());
|
||||
ASSERT_EQUAL(kMetaFieldsMap[Metadata::FMD_POSTCODE], MWMPlacePageCellTypePostcode, ());
|
||||
ASSERT_EQUAL(kMetaFieldsMap[MWMPlacePageCellTypePostcode], Metadata::FMD_POSTCODE, ());
|
||||
ASSERT_EQUAL(kMetaFieldsMap[MWMPlacePageCellTypeSpacer], 0, ());
|
||||
ASSERT_EQUAL(kMetaFieldsMap[Metadata::FMD_MAXSPEED], 0, ());
|
||||
}
|
||||
} // namespace
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="VAd-kw-ZEC" id="KHz-zH-ymS">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xwC-DR-6Il">
|
||||
|
|
@ -39,16 +39,6 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="CNm-TR-GPW" userLabel="Separator">
|
||||
<rect key="frame" x="60" y="43" width="260" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="fPa-eO-g5X"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_placepage_change" translatesAutoresizingMaskIntoConstraints="NO" id="RZw-oW-agi" userLabel="Toggle Image">
|
||||
<rect key="frame" x="288" y="10" width="24" height="24"/>
|
||||
<constraints>
|
||||
|
|
@ -74,17 +64,14 @@
|
|||
<constraint firstItem="xwC-DR-6Il" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" constant="16" id="4B0-o5-ixn"/>
|
||||
<constraint firstAttribute="bottom" secondItem="viE-zJ-wsl" secondAttribute="bottom" constant="12" id="5Me-Rj-yun"/>
|
||||
<constraint firstAttribute="trailing" secondItem="vu9-VL-9jn" secondAttribute="trailing" id="8ig-bw-zGd"/>
|
||||
<constraint firstAttribute="bottom" secondItem="CNm-TR-GPW" secondAttribute="bottom" id="9fe-9S-IXI"/>
|
||||
<constraint firstItem="xwC-DR-6Il" firstAttribute="centerY" secondItem="KHz-zH-ymS" secondAttribute="centerY" id="CYL-hn-gD1"/>
|
||||
<constraint firstAttribute="bottom" secondItem="vu9-VL-9jn" secondAttribute="bottom" id="GwU-YF-i08"/>
|
||||
<constraint firstItem="viE-zJ-wsl" firstAttribute="top" secondItem="KHz-zH-ymS" secondAttribute="top" constant="12" id="HFr-xw-JHR"/>
|
||||
<constraint firstItem="viE-zJ-wsl" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" constant="60" id="OiU-eg-c9z"/>
|
||||
<constraint firstItem="CNm-TR-GPW" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" constant="60" id="YBm-HI-8QY"/>
|
||||
<constraint firstItem="RZw-oW-agi" firstAttribute="leading" secondItem="viE-zJ-wsl" secondAttribute="trailing" id="b4Y-Av-Oa4"/>
|
||||
<constraint firstItem="vu9-VL-9jn" firstAttribute="leading" secondItem="KHz-zH-ymS" secondAttribute="leading" id="bwh-x8-HDj"/>
|
||||
<constraint firstItem="RZw-oW-agi" firstAttribute="centerY" secondItem="KHz-zH-ymS" secondAttribute="centerY" id="ftp-Ze-2yH"/>
|
||||
<constraint firstItem="vu9-VL-9jn" firstAttribute="top" secondItem="KHz-zH-ymS" secondAttribute="top" id="hAZ-rE-oQa"/>
|
||||
<constraint firstAttribute="trailing" secondItem="CNm-TR-GPW" secondAttribute="trailing" id="j04-QC-yoJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="RZw-oW-agi" secondAttribute="trailing" constant="8" id="q5W-GA-34D"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DKh-ne-anv" id="M4j-cz-kSo">
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="320" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="DT5-2i-vCG">
|
||||
|
|
@ -41,27 +41,14 @@
|
|||
<outlet property="delegate" destination="DKh-ne-anv" id="KQo-Mn-gqx"/>
|
||||
</connections>
|
||||
</textView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZSw-Rd-B64" userLabel="Separator">
|
||||
<rect key="frame" x="60" y="43" width="260" height="1"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="hIQ-vD-PeI"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="ZSw-Rd-B64" firstAttribute="top" secondItem="T5l-Sb-Hfo" secondAttribute="bottom" id="9BA-P2-SVl"/>
|
||||
<constraint firstItem="T5l-Sb-Hfo" firstAttribute="leading" secondItem="M4j-cz-kSo" secondAttribute="leading" constant="60" id="9CI-ss-zAr"/>
|
||||
<constraint firstAttribute="bottom" secondItem="T5l-Sb-Hfo" secondAttribute="bottom" id="Ejg-Ht-2JQ"/>
|
||||
<constraint firstItem="DT5-2i-vCG" firstAttribute="centerY" secondItem="M4j-cz-kSo" secondAttribute="centerY" id="MX4-xc-kFl"/>
|
||||
<constraint firstItem="T5l-Sb-Hfo" firstAttribute="top" secondItem="M4j-cz-kSo" secondAttribute="top" id="Vw0-bf-uUe"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ZSw-Rd-B64" secondAttribute="bottom" id="bJ8-qw-Eah"/>
|
||||
<constraint firstItem="ZSw-Rd-B64" firstAttribute="leading" secondItem="M4j-cz-kSo" secondAttribute="leading" constant="60" id="d7O-pD-dIE"/>
|
||||
<constraint firstItem="DT5-2i-vCG" firstAttribute="leading" secondItem="M4j-cz-kSo" secondAttribute="leading" constant="16" id="gle-Hg-xi1"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ZSw-Rd-B64" secondAttribute="trailing" id="n1d-lY-EC3"/>
|
||||
<constraint firstAttribute="trailing" secondItem="T5l-Sb-Hfo" secondAttribute="trailing" constant="32" id="ot9-cN-XF3"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
|
|
@ -69,7 +56,6 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</tableViewCellContentView>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<inset key="separatorInset" minX="48" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
|
|
|
|||
|
|
@ -68,11 +68,18 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="none" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="hZM-Gs-BbS">
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" id="TRO-vz-04P">
|
||||
<rect key="frame" x="0.0" y="75" width="320" height="1"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" id="hZM-Gs-BbS">
|
||||
<rect key="frame" x="0.0" y="84" width="320" height="384"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="separatorColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<inset key="separatorInset" minX="60" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
<color key="sectionIndexBackgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
|
||||
|
|
@ -80,14 +87,6 @@
|
|||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</tableView>
|
||||
<view contentMode="scaleToFill" id="Spo-tb-t0A">
|
||||
<rect key="frame" x="0.0" y="75" width="320" height="1"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="500 mi" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="kGT-CI-UsC">
|
||||
<rect key="frame" x="259" y="25" width="57" height="21"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
|
||||
|
|
@ -100,14 +99,14 @@
|
|||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_direction_light" id="ExH-ug-j1j">
|
||||
<rect key="frame" x="235" y="23.5" width="20" height="20"/>
|
||||
<rect key="frame" x="235" y="23" width="20" height="20"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="mwm_name" value="img_direction"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="X4O-iK-cA2">
|
||||
<rect key="frame" x="228" y="13.5" width="84" height="43"/>
|
||||
<rect key="frame" x="228" y="13" width="84" height="43"/>
|
||||
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
|
||||
<state key="normal">
|
||||
<color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
|
||||
|
|
@ -125,7 +124,7 @@
|
|||
<outlet property="distanceLabel" destination="kGT-CI-UsC" id="xLt-R1-jy2"/>
|
||||
<outlet property="featureTable" destination="hZM-Gs-BbS" id="iBU-Iq-8go"/>
|
||||
<outlet property="ownerPlacePage" destination="-1" id="ptD-bf-NPp"/>
|
||||
<outlet property="separatorView" destination="Spo-tb-t0A" id="y6P-TK-Wws"/>
|
||||
<outlet property="separatorView" destination="TRO-vz-04P" id="zgT-Vz-9R2"/>
|
||||
<outlet property="titleLabel" destination="T1Y-Oq-6fg" id="ifK-nU-q7x"/>
|
||||
<outlet property="typeLabel" destination="TNu-JO-vJi" id="mWV-cH-KMk"/>
|
||||
</connections>
|
||||
|
|
@ -153,5 +152,6 @@
|
|||
</objects>
|
||||
<resources>
|
||||
<image name="img_direction_light" width="32" height="32"/>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
6
iphone/Maps/Images.xcassets/Separator/Contents.json
Normal file
6
iphone/Maps/Images.xcassets/Separator/Contents.json
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
}
|
||||
}
|
||||
26
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/Contents.json
vendored
Normal file
26
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,26 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "separator_image.png",
|
||||
"scale" : "1x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "separator_image@2x.png",
|
||||
"scale" : "2x"
|
||||
},
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "separator_image@3x.png",
|
||||
"scale" : "3x"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
BIN
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/separator_image.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/separator_image.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 73 B |
BIN
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/separator_image@2x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/separator_image@2x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
BIN
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/separator_image@3x.png
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Separator/separator_image.imageset/separator_image@3x.png
vendored
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 14 KiB |
|
|
@ -26,8 +26,6 @@
|
|||
3401CD7E1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3401CD7B1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.mm */; };
|
||||
3401CD7F1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3401CD7C1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib */; };
|
||||
3401CD801C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3401CD7C1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib */; };
|
||||
3401CD821C3D33040028C6F8 /* MWMEditorSpacerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3401CD811C3D33040028C6F8 /* MWMEditorSpacerCell.xib */; };
|
||||
3401CD831C3D33040028C6F8 /* MWMEditorSpacerCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3401CD811C3D33040028C6F8 /* MWMEditorSpacerCell.xib */; };
|
||||
340837131B7243CE00B5C185 /* MWMActivityViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837121B7243CE00B5C185 /* MWMActivityViewController.mm */; };
|
||||
340837161B72451A00B5C185 /* MWMShareLocationActivityItem.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340837151B72451A00B5C185 /* MWMShareLocationActivityItem.mm */; };
|
||||
340C20E31C3E565600111D22 /* MWMCuisineEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 340C20E21C3E565600111D22 /* MWMCuisineEditorViewController.mm */; };
|
||||
|
|
@ -67,10 +65,6 @@
|
|||
34181EA21C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34181E7E1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm */; };
|
||||
34181EA31C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34181E7F1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib */; };
|
||||
34181EA41C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34181E7F1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib */; };
|
||||
34181EA51C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34181E811C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm */; };
|
||||
34181EA61C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34181E811C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm */; };
|
||||
34181EA71C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34181E821C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib */; };
|
||||
34181EA81C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34181E821C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib */; };
|
||||
34181EAF1C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34181E881C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm */; };
|
||||
34181EB01C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34181E881C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm */; };
|
||||
34181EB11C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34181E891C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.xib */; };
|
||||
|
|
@ -118,10 +112,6 @@
|
|||
34570A411B13229300E6D4FD /* FBSDKLoginKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 34570A401B13229300E6D4FD /* FBSDKLoginKit.framework */; settings = {ATTRIBUTES = (Required, ); }; };
|
||||
345FDD261C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345FDD251C3BB3AF0070C459 /* MWMEditorViewController.mm */; };
|
||||
345FDD271C3BB3AF0070C459 /* MWMEditorViewController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345FDD251C3BB3AF0070C459 /* MWMEditorViewController.mm */; };
|
||||
345FDD2A1C3BF9760070C459 /* MWMEditorTableViewHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345FDD291C3BF9760070C459 /* MWMEditorTableViewHeader.mm */; };
|
||||
345FDD2B1C3BF9760070C459 /* MWMEditorTableViewHeader.mm in Sources */ = {isa = PBXBuildFile; fileRef = 345FDD291C3BF9760070C459 /* MWMEditorTableViewHeader.mm */; };
|
||||
345FDD2D1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 345FDD2C1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib */; };
|
||||
345FDD2E1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 345FDD2C1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib */; };
|
||||
34634B1B1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 34634B1A1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib */; };
|
||||
3465E7D81B6658C000854C4D /* MWMAPIBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3465E7D71B6658C000854C4D /* MWMAPIBar.mm */; };
|
||||
346EDADB1B9F0E35004F8DB5 /* MWMMultilineLabel.mm in Sources */ = {isa = PBXBuildFile; fileRef = 346EDADA1B9F0E35004F8DB5 /* MWMMultilineLabel.mm */; };
|
||||
|
|
@ -722,8 +712,6 @@
|
|||
F6FE2C0F1B03A006009814AA /* MWMPlacePageNavigationBar.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE2C0E1B03A006009814AA /* MWMPlacePageNavigationBar.mm */; };
|
||||
F6FE2C111B03A016009814AA /* PlacePageNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FE2C101B03A015009814AA /* PlacePageNavigationBar.xib */; };
|
||||
F6FE2C151B04A44E009814AA /* MWMPlacePageEntity.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FE2C141B04A44E009814AA /* MWMPlacePageEntity.mm */; };
|
||||
F6FEA8291C57B583007223CC /* MWMEditorSpacerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */; };
|
||||
F6FEA82A1C57B583007223CC /* MWMEditorSpacerCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */; };
|
||||
F6FEA82D1C58E89B007223CC /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; };
|
||||
F6FEA82E1C58F108007223CC /* MWMButton.mm in Sources */ = {isa = PBXBuildFile; fileRef = F6FEA82C1C58E89B007223CC /* MWMButton.mm */; };
|
||||
F6FF2E2B1B8C5C020063FD1F /* MWMNextTurnPanel.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6FF2E2A1B8C5C020063FD1F /* MWMNextTurnPanel.xib */; };
|
||||
|
|
@ -790,7 +778,6 @@
|
|||
3401CD7A1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorSwitchTableViewCell.h; sourceTree = "<group>"; };
|
||||
3401CD7B1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorSwitchTableViewCell.mm; sourceTree = "<group>"; };
|
||||
3401CD7C1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorSwitchTableViewCell.xib; sourceTree = "<group>"; };
|
||||
3401CD811C3D33040028C6F8 /* MWMEditorSpacerCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorSpacerCell.xib; sourceTree = "<group>"; };
|
||||
340537621BBED98600D452C6 /* MWMMapViewControlsCommon.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MWMMapViewControlsCommon.h; path = APIBar/MWMMapViewControlsCommon.h; sourceTree = "<group>"; };
|
||||
340837111B7243CE00B5C185 /* MWMActivityViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMActivityViewController.h; sourceTree = "<group>"; };
|
||||
340837121B7243CE00B5C185 /* MWMActivityViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMActivityViewController.mm; sourceTree = "<group>"; };
|
||||
|
|
@ -832,9 +819,6 @@
|
|||
34181E7D1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOpeningHoursDeleteScheduleTableViewCell.h; sourceTree = "<group>"; };
|
||||
34181E7E1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMOpeningHoursDeleteScheduleTableViewCell.mm; sourceTree = "<group>"; };
|
||||
34181E7F1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOpeningHoursDeleteScheduleTableViewCell.xib; sourceTree = "<group>"; };
|
||||
34181E801C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOpeningHoursSpacerTableViewCell.h; sourceTree = "<group>"; };
|
||||
34181E811C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMOpeningHoursSpacerTableViewCell.mm; sourceTree = "<group>"; };
|
||||
34181E821C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOpeningHoursSpacerTableViewCell.xib; sourceTree = "<group>"; };
|
||||
34181E871C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMOpeningHoursTimeSelectorTableViewCell.h; sourceTree = "<group>"; };
|
||||
34181E881C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMOpeningHoursTimeSelectorTableViewCell.mm; sourceTree = "<group>"; };
|
||||
34181E891C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMOpeningHoursTimeSelectorTableViewCell.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -902,9 +886,6 @@
|
|||
34570A401B13229300E6D4FD /* FBSDKLoginKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = FBSDKLoginKit.framework; path = Statistics/FBSDKLoginKit.framework; sourceTree = "<group>"; };
|
||||
345FDD241C3BB3AF0070C459 /* MWMEditorViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorViewController.h; sourceTree = "<group>"; };
|
||||
345FDD251C3BB3AF0070C459 /* MWMEditorViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorViewController.mm; sourceTree = "<group>"; };
|
||||
345FDD281C3BF9760070C459 /* MWMEditorTableViewHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorTableViewHeader.h; sourceTree = "<group>"; };
|
||||
345FDD291C3BF9760070C459 /* MWMEditorTableViewHeader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMEditorTableViewHeader.mm; sourceTree = "<group>"; };
|
||||
345FDD2C1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMEditorTableViewHeader.xib; sourceTree = "<group>"; };
|
||||
3460B4C11BF369A2003EE796 /* StatisticsStrings.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = StatisticsStrings.h; sourceTree = "<group>"; };
|
||||
34634B1A1BB42D270013573C /* MWMBottomMenuCollectionViewLandscapeCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMBottomMenuCollectionViewLandscapeCell.xib; sourceTree = "<group>"; };
|
||||
3465E7D61B6658C000854C4D /* MWMAPIBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMAPIBar.h; sourceTree = "<group>"; };
|
||||
|
|
@ -1375,8 +1356,6 @@
|
|||
F6FE2C101B03A015009814AA /* PlacePageNavigationBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PlacePageNavigationBar.xib; sourceTree = "<group>"; };
|
||||
F6FE2C131B04A44E009814AA /* MWMPlacePageEntity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMPlacePageEntity.h; sourceTree = "<group>"; };
|
||||
F6FE2C141B04A44E009814AA /* MWMPlacePageEntity.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMPlacePageEntity.mm; sourceTree = "<group>"; };
|
||||
F6FEA8271C57B583007223CC /* MWMEditorSpacerCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMEditorSpacerCell.h; sourceTree = "<group>"; };
|
||||
F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMEditorSpacerCell.m; sourceTree = "<group>"; };
|
||||
F6FEA82B1C58E89B007223CC /* MWMButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMButton.h; sourceTree = "<group>"; };
|
||||
F6FEA82C1C58E89B007223CC /* MWMButton.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MWMButton.mm; sourceTree = "<group>"; };
|
||||
F6FF2E2A1B8C5C020063FD1F /* MWMNextTurnPanel.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = MWMNextTurnPanel.xib; sourceTree = "<group>"; };
|
||||
|
|
@ -1769,9 +1748,6 @@
|
|||
34181E7D1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.h */,
|
||||
34181E7E1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.mm */,
|
||||
34181E7F1C0ECF210081B586 /* MWMOpeningHoursDeleteScheduleTableViewCell.xib */,
|
||||
34181E801C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.h */,
|
||||
34181E811C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm */,
|
||||
34181E821C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib */,
|
||||
34181E871C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.h */,
|
||||
34181E881C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm */,
|
||||
34181E891C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.xib */,
|
||||
|
|
@ -2155,9 +2131,6 @@
|
|||
340C20E51C3E58B000111D22 /* MWMEditorCommon.h */,
|
||||
345FDD241C3BB3AF0070C459 /* MWMEditorViewController.h */,
|
||||
345FDD251C3BB3AF0070C459 /* MWMEditorViewController.mm */,
|
||||
345FDD281C3BF9760070C459 /* MWMEditorTableViewHeader.h */,
|
||||
345FDD291C3BF9760070C459 /* MWMEditorTableViewHeader.mm */,
|
||||
345FDD2C1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib */,
|
||||
3401CD641C3C03A80028C6F8 /* MWMEditorTextTableViewCell.h */,
|
||||
3401CD651C3C03A80028C6F8 /* MWMEditorTextTableViewCell.mm */,
|
||||
3401CD661C3C03A80028C6F8 /* MWMEditorTextTableViewCell.xib */,
|
||||
|
|
@ -2168,9 +2141,6 @@
|
|||
3401CD7A1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.h */,
|
||||
3401CD7B1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.mm */,
|
||||
3401CD7C1C3CF1BE0028C6F8 /* MWMEditorSwitchTableViewCell.xib */,
|
||||
F6FEA8271C57B583007223CC /* MWMEditorSpacerCell.h */,
|
||||
F6FEA8281C57B583007223CC /* MWMEditorSpacerCell.m */,
|
||||
3401CD811C3D33040028C6F8 /* MWMEditorSpacerCell.xib */,
|
||||
);
|
||||
path = Editor;
|
||||
sourceTree = "<group>";
|
||||
|
|
@ -2980,7 +2950,6 @@
|
|||
34B6CF5D1BBBFC6B009203C6 /* LaunchScreen.storyboard in Resources */,
|
||||
3476B8DC1BFDD30B00874594 /* tts-how-to-set-up-voice.html in Resources */,
|
||||
978D4A31199A11E600D72CA7 /* faq.html in Resources */,
|
||||
345FDD2D1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib in Resources */,
|
||||
3491E7CD1C06F1F10042FE24 /* MWMPlacePageButtonCell.xib in Resources */,
|
||||
F66A8FB21B0A0954001B9C97 /* PlacePageView.xib in Resources */,
|
||||
349C26B61BB02C6F0005DF2F /* MWMBottomMenuViewController.xib in Resources */,
|
||||
|
|
@ -3034,7 +3003,6 @@
|
|||
34B82AD11B846B2C00180497 /* MWMSearchBookmarksCell.xib in Resources */,
|
||||
4A7D89C61B2EBF3B00AC843E /* resources-mdpi_dark in Resources */,
|
||||
F6BC1E541ACBF9AB00EF0360 /* MWMFacebookAlert.xib in Resources */,
|
||||
3401CD821C3D33040028C6F8 /* MWMEditorSpacerCell.xib in Resources */,
|
||||
F607C1871C032A8800B53A87 /* resources-hdpi_clear in Resources */,
|
||||
F6CB21641AEFC42800FB8963 /* PlacePageActionBar.xib in Resources */,
|
||||
34F45E901B96E8B100AC93F8 /* MWMSearchTabButtonsView.xib in Resources */,
|
||||
|
|
@ -3049,7 +3017,6 @@
|
|||
F6CB215C1AEE704D00FB8963 /* PlacePageInfoCell.xib in Resources */,
|
||||
347BAC691B733D540010FF78 /* MWMPedestrianShareAlert.xib in Resources */,
|
||||
F6FF2E2B1B8C5C020063FD1F /* MWMNextTurnPanel.xib in Resources */,
|
||||
34181EA71C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib in Resources */,
|
||||
FAF30A95173AB23900818BF6 /* 07_roboto_medium.ttf in Resources */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
|
|
@ -3105,7 +3072,6 @@
|
|||
6741A9631BF340DE002C974C /* Images.xcassets in Resources */,
|
||||
6741A9641BF340DE002C974C /* MWMSearchDownloadViewController.xib in Resources */,
|
||||
9DA46A151C47E95700EF52BA /* resources-6plus_legacy in Resources */,
|
||||
345FDD2E1C3BF98D0070C459 /* MWMEditorTableViewHeader.xib in Resources */,
|
||||
342F539C1C529AF100229014 /* packed_polygons_migrate.bin in Resources */,
|
||||
342F539A1C529AF100229014 /* countries_migrate.txt in Resources */,
|
||||
34F9FB931C43AF2400F71201 /* MWMStreetEditorEditTableViewCell.xib in Resources */,
|
||||
|
|
@ -3124,7 +3090,6 @@
|
|||
6741A96E1BF340DE002C974C /* MWMRoutePreview.xib in Resources */,
|
||||
6741A96F1BF340DE002C974C /* MWMSearchSuggestionCell.xib in Resources */,
|
||||
9DA46A0B1C47E92100EF52BA /* resources-mdpi_legacy in Resources */,
|
||||
34181EA81C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.xib in Resources */,
|
||||
6741A9701BF340DE002C974C /* MWMiPadRoutePreview.xib in Resources */,
|
||||
6741A9711BF340DE002C974C /* copyright.html in Resources */,
|
||||
6741A9721BF340DE002C974C /* MWMSearchCommonCell.xib in Resources */,
|
||||
|
|
@ -3170,7 +3135,6 @@
|
|||
F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */,
|
||||
6741A9921BF340DE002C974C /* PlacePageActionBar.xib in Resources */,
|
||||
34181E941C0ECF210081B586 /* MWMOpeningHoursAddScheduleTableViewCell.xib in Resources */,
|
||||
3401CD831C3D33040028C6F8 /* MWMEditorSpacerCell.xib in Resources */,
|
||||
6741A9931BF340DE002C974C /* MWMSearchTabButtonsView.xib in Resources */,
|
||||
6741A9941BF340DE002C974C /* MWMPortraitNavigationDashboard.xib in Resources */,
|
||||
6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */,
|
||||
|
|
@ -3254,7 +3218,6 @@
|
|||
34FE4C451BCC013500066718 /* MWMMapWidgets.mm in Sources */,
|
||||
F61B0F2C1B8B82DB00C08258 /* MWMNextTurnPanel.mm in Sources */,
|
||||
F6F722F81AE1572400DA3DA1 /* MWMiPhonePortraitPlacePage.mm in Sources */,
|
||||
345FDD2A1C3BF9760070C459 /* MWMEditorTableViewHeader.mm in Sources */,
|
||||
F6CB21681AEFC6AA00FB8963 /* MWMPlacePageActionBar.mm in Sources */,
|
||||
34181EAF1C0ECF210081B586 /* MWMOpeningHoursTimeSelectorTableViewCell.mm in Sources */,
|
||||
F68E6BD21B8DB7AE0040566D /* MWMRouteHelperPanel.mm in Sources */,
|
||||
|
|
@ -3296,7 +3259,6 @@
|
|||
977E26BE19E31BBE00BA2219 /* CountryTreeVC.mm in Sources */,
|
||||
34BF0CC61C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */,
|
||||
97F0817E19AF72590098FB0B /* BadgeView.mm in Sources */,
|
||||
F6FEA8291C57B583007223CC /* MWMEditorSpacerCell.m in Sources */,
|
||||
34B82AC41B84608600180497 /* MWMSearchHistoryClearCell.mm in Sources */,
|
||||
F64F4B741B4A45FD0081A24A /* MWMDownloaderDialogHeader.mm in Sources */,
|
||||
34F8ADD91B97229A004184CC /* MWMSearchTableView.mm in Sources */,
|
||||
|
|
@ -3312,7 +3274,6 @@
|
|||
F6588E371B15D87A00EE1E58 /* MWMBookmarkColorCell.mm in Sources */,
|
||||
F6D409FA1B319BD70041730F /* ContextViews.mm in Sources */,
|
||||
342CC5F11C2D7730005F3FE5 /* MWMAuthorizationLoginViewController.mm in Sources */,
|
||||
34181EA51C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm in Sources */,
|
||||
34EB84581C073DF70004689F /* MWMOpeningHoursEditorViewController.mm in Sources */,
|
||||
349A357A1B53D4C9009677EE /* MWMCircularProgress.mm in Sources */,
|
||||
FAA5C2A2144F135F005337F6 /* LocationManager.mm in Sources */,
|
||||
|
|
@ -3427,7 +3388,6 @@
|
|||
6741A9AC1BF340DE002C974C /* MWMSearchTabButtonsView.mm in Sources */,
|
||||
6741A9AD1BF340DE002C974C /* MWMSpringAnimation.mm in Sources */,
|
||||
6741A9AE1BF340DE002C974C /* MWMSearchCategoryCell.mm in Sources */,
|
||||
34181EA61C0ECF210081B586 /* MWMOpeningHoursSpacerTableViewCell.mm in Sources */,
|
||||
6741A9AF1BF340DE002C974C /* ActiveMapsVC.mm in Sources */,
|
||||
6741A9B01BF340DE002C974C /* MapsAppDelegate.mm in Sources */,
|
||||
6741A9B11BF340DE002C974C /* MWMAPIBarView.mm in Sources */,
|
||||
|
|
@ -3454,7 +3414,6 @@
|
|||
6741A9C11BF340DE002C974C /* MWMNextTurnPanel.mm in Sources */,
|
||||
6741A9C21BF340DE002C974C /* MWMiPhonePortraitPlacePage.mm in Sources */,
|
||||
6741A9C31BF340DE002C974C /* MWMPlacePageActionBar.mm in Sources */,
|
||||
345FDD2B1C3BF9760070C459 /* MWMEditorTableViewHeader.mm in Sources */,
|
||||
6741A9C41BF340DE002C974C /* MWMRouteHelperPanel.mm in Sources */,
|
||||
6741A9C51BF340DE002C974C /* MWMZoomButtons.mm in Sources */,
|
||||
6741A9C61BF340DE002C974C /* MWMSearchCommonCell.mm in Sources */,
|
||||
|
|
@ -3497,7 +3456,6 @@
|
|||
F6F6ACFC1C15C1010060FDD0 /* MWMRecentTrackSettingsController.mm in Sources */,
|
||||
34BF0CC71C31304A00D097EB /* MWMAuthorizationCommon.mm in Sources */,
|
||||
6741A9DF1BF340DE002C974C /* MWMSearchHistoryClearCell.mm in Sources */,
|
||||
F6FEA82A1C57B583007223CC /* MWMEditorSpacerCell.m in Sources */,
|
||||
6741A9E01BF340DE002C974C /* MWMDownloaderDialogHeader.mm in Sources */,
|
||||
6741A9E11BF340DE002C974C /* MWMSearchTableView.mm in Sources */,
|
||||
6741A9E21BF340DE002C974C /* MWMPlacePageTypeDescription.mm in Sources */,
|
||||
|
|
|
|||
|
|
@ -733,49 +733,28 @@
|
|||
<point key="canvasLocation" x="1143" y="1224"/>
|
||||
</scene>
|
||||
<!--Editor View Controller-->
|
||||
<scene sceneID="6jJ-Tq-Z1Z">
|
||||
<scene sceneID="XbW-Wc-ZB3">
|
||||
<objects>
|
||||
<viewController id="2nM-Q9-E25" customClass="MWMEditorViewController" sceneMemberID="viewController">
|
||||
<layoutGuides>
|
||||
<viewControllerLayoutGuide type="top" id="hRp-wa-ZHE"/>
|
||||
<viewControllerLayoutGuide type="bottom" id="sr6-JR-AwW"/>
|
||||
</layoutGuides>
|
||||
<view key="view" contentMode="scaleToFill" id="Lgz-Gb-F8I">
|
||||
<tableViewController id="Lfa-Zp-orR" customClass="MWMEditorViewController" sceneMemberID="viewController">
|
||||
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="HU6-ak-Eu1">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="EH3-92-Tzz">
|
||||
<rect key="frame" x="0.0" y="64" width="600" height="536"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="2nM-Q9-E25" id="A5t-MA-cFT"/>
|
||||
<outlet property="delegate" destination="2nM-Q9-E25" id="k0W-Eb-NFt"/>
|
||||
</connections>
|
||||
</tableView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="EH3-92-Tzz" firstAttribute="leading" secondItem="Lgz-Gb-F8I" secondAttribute="leading" id="Eq1-QR-49b"/>
|
||||
<constraint firstItem="sr6-JR-AwW" firstAttribute="top" secondItem="EH3-92-Tzz" secondAttribute="bottom" id="VXm-ke-yXK"/>
|
||||
<constraint firstItem="EH3-92-Tzz" firstAttribute="top" secondItem="hRp-wa-ZHE" secondAttribute="bottom" id="iRH-mb-23c"/>
|
||||
<constraint firstAttribute="trailing" secondItem="EH3-92-Tzz" secondAttribute="trailing" id="oQG-nn-0Dm"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<navigationItem key="navigationItem" id="SXI-s6-K6S"/>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="Lfa-Zp-orR" id="xpr-4K-awa"/>
|
||||
<outlet property="delegate" destination="Lfa-Zp-orR" id="h68-o4-xW2"/>
|
||||
</connections>
|
||||
</tableView>
|
||||
<navigationItem key="navigationItem" id="n8f-MH-xDc"/>
|
||||
<connections>
|
||||
<outlet property="tableView" destination="EH3-92-Tzz" id="HAe-TD-KcI"/>
|
||||
<outlet property="tableViewBottomOffset" destination="VXm-ke-yXK" id="Su9-9Z-OP4"/>
|
||||
<segue destination="IAA-1a-ZuZ" kind="custom" identifier="Editor2CuisineEditorSegue" customClass="MWMSegue" id="mPs-fC-nli"/>
|
||||
<segue destination="Ld6-gM-2hk" kind="custom" identifier="Editor2OpeningHoursEditorSegue" customClass="MWMSegue" id="iTp-yQ-ied"/>
|
||||
<segue destination="Heu-QR-M0N" kind="custom" identifier="Editor2StreetEditorSegue" customClass="MWMSegue" id="YIe-tB-Qac"/>
|
||||
<segue destination="Ld6-gM-2hk" kind="custom" identifier="Editor2OpeningHoursEditorSegue" customClass="MWMSegue" id="EMH-RE-PDh"/>
|
||||
<segue destination="IAA-1a-ZuZ" kind="custom" identifier="Editor2CuisineEditorSegue" customClass="MWMSegue" id="WK7-zs-Cgl"/>
|
||||
<segue destination="Heu-QR-M0N" kind="custom" identifier="Editor2StreetEditorSegue" customClass="MWMSegue" id="iJS-b1-GuT"/>
|
||||
</connections>
|
||||
</viewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="DWN-06-Lmz" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</tableViewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="FGq-OI-eQl" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="352" y="2753"/>
|
||||
<point key="canvasLocation" x="330" y="2753"/>
|
||||
</scene>
|
||||
<!--Cuisine Editor View Controller-->
|
||||
<scene sceneID="dIV-0o-2RN">
|
||||
|
|
@ -789,14 +768,9 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="p0S-WX-gWg">
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="p0S-WX-gWg">
|
||||
<rect key="frame" x="0.0" y="20" width="600" height="580"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="rect" keyPath="contentInset">
|
||||
<rect key="value" x="36" y="0.0" width="0.0" height="0.0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="IAA-1a-ZuZ" id="Ndb-O3-616"/>
|
||||
<outlet property="delegate" destination="IAA-1a-ZuZ" id="7yW-1N-N0s"/>
|
||||
|
|
@ -834,14 +808,11 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="X1H-IB-Nv1">
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="none" showsSelectionImmediatelyOnTouchBegin="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="X1H-IB-Nv1">
|
||||
<rect key="frame" x="0.0" y="20" width="600" height="536"/>
|
||||
<color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.12" colorSpace="calibratedRGB"/>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
|
||||
<userDefinedRuntimeAttribute type="rect" keyPath="contentInset">
|
||||
<rect key="value" x="20" y="0.0" width="0.0" height="0.0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="Ld6-gM-2hk" id="ai8-Pg-tCM"/>
|
||||
|
|
@ -852,7 +823,7 @@
|
|||
<rect key="frame" x="0.0" y="20" width="600" height="536"/>
|
||||
<subviews>
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="PrH-u2-IEv" userLabel="Editor View" customClass="MWMTextView">
|
||||
<rect key="frame" x="0.0" y="20" width="600" height="88"/>
|
||||
<rect key="frame" x="0.0" y="36" width="600" height="88"/>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="88" id="oAE-yX-hVe"/>
|
||||
|
|
@ -870,54 +841,50 @@
|
|||
<outlet property="delegate" destination="Ld6-gM-2hk" id="Ewa-a5-hAF"/>
|
||||
</connections>
|
||||
</textView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OZH-Nh-yyg" userLabel="Separator#1">
|
||||
<rect key="frame" x="0.0" y="20" width="600" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="z2Z-G2-Np7">
|
||||
<rect key="frame" x="0.0" y="35" width="600" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="4mJ-cW-1IE"/>
|
||||
<constraint firstAttribute="height" constant="1" id="xUX-ck-MQb"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Od2-hh-s2D" userLabel="Separator#2">
|
||||
<rect key="frame" x="0.0" y="107" width="600" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</imageView>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="ebA-fW-ddJ">
|
||||
<rect key="frame" x="0.0" y="123" width="600" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="EnE-rQ-Wgo"/>
|
||||
<constraint firstAttribute="height" constant="1" id="HOj-tZ-b3F"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qLA-ZE-Nro" userLabel="Separator#3">
|
||||
<rect key="frame" x="0.0" y="475" width="600" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</imageView>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="5T5-Pp-hb5">
|
||||
<rect key="frame" x="0.0" y="491" width="600" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="zpX-oV-iH0"/>
|
||||
<constraint firstAttribute="height" constant="1" id="ZXK-zv-uSz"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Oyj-85-upn" userLabel="Separator#4">
|
||||
<rect key="frame" x="0.0" y="148" width="600" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
</imageView>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="IX2-yp-0oa">
|
||||
<rect key="frame" x="0.0" y="164" width="600" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="gvj-vG-Xcv"/>
|
||||
<constraint firstAttribute="height" constant="1" id="rD4-fE-ez2"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="85Z-MR-kUV" userLabel="Help View">
|
||||
<rect key="frame" x="0.0" y="148" width="600" height="328"/>
|
||||
<rect key="frame" x="0.0" y="164" width="600" height="328"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="n79-h1-Nk3" userLabel="Button">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Example values" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="dAM-iT-fzu">
|
||||
<rect key="frame" x="16" y="12" width="120" height="20"/>
|
||||
<rect key="frame" x="16" y="12" width="119" height="20"/>
|
||||
<fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -937,16 +904,15 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kJf-hx-7zh" userLabel="Example values separator">
|
||||
<rect key="frame" x="16" y="43" width="584" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="Suj-t5-ZWs">
|
||||
<rect key="frame" x="16" y="44" width="584" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="xM3-KH-W6O"/>
|
||||
<constraint firstAttribute="height" constant="1" id="cv8-Tg-Oin"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="MiP-Du-s3i">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="44"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
|
||||
|
|
@ -957,16 +923,16 @@
|
|||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="Suj-t5-ZWs" secondAttribute="trailing" id="8Z7-Ws-OgZ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="m7d-sG-5LN" secondAttribute="trailing" constant="8" id="EGO-GU-Xk2"/>
|
||||
<constraint firstItem="m7d-sG-5LN" firstAttribute="centerY" secondItem="n79-h1-Nk3" secondAttribute="centerY" id="EXk-bK-EtL"/>
|
||||
<constraint firstAttribute="bottom" secondItem="MiP-Du-s3i" secondAttribute="bottom" id="PqU-PO-luB"/>
|
||||
<constraint firstItem="dAM-iT-fzu" firstAttribute="leading" secondItem="n79-h1-Nk3" secondAttribute="leading" constant="16" id="aL0-Pg-Lg6"/>
|
||||
<constraint firstAttribute="bottom" secondItem="kJf-hx-7zh" secondAttribute="bottom" id="aNU-NV-xql"/>
|
||||
<constraint firstItem="MiP-Du-s3i" firstAttribute="top" secondItem="n79-h1-Nk3" secondAttribute="top" id="c9Y-Wq-jgz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="MiP-Du-s3i" secondAttribute="trailing" id="d20-ah-hq4"/>
|
||||
<constraint firstAttribute="trailing" secondItem="kJf-hx-7zh" secondAttribute="trailing" id="fAP-k0-dHd"/>
|
||||
<constraint firstAttribute="bottom" secondItem="Suj-t5-ZWs" secondAttribute="bottom" constant="-1" id="eYl-ri-wAD"/>
|
||||
<constraint firstAttribute="height" constant="44" id="fsT-x7-O77"/>
|
||||
<constraint firstItem="kJf-hx-7zh" firstAttribute="leading" secondItem="n79-h1-Nk3" secondAttribute="leading" constant="16" id="l9d-r7-2xx"/>
|
||||
<constraint firstItem="Suj-t5-ZWs" firstAttribute="leading" secondItem="n79-h1-Nk3" secondAttribute="leading" constant="16" id="kfm-oM-ieg"/>
|
||||
<constraint firstItem="MiP-Du-s3i" firstAttribute="leading" secondItem="n79-h1-Nk3" secondAttribute="leading" id="nyq-4N-d3B"/>
|
||||
<constraint firstItem="dAM-iT-fzu" firstAttribute="centerY" secondItem="n79-h1-Nk3" secondAttribute="centerY" id="u5E-mE-qqT"/>
|
||||
</constraints>
|
||||
|
|
@ -1013,22 +979,22 @@
|
|||
<constraints>
|
||||
<constraint firstItem="85Z-MR-kUV" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="0qo-8d-jei"/>
|
||||
<constraint firstItem="PrH-u2-IEv" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="22S-vT-VQI"/>
|
||||
<constraint firstItem="Od2-hh-s2D" firstAttribute="leading" secondItem="PrH-u2-IEv" secondAttribute="leading" id="35f-ff-rTx"/>
|
||||
<constraint firstItem="85Z-MR-kUV" firstAttribute="top" secondItem="PrH-u2-IEv" secondAttribute="bottom" constant="40" id="3rp-pL-qvt"/>
|
||||
<constraint firstAttribute="trailing" secondItem="PrH-u2-IEv" secondAttribute="trailing" id="43u-pf-eOY"/>
|
||||
<constraint firstItem="Oyj-85-upn" firstAttribute="trailing" secondItem="85Z-MR-kUV" secondAttribute="trailing" id="50o-ed-EsW"/>
|
||||
<constraint firstItem="Od2-hh-s2D" firstAttribute="trailing" secondItem="PrH-u2-IEv" secondAttribute="trailing" id="5ex-yX-uag"/>
|
||||
<constraint firstItem="OZH-Nh-yyg" firstAttribute="trailing" secondItem="PrH-u2-IEv" secondAttribute="trailing" id="Amm-hA-uSa"/>
|
||||
<constraint firstItem="OZH-Nh-yyg" firstAttribute="top" secondItem="PrH-u2-IEv" secondAttribute="top" id="Cxr-Mp-MOC"/>
|
||||
<constraint firstAttribute="trailing" secondItem="IX2-yp-0oa" secondAttribute="trailing" id="5q0-UJ-l3H"/>
|
||||
<constraint firstItem="z2Z-G2-Np7" firstAttribute="top" secondItem="aQv-7U-zAP" secondAttribute="top" constant="35" id="FJ7-tM-oSy"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ebA-fW-ddJ" secondAttribute="trailing" id="HuA-Ma-8g4"/>
|
||||
<constraint firstAttribute="trailing" secondItem="85Z-MR-kUV" secondAttribute="trailing" id="I25-lc-WgS"/>
|
||||
<constraint firstItem="Oyj-85-upn" firstAttribute="leading" secondItem="85Z-MR-kUV" secondAttribute="leading" id="OPh-Zg-16j"/>
|
||||
<constraint firstItem="Od2-hh-s2D" firstAttribute="bottom" secondItem="PrH-u2-IEv" secondAttribute="bottom" id="SLG-Vo-OsO"/>
|
||||
<constraint firstItem="qLA-ZE-Nro" firstAttribute="leading" secondItem="85Z-MR-kUV" secondAttribute="leading" id="Z2B-jV-WgU"/>
|
||||
<constraint firstItem="OZH-Nh-yyg" firstAttribute="leading" secondItem="PrH-u2-IEv" secondAttribute="leading" id="gXa-95-2Iu"/>
|
||||
<constraint firstItem="qLA-ZE-Nro" firstAttribute="trailing" secondItem="85Z-MR-kUV" secondAttribute="trailing" id="jzZ-1N-lz0"/>
|
||||
<constraint firstItem="PrH-u2-IEv" firstAttribute="top" secondItem="aQv-7U-zAP" secondAttribute="top" constant="20" id="q1u-ty-S9z"/>
|
||||
<constraint firstItem="qLA-ZE-Nro" firstAttribute="bottom" secondItem="85Z-MR-kUV" secondAttribute="bottom" id="qEn-O6-ZNY"/>
|
||||
<constraint firstItem="Oyj-85-upn" firstAttribute="top" secondItem="85Z-MR-kUV" secondAttribute="top" id="sdw-g0-ncu"/>
|
||||
<constraint firstItem="5T5-Pp-hb5" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="QrI-l6-1WI"/>
|
||||
<constraint firstAttribute="bottom" secondItem="5T5-Pp-hb5" secondAttribute="bottom" constant="44" id="TYy-8g-z0j"/>
|
||||
<constraint firstItem="IX2-yp-0oa" firstAttribute="top" secondItem="ebA-fW-ddJ" secondAttribute="bottom" constant="40" id="UNQ-CL-cIR"/>
|
||||
<constraint firstItem="ebA-fW-ddJ" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="YIg-tu-FXy"/>
|
||||
<constraint firstItem="85Z-MR-kUV" firstAttribute="top" secondItem="ebA-fW-ddJ" secondAttribute="bottom" constant="40" id="dOd-hi-MxX"/>
|
||||
<constraint firstAttribute="trailing" secondItem="5T5-Pp-hb5" secondAttribute="trailing" id="k3P-gU-ITU"/>
|
||||
<constraint firstItem="z2Z-G2-Np7" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="m3U-xK-nUG"/>
|
||||
<constraint firstItem="PrH-u2-IEv" firstAttribute="top" secondItem="aQv-7U-zAP" secondAttribute="top" constant="36" id="q1u-ty-S9z"/>
|
||||
<constraint firstAttribute="trailing" secondItem="z2Z-G2-Np7" secondAttribute="trailing" id="ugB-hb-6BG"/>
|
||||
<constraint firstItem="IX2-yp-0oa" firstAttribute="leading" secondItem="aQv-7U-zAP" secondAttribute="leading" id="vBX-Hr-mju"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="SZQ-ra-FC3" userLabel="Mode Switch">
|
||||
|
|
@ -1058,29 +1024,28 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMGray"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="I01-E8-Jbx" userLabel="Separator#1">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="1"/>
|
||||
<color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="separator_image" translatesAutoresizingMaskIntoConstraints="NO" id="onT-vv-01i">
|
||||
<rect key="frame" x="0.0" y="-1" width="600" height="1"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="p5A-xI-5il"/>
|
||||
<constraint firstAttribute="height" constant="1" id="UUW-c4-eNA"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="blackDividers"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMSeparator"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
|
||||
<constraints>
|
||||
<constraint firstItem="I01-E8-Jbx" firstAttribute="top" secondItem="SZQ-ra-FC3" secondAttribute="top" id="6kh-l0-8fT"/>
|
||||
<constraint firstItem="onT-vv-01i" firstAttribute="top" secondItem="SZQ-ra-FC3" secondAttribute="top" constant="-1" id="0rP-2v-SID"/>
|
||||
<constraint firstAttribute="bottom" secondItem="fB1-w2-lJI" secondAttribute="bottom" id="FuW-nL-fSI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="I01-E8-Jbx" secondAttribute="trailing" id="OzQ-l1-X0W"/>
|
||||
<constraint firstItem="I01-E8-Jbx" firstAttribute="leading" secondItem="SZQ-ra-FC3" secondAttribute="leading" id="X8c-nD-UCv"/>
|
||||
<constraint firstItem="onT-vv-01i" firstAttribute="leading" secondItem="SZQ-ra-FC3" secondAttribute="leading" id="XAo-Dc-5X5"/>
|
||||
<constraint firstItem="z8F-55-5rJ" firstAttribute="centerY" secondItem="SZQ-ra-FC3" secondAttribute="centerY" id="ZHU-F4-3vI"/>
|
||||
<constraint firstItem="fB1-w2-lJI" firstAttribute="top" secondItem="SZQ-ra-FC3" secondAttribute="top" id="hQA-tq-Agw"/>
|
||||
<constraint firstItem="fB1-w2-lJI" firstAttribute="leading" secondItem="SZQ-ra-FC3" secondAttribute="leading" id="q93-A3-mQM"/>
|
||||
<constraint firstAttribute="height" constant="44" id="sey-dR-Lpz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="fB1-w2-lJI" secondAttribute="trailing" id="vSY-s6-Cf8"/>
|
||||
<constraint firstAttribute="trailing" secondItem="z8F-55-5rJ" secondAttribute="trailing" constant="8" id="x70-rE-la5"/>
|
||||
<constraint firstAttribute="trailing" secondItem="onT-vv-01i" secondAttribute="trailing" id="zeT-UU-vSn"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="white"/>
|
||||
|
|
@ -1110,7 +1075,7 @@
|
|||
<outlet property="editorView" destination="PrH-u2-IEv" id="PNK-Yj-cdS"/>
|
||||
<outlet property="exampesButtonBottomOffset" destination="Phh-rb-ON1" id="JcL-82-aMg"/>
|
||||
<outlet property="exampleValuesExpandView" destination="m7d-sG-5LN" id="TTZ-yw-ImJ"/>
|
||||
<outlet property="exampleValuesSeparator" destination="kJf-hx-7zh" id="zHr-RN-xMw"/>
|
||||
<outlet property="exampleValuesSeparator" destination="Suj-t5-ZWs" id="93G-FX-98W"/>
|
||||
<outlet property="help" destination="5ir-0i-m9E" id="14F-m4-zqW"/>
|
||||
<outlet property="helpView" destination="85Z-MR-kUV" id="Rcg-KD-UIA"/>
|
||||
<outlet property="ohTextViewHeight" destination="oBv-SK-cOU" id="8yB-hb-hml"/>
|
||||
|
|
@ -2500,7 +2465,7 @@ the world. Join us!</string>
|
|||
</navigationBar>
|
||||
<nil name="viewControllers"/>
|
||||
<connections>
|
||||
<segue destination="2nM-Q9-E25" kind="relationship" relationship="rootViewController" id="K0n-hr-hzp"/>
|
||||
<segue destination="Lfa-Zp-orR" kind="relationship" relationship="rootViewController" id="tWf-yS-deO"/>
|
||||
</connections>
|
||||
</navigationController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="nJK-jd-lsd" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
|
|
@ -2511,10 +2476,10 @@ the world. Join us!</string>
|
|||
<scene sceneID="hgU-jB-a3C">
|
||||
<objects>
|
||||
<tableViewController id="Heu-QR-M0N" customClass="MWMStreetEditorViewController" sceneMemberID="viewController">
|
||||
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="rJJ-UB-6u2">
|
||||
<tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" keyboardDismissMode="onDrag" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" id="rJJ-UB-6u2">
|
||||
<rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
|
||||
<color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="calibratedRGB"/>
|
||||
<inset key="scrollIndicatorInsets" minX="0.0" minY="44" maxX="0.0" maxY="0.0"/>
|
||||
<connections>
|
||||
<outlet property="dataSource" destination="Heu-QR-M0N" id="TzF-Rz-ZsY"/>
|
||||
|
|
@ -2537,8 +2502,9 @@ the world. Join us!</string>
|
|||
<image name="img_perspective_view" width="220" height="220"/>
|
||||
<image name="login_facebook" width="28" height="28"/>
|
||||
<image name="login_google" width="28" height="28"/>
|
||||
<image name="separator_image" width="1" height="1"/>
|
||||
</resources>
|
||||
<inferredMetricsTieBreakers>
|
||||
<segue reference="Pet-Wq-d4a"/>
|
||||
<segue reference="w48-2Y-VXA"/>
|
||||
</inferredMetricsTieBreakers>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ typedef NS_ENUM(NSUInteger, MWMImageColoring)
|
|||
MWMImageColoringOther,
|
||||
MWMImageColoringBlue,
|
||||
MWMImageColoringBlack,
|
||||
MWMImageColoringGray
|
||||
MWMImageColoringGray,
|
||||
MWMImageColoringSeparator
|
||||
};
|
||||
|
||||
@interface UIImageView (Coloring)
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
#import "Common.h"
|
||||
#import "UIImageView+Coloring.h"
|
||||
#import "UIColor+MapsMeColor.h"
|
||||
|
||||
|
|
@ -35,6 +36,8 @@
|
|||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Warc-performSelector-leaks"
|
||||
self.tintColor = [[UIColor class] performSelector:self.coloringSelector];
|
||||
if (isIOS7 && self.mwm_coloring == MWMImageColoringSeparator)
|
||||
self.backgroundColor = [[UIColor class] performSelector:self.coloringSelector];
|
||||
#pragma clang diagnostic pop
|
||||
}
|
||||
|
||||
|
|
@ -62,6 +65,8 @@
|
|||
return @selector(blackHintText);
|
||||
case MWMImageColoringOther:
|
||||
return @selector(white);
|
||||
case MWMImageColoringSeparator:
|
||||
return @selector(blackDividers);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -78,6 +83,7 @@
|
|||
break;
|
||||
case MWMImageColoringOther:
|
||||
case MWMImageColoringBlue:
|
||||
case MWMImageColoringSeparator:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -92,6 +98,8 @@
|
|||
self.mwm_coloring = MWMImageColoringOther;
|
||||
else if ([coloring isEqualToString:@"MWMGray"])
|
||||
self.mwm_coloring = MWMImageColoringGray;
|
||||
else if ([coloring isEqualToString:@"MWMSeparator"])
|
||||
self.mwm_coloring = MWMImageColoringSeparator;
|
||||
else
|
||||
NSAssert(false, @"Incorrect UIImageView's coloring");
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue