From 2200ae8ccee479d4684d4c037ee90d1bae413e02 Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Wed, 23 Aug 2017 11:29:52 +1000 Subject: [PATCH 1/9] Added ability to add a fallback image for all ImageSlideshowItem's --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 5 ++++- .../Classes/Core/ImageSlideshowItem.swift | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 0b421287..12cf657d 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -94,6 +94,9 @@ open class ImageSlideshow: UIView { return nil } } + + /// Optional fallbackImage for each InputSource + open var fallbackImage : ImageSource? /// Current scroll view page. This may differ from `currentPage` as circular slider has two more dummy pages at indexes 0 and n-1 to provide fluent scrolling between first and last item. open fileprivate(set) var scrollViewPage: Int = 0 @@ -245,7 +248,7 @@ open class ImageSlideshow: UIView { var i = 0 for image in scrollViewImages { - let item = ImageSlideshowItem(image: image, zoomEnabled: self.zoomEnabled, activityIndicator: self.activityIndicator?.create()) + let item = ImageSlideshowItem(image: image, zoomEnabled: self.zoomEnabled, activityIndicator: self.activityIndicator?.create(), fallbackImage: fallbackImage) item.imageView.contentMode = self.contentScaleMode slideshowItems.append(item) scrollView.addSubview(item) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift index 36f4a3e9..3b467ab0 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift @@ -18,6 +18,9 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Input Source for the item open let image: InputSource + + /// Fallback Input Source for the item + open let fallbackImage : InputSource? /// Guesture recognizer to detect double tap to zoom open var gestureRecognizer: UITapGestureRecognizer? @@ -45,8 +48,9 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { Initializes a new ImageSlideshowItem - parameter image: Input Source to load the image - parameter zoomEnabled: holds if it should be possible to zoom-in the image + - parameter fallbackImage: A fallback image to display if image is unavailable */ - init(image: InputSource, zoomEnabled: Bool, activityIndicator: ActivityIndicatorView? = nil) { + init(image: InputSource, zoomEnabled: Bool, activityIndicator: ActivityIndicatorView? = nil, fallbackImage: InputSource? = nil) { self.zoomEnabled = zoomEnabled self.image = image self.activityIndicator = activityIndicator @@ -116,7 +120,8 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Request to load Image Source to Image View func loadImage() { - if self.imageView.image == nil && !isLoading { + if (self.imageView.image == nil || self.loadFailed) && !isLoading { + self.imageView.image = nil isLoading = true imageReleased = false activityIndicator?.show() @@ -126,6 +131,11 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { self.activityIndicator?.hide() self.loadFailed = image == nil self.isLoading = false + if self.loadFailed && self.fallbackImage != nil { + self.fallbackImage?.load(to: self.imageView) { fallbackImage in + self.imageView.image = self.imageReleased ? nil : fallbackImage + } + } } } } From dacfb16c32805396fda9c91869c302c818e984b4 Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Wed, 23 Aug 2017 11:29:52 +1000 Subject: [PATCH 2/9] Added ability to add a fallback image for all ImageSlideshowItem's --- .../Classes/Core/ImageSlideshow.swift | 8 ++++++- .../Classes/Core/ImageSlideshowItem.swift | 21 +++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 0b421287..93fb0177 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -94,6 +94,9 @@ open class ImageSlideshow: UIView { return nil } } + + /// Optional fallbackImage for each InputSource + open var fallbackImage: ImageSource? /// Current scroll view page. This may differ from `currentPage` as circular slider has two more dummy pages at indexes 0 and n-1 to provide fluent scrolling between first and last item. open fileprivate(set) var scrollViewPage: Int = 0 @@ -149,6 +152,9 @@ open class ImageSlideshow: UIView { } } } + + // Fallback content mode for fallbackImage + open var fallbackScaleMode: UIViewContentMode = UIViewContentMode.scaleAspectFit fileprivate var slideshowTimer: Timer? fileprivate var scrollViewImages = [InputSource]() @@ -245,7 +251,7 @@ open class ImageSlideshow: UIView { var i = 0 for image in scrollViewImages { - let item = ImageSlideshowItem(image: image, zoomEnabled: self.zoomEnabled, activityIndicator: self.activityIndicator?.create()) + let item = ImageSlideshowItem(image: image, zoomEnabled: self.zoomEnabled, activityIndicator: self.activityIndicator?.create(), fallbackImage: fallbackImage, fallbackScaleMode: self.fallbackScaleMode) item.imageView.contentMode = self.contentScaleMode slideshowItems.append(item) scrollView.addSubview(item) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift index 36f4a3e9..1e07208e 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift @@ -18,6 +18,12 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Input Source for the item open let image: InputSource + + /// Fallback Input Source for the item + open let fallbackImage: InputSource? + + /// Scale mode for fallback input source + open let fallbackScaleMode: UIViewContentMode /// Guesture recognizer to detect double tap to zoom open var gestureRecognizer: UITapGestureRecognizer? @@ -45,11 +51,15 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { Initializes a new ImageSlideshowItem - parameter image: Input Source to load the image - parameter zoomEnabled: holds if it should be possible to zoom-in the image + - parameter fallbackImage: A fallback image to display if image is unavailable + - parameter fallbackScaleMode: The fallback image scale mode */ - init(image: InputSource, zoomEnabled: Bool, activityIndicator: ActivityIndicatorView? = nil) { + init(image: InputSource, zoomEnabled: Bool, activityIndicator: ActivityIndicatorView? = nil, fallbackImage: InputSource? = nil) { self.zoomEnabled = zoomEnabled self.image = image self.activityIndicator = activityIndicator + self.fallbackImage = fallbackImage + self.fallbackScaleMode = fallbackScaleMode super.init(frame: CGRect.null) @@ -116,7 +126,8 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Request to load Image Source to Image View func loadImage() { - if self.imageView.image == nil && !isLoading { + if (self.imageView.image == nil || self.loadFailed) && !isLoading { + self.imageView.image = nil isLoading = true imageReleased = false activityIndicator?.show() @@ -126,6 +137,12 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { self.activityIndicator?.hide() self.loadFailed = image == nil self.isLoading = false + if self.loadFailed && self.fallbackImage != nil { + self.fallbackImage?.load(to: self.imageView) { fallbackImage in + self.imageView.image = self.imageReleased ? nil : fallbackImage + self.imageView.contentMode = self.fallbackScaleMode + } + } } } } From b3b711f826f6350cd4d24a0cb815f1f59a132d82 Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Tue, 5 Feb 2019 09:38:37 +1000 Subject: [PATCH 3/9] Fixed tests --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 2 +- .../Classes/Core/ImageSlideshowItem.swift | 14 +++++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index dfd17eb4..cef20b97 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -182,7 +182,7 @@ open class ImageSlideshow: UIView { } // Fallback content mode for fallbackImage - open var fallbackScaleMode: UIViewContentMode = UIViewContentMode.scaleAspectFit + open var fallbackScaleMode: UIView.ContentMode = UIView.ContentMode.scaleAspectFit fileprivate var slideshowTimer: Timer? fileprivate var scrollViewImages = [InputSource]() diff --git a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift index 4fb8f718..3bef753c 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift @@ -24,7 +24,7 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { public let fallbackImage: InputSource? /// Scale mode for fallback input source - public let fallbackScaleMode: UIViewContentMode + public let fallbackScaleMode: UIView.ContentMode /// Guesture recognizer to detect double tap to zoom open var gestureRecognizer: UITapGestureRecognizer? @@ -146,10 +146,14 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { self?.activityIndicator?.hide() self?.loadFailed = image == nil self?.isLoading = false - if self?.loadFailed && self?.fallbackImage != nil { - self?.fallbackImage?.load(to: self?.imageView) { fallbackImage in - self?.imageView.image = self?.imageReleased ? nil : fallbackImage - self?.imageView.contentMode = self?.fallbackScaleMode + if (self?.loadFailed ?? false) && self?.fallbackImage != nil { + if let imageView = self?.imageView { + self?.fallbackImage?.load(to: imageView) { fallbackImage in + imageView.image = (self?.imageReleased ?? false) ? nil : fallbackImage + if let scaleMode = self?.fallbackScaleMode { + imageView.contentMode = scaleMode + } + } } } } From 2d1706f436ea43261d3a83dc9b5e56044f838948 Mon Sep 17 00:00:00 2001 From: Peter IJlst Date: Tue, 25 Jun 2019 11:18:53 +0200 Subject: [PATCH 4/9] fix for iOS 13 --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 27e57386..f82683ea 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -543,6 +543,8 @@ open class ImageSlideshow: UIView { fullscreen.inputs = images slideshowTransitioningDelegate = ZoomAnimatedTransitioningDelegate(slideshowView: self, slideshowController: fullscreen) fullscreen.transitioningDelegate = slideshowTransitioningDelegate + fullscreen.modalPresentationStyle = .fullScreen + fullscreen.modalTransitionStyle = .coverVertical controller.present(fullscreen, animated: true, completion: nil) return fullscreen From 305f99c890c1e0e8590bd3aec4dfc6eda8c48fa6 Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Thu, 12 Sep 2019 16:17:28 +1000 Subject: [PATCH 5/9] Revert "Merge pull request #2 from 0xPr0xy/master" This reverts commit 6645bf66c7250527cac89453c7bfd4eecb5e20a8, reversing changes made to 40af92519dc6cbe5a50ad1b7e96fb939afcf9ed2. --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 2 -- 1 file changed, 2 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 725556d9..7c92a940 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -549,8 +549,6 @@ open class ImageSlideshow: UIView { fullscreen.inputs = images slideshowTransitioningDelegate = ZoomAnimatedTransitioningDelegate(slideshowView: self, slideshowController: fullscreen) fullscreen.transitioningDelegate = slideshowTransitioningDelegate - fullscreen.modalPresentationStyle = .fullScreen - fullscreen.modalTransitionStyle = .coverVertical controller.present(fullscreen, animated: true, completion: nil) return fullscreen From 18f88f9b8b3e5d0699af96058d7ef697cfa178e8 Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Thu, 12 Sep 2019 16:23:35 +1000 Subject: [PATCH 6/9] Disable transition delegate for form sheets --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 7c92a940..8df4fb33 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -547,8 +547,10 @@ open class ImageSlideshow: UIView { fullscreen.initialPage = currentPage fullscreen.inputs = images - slideshowTransitioningDelegate = ZoomAnimatedTransitioningDelegate(slideshowView: self, slideshowController: fullscreen) - fullscreen.transitioningDelegate = slideshowTransitioningDelegate + if controller.modalPresentationStyle == .formSheet { + slideshowTransitioningDelegate = ZoomAnimatedTransitioningDelegate(slideshowView: self, slideshowController: fullscreen) + fullscreen.transitioningDelegate = slideshowTransitioningDelegate + } controller.present(fullscreen, animated: true, completion: nil) return fullscreen From 1fe05bc352f1e3b03fab85f539a73b511141076f Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Mon, 1 Jun 2020 08:37:50 +1000 Subject: [PATCH 7/9] Add respectSafeAreaInsets to the PageIndicator to allow page indicator views to go beyond the safe area --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 3 ++- ImageSlideshow/Classes/Core/PageIndicator.swift | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 8df4fb33..98a0a201 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -285,7 +285,8 @@ open class ImageSlideshow: UIView { pageIndicatorView.isHidden = images.count < 2 var edgeInsets: UIEdgeInsets = UIEdgeInsets.zero - if #available(iOS 11.0, *) { + if #available(iOS 11.0, *), + pageIndicator?.respectSafeAreaInsets ?? true { edgeInsets = safeAreaInsets } diff --git a/ImageSlideshow/Classes/Core/PageIndicator.swift b/ImageSlideshow/Classes/Core/PageIndicator.swift index 2dd99b5e..801618f0 100644 --- a/ImageSlideshow/Classes/Core/PageIndicator.swift +++ b/ImageSlideshow/Classes/Core/PageIndicator.swift @@ -17,6 +17,9 @@ public protocol PageIndicatorView: class { /// Total number of pages of the page indicator var numberOfPages: Int { get set} + + /// Bool indicating if the page indicator view should respect safe area insets + var respectSafeAreaInsets: Bool { get } } extension UIPageControl: PageIndicatorView { @@ -33,6 +36,10 @@ extension UIPageControl: PageIndicatorView { } } + public var respectSafeAreaInsets: Bool { + return true + } + open override func sizeToFit() { var frame = self.frame frame.size = size(forNumberOfPages: numberOfPages) @@ -59,6 +66,10 @@ public class LabelPageIndicator: UILabel, PageIndicatorView { } } + public var respectSafeAreaInsets: Bool { + return true + } + public override init(frame: CGRect) { super.init(frame: frame) initialize() From 2d03c0a930a4cfd2566cd2cc376ff2f55fe4aece Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Mon, 13 Jul 2020 16:40:53 +1000 Subject: [PATCH 8/9] Resolved conflict --- .../Classes/Core/ImageSlideshow.swift | 10 +++++-- .../Classes/Core/ImageSlideshowItem.swift | 27 +++++++++++++++++-- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index 9d4fbd37..4909845c 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -28,7 +28,7 @@ public protocol ImageSlideshowDelegate: class { @objc optional func imageSlideshowDidEndDecelerating(_ imageSlideshow: ImageSlideshow) } -/** +/** Used to represent position of the Page Control - hidden: Page Control is hidden - insideScrollView: Page Control is inside image slideshow @@ -145,6 +145,9 @@ open class ImageSlideshow: UIView { } } + /// Optional fallbackImage for each InputSource + open var fallbackImage: ImageSource? + /// Current scroll view page. This may differ from `currentPage` as circular slider has two more dummy pages at indexes 0 and n-1 to provide fluent scrolling between first and last item. open fileprivate(set) var scrollViewPage: Int = 0 @@ -207,6 +210,9 @@ open class ImageSlideshow: UIView { } } + // Fallback content mode for fallbackImage + open var fallbackScaleMode: UIViewContentMode = UIViewContentMode.scaleAspectFit + fileprivate var slideshowTimer: Timer? fileprivate var scrollViewImages = [InputSource]() fileprivate var isAnimating: Bool = false @@ -320,7 +326,7 @@ open class ImageSlideshow: UIView { var i = 0 for image in scrollViewImages { - let item = ImageSlideshowItem(image: image, zoomEnabled: zoomEnabled, activityIndicator: activityIndicator?.create(), maximumScale: maximumScale) + let item = ImageSlideshowItem(image: image, zoomEnabled: zoomEnabled, activityIndicator: activityIndicator?.create(), maximumScale: maximumScale, fallbackImage: fallbackImage, fallbackScaleMode: fallbackScaleMode) item.imageView.contentMode = contentScaleMode slideshowItems.append(item) scrollView.addSubview(item) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift index 7b2136a8..86c53aba 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift @@ -20,6 +20,12 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Input Source for the item public let image: InputSource + /// Fallback Input Source for the item + public let fallbackImage: InputSource? + + /// Scale mode for fallback input source + public let fallbackScaleMode: UIViewContentMode + /// Guesture recognizer to detect double tap to zoom open var gestureRecognizer: UITapGestureRecognizer? @@ -52,12 +58,16 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { Initializes a new ImageSlideshowItem - parameter image: Input Source to load the image - parameter zoomEnabled: holds if it should be possible to zoom-in the image + - parameter fallbackImage: A fallback image to display if image is unavailable + - parameter fallbackScaleMode: The fallback image scale mode */ - init(image: InputSource, zoomEnabled: Bool, activityIndicator: ActivityIndicatorView? = nil, maximumScale: CGFloat = 2.0) { + init(image: InputSource, zoomEnabled: Bool, activityIndicator: ActivityIndicatorView? = nil, maximumScale: CGFloat = 2.0, fallbackImage: InputSource? = nil, fallbackScaleMode: UIContentMode = .scaleAspectFit) { self.zoomEnabled = zoomEnabled self.image = image self.activityIndicator = activityIndicator self.maximumScale = maximumScale + self.fallbackImage = fallbackImage + self.fallbackScaleMode = fallbackScaleMode super.init(frame: CGRect.null) @@ -135,7 +145,8 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Request to load Image Source to Image View public func loadImage() { - if self.imageView.image == nil && !isLoading { + if (self.imageView.image == nil || self.loadFailed) && !isLoading { + self.imageView.image = nil isLoading = true imageReleased = false activityIndicator?.show() @@ -150,6 +161,18 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { self?.loadFailed = image == nil self?.isLoading = false + if self?.loadFailed ?? false && self?.fallbackImage != nil { + if let imageView = self?.imageView { + self?.fallbackImage?.load(to: imageView) { fallbackImage in + guard let `self` = self else { + return + } + self.imageView.image = self.imageReleased ? nil : fallbackImage + self.imageView.contentMode = self.fallbackScaleMode + } + } + } + self?.setNeedsLayout() } } From b1ce324f54e52afb563c7cc9b31ec640aca64468 Mon Sep 17 00:00:00 2001 From: Lachlan Anderson Date: Tue, 14 Jul 2020 07:23:03 +1000 Subject: [PATCH 9/9] Fixed rebase --- ImageSlideshow/Classes/Core/ImageSlideshow.swift | 9 ++------- ImageSlideshow/Classes/Core/ImageSlideshowItem.swift | 8 +------- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/ImageSlideshow/Classes/Core/ImageSlideshow.swift b/ImageSlideshow/Classes/Core/ImageSlideshow.swift index b24eacc9..acdd34fc 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshow.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshow.swift @@ -144,13 +144,11 @@ open class ImageSlideshow: UIView { return nil } } - - /// Optional fallbackImage for each InputSource - open var fallbackImage: ImageSource? /// Optional fallbackImage for each InputSource open var fallbackImage: ImageSource? + /// Current scroll view page. This may differ from `currentPage` as circular slider has two more dummy pages at indexes 0 and n-1 to provide fluent scrolling between first and last item. open fileprivate(set) var scrollViewPage: Int = 0 @@ -212,12 +210,9 @@ open class ImageSlideshow: UIView { } } } - - // Fallback content mode for fallbackImage - open var fallbackScaleMode: UIView.ContentMode = UIView.ContentMode.scaleAspectFit // Fallback content mode for fallbackImage - open var fallbackScaleMode: UIViewContentMode = UIViewContentMode.scaleAspectFit + open var fallbackScaleMode: UIView.ContentMode = .scaleAspectFit fileprivate var slideshowTimer: Timer? fileprivate var scrollViewImages = [InputSource]() diff --git a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift index 6977dc2e..1a03e37a 100644 --- a/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift +++ b/ImageSlideshow/Classes/Core/ImageSlideshowItem.swift @@ -19,18 +19,12 @@ open class ImageSlideshowItem: UIScrollView, UIScrollViewDelegate { /// Input Source for the item public let image: InputSource - - /// Fallback Input Source for the item - public let fallbackImage: InputSource? - - /// Scale mode for fallback input source - public let fallbackScaleMode: UIView.ContentMode /// Fallback Input Source for the item public let fallbackImage: InputSource? /// Scale mode for fallback input source - public let fallbackScaleMode: UIViewContentMode + public let fallbackScaleMode: UIView.ContentMode /// Guesture recognizer to detect double tap to zoom open var gestureRecognizer: UITapGestureRecognizer?