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

[iOS] Fix a compilation error

Browse source 
Revert ae4bc37 "Remove graphics" for iphone/ directory

Signed-off-by: Roman Tsisyk <roman@tsisyk.com>
This commit is contained in:
Roman Tsisyk 2021-02-18 10:07:04 +03:00
parent a4ca4f454a
commit 2bb8ce43ba
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
iphone/Maps/Images.xcassets/Promo/img_booking_popup_pholder_light.imageset/Contents.json vendored
View file

@ -2,14 +2,17 @@
"images" : [
{
"idiom" : "universal",
"filename" : "img_booking_popup_pholder_light.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "img_booking_popup_pholder_light@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "img_booking_popup_pholder_light@3x.png",
"scale" : "3x"
}
],

2
iphone/Maps/TipsAndTricks/SearchTutorialBlur.xib
View file

@ -51,7 +51,7 @@
<color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<nil key="highlightedColor"/>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" />
<userDefinedRuntimeAttribute type="string" keyPath="localizedText" value="tips_book_hotel_title"/>
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sYr-oN-jn1">

3
iphone/Maps/UI/Promo/PromoAfterBookingViewController.swift
View file

@ -50,7 +50,8 @@ class PromoAfterBookingViewController: UIViewController {
private func setCityImage(_ imageUrl: String) {
cityImageView.image = UIColor.isNightMode()
? UIImage(named: "img_booking_popup_pholder_dark")
: UIImage(named: "img_booking_popup_pholder_light")
if !imageUrl.isEmpty, let url = URL(string: imageUrl) {
cityImageView.wi_setImage(with: url, transitionDuration: kDefaultAnimationDuration)
}

6
iphone/Maps/UI/Promo/PromoAfterBookingViewController.xib
View file

@ -20,7 +20,7 @@
<rect key="frame" x="0.0" y="0.0" width="307" height="339"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sDQ-mR-Qzk" userLabel="City Image">
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="img_booking_popup_pholder_light" translatesAutoresizingMaskIntoConstraints="NO" id="sDQ-mR-Qzk" userLabel="City Image">
<rect key="frame" x="0.0" y="0.0" width="307" height="128"/>
<constraints>
<constraint firstAttribute="height" constant="128" id="NJk-9b-9g9"/>
@ -107,5 +107,7 @@
<point key="canvasLocation" x="-779.46026986506752" y="-103.2"/>
</view>
</objects>
<resources>
<image name="img_booking_popup_pholder_light" width="307" height="128"/>
</resources>
</document>