Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladiMihaylenko <vxmihaylenko@gmail.com>2017-02-28 13:11:15 +0300
committerSergey Yershov <syershov@maps.me>2017-02-28 13:15:02 +0300
commitfce669d15b40e5ad84ccab924769dc26c21d284a (patch)
treefe0ac195fafdcb4b1ec5d62e33cb814d64245ffa
parent789b8416f2de0f52474021d70a043a534d7781e3 (diff)
[ios] Rich pp was tuned.beta-654
-rw-r--r--iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/CarouselElement.xib4
-rw-r--r--iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift4
-rw-r--r--iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift3
-rw-r--r--iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift2
4 files changed, 7 insertions, 6 deletions
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/CarouselElement.xib b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/CarouselElement.xib
index 5c4abe5510..161290e482 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/CarouselElement.xib
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/CarouselElement.xib
@@ -20,6 +20,9 @@
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="49T-yd-qah">
<rect key="frame" x="0.0" y="0.0" width="150" height="100"/>
+ <userDefinedRuntimeAttributes>
+ <userDefinedRuntimeAttribute type="string" keyPath="backgroundColorName" value="pressBackground"/>
+ </userDefinedRuntimeAttributes>
</imageView>
<view contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Mmh-sw-uHm">
<rect key="frame" x="0.0" y="0.0" width="150" height="100"/>
@@ -47,7 +50,6 @@
<outlet property="image" destination="49T-yd-qah" id="oUk-H9-V0F"/>
<outletCollection property="dimMask" destination="Mmh-sw-uHm" collectionClass="NSMutableArray" id="DdN-K1-Ytc"/>
<outletCollection property="dimMask" destination="2V7-Dd-KtM" collectionClass="NSMutableArray" id="BeV-h5-wJV"/>
-
</connections>
<point key="canvasLocation" x="43" y="118"/>
</collectionViewCell>
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift
index c0119ea901..b425ba6d9c 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift
@@ -3,7 +3,7 @@ final class CarouselElement : UICollectionViewCell {
@IBOutlet private var dimMask: [UIView]!
func config(with url: URL, isLastCell: Bool) {
- image.af_setImage(withURL: url, placeholderImage: #imageLiteral(resourceName: "ic_placeholder"))
+ image.af_setImage(withURL: url, imageTransition: .crossDissolve(kDefaultAnimationDuration))
dimMask.forEach { $0.isHidden = !isLastCell }
}
}
@@ -39,7 +39,7 @@ extension PPHotelCarouselCell: UICollectionViewDelegate, UICollectionViewDataSou
let cell = collectionView.dequeueReusableCell(withCellClass: CarouselElement.self,
indexPath: indexPath) as! CarouselElement
- cell.config(with: dataSource[indexPath.item].previewURL, isLastCell: isLastCell(indexPath))
+ cell.config(with: dataSource[indexPath.item].imageURL, isLastCell: isLastCell(indexPath))
return cell
}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift
index a28b134165..63ebe81f7f 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift
@@ -7,8 +7,7 @@ final class GalleryCell: UICollectionViewCell {
var model: Model! {
didSet {
- imageView.af_setImage(withURL: model.previewURL,
- placeholderImage: #imageLiteral(resourceName: "ic_placeholder"))
+ imageView.af_setImage(withURL: model.previewURL, imageTransition: .crossDissolve(kDefaultAnimationDuration))
}
}
diff --git a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift
index f2ecb29506..eaf5283c21 100644
--- a/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift
+++ b/iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/GalleryItemViewController.swift
@@ -29,7 +29,7 @@ final class GalleryItemViewController: MWMViewController {
imageView.contentMode = .scaleAspectFit
scrollView.addSubview(imageView)
imageView.af_setImage(withURL: model.imageURL,
- placeholderImage: #imageLiteral(resourceName: "ic_placeholder"))
+ imageTransition: .crossDissolve(kDefaultAnimationDuration))
}
override func viewDidLayoutSubviews() {