Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions AXPhotoViewer.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AXPhotoViewer"
s.version = "1.7.1"
s.version = "1.7.2"
s.license = { :type => 'MIT', :file => 'LICENSE.md' }
s.summary = "An iOS/tvOS photo gallery viewer, useful for viewing a large number of photos."
s.homepage = "https://github.com/alexhillc/AXPhotoViewer"
Expand All @@ -18,7 +18,7 @@ Pod::Spec.new do |s|
cs.ios.dependency 'AXStateButton', '>= 1.1.3'
cs.ios.dependency 'FLAnimatedImage', '>= 1.0.0'
cs.tvos.dependency 'FLAnimatedImage-tvOS', '>= 1.0.16'
cs.resources = 'Assets/*.{xcassets}'
cs.resource_bundle = { 'AXPhotoViewerResources' => ['Assets/*.{xcassets}'] }
cs.source_files = 'Source/*.{swift,h,m}',
'Source/Classes/**/*.{swift,h,m}',
'Source/Protocols/*.{swift,h,m}',
Expand Down
7 changes: 7 additions & 0 deletions Source/AXBundle.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,11 @@ struct AXBundle {
return Bundle(for: AXPhotosViewController.self)
}

static var resourcesBundle: Bundle? {

let bundle = AXBundle.frameworkBundle
guard let path = bundle.path(forResource: "AXPhotoViewerResources", ofType: "bundle") else { return nil }

return Bundle(path: path)
}
}
2 changes: 1 addition & 1 deletion Source/Classes/Views/AXLoadingView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
/// The image to show in the `errorImageView` when displaying an error.
@objc open var errorImage: UIImage? {
get {
return UIImage(named: "axphotoviewer-error", in: AXBundle.frameworkBundle, compatibleWith: nil)
return UIImage(named: "axphotoviewer-error", in: AXBundle.resourcesBundle, compatibleWith: nil)
}
}

Expand Down
4 changes: 2 additions & 2 deletions Source/Extensions/FLAnimatedImageView+AXExtensions.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
//

#if TARGET_OS_IOS
@import FLAnimatedImage.FLAnimatedImageView;
@import FLAnimatedImage;
#elif TARGET_OS_TV
@import FLAnimatedImage_tvOS.FLAnimatedImageView;
@import FLAnimatedImage_tvOS;
#endif

@interface FLAnimatedImageView (AXExtensions)
Expand Down