forked from organicmaps/organicmaps
[iOS] update bookmarks sharing options screen
This commit is contained in:
Aleksey Belouosv
Olesia Bolovintseva
parent
cf7ca68325
commit
84e5efca8d
5 changed files with 324 additions and 201 deletions
|
|
@ -19,177 +19,10 @@
|
|||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
|
||||
<sections>
|
||||
<tableViewSection headerTitle="Public access" id="wSk-N4-gbo">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="56" id="YW0-jq-Isw" customClass="UploadActionCell" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="55.5" width="375" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YW0-jq-Isw" id="ayR-ii-DjA">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxGlobe" translatesAutoresizingMaskIntoConstraints="NO" id="fmA-82-rPS">
|
||||
<rect key="frame" x="16" y="16" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="5bK-ck-alK"/>
|
||||
<constraint firstAttribute="width" constant="24" id="RId-hH-I1b"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload and publish" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uMP-YO-wbu">
|
||||
<rect key="frame" x="56" y="18" width="140" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lF2-pc-Qo7">
|
||||
<rect key="frame" x="335" y="16" width="24" height="24"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="9r2-mf-DsT"/>
|
||||
<constraint firstAttribute="width" constant="24" id="Gon-Yr-8Fq"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PYo-PL-9Fc">
|
||||
<rect key="frame" x="335" y="16" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<state key="normal" title="Button" image="ic24PxShare"/>
|
||||
<connections>
|
||||
<action selector="shareButtonPressed:" destination="YW0-jq-Isw" eventType="touchUpInside" id="j1d-qF-UIt"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="bottom" secondItem="lF2-pc-Qo7" secondAttribute="bottom" id="BJL-HW-qeL"/>
|
||||
<constraint firstItem="fmA-82-rPS" firstAttribute="centerY" secondItem="ayR-ii-DjA" secondAttribute="centerY" id="Bfj-dF-WcJ"/>
|
||||
<constraint firstItem="uMP-YO-wbu" firstAttribute="centerY" secondItem="fmA-82-rPS" secondAttribute="centerY" id="D4L-J4-gPv"/>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="leading" secondItem="lF2-pc-Qo7" secondAttribute="leading" id="KDo-o9-elh"/>
|
||||
<constraint firstItem="lF2-pc-Qo7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uMP-YO-wbu" secondAttribute="trailing" constant="16" id="RxV-Xg-PoI"/>
|
||||
<constraint firstItem="fmA-82-rPS" firstAttribute="leading" secondItem="ayR-ii-DjA" secondAttribute="leadingMargin" id="Zzq-yt-7DW"/>
|
||||
<constraint firstItem="lF2-pc-Qo7" firstAttribute="centerY" secondItem="ayR-ii-DjA" secondAttribute="centerY" id="cBC-St-gRO"/>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="trailing" secondItem="lF2-pc-Qo7" secondAttribute="trailing" id="h2e-6c-4ID"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lF2-pc-Qo7" secondAttribute="trailing" constant="16" id="iJm-Q9-d2P"/>
|
||||
<constraint firstItem="uMP-YO-wbu" firstAttribute="leading" secondItem="fmA-82-rPS" secondAttribute="trailing" constant="16" id="qOc-7f-rpS"/>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="top" secondItem="lF2-pc-Qo7" secondAttribute="top" id="qZ8-cY-uRw"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="actionImage" destination="fmA-82-rPS" id="Z0K-e9-nZj"/>
|
||||
<outlet property="actionTitle" destination="uMP-YO-wbu" id="pQd-ox-QLF"/>
|
||||
<outlet property="progressView" destination="lF2-pc-Qo7" id="R12-gK-Si1"/>
|
||||
<outlet property="shareButton" destination="PYo-PL-9Fc" id="2yn-Sk-Yq8"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="95" id="VdZ-fO-p63" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="111.5" width="375" height="95"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="VdZ-fO-p63" id="Y9s-zu-iol">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="94.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="This list will be uploaded in the public
catalog at MAPS.ME as guide and will be
easily shared with others" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N3w-HY-3ac">
|
||||
<rect key="frame" x="56" y="18" width="303" height="58.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="upload_and_publish_desc"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="N3w-HY-3ac" secondAttribute="bottom" constant="18" id="1EW-1C-WIX"/>
|
||||
<constraint firstItem="N3w-HY-3ac" firstAttribute="top" secondItem="Y9s-zu-iol" secondAttribute="top" constant="18" id="qEv-Gk-ane"/>
|
||||
<constraint firstItem="N3w-HY-3ac" firstAttribute="leading" secondItem="Y9s-zu-iol" secondAttribute="leading" constant="56" id="upe-MD-o7N"/>
|
||||
<constraint firstAttribute="trailing" secondItem="N3w-HY-3ac" secondAttribute="trailing" constant="16" id="zDt-Qf-8JF"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="86" id="3UL-dT-hKc" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="206.5" width="375" height="86"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3UL-dT-hKc" id="402-ot-2TF">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="85.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Please note: by proceeding, you accept the license agreement" translatesAutoresizingMaskIntoConstraints="NO" id="dsV-Vs-oCo" customClass="LinkTextView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="56" y="18" width="303" height="49.5"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="14"/>
|
||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset">
|
||||
<rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</textView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="dsV-Vs-oCo" firstAttribute="leading" secondItem="402-ot-2TF" secondAttribute="leading" constant="56" id="BgN-PM-ejM"/>
|
||||
<constraint firstAttribute="bottom" secondItem="dsV-Vs-oCo" secondAttribute="bottom" constant="18" id="MYS-Cs-qSO"/>
|
||||
<constraint firstItem="dsV-Vs-oCo" firstAttribute="top" secondItem="402-ot-2TF" secondAttribute="top" constant="18" id="pbY-qn-0dd"/>
|
||||
<constraint firstAttribute="trailing" secondItem="dsV-Vs-oCo" secondAttribute="trailing" constant="16" id="vcP-CZ-R8d"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="y5U-AG-X4u" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="292.5" width="375" height="50"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="y5U-AG-X4u" id="2pY-Yp-mFr">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxEdit" translatesAutoresizingMaskIntoConstraints="NO" id="c7L-Ts-xbm">
|
||||
<rect key="frame" x="16" y="13" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" relation="greaterThanOrEqual" constant="24" id="7mz-ea-yZR"/>
|
||||
<constraint firstAttribute="width" relation="greaterThanOrEqual" constant="24" id="TR3-jI-vFJ"/>
|
||||
<constraint firstAttribute="height" constant="24" id="aN1-2W-dVM"/>
|
||||
<constraint firstAttribute="width" constant="24" id="ikv-1p-fdU"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Edit on web" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wLX-hM-JLH">
|
||||
<rect key="frame" x="56" y="15" width="85" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="edit_on_web"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailingMargin" relation="greaterThanOrEqual" secondItem="wLX-hM-JLH" secondAttribute="trailing" constant="16" id="SL2-VO-qey"/>
|
||||
<constraint firstItem="wLX-hM-JLH" firstAttribute="centerY" secondItem="2pY-Yp-mFr" secondAttribute="centerY" id="dej-se-4TT"/>
|
||||
<constraint firstItem="c7L-Ts-xbm" firstAttribute="leading" secondItem="2pY-Yp-mFr" secondAttribute="leadingMargin" id="glD-Zf-gsX"/>
|
||||
<constraint firstItem="c7L-Ts-xbm" firstAttribute="centerY" secondItem="2pY-Yp-mFr" secondAttribute="centerY" id="ldu-hm-6jT"/>
|
||||
<constraint firstItem="wLX-hM-JLH" firstAttribute="leading" secondItem="c7L-Ts-xbm" secondAttribute="trailing" constant="16" id="xN9-GL-sN7"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<segue destination="FPL-Dh-v8t" kind="presentation" identifier="editOnWeb" id="k7O-p8-5zO"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
<tableViewSection headerTitle="Limited access" id="GtE-jP-p4q">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="56" id="90b-ef-VUJ" customClass="UploadActionCell" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="398.5" width="375" height="56"/>
|
||||
<rect key="frame" x="0.0" y="55.5" width="375" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="90b-ef-VUJ" id="AlV-ie-H63">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/>
|
||||
|
|
@ -251,7 +84,7 @@
|
|||
</connections>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="50" id="4dc-7Z-s7O" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="454.5" width="375" height="50"/>
|
||||
<rect key="frame" x="0.0" y="111.5" width="375" height="50"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="4dc-7Z-s7O" id="5YA-YS-3K5">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
|
||||
|
|
@ -277,6 +110,232 @@
|
|||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="aAa-cf-kTL" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="161.5" width="375" height="50"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="aAa-cf-kTL" id="IXm-Uq-qPs">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Update guide" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AbE-1A-kJm">
|
||||
<rect key="frame" x="56" y="15" width="303" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="update_guide"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxUpdate" translatesAutoresizingMaskIntoConstraints="NO" id="mcr-7c-yuH">
|
||||
<rect key="frame" x="16" y="13" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="6pT-bN-NlA"/>
|
||||
<constraint firstAttribute="width" constant="24" id="qbJ-aO-ytm"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="leadingMargin" secondItem="mcr-7c-yuH" secondAttribute="leading" id="7fK-6b-bQQ"/>
|
||||
<constraint firstItem="AbE-1A-kJm" firstAttribute="leading" secondItem="mcr-7c-yuH" secondAttribute="trailing" constant="16" id="fk2-um-QgI"/>
|
||||
<constraint firstItem="AbE-1A-kJm" firstAttribute="centerY" secondItem="IXm-Uq-qPs" secondAttribute="centerY" id="lqW-CO-bfx"/>
|
||||
<constraint firstItem="mcr-7c-yuH" firstAttribute="centerY" secondItem="IXm-Uq-qPs" secondAttribute="centerY" id="pQX-5z-3Nz"/>
|
||||
<constraint firstAttribute="trailing" secondItem="AbE-1A-kJm" secondAttribute="trailing" constant="16" id="t8y-Ef-M9e"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
<tableViewSection headerTitle="Public access" id="wSk-N4-gbo">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="56" id="YW0-jq-Isw" customClass="UploadActionCell" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="267.5" width="375" height="56"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="YW0-jq-Isw" id="ayR-ii-DjA">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="55.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxGlobe" translatesAutoresizingMaskIntoConstraints="NO" id="fmA-82-rPS">
|
||||
<rect key="frame" x="16" y="16" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="5bK-ck-alK"/>
|
||||
<constraint firstAttribute="width" constant="24" id="RId-hH-I1b"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload and publish" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uMP-YO-wbu">
|
||||
<rect key="frame" x="56" y="18" width="140" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="0.11764705882352941" green="0.58823529411764708" blue="0.94117647058823528" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lF2-pc-Qo7">
|
||||
<rect key="frame" x="335" y="16" width="24" height="24"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="24" id="9r2-mf-DsT"/>
|
||||
<constraint firstAttribute="width" constant="24" id="Gon-Yr-8Fq"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PYo-PL-9Fc">
|
||||
<rect key="frame" x="335" y="16" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<state key="normal" title="Button" image="ic24PxShare"/>
|
||||
<connections>
|
||||
<action selector="shareButtonPressed:" destination="YW0-jq-Isw" eventType="touchUpInside" id="j1d-qF-UIt"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="bottom" secondItem="lF2-pc-Qo7" secondAttribute="bottom" id="BJL-HW-qeL"/>
|
||||
<constraint firstItem="fmA-82-rPS" firstAttribute="centerY" secondItem="ayR-ii-DjA" secondAttribute="centerY" id="Bfj-dF-WcJ"/>
|
||||
<constraint firstItem="uMP-YO-wbu" firstAttribute="centerY" secondItem="fmA-82-rPS" secondAttribute="centerY" id="D4L-J4-gPv"/>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="leading" secondItem="lF2-pc-Qo7" secondAttribute="leading" id="KDo-o9-elh"/>
|
||||
<constraint firstItem="lF2-pc-Qo7" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="uMP-YO-wbu" secondAttribute="trailing" constant="16" id="RxV-Xg-PoI"/>
|
||||
<constraint firstItem="fmA-82-rPS" firstAttribute="leading" secondItem="ayR-ii-DjA" secondAttribute="leadingMargin" id="Zzq-yt-7DW"/>
|
||||
<constraint firstItem="lF2-pc-Qo7" firstAttribute="centerY" secondItem="ayR-ii-DjA" secondAttribute="centerY" id="cBC-St-gRO"/>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="trailing" secondItem="lF2-pc-Qo7" secondAttribute="trailing" id="h2e-6c-4ID"/>
|
||||
<constraint firstAttribute="trailing" secondItem="lF2-pc-Qo7" secondAttribute="trailing" constant="16" id="iJm-Q9-d2P"/>
|
||||
<constraint firstItem="uMP-YO-wbu" firstAttribute="leading" secondItem="fmA-82-rPS" secondAttribute="trailing" constant="16" id="qOc-7f-rpS"/>
|
||||
<constraint firstItem="PYo-PL-9Fc" firstAttribute="top" secondItem="lF2-pc-Qo7" secondAttribute="top" id="qZ8-cY-uRw"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
<connections>
|
||||
<outlet property="actionImage" destination="fmA-82-rPS" id="Z0K-e9-nZj"/>
|
||||
<outlet property="actionTitle" destination="uMP-YO-wbu" id="pQd-ox-QLF"/>
|
||||
<outlet property="progressView" destination="lF2-pc-Qo7" id="R12-gK-Si1"/>
|
||||
<outlet property="shareButton" destination="PYo-PL-9Fc" id="2yn-Sk-Yq8"/>
|
||||
</connections>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" rowHeight="86" id="3UL-dT-hKc" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="323.5" width="375" height="86"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="3UL-dT-hKc" id="402-ot-2TF">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="85.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="Please note: by proceeding, you accept the license agreement" translatesAutoresizingMaskIntoConstraints="NO" id="dsV-Vs-oCo" customClass="LinkTextView" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="56" y="18" width="303" height="49.5"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<fontDescription key="fontDescription" name=".AppleSystemUIFont" family=".AppleSystemUIFont" pointSize="14"/>
|
||||
<textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="textContainer.lineFragmentPadding">
|
||||
<integer key="value" value="0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
<userDefinedRuntimeAttribute type="rect" keyPath="textContainerInset">
|
||||
<rect key="value" x="0.0" y="0.0" width="0.0" height="0.0"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</textView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="dsV-Vs-oCo" firstAttribute="leading" secondItem="402-ot-2TF" secondAttribute="leading" constant="56" id="BgN-PM-ejM"/>
|
||||
<constraint firstAttribute="bottom" secondItem="dsV-Vs-oCo" secondAttribute="bottom" constant="18" id="MYS-Cs-qSO"/>
|
||||
<constraint firstItem="dsV-Vs-oCo" firstAttribute="top" secondItem="402-ot-2TF" secondAttribute="top" constant="18" id="pbY-qn-0dd"/>
|
||||
<constraint firstAttribute="trailing" secondItem="dsV-Vs-oCo" secondAttribute="trailing" constant="16" id="vcP-CZ-R8d"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" rowHeight="50" id="7OC-5n-kuV" customClass="MWMTableViewCell">
|
||||
<rect key="frame" x="0.0" y="409.5" width="375" height="50"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="7OC-5n-kuV" id="ycu-0k-aXG">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="49.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Update guide" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L3P-U3-xdo">
|
||||
<rect key="frame" x="56" y="15" width="303" height="20"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<color key="textColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="update_guide"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="linkBlue"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular16"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic24PxUpdate" translatesAutoresizingMaskIntoConstraints="NO" id="2cF-g6-zQ1">
|
||||
<rect key="frame" x="16" y="13" width="24" height="24"/>
|
||||
<color key="tintColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="width" constant="24" id="OCh-zc-INp"/>
|
||||
<constraint firstAttribute="height" constant="24" id="aO1-pe-dmU"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="coloring" value="MWMBlue"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</imageView>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="2cF-g6-zQ1" firstAttribute="centerY" secondItem="ycu-0k-aXG" secondAttribute="centerY" id="6ZT-XI-LAq"/>
|
||||
<constraint firstAttribute="trailing" secondItem="L3P-U3-xdo" secondAttribute="trailing" constant="16" id="Xgr-iF-bBs"/>
|
||||
<constraint firstAttribute="leadingMargin" secondItem="2cF-g6-zQ1" secondAttribute="leading" id="kKk-Bo-CiN"/>
|
||||
<constraint firstItem="L3P-U3-xdo" firstAttribute="centerY" secondItem="ycu-0k-aXG" secondAttribute="centerY" id="uMu-7Q-Tcl"/>
|
||||
<constraint firstItem="L3P-U3-xdo" firstAttribute="leading" secondItem="2cF-g6-zQ1" secondAttribute="trailing" constant="16" id="xwh-p9-HQK"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
<tableViewSection headerTitle="Web editor" id="Ycc-hd-WDM">
|
||||
<cells>
|
||||
<tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" rowHeight="129" id="wRG-8I-r2U">
|
||||
<rect key="frame" x="0.0" y="515.5" width="375" height="129"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="wRG-8I-r2U" id="BPo-ON-rJH">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="128.5"/>
|
||||
<autoresizingMask key="autoresizingMask"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Upload your guide and get the link for edit from desktop" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h4Z-cZ-Nmn">
|
||||
<rect key="frame" x="16" y="16" width="343" height="36.5"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="14"/>
|
||||
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.54000000000000004" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<nil key="highlightedColor"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="web_editor_description"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular14"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ULn-RX-CjB">
|
||||
<rect key="frame" x="16" y="68.5" width="343" height="44"/>
|
||||
<color key="backgroundColor" red="0.1176470588" green="0.58823529409999997" blue="0.94117647059999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="44" id="GBG-1m-bkN"/>
|
||||
</constraints>
|
||||
<state key="normal" title="Edit on web"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
|
||||
<integer key="value" value="8"/>
|
||||
</userDefinedRuntimeAttribute>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<segue destination="FPL-Dh-v8t" kind="presentation" identifier="editOnWeb" id="XOx-hn-7qC"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="h4Z-cZ-Nmn" secondAttribute="trailing" constant="16" id="6Kr-ar-HD3"/>
|
||||
<constraint firstItem="ULn-RX-CjB" firstAttribute="leading" secondItem="BPo-ON-rJH" secondAttribute="leading" constant="16" id="6uj-1B-9qx"/>
|
||||
<constraint firstAttribute="trailing" secondItem="ULn-RX-CjB" secondAttribute="trailing" constant="16" id="Rr7-ov-x4x"/>
|
||||
<constraint firstAttribute="bottom" secondItem="ULn-RX-CjB" secondAttribute="bottom" constant="16" id="XML-Cc-bsG"/>
|
||||
<constraint firstItem="h4Z-cZ-Nmn" firstAttribute="leading" secondItem="BPo-ON-rJH" secondAttribute="leading" constant="16" id="gKc-Xw-2uC"/>
|
||||
<constraint firstItem="ULn-RX-CjB" firstAttribute="top" secondItem="h4Z-cZ-Nmn" secondAttribute="bottom" constant="16" id="h5W-yX-CcH"/>
|
||||
<constraint firstItem="h4Z-cZ-Nmn" firstAttribute="top" secondItem="BPo-ON-rJH" secondAttribute="top" constant="16" id="z5Q-1M-a9x"/>
|
||||
</constraints>
|
||||
</tableViewCellContentView>
|
||||
</tableViewCell>
|
||||
</cells>
|
||||
</tableViewSection>
|
||||
</sections>
|
||||
|
|
@ -286,16 +345,18 @@
|
|||
</connections>
|
||||
</tableView>
|
||||
<connections>
|
||||
<outlet property="editOnWebCell" destination="y5U-AG-X4u" id="uSl-Py-gEm"/>
|
||||
<outlet property="directLinkInstructionsLabel" destination="XQh-26-CNo" id="0mF-Ta-Odg"/>
|
||||
<outlet property="getDirectLinkCell" destination="90b-ef-VUJ" id="L7h-0r-eSe"/>
|
||||
<outlet property="licenseAgreementTextView" destination="dsV-Vs-oCo" id="TtB-Uw-WGR"/>
|
||||
<outlet property="updateDirectLinkCell" destination="aAa-cf-kTL" id="Gaz-h4-0E6"/>
|
||||
<outlet property="updatePublishCell" destination="7OC-5n-kuV" id="JuX-3X-bo4"/>
|
||||
<outlet property="uploadAndPublishCell" destination="YW0-jq-Isw" id="84h-vp-JdM"/>
|
||||
<segue destination="fDN-IN-IEc" kind="show" identifier="chooseProperties" id="I88-nm-PsT"/>
|
||||
</connections>
|
||||
</tableViewController>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="ylv-YU-ujs" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
||||
</objects>
|
||||
<point key="canvasLocation" x="-198" y="-26"/>
|
||||
<point key="canvasLocation" x="-199.19999999999999" y="-26.53673163418291"/>
|
||||
</scene>
|
||||
<!--Sharing Tags View Controller-->
|
||||
<scene sceneID="fwI-5y-8lb">
|
||||
|
|
@ -817,10 +878,10 @@ upload photos and more</string>
|
|||
</scene>
|
||||
</scenes>
|
||||
<resources>
|
||||
<image name="ic24PxEdit" width="24" height="24"/>
|
||||
<image name="ic24PxGlobe" width="24" height="24"/>
|
||||
<image name="ic24PxLink" width="24" height="24"/>
|
||||
<image name="ic24PxShare" width="24" height="24"/>
|
||||
<image name="ic24PxUpdate" width="24" height="24"/>
|
||||
<image name="img_guide_editonweb" width="240" height="240"/>
|
||||
</resources>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -31,26 +31,34 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
private let kTagsControllerIdentifier = "tags"
|
||||
private let kEditOnWebSegueIdentifier = "editOnWeb"
|
||||
|
||||
private let publicSectionIndex = 0
|
||||
private let privateSectionIndex = 1
|
||||
private let editOnWebCellIndex = 3
|
||||
private let rowsInPrivateSection = 2
|
||||
|
||||
private let privateSectionIndex = 0
|
||||
private let publicSectionIndex = 1
|
||||
private let editOnWebSectionIndex = 2
|
||||
private let rowsInEditOnWebSection = 1
|
||||
private let directLinkUpdateRowIndex = 2
|
||||
private let publishUpdateRowIndex = 2
|
||||
|
||||
private var rowsInPublicSection: Int {
|
||||
return categoryAccessStatus == .public ? 4 : 3
|
||||
return categoryAccessStatus == .public ? 3 : 2
|
||||
}
|
||||
|
||||
private var rowsInPrivateSection: Int {
|
||||
return categoryAccessStatus == .private ? 3 : 2
|
||||
}
|
||||
|
||||
@IBOutlet private weak var uploadAndPublishCell: UploadActionCell!
|
||||
@IBOutlet private weak var getDirectLinkCell: UploadActionCell!
|
||||
@IBOutlet private weak var editOnWebCell: UITableViewCell!
|
||||
|
||||
@IBOutlet private weak var updatePublishCell: UITableViewCell!
|
||||
@IBOutlet private weak var updateDirectLinkCell: UITableViewCell!
|
||||
@IBOutlet private weak var directLinkInstructionsLabel: UILabel!
|
||||
|
||||
@IBOutlet private weak var licenseAgreementTextView: UITextView! {
|
||||
didSet {
|
||||
let htmlString = String(coreFormat: L("ugc_routes_user_agreement"), arguments: [ViewModel.termsOfUseLink()])
|
||||
let attributes: [NSAttributedStringKey : Any] = [NSAttributedStringKey.font: UIFont.regular14(),
|
||||
NSAttributedStringKey.foregroundColor: UIColor.blackSecondaryText()]
|
||||
licenseAgreementTextView.attributedText = NSAttributedString.string(withHtml: htmlString,
|
||||
defaultAttributes: attributes)
|
||||
defaultAttributes: attributes)
|
||||
licenseAgreementTextView.delegate = self
|
||||
}
|
||||
}
|
||||
|
|
@ -70,7 +78,9 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
break
|
||||
case .public:
|
||||
categoryUrl = manager.sharingUrl(forCategoryId: categoryId)
|
||||
getDirectLinkCell.cellState = .disabled
|
||||
uploadAndPublishCell.cellState = .completed
|
||||
directLinkInstructionsLabel.text = L("unable_get_direct_link_desc")
|
||||
case .private:
|
||||
categoryUrl = manager.sharingUrl(forCategoryId: categoryId)
|
||||
getDirectLinkCell.cellState = .completed
|
||||
|
|
@ -79,7 +89,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
}
|
||||
}
|
||||
|
||||
func configureActionCells() {
|
||||
private func configureActionCells() {
|
||||
uploadAndPublishCell.config(titles: [ .normal : L("upload_and_publish"),
|
||||
.inProgress : L("upload_and_publish_progress_text"),
|
||||
.completed : L("upload_and_publish_success") ],
|
||||
|
|
@ -96,16 +106,14 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
return UITableViewAutomaticDimension
|
||||
}
|
||||
|
||||
override func numberOfSections(in _: UITableView) -> Int {
|
||||
return categoryAccessStatus == .public ? 1 : 2
|
||||
}
|
||||
|
||||
override func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
|
||||
switch section {
|
||||
case publicSectionIndex:
|
||||
return rowsInPublicSection
|
||||
case privateSectionIndex:
|
||||
return rowsInPrivateSection
|
||||
case editOnWebSectionIndex:
|
||||
return rowsInEditOnWebSection
|
||||
default:
|
||||
return 0
|
||||
}
|
||||
|
|
@ -113,7 +121,16 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
|
||||
override func tableView(_ tableView: UITableView,
|
||||
titleForHeaderInSection section: Int) -> String? {
|
||||
return section == 0 ? L("public_access") : L("limited_access")
|
||||
switch section {
|
||||
case 0:
|
||||
return L("limited_access")
|
||||
case 1:
|
||||
return L("public_access")
|
||||
case 2:
|
||||
return L("edit_on_web")
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
override func tableView(_ tableView: UITableView,
|
||||
|
|
@ -136,10 +153,22 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
startUploadAndPublishFlow()
|
||||
} else if cell == getDirectLinkCell {
|
||||
uploadAndGetDirectLink()
|
||||
}
|
||||
} else if cell == updatePublishCell {
|
||||
updatePublic()
|
||||
} else if cell == updateDirectLinkCell {
|
||||
updateDirectLink()
|
||||
}
|
||||
}
|
||||
|
||||
func startUploadAndPublishFlow() {
|
||||
|
||||
private func updatePublic() {
|
||||
|
||||
}
|
||||
|
||||
private func updateDirectLink() {
|
||||
|
||||
}
|
||||
|
||||
private func startUploadAndPublishFlow() {
|
||||
Statistics.logEvent(kStatSharingOptionsClick, withParameters: [kStatItem : kStatPublic])
|
||||
performAfterValidation(anchor: uploadAndPublishCell) { [weak self] in
|
||||
if let self = self {
|
||||
|
|
@ -148,7 +177,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
}
|
||||
}
|
||||
|
||||
func uploadAndPublish() {
|
||||
private func uploadAndPublish() {
|
||||
guard categoryId != MWMFrameworkHelper.invalidCategoryId(),
|
||||
let tags = sharingTags,
|
||||
let userStatus = sharingUserStatus else {
|
||||
|
|
@ -170,10 +199,17 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
Statistics.logEvent(kStatSharingOptionsUploadSuccess, withParameters:
|
||||
[kStatTracks : self.manager.getCategoryTracksCount(self.categoryId),
|
||||
kStatPoints : self.manager.getCategoryMarksCount(self.categoryId)])
|
||||
|
||||
|
||||
self.getDirectLinkCell.cellState = .disabled
|
||||
self.directLinkInstructionsLabel.text = L("unable_get_direct_link_desc")
|
||||
self.tableView.beginUpdates()
|
||||
self.tableView.deleteSections(IndexSet(arrayLiteral: self.privateSectionIndex), with: .fade)
|
||||
self.tableView.insertRows(at: [IndexPath(item: self.editOnWebCellIndex,
|
||||
let directLinkUpdateIndexPath = IndexPath(row: self.directLinkUpdateRowIndex,
|
||||
section: self.privateSectionIndex)
|
||||
if (self.tableView.cellForRow(at: directLinkUpdateIndexPath) != nil) {
|
||||
self.tableView.deleteRows(at: [directLinkUpdateIndexPath], with: .automatic)
|
||||
}
|
||||
|
||||
self.tableView.insertRows(at: [IndexPath(row: self.publishUpdateRowIndex,
|
||||
section: self.publicSectionIndex)],
|
||||
with: .automatic)
|
||||
self.tableView.endUpdates()
|
||||
|
|
@ -181,7 +217,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
}
|
||||
}
|
||||
|
||||
func uploadAndGetDirectLink() {
|
||||
private func uploadAndGetDirectLink() {
|
||||
Statistics.logEvent(kStatSharingOptionsClick, withParameters: [kStatItem : kStatPrivate])
|
||||
performAfterValidation(anchor: getDirectLinkCell) { [weak self] in
|
||||
guard let s = self, s.categoryId != MWMFrameworkHelper.invalidCategoryId() else {
|
||||
|
|
@ -204,12 +240,15 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
Statistics.logEvent(kStatSharingOptionsUploadSuccess, withParameters:
|
||||
[kStatTracks : s.manager.getCategoryTracksCount(s.categoryId),
|
||||
kStatPoints : s.manager.getCategoryMarksCount(s.categoryId)])
|
||||
s.tableView.insertRows(at: [IndexPath(item: s.directLinkUpdateRowIndex,
|
||||
section: s.privateSectionIndex)],
|
||||
with: .automatic)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func performAfterValidation(anchor: UIView, action: @escaping MWMVoidBlock) {
|
||||
private func performAfterValidation(anchor: UIView, action: @escaping MWMVoidBlock) {
|
||||
if MWMFrameworkHelper.isNetworkConnected() {
|
||||
signup(anchor: anchor, onComplete: { success in
|
||||
if success {
|
||||
|
|
@ -230,7 +269,7 @@ final class BookmarksSharingViewController: MWMTableViewController {
|
|||
}
|
||||
}
|
||||
|
||||
func showErrorAlert(_ error: NSError) {
|
||||
private func showErrorAlert(_ error: NSError) {
|
||||
guard error.code == kCategoryUploadFailedCode,
|
||||
let statusCode = error.userInfo[kCategoryUploadStatusKey] as? Int,
|
||||
let status = MWMCategoryUploadStatus(rawValue: statusCode) else {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ enum UploadActionCellState: String {
|
|||
case normal
|
||||
case inProgress
|
||||
case completed
|
||||
case disabled
|
||||
}
|
||||
|
||||
final class UploadActionCell: MWMTableViewCell {
|
||||
|
|
@ -37,7 +38,7 @@ final class UploadActionCell: MWMTableViewCell {
|
|||
actionTitle.font = .regular16()
|
||||
actionTitle.text = titles?[.normal]
|
||||
shareButton.isHidden = true
|
||||
break
|
||||
selectionStyle = .default
|
||||
case .inProgress:
|
||||
progress.state = .spinner
|
||||
actionImage.tintColor = .blackSecondaryText()
|
||||
|
|
@ -45,15 +46,22 @@ final class UploadActionCell: MWMTableViewCell {
|
|||
actionTitle.font = .italic16()
|
||||
actionTitle.text = titles?[.inProgress]
|
||||
shareButton.isHidden = true
|
||||
break
|
||||
case .completed:
|
||||
selectionStyle = .none
|
||||
case .completed:
|
||||
progress.state = .completed
|
||||
actionImage.tintColor = .blackSecondaryText()
|
||||
actionTitle.textColor = .blackSecondaryText()
|
||||
actionTitle.font = .regular16()
|
||||
actionTitle.text = titles?[.completed]
|
||||
shareButton.isHidden = false
|
||||
break
|
||||
selectionStyle = .none
|
||||
case .disabled:
|
||||
progress.state = .normal
|
||||
actionImage.tintColor = .blackSecondaryText()
|
||||
actionTitle.textColor = .blackSecondaryText()
|
||||
actionTitle.font = .regular16()
|
||||
shareButton.isHidden = true
|
||||
selectionStyle = .none
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
15
iphone/Maps/Images.xcassets/Sharing/ic24PxUpdate.imageset/Contents.json
vendored
Normal file
15
iphone/Maps/Images.xcassets/Sharing/ic24PxUpdate.imageset/Contents.json
vendored
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
{
|
||||
"images" : [
|
||||
{
|
||||
"idiom" : "universal",
|
||||
"filename" : "ic24PxUpdate.pdf"
|
||||
}
|
||||
],
|
||||
"info" : {
|
||||
"version" : 1,
|
||||
"author" : "xcode"
|
||||
},
|
||||
"properties" : {
|
||||
"template-rendering-intent" : "template"
|
||||
}
|
||||
}
|
||||
BIN
iphone/Maps/Images.xcassets/Sharing/ic24PxUpdate.imageset/ic24PxUpdate.pdf
vendored
Normal file
BIN
iphone/Maps/Images.xcassets/Sharing/ic24PxUpdate.imageset/ic24PxUpdate.pdf
vendored
Normal file
Binary file not shown.
Loading…
Add table
Reference in a new issue