RedAuburn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[iOS] Fixed build for rebase release-96-to-master

Browse source
This commit is contained in:
Alexander Boriskov 2020-02-12 12:49:42 +03:00 • committed by Daria Volvenkova
parent a9d2f7f490
commit ea4efcce49
10 changed files with 37 additions and 99 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Bridging-Header.h
View file

@ -14,8 +14,6 @@
#import "3party/Alohalytics/src/alohalytics_objc.h"
#import "MPNativeAd+MWM.h"
//#import "MPNativeAd.h"
//#import "MoPub-Bridging-Header.h"
#import "UIKitCategories.h"
#import "private.h"
@ -23,8 +21,6 @@
#import <CoreApi/CoreApi-swift.h>
#import "BookmarksVC.h"
//#import "FacebookNativeAdAdapter.h"
#import "CatalogPromoItem.h"
#import "CoreNotificationWrapper.h"
#import "MapViewController.h"
#import "MWMActionBarButton.h"

2
iphone/Maps/Core/Routing/MWMRouter.mm
View file

@ -463,7 +463,7 @@ void logPointEvent(MWMRoutePoint * point, NSString * eventType)
{
rm.FollowRoute();
[[MWMMapViewControlsManager manager] onRouteStart];
[MWMThemeManager setAutoUpdates:YES];}
[MWMThemeManager setAutoUpdates:YES];
}
else
{

13
iphone/Maps/UI/Ads/AdBannerView.swift
View file

@ -184,14 +184,15 @@ class AdBannerView: UIView {
} else {
adCallToActionButtons = [adCallToActionButtonCompact, adCallToActionButtonDetailed]
}
ad.registerView(forInteraction: self, with: nil, withClickableViews: adCallToActionButtons)
ad.registerView(forInteraction: self,
mediaView: FBMediaView(),
iconImageView: adIconImageView,
viewController: UIViewController.topViewController(),
clickableViews: adCallToActionButtons)
ad.icon?.loadAsync { [weak self] image in
self?.adIconImageView.image = image
}
adTitleLabel.attributedText = attributedTitle(title: ad.title ?? "",
adTitleLabel.attributedText = attributedTitle(title: ad.headline ?? "",
indent: adPrivacyImage.width + DAAImageWidth.constant)
adBodyLabel.text = ad.body ?? ""
adBodyLabel.text = ad.bodyText ?? ""
let config = state.config()
adTitleLabel.numberOfLines = config.numberOfTitleLines
adBodyLabel.numberOfLines = config.numberOfBodyLines

61
iphone/Maps/UI/Ads/AdBannerView.xib
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15505" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15510"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
@ -31,16 +31,7 @@
<constraint firstAttribute="height" constant="40" id="eGj-tP-y29"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="1"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
<color key="value" white="0.0" alpha="0.12" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdsIconImage"/>
</userDefinedRuntimeAttributes>
</imageView>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="6hQ-rg-viN" userLabel="Privacy images">
@ -74,10 +65,7 @@
<constraint firstAttribute="bottom" secondItem="8tz-ng-GBn" secondAttribute="bottom" id="zWj-cW-sxT"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="4"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdBannerPrivacyImage"/>
</userDefinedRuntimeAttributes>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" horizontalCompressionResistancePriority="300" text="Delivery Club" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="GhG-Kh-VRe">
@ -86,8 +74,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="bold12"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="bold12:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="TopLeft" horizontalHuggingPriority="451" verticalHuggingPriority="249" horizontalCompressionResistancePriority="249" text="Как " textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="D5E-LW-54x">
@ -96,8 +83,7 @@
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="calibratedRGB"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="regular12"/>
<userDefinedRuntimeAttribute type="string" keyPath="colorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular12:blackSecondaryText"/>
</userDefinedRuntimeAttributes>
</label>
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="551" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="S7j-gp-e0z">
@ -113,13 +99,7 @@
<color key="titleColor" red="0.59999999999999998" green="0.58823529409999997" blue="0.56862745100000001" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium12"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="10"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdCallToActionButton"/>
</userDefinedRuntimeAttributes>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gqm-uV-OY1">
@ -132,13 +112,7 @@
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdBannerButton"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="remove_ads"/>
</userDefinedRuntimeAttributes>
<connections>
@ -155,13 +129,7 @@
<color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="0.40000000000000002" colorSpace="calibratedRGB"/>
</state>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="fontName" value="medium14"/>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerButtonBackground"/>
<userDefinedRuntimeAttribute type="string" keyPath="textColorName" value="blackSecondaryText"/>
<userDefinedRuntimeAttribute type="boolean" keyPath="layer.masksToBounds" value="YES"/>
<userDefinedRuntimeAttribute type="number" keyPath="layer.cornerRadius">
<integer key="value" value="8"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="AdBannerButton"/>
</userDefinedRuntimeAttributes>
</button>
<button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Nqu-Vs-pn3">
@ -239,13 +207,7 @@
<constraint firstItem="6hQ-rg-viN" firstAttribute="leading" secondItem="h4t-4z-OMT" secondAttribute="trailing" priority="250" constant="8" id="xru-9W-5gV"/>
</constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="layer.borderWidth">
<integer key="value" value="2"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="color" keyPath="layer.borderUIColor">
<color key="value" white="0.0" alpha="0.12" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</userDefinedRuntimeAttribute>
<userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="bannerBackground"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="NativeAdView"/>
</userDefinedRuntimeAttributes>
</view>
</subviews>
@ -262,6 +224,9 @@
</constraints>
<freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="Background"/>
</userDefinedRuntimeAttributes>
<connections>
<outlet property="DAAImage" destination="tQY-db-Vng" id="atH-fh-ho2"/>
<outlet property="DAAImageWidth" destination="Wsd-jg-DFB" id="H6c-p1-1zx"/>

29
iphone/Maps/UI/Authorization/AuthorizationViewController.xib
View file

@ -76,7 +76,7 @@
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Cdf-p5-Bbb">
<rect key="frame" x="32" y="59" width="350" height="55.5"/>
<rect key="frame" x="32" y="59" width="350" height="55.5"/>
<subviews>
<view opaque="NO" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="33D-0u-y3N" customClass="Checkmark" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="5" width="40" height="40"/>
@ -123,7 +123,7 @@
</constraints>
</view>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="XHd-bd-GsP">
<rect key="frame" x="32" y="114.5" width="350" height="55.5"/>
<rect key="frame" x="32" y="114.5" width="350" height="55.5"/>
<subviews>
<view opaque="NO" contentMode="center" translatesAutoresizingMaskIntoConstraints="NO" id="3cN-Qb-mdM" customClass="Checkmark" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="0.0" y="5" width="40" height="40"/>
@ -208,36 +208,36 @@
</constraints>
</view>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8iU-Se-s8N" customClass="LeftAlignedIconButton" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="32" y="237.5" width="350" height="40"/>
<rect key="frame" x="32" y="237.5" width="350" height="40"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="GEc-UM-DNb"/>
</constraints>
<inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Google" image="login_google_button"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="GoogleButton"/>
</userDefinedRuntimeAttributes>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="GoogleButton"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="googleSignIn" destination="-1" eventType="touchUpInside" id="pit-ir-2fB"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="O8A-fR-loh" customClass="LeftAlignedIconButton" customModule="maps_me" customModuleProvider="target">
<rect key="frame" x="32" y="293.5" width="350" height="40"/>
<rect key="frame" x="32" y="293.5" width="350" height="40"/>
<color key="backgroundColor" red="0.23137254901960785" green="0.34901960784313724" blue="0.59607843137254901" alpha="1" colorSpace="calibratedRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="Evn-BD-u7u"/>
</constraints>
<inset key="imageEdgeInsets" minX="16" minY="0.0" maxX="0.0" maxY="0.0"/>
<state key="normal" title="Facebook" image="login_facebook_button"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FacebookButton"/>
</userDefinedRuntimeAttributes>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FacebookButton"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="facebookSignIn" destination="-1" eventType="touchUpInside" id="t2x-dC-1bh"/>
</connections>
</button>
<button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ZDx-fj-xoO">
<rect key="frame" x="32" y="349.5" width="350" height="40"/>
<rect key="frame" x="32" y="349.5" width="350" height="40"/>
<color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstAttribute="height" constant="44" id="jEe-rd-j73"/>
@ -245,17 +245,12 @@
<state key="normal" title="Phone number"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="phone_number"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="FlatNormalButton"/>
</userDefinedRuntimeAttributes>
<connections>
<action selector="phoneSignIn" destination="-1" eventType="touchUpInside" id="EmS-LY-4qT"/>
</connections>
</button>
<rect key="frame" x="32" y="20" width="350" height="33.5"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="styleName" value="regular14:blackSecondaryText"/>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="sign_message_gdpr"/>
</userDefinedRuntimeAttributes>
</subviews>
</stackView>
</subviews>

2
iphone/Maps/UI/PlacePage/CatalogGalleryViewController.swift
View file

@ -31,7 +31,7 @@ class CatalogPromoItemCell: UICollectionViewCell {
if promoItem.hexColor.count == 6 {
proContainerView.backgroundColor = UIColor(fromHexString: promoItem.hexColor)
} else {
proContainerView.backgroundColor = UIColor.ratingRed()
proContainerView.backgroundColor = UIColor.red
}
proContainerView.isHidden = false
}

2
iphone/Maps/UI/PlacePage/MyReviewViewController.swift
View file

@ -15,7 +15,7 @@ class MyReviewViewController: UIViewController {
@IBOutlet var starViews: [StarRatingView]! {
didSet {
starViews.forEach {
$0.activeColor = UIColor.ratingYellow()
$0.activeColor = UIColor.yellow
$0.inactiveColor = UIColor.blackDividers()
}
}

2
iphone/Maps/UI/PlacePage/PlacePagePreviewViewController.swift
View file

@ -94,7 +94,6 @@ class PlacePagePreviewViewController: UIViewController {
func updateUgc(_ ugcData: UgcData) {
ugcContainerView.isHidden = false
if let summaryRating = ugcData.summaryRating {
ratingSummaryView.defaultConfig()
ratingSummaryView.value = summaryRating.ratingString
ratingSummaryView.type = summaryRating.ratingType
reviewsLabel.text = String(format:L("placepage_summary_rating_description"), ugcData.ratingsCount)
@ -116,7 +115,6 @@ class PlacePagePreviewViewController: UIViewController {
func updateBooking(_ bookingData: HotelBookingData, rooms: HotelRooms?) {
ugcContainerView.isHidden = false
ratingSummaryView.defaultConfig()
ratingSummaryView.value = NSNumber(value: bookingData.score).stringValue
let rawRating = Int(bookingData.score / 2) + 1
ratingSummaryView.type = UgcSummaryRatingType(rawValue: rawRating) ?? .none

14
iphone/Maps/UI/PlacePage/RatingSummaryViewController.swift
View file

@ -1,23 +1,13 @@
class RatingSummaryViewController: UIViewController {
@IBOutlet var titleLabel: UILabel!
@IBOutlet var countLabel: UILabel!
@IBOutlet var ratingSummaryView: RatingSummaryView! {
didSet {
ratingSummaryView.horribleColor = UIColor.ratingRed()
ratingSummaryView.badColor = UIColor.ratingOrange()
ratingSummaryView.normalColor = UIColor.ratingYellow()
ratingSummaryView.goodColor = UIColor.ratingLightGreen()
ratingSummaryView.excellentColor = UIColor.ratingGreen()
ratingSummaryView.textFont = UIFont.bold28()
ratingSummaryView.textSize = 28
}
}
@IBOutlet var ratingSummaryView: RatingSummaryView!
@IBOutlet var ratingViews: [UIView]!
@IBOutlet var ratingLabels: [UILabel]!
@IBOutlet var starViews: [StarRatingView]! {
didSet {
starViews.forEach {
$0.activeColor = UIColor.ratingYellow()
$0.activeColor = UIColor.yellow
$0.inactiveColor = UIColor.blackDividers()
}
}

7
iphone/Maps/UI/Settings/Cells/SettingsTableViewLinkCell.swift
View file

@ -10,13 +10,6 @@ final class SettingsTableViewLinkCell: MWMTableViewCell {
self.info?.styleName = "regular17:blackSecondaryText"
}
override func awakeFromNib() {
super.awakeFromNib()
self.styleName = "Background"
self.title.styleName = "regular17:blackPrimaryText"
self.info.styleName = "regular17:blackSecondaryText"
}
@objc func config(title: String, info: String?) {
self.title.text = title