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

[iOS] fix bugs related to images from web

Browse source
This commit is contained in:
Aleksey Belouosv 2019-01-14 15:11:00 +03:00 • committed by Olesia Bolovintseva
parent 29281140cd
commit 7e88394445
4 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
iphone/Maps/Core/WebImage/UIImageView+WebImage.m
View file

@ -26,16 +26,13 @@ static char kAssociatedObjectKey;
[UIView transitionWithView:self
duration:duration
options:UIViewAnimationOptionTransitionCrossDissolve
animations:^{
self.image = image;
}
completion:^(BOOL finished) {
if (completion) { completion(image, nil); }
}];
animations:^{ self.image = image; }
completion:nil];
} else {
self.image = image;
if (completion) { completion(image, nil); }
}
if (completion) { completion(image, nil); }
}];
objc_setAssociatedObject(self, &kAssociatedObjectKey, task, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
}

2
iphone/Maps/UI/Ads/AdBanner.swift
View file

@ -110,7 +110,9 @@ final class AdBanner: UITableViewCell {
@objc weak var mpNativeAd: MPNativeAd?
override func prepareForReuse() {
super.prepareForReuse()
adIconImageView.wi_cancelImageRequest()
adIconImageView.image = nil;
}
private var nativeAd: Banner? {

5
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/BookingCells/PPHotelCarouselCell.swift
View file

@ -6,6 +6,11 @@ final class CarouselElement: UICollectionViewCell {
image.wi_setImage(with: url, transitionDuration: kDefaultAnimationDuration)
dimMask.forEach { $0.isHidden = !isLastCell }
}
override func prepareForReuse() {
super.prepareForReuse()
image.image = nil;
}
}
@objc(MWMPPHotelCarouselCell)

2
iphone/Maps/UI/PlacePage/PlacePageLayout/Content/Gallery/Cells/GalleryCell.swift
View file

@ -10,6 +10,8 @@ final class GalleryCell: UICollectionViewCell {
}
override func prepareForReuse() {
super.prepareForReuse()
imageView.wi_cancelImageRequest()
imageView.image = nil;
}
}