forked from organicmaps/organicmaps
[iOS] fix UI issues in bookmarks list
This commit is contained in:
Aleksey Belousov
Alexander Boriskov
parent
5afd954fd7
commit
cc2f1599db
8 changed files with 81 additions and 74 deletions
|
|
@ -26,10 +26,11 @@ class BookmarksListInfoViewController: UIViewController {
|
|||
@IBOutlet var titleImageView: UIImageView!
|
||||
@IBOutlet var titleLabel: UILabel!
|
||||
@IBOutlet var descriptionButton: UIButton!
|
||||
@IBOutlet var descriptionButtonView: UIView!
|
||||
@IBOutlet var authorContainerView: UIView!
|
||||
@IBOutlet var authorImageView: UIImageView!
|
||||
@IBOutlet var authorLabel: UILabel!
|
||||
@IBOutlet var infoStack: UIStackView!
|
||||
@IBOutlet var separatorsConstraints: [NSLayoutConstraint]!
|
||||
|
||||
@IBAction func onDescription(_ sender: UIButton) {
|
||||
delegate?.didPressDescription()
|
||||
|
|
@ -38,6 +39,8 @@ class BookmarksListInfoViewController: UIViewController {
|
|||
override func viewDidLoad() {
|
||||
super.viewDidLoad()
|
||||
descriptionButton.setTitle(L("description_guide").uppercased(), for: .normal)
|
||||
separatorsConstraints.forEach { $0.constant = 1 / UIScreen.main.scale }
|
||||
|
||||
guard let info = info else { return }
|
||||
updateInfo(info)
|
||||
}
|
||||
|
|
@ -46,7 +49,8 @@ class BookmarksListInfoViewController: UIViewController {
|
|||
titleLabel.text = info.title
|
||||
authorLabel.text = String(coreFormat: L("author_name_by_prefix"), arguments: [info.author])
|
||||
authorImageView.isHidden = !info.hasLogo
|
||||
descriptionButtonView.isHidden = !info.hasDescription
|
||||
authorContainerView.isHidden = info.author.isEmpty
|
||||
descriptionButton.isHidden = !info.hasDescription
|
||||
|
||||
titleImageView.isHidden = true
|
||||
if let imageUrl = info.imageUrl {
|
||||
|
|
|
|||
|
|
@ -10,14 +10,16 @@
|
|||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="BookmarksListInfoViewController" customModule="maps_me" customModuleProvider="target">
|
||||
<connections>
|
||||
<outlet property="authorContainerView" destination="bit-FN-ytL" id="CAI-TP-A5D"/>
|
||||
<outlet property="authorImageView" destination="Wss-1i-hZy" id="QEU-QE-qyP"/>
|
||||
<outlet property="authorLabel" destination="Eqa-1j-puo" id="fNR-7I-wht"/>
|
||||
<outlet property="descriptionButton" destination="cxc-pt-qei" id="zce-so-aHF"/>
|
||||
<outlet property="descriptionButtonView" destination="TIy-PU-SzO" id="VBr-Yp-TSd"/>
|
||||
<outlet property="infoStack" destination="226-gO-8GN" id="f2A-eJ-FGG"/>
|
||||
<outlet property="titleImageView" destination="dsB-Xh-jOl" id="rsb-lH-MDN"/>
|
||||
<outlet property="titleLabel" destination="TFR-Qj-pUF" id="D2T-y8-ztA"/>
|
||||
<outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
|
||||
<outletCollection property="separatorsConstraints" destination="GqW-4j-7uM" collectionClass="NSMutableArray" id="wXt-eX-9BJ"/>
|
||||
<outletCollection property="separatorsConstraints" destination="soU-hC-iDQ" collectionClass="NSMutableArray" id="bQl-DL-hUh"/>
|
||||
</connections>
|
||||
</placeholder>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
|
|
@ -44,7 +46,7 @@
|
|||
<rect key="frame" x="0.0" y="0.0" width="343" height="48"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" verticalCompressionResistancePriority="751" text="Paris" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TFR-Qj-pUF">
|
||||
<rect key="frame" x="0.0" y="14" width="343" height="34"/>
|
||||
<rect key="frame" x="0.0" y="16" width="343" height="32"/>
|
||||
<fontDescription key="fontDescription" type="boldSystem" pointSize="24"/>
|
||||
<nil key="textColor"/>
|
||||
<nil key="highlightedColor"/>
|
||||
|
|
@ -54,52 +56,47 @@
|
|||
</label>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstItem="TFR-Qj-pUF" firstAttribute="top" secondItem="Z9F-Yb-cDq" secondAttribute="top" constant="14" id="1Pq-uJ-IXO"/>
|
||||
<constraint firstItem="TFR-Qj-pUF" firstAttribute="top" secondItem="Z9F-Yb-cDq" secondAttribute="top" constant="16" id="1Pq-uJ-IXO"/>
|
||||
<constraint firstAttribute="trailing" secondItem="TFR-Qj-pUF" secondAttribute="trailing" id="9jE-YY-ZE7"/>
|
||||
<constraint firstItem="TFR-Qj-pUF" firstAttribute="leading" secondItem="Z9F-Yb-cDq" secondAttribute="leading" id="Mqn-yA-iWF"/>
|
||||
<constraint firstAttribute="bottom" secondItem="TFR-Qj-pUF" secondAttribute="bottom" id="j5w-Th-flQ"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TIy-PU-SzO">
|
||||
<rect key="frame" x="0.0" y="48" width="343" height="50"/>
|
||||
<subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
|
||||
<rect key="frame" x="0.0" y="0.0" width="343" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="40" id="g6j-hs-K1V"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
|
||||
<state key="normal" title="DESCRIPTION"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="onDescription:" destination="-1" eventType="touchUpInside" id="fQR-bp-Mds"/>
|
||||
</connections>
|
||||
</button>
|
||||
</subviews>
|
||||
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cxc-pt-qei">
|
||||
<rect key="frame" x="0.0" y="48" width="343" height="40"/>
|
||||
<constraints>
|
||||
<constraint firstItem="cxc-pt-qei" firstAttribute="top" secondItem="TIy-PU-SzO" secondAttribute="top" id="GNA-8E-ru3"/>
|
||||
<constraint firstAttribute="bottom" secondItem="cxc-pt-qei" secondAttribute="bottom" constant="10" id="NZd-rr-ivd"/>
|
||||
<constraint firstAttribute="trailing" secondItem="cxc-pt-qei" secondAttribute="trailing" id="Sjc-Nr-PCH"/>
|
||||
<constraint firstItem="cxc-pt-qei" firstAttribute="leading" secondItem="TIy-PU-SzO" secondAttribute="leading" id="kPL-KQ-ZRX"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aEi-QI-Tol">
|
||||
<rect key="frame" x="0.0" y="98" width="343" height="1"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.11852525684931507" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="soU-hC-iDQ"/>
|
||||
<constraint firstAttribute="height" constant="40" id="g6j-hs-K1V"/>
|
||||
</constraints>
|
||||
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="14"/>
|
||||
<state key="normal" title="DESCRIPTION"/>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalTransButton"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
<connections>
|
||||
<action selector="onDescription:" destination="-1" eventType="touchUpInside" id="fQR-bp-Mds"/>
|
||||
</connections>
|
||||
</button>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="TIy-PU-SzO">
|
||||
<rect key="frame" x="0.0" y="88" width="343" height="10"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="10" id="HNz-j1-2hp"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bit-FN-ytL">
|
||||
<rect key="frame" x="0.0" y="99" width="343" height="60"/>
|
||||
<rect key="frame" x="0.0" y="98" width="343" height="61"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="aEi-QI-Tol">
|
||||
<rect key="frame" x="0.0" y="0.0" width="343" height="1"/>
|
||||
<color key="backgroundColor" white="0.0" alpha="0.11852525684931507" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="soU-hC-iDQ"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="MU1-nd-FMk">
|
||||
<rect key="frame" x="0.0" y="0.0" width="343" height="60"/>
|
||||
<rect key="frame" x="0.0" y="1" width="343" height="60"/>
|
||||
<subviews>
|
||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" image="img_lp" translatesAutoresizingMaskIntoConstraints="NO" id="Wss-1i-hZy">
|
||||
<rect key="frame" x="0.0" y="0.0" width="70" height="60"/>
|
||||
|
|
@ -126,7 +123,10 @@
|
|||
<constraint firstItem="MU1-nd-FMk" firstAttribute="leading" secondItem="bit-FN-ytL" secondAttribute="leading" id="5Nw-V9-fI7"/>
|
||||
<constraint firstAttribute="bottom" secondItem="MU1-nd-FMk" secondAttribute="bottom" id="Gj5-MA-ERI"/>
|
||||
<constraint firstAttribute="trailing" secondItem="MU1-nd-FMk" secondAttribute="trailing" id="UMa-6G-vfG"/>
|
||||
<constraint firstItem="MU1-nd-FMk" firstAttribute="top" secondItem="bit-FN-ytL" secondAttribute="top" id="lkc-U7-pxc"/>
|
||||
<constraint firstItem="aEi-QI-Tol" firstAttribute="leading" secondItem="bit-FN-ytL" secondAttribute="leading" id="bGS-V6-zTn"/>
|
||||
<constraint firstItem="aEi-QI-Tol" firstAttribute="top" secondItem="bit-FN-ytL" secondAttribute="top" id="jX7-lf-0c5"/>
|
||||
<constraint firstItem="MU1-nd-FMk" firstAttribute="top" secondItem="aEi-QI-Tol" secondAttribute="bottom" id="lkc-U7-pxc"/>
|
||||
<constraint firstAttribute="trailing" secondItem="aEi-QI-Tol" secondAttribute="trailing" id="xWz-Ie-kOO"/>
|
||||
</constraints>
|
||||
</view>
|
||||
</subviews>
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ extension BookmarksListViewController: UITableViewDataSource {
|
|||
|
||||
extension BookmarksListViewController: UITableViewDelegate {
|
||||
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
|
||||
48
|
||||
60
|
||||
}
|
||||
|
||||
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<outlet property="delegate" destination="-1" id="Ub6-3s-o8d"/>
|
||||
</connections>
|
||||
</searchBar>
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="fva-qQ-WqU">
|
||||
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="60" sectionFooterHeight="1" translatesAutoresizingMaskIntoConstraints="NO" id="fva-qQ-WqU">
|
||||
<rect key="frame" x="0.0" y="56" width="375" height="567"/>
|
||||
<color key="backgroundColor" systemColor="groupTableViewBackgroundColor"/>
|
||||
<inset key="separatorInset" minX="56" minY="0.0" maxX="0.0" maxY="0.0"/>
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||
<device id="retina4_7" orientation="portrait" appearance="light"/>
|
||||
<dependencies>
|
||||
<deployment identifier="iOS"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
|
||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
|
||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
||||
</dependencies>
|
||||
<objects>
|
||||
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
|
||||
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
|
||||
<view contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="iN0-l3-epB" customClass="BookmarksListSectionHeader" customModule="maps_me" customModuleProvider="target">
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="48"/>
|
||||
<rect key="frame" x="0.0" y="0.0" width="375" height="60"/>
|
||||
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
|
||||
<subviews>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xCm-Dh-8mT">
|
||||
<rect key="frame" x="16" y="0.0" width="343" height="48"/>
|
||||
<rect key="frame" x="16" y="12" width="343" height="48"/>
|
||||
<subviews>
|
||||
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Bookmarks" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yNv-Yr-Hkr">
|
||||
<rect key="frame" x="0.0" y="0.0" width="287" height="48"/>
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold20:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zdf-Q0-3xO">
|
||||
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" horizontalCompressionResistancePriority="751" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zdf-Q0-3xO">
|
||||
<rect key="frame" x="287" y="0.0" width="56" height="48"/>
|
||||
<fontDescription key="fontDescription" type="system" pointSize="16"/>
|
||||
<state key="normal" title="Hide All"/>
|
||||
|
|
@ -43,14 +43,14 @@
|
|||
<constraint firstAttribute="bottom" secondItem="xCm-Dh-8mT" secondAttribute="bottom" id="3MG-Ep-gMo"/>
|
||||
<constraint firstItem="xCm-Dh-8mT" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="16" id="9XD-d8-7vk"/>
|
||||
<constraint firstAttribute="trailing" secondItem="xCm-Dh-8mT" secondAttribute="trailing" constant="16" id="OGF-TS-kyi"/>
|
||||
<constraint firstItem="xCm-Dh-8mT" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="OLp-AI-xo9"/>
|
||||
<constraint firstItem="xCm-Dh-8mT" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="12" id="OLp-AI-xo9"/>
|
||||
</constraints>
|
||||
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
|
||||
<connections>
|
||||
<outlet property="titleLabel" destination="yNv-Yr-Hkr" id="2D1-wr-wFj"/>
|
||||
<outlet property="visibilityButton" destination="zdf-Q0-3xO" id="Z64-hc-gnc"/>
|
||||
</connections>
|
||||
<point key="canvasLocation" x="138.40000000000001" y="207.79610194902551"/>
|
||||
<point key="canvasLocation" x="138.40000000000001" y="201.94902548725639"/>
|
||||
</view>
|
||||
</objects>
|
||||
</document>
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ class GuideDescriptionViewController: MWMViewController {
|
|||
@IBOutlet private var photoActivityIndicator: UIActivityIndicatorView!
|
||||
@IBOutlet private var titleLabel: UILabel!
|
||||
@IBOutlet private var subtitleLabel: UILabel!
|
||||
@IBOutlet private var providerContainerView: UIView!
|
||||
@IBOutlet private var providerIcon: UIImageView!
|
||||
@IBOutlet private var providerLabel: UILabel!
|
||||
@IBOutlet private var descriptionText: UITextView!
|
||||
|
|
@ -24,7 +25,8 @@ class GuideDescriptionViewController: MWMViewController {
|
|||
|
||||
title = category.title
|
||||
titleLabel.text = category.title
|
||||
providerLabel.text = category.author
|
||||
providerLabel.text = String(coreFormat: L("author_name_by_prefix"), arguments: [category.author])
|
||||
providerContainerView.isHidden = category.author.isEmpty
|
||||
subtitleLabel.attributedText = NSMutableAttributedString(htmlString: category.annotation, baseFont: UIFont.regular16())
|
||||
descriptionText.attributedText = NSMutableAttributedString(htmlString: category.detailedAnnotation, baseFont: UIFont.regular16())
|
||||
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@
|
|||
<outlet property="photo" destination="OZ0-EB-ayO" id="6Zx-Ve-8dW"/>
|
||||
<outlet property="photoActivityIndicator" destination="Bgr-g1-5lE" id="BnS-zE-hqq"/>
|
||||
<outlet property="photoViewContainer" destination="vQ9-Cg-9CP" id="o1E-7m-xkD"/>
|
||||
<outlet property="providerContainerView" destination="mTg-8a-cqj" id="YrF-4P-3bb"/>
|
||||
<outlet property="providerIcon" destination="fwF-di-rja" id="rHe-gz-cs9"/>
|
||||
<outlet property="providerLabel" destination="CDJ-Rz-hR5" id="6hu-4R-Byi"/>
|
||||
<outlet property="subtitleLabel" destination="LbD-yc-cal" id="ZYn-UM-S94"/>
|
||||
|
|
@ -74,13 +75,26 @@
|
|||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular16:blackPrimaryText"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</label>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QJn-rO-FZg">
|
||||
<rect key="frame" x="16" y="96" width="382" height="1"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="ezx-6w-ZyU"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="bottom" secondItem="QJn-rO-FZg" secondAttribute="bottom" id="1KL-sf-EIJ"/>
|
||||
<constraint firstAttribute="trailing" secondItem="hh3-UD-FXJ" secondAttribute="trailing" constant="16" id="33S-zf-SgW"/>
|
||||
<constraint firstAttribute="trailing" secondItem="LbD-yc-cal" secondAttribute="trailing" constant="16" id="FXi-lH-haB"/>
|
||||
<constraint firstItem="hh3-UD-FXJ" firstAttribute="top" secondItem="Y73-5Z-ypa" secondAttribute="top" constant="28" id="Meh-Du-GBq"/>
|
||||
<constraint firstAttribute="bottom" secondItem="LbD-yc-cal" secondAttribute="bottom" constant="20" id="eu8-JJ-CuV"/>
|
||||
<constraint firstAttribute="trailing" secondItem="QJn-rO-FZg" secondAttribute="trailing" constant="16" id="kHQ-nY-plH"/>
|
||||
<constraint firstItem="LbD-yc-cal" firstAttribute="leading" secondItem="Y73-5Z-ypa" secondAttribute="leading" constant="16" id="ooJ-xp-PFq"/>
|
||||
<constraint firstItem="QJn-rO-FZg" firstAttribute="leading" secondItem="Y73-5Z-ypa" secondAttribute="leading" constant="16" id="rGD-ie-QUb"/>
|
||||
<constraint firstItem="hh3-UD-FXJ" firstAttribute="leading" secondItem="Y73-5Z-ypa" secondAttribute="leading" constant="16" id="x2s-nc-dOt"/>
|
||||
<constraint firstItem="LbD-yc-cal" firstAttribute="top" secondItem="hh3-UD-FXJ" secondAttribute="bottom" constant="8" id="ymw-Mn-Fe0"/>
|
||||
</constraints>
|
||||
|
|
@ -91,16 +105,6 @@
|
|||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mTg-8a-cqj">
|
||||
<rect key="frame" x="0.0" y="279" width="414" height="84"/>
|
||||
<subviews>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QJn-rO-FZg">
|
||||
<rect key="frame" x="16" y="0.0" width="382" height="1"/>
|
||||
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
|
||||
<constraints>
|
||||
<constraint firstAttribute="height" constant="1" id="ezx-6w-ZyU"/>
|
||||
</constraints>
|
||||
<userDefinedRuntimeAttributes>
|
||||
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Divider"/>
|
||||
</userDefinedRuntimeAttributes>
|
||||
</view>
|
||||
<stackView opaque="NO" contentMode="scaleToFill" spacing="16" translatesAutoresizingMaskIntoConstraints="NO" id="12S-Lx-MCj">
|
||||
<rect key="frame" x="16" y="12" width="382" height="60"/>
|
||||
<subviews>
|
||||
|
|
@ -134,15 +138,12 @@
|
|||
</subviews>
|
||||
<constraints>
|
||||
<constraint firstAttribute="trailing" secondItem="12S-Lx-MCj" secondAttribute="trailing" constant="16" id="55h-DV-gQu"/>
|
||||
<constraint firstItem="QJn-rO-FZg" firstAttribute="top" secondItem="mTg-8a-cqj" secondAttribute="top" id="Fei-fA-xca"/>
|
||||
<constraint firstItem="SjC-kq-PvM" firstAttribute="leading" secondItem="mTg-8a-cqj" secondAttribute="leading" constant="16" id="GFs-Fs-fFc"/>
|
||||
<constraint firstItem="QJn-rO-FZg" firstAttribute="leading" secondItem="mTg-8a-cqj" secondAttribute="leading" constant="16" id="HCg-qc-nRx"/>
|
||||
<constraint firstAttribute="trailing" secondItem="SjC-kq-PvM" secondAttribute="trailing" constant="16" id="ZTc-et-gze"/>
|
||||
<constraint firstAttribute="trailing" secondItem="QJn-rO-FZg" secondAttribute="trailing" constant="16" id="bhh-Mc-h2g"/>
|
||||
<constraint firstItem="12S-Lx-MCj" firstAttribute="top" secondItem="QJn-rO-FZg" secondAttribute="bottom" constant="11" id="fuT-5c-Zfb"/>
|
||||
<constraint firstAttribute="bottom" secondItem="SjC-kq-PvM" secondAttribute="bottom" id="izq-lF-HqV"/>
|
||||
<constraint firstItem="SjC-kq-PvM" firstAttribute="top" secondItem="12S-Lx-MCj" secondAttribute="bottom" constant="11" id="kjx-7y-3Sa"/>
|
||||
<constraint firstItem="12S-Lx-MCj" firstAttribute="leading" secondItem="mTg-8a-cqj" secondAttribute="leading" constant="16" id="oSW-rQ-KED"/>
|
||||
<constraint firstItem="12S-Lx-MCj" firstAttribute="top" secondItem="mTg-8a-cqj" secondAttribute="top" constant="12" id="wLQ-m7-Vmq"/>
|
||||
</constraints>
|
||||
</view>
|
||||
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="j0J-od-RtZ">
|
||||
|
|
|
|||
|
|
@ -30,18 +30,18 @@ class Fonts: IFonts {
|
|||
var light12 = UIFont.systemFont(ofSize: 12, weight:UIFont.Weight.light)
|
||||
var light16 = UIFont.systemFont(ofSize: 16, weight:UIFont.Weight.light)
|
||||
var light17 = UIFont.systemFont(ofSize: 17, weight:UIFont.Weight.light)
|
||||
var bold12 = UIFont.boldSystemFont(ofSize: 12)
|
||||
var bold14 = UIFont.boldSystemFont(ofSize: 14)
|
||||
var bold16 = UIFont.boldSystemFont(ofSize: 16)
|
||||
var bold17 = UIFont.boldSystemFont(ofSize: 17)
|
||||
var bold18 = UIFont.boldSystemFont(ofSize: 18)
|
||||
var bold20 = UIFont.boldSystemFont(ofSize: 20)
|
||||
var bold22 = UIFont.boldSystemFont(ofSize: 22)
|
||||
var bold24 = UIFont.boldSystemFont(ofSize: 24)
|
||||
var bold28 = UIFont.boldSystemFont(ofSize: 28)
|
||||
var bold34 = UIFont.boldSystemFont(ofSize: 34)
|
||||
var bold36 = UIFont.boldSystemFont(ofSize: 26)
|
||||
var bold48 = UIFont.boldSystemFont(ofSize: 48)
|
||||
var bold12 = UIFont.systemFont(ofSize: 12, weight:UIFont.Weight.bold)
|
||||
var bold14 = UIFont.systemFont(ofSize: 14, weight:UIFont.Weight.bold)
|
||||
var bold16 = UIFont.systemFont(ofSize: 16, weight:UIFont.Weight.bold)
|
||||
var bold17 = UIFont.systemFont(ofSize: 17, weight:UIFont.Weight.bold)
|
||||
var bold18 = UIFont.systemFont(ofSize: 18, weight:UIFont.Weight.bold)
|
||||
var bold20 = UIFont.systemFont(ofSize: 20, weight:UIFont.Weight.bold)
|
||||
var bold22 = UIFont.systemFont(ofSize: 22, weight:UIFont.Weight.bold)
|
||||
var bold24 = UIFont.systemFont(ofSize: 24, weight:UIFont.Weight.bold)
|
||||
var bold28 = UIFont.systemFont(ofSize: 28, weight:UIFont.Weight.bold)
|
||||
var bold34 = UIFont.systemFont(ofSize: 34, weight:UIFont.Weight.bold)
|
||||
var bold36 = UIFont.systemFont(ofSize: 36, weight:UIFont.Weight.bold)
|
||||
var bold48 = UIFont.systemFont(ofSize: 48, weight:UIFont.Weight.bold)
|
||||
var heavy17 = UIFont.systemFont(ofSize: 17, weight:UIFont.Weight.heavy)
|
||||
var heavy20 = UIFont.systemFont(ofSize: 20, weight:UIFont.Weight.heavy)
|
||||
var heavy32 = UIFont.systemFont(ofSize: 32, weight:UIFont.Weight.heavy)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue