From 0c56034147c8d61916ff656b150bd682c25329cd Mon Sep 17 00:00:00 2001 From: ulmentflam Date: Sun, 15 Sep 2019 23:47:44 -0400 Subject: [PATCH 1/4] Xcode 11 update branch with support for darkmode, still requires darkmode color updates for the search bar --- Library/SwiftyGiphyViewController.swift | 21 +++++++++++++++++++++ Podfile.lock | 16 ++++++++-------- SwiftyGiphy.podspec | 2 +- SwiftyGiphy.xcodeproj/project.pbxproj | 10 +++++++--- SwiftyGiphy/Base.lproj/Main.storyboard | 8 +++----- 5 files changed, 40 insertions(+), 17 deletions(-) diff --git a/Library/SwiftyGiphyViewController.swift b/Library/SwiftyGiphyViewController.swift index d9c08a9..d5e2570 100644 --- a/Library/SwiftyGiphyViewController.swift +++ b/Library/SwiftyGiphyViewController.swift @@ -83,7 +83,13 @@ public class SwiftyGiphyViewController: UIViewController { super.loadView() self.title = NSLocalizedString("Giphy", comment: "Giphy") + self.navigationItem.titleView = UIImageView(image: UIImage(named: "GiphyLogoEmblem", in: Bundle(for: SwiftyGiphyViewController.self), compatibleWith: nil)) + if #available(iOS 13, *) { + if self.traitCollection.userInterfaceStyle == .dark { + self.navigationItem.titleView = UIImageView(image: UIImage(named: "GiphyLogoEmblemLight", in: Bundle(for: SwiftyGiphyViewController.self), compatibleWith: nil)) + } + } searchController.searchBar.placeholder = NSLocalizedString("Search GIFs", comment: "The placeholder string for the Giphy search field") searchController.searchResultsUpdater = self @@ -202,6 +208,21 @@ public class SwiftyGiphyViewController: UIViewController { super.didReceiveMemoryWarning() // Dispose of any resources that can be recreated. } + + public override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) { + super.traitCollectionDidChange(previousTraitCollection) + + if #available(iOS 13.0, *) { + let hasUserInterfaceStyleChanged = previousTraitCollection?.hasDifferentColorAppearance(comparedTo: traitCollection) ?? false + if hasUserInterfaceStyleChanged { + if traitCollection.userInterfaceStyle == .dark { + self.navigationItem.titleView = UIImageView(image: UIImage(named: "GiphyLogoEmblemLight", in: Bundle(for: SwiftyGiphyViewController.self), compatibleWith: nil)) + } else { + self.navigationItem.titleView = UIImageView(image: UIImage(named: "GiphyLogoEmblem", in: Bundle(for: SwiftyGiphyViewController.self), compatibleWith: nil)) + } + } + } + } deinit { NotificationCenter.default.removeObserver(self) diff --git a/Podfile.lock b/Podfile.lock index c8c33cf..eeded57 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,12 +1,12 @@ PODS: - FLAnimatedImage (1.0.12) - NSTimer-Blocks (0.0.1) - - ObjectMapper (3.3.0) - - SDWebImage/Core (4.0.0) - - SDWebImage/GIF (4.0.0): + - ObjectMapper (3.5.1) + - SDWebImage/Core (4.4.7) + - SDWebImage/GIF (4.4.7): - FLAnimatedImage (~> 1.0) - SDWebImage/Core - - SwiftyGiphy (1.2.0): + - SwiftyGiphy (1.3.0): - FLAnimatedImage (~> 1.0) - NSTimer-Blocks - ObjectMapper (~> 3.0) @@ -29,10 +29,10 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: FLAnimatedImage: 4a0b56255d9b05f18b6dd7ee06871be5d3b89e31 NSTimer-Blocks: 88faf9aef5f250ead087f3f67ae642517083bf36 - ObjectMapper: b612bf8c8e99c4dc0bb6013a51f7c27966ed5da9 - SDWebImage: 76a6348bdc74eb5a55dd08a091ef298e56b55e41 - SwiftyGiphy: 6fb86ca967445826a9b1aa629ce22d970bca579d + ObjectMapper: 70187b8941977c62ccfb423caf6b50be405cabf0 + SDWebImage: c10d14a8883ebd89664f02a422006f66a85c0c5d + SwiftyGiphy: 614f076556fd3e8fcab417718f2b9adacef9e6b0 PODFILE CHECKSUM: 99ae6577f47a8d8b2d37875a1c21f2c41e5295fb -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.1 diff --git a/SwiftyGiphy.podspec b/SwiftyGiphy.podspec index 7e6e56d..2f5d26c 100644 --- a/SwiftyGiphy.podspec +++ b/SwiftyGiphy.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'SwiftyGiphy' - s.version = '1.2.0' + s.version = '1.3.0' s.summary = 'Provides a UI and API layer for Giphy discovery and integration.' # This description is used to generate tags and improve search results. diff --git a/SwiftyGiphy.xcodeproj/project.pbxproj b/SwiftyGiphy.xcodeproj/project.pbxproj index 93bc97b..66c6789 100644 --- a/SwiftyGiphy.xcodeproj/project.pbxproj +++ b/SwiftyGiphy.xcodeproj/project.pbxproj @@ -128,7 +128,7 @@ C60B80391E71E45000ECF39E = { CreatedOnToolsVersion = 8.2.1; DevelopmentTeam = P87N88ZC7B; - LastSwiftMigration = 1000; + LastSwiftMigration = 1020; ProvisioningStyle = Automatic; }; }; @@ -274,6 +274,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; @@ -333,6 +334,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; @@ -359,12 +361,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = P87N88ZC7B; + DYLIB_CURRENT_VERSION = 1; INFOPLIST_FILE = SwiftyGiphy/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.52inc.SwiftyGiphySample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Debug; }; @@ -374,12 +377,13 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; DEVELOPMENT_TEAM = P87N88ZC7B; + DYLIB_CURRENT_VERSION = 1; INFOPLIST_FILE = SwiftyGiphy/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.52inc.SwiftyGiphySample; PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_VERSION = 4.2; + SWIFT_VERSION = 5.0; }; name = Release; }; diff --git a/SwiftyGiphy/Base.lproj/Main.storyboard b/SwiftyGiphy/Base.lproj/Main.storyboard index 851b31b..e294fb0 100644 --- a/SwiftyGiphy/Base.lproj/Main.storyboard +++ b/SwiftyGiphy/Base.lproj/Main.storyboard @@ -1,11 +1,9 @@ - - - - + + - + From 7318ce785688a18679f4a4bf7e9c6caedad5d0b8 Mon Sep 17 00:00:00 2001 From: ulmentflam Date: Sun, 15 Sep 2019 23:47:57 -0400 Subject: [PATCH 2/4] Xcode 11 update branch with support for darkmode, still requires darkmode color updates for the search bar --- Assets/GiphyLogoEmblemLight.png | Bin 0 -> 2915 bytes Assets/GiphyLogoEmblemLight@2x.png | Bin 0 -> 6305 bytes Assets/GiphyLogoEmblemLight@3x.png | Bin 0 -> 8659 bytes .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 ++++++++ 5 files changed, 16 insertions(+) create mode 100644 Assets/GiphyLogoEmblemLight.png create mode 100644 Assets/GiphyLogoEmblemLight@2x.png create mode 100644 Assets/GiphyLogoEmblemLight@3x.png create mode 100644 SwiftyGiphy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 SwiftyGiphy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/Assets/GiphyLogoEmblemLight.png b/Assets/GiphyLogoEmblemLight.png new file mode 100644 index 0000000000000000000000000000000000000000..c326a3f799a3f353291b6f5e456dd2f47a0ec4ed GIT binary patch literal 2915 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 literal 0 HcmV?d00001 diff --git a/SwiftyGiphy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftyGiphy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftyGiphy.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/SwiftyGiphy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/SwiftyGiphy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 0000000..18d9810 --- /dev/null +++ b/SwiftyGiphy.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + From 0ec568930dd8166b0fae9f519193679ef833b52e Mon Sep 17 00:00:00 2001 From: ulmentflam Date: Thu, 24 Oct 2019 12:25:59 -0400 Subject: [PATCH 3/4] Swift 5 and Xcode 11.1 --- Library/SwiftyGiphyCollectionViewCell.swift | 6 +++++- Library/SwiftyGiphyViewController.swift | 3 +++ Podfile.lock | 4 ++-- SwiftyGiphy.podspec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Library/SwiftyGiphyCollectionViewCell.swift b/Library/SwiftyGiphyCollectionViewCell.swift index e312872..b5e14c1 100644 --- a/Library/SwiftyGiphyCollectionViewCell.swift +++ b/Library/SwiftyGiphyCollectionViewCell.swift @@ -70,9 +70,12 @@ class SwiftyGiphyCollectionViewCell: UICollectionViewCell { override func prepareForReuse() { super.prepareForReuse() - + imageView.sd_cancelCurrentAnimationImagesLoad() + imageView.sd_cancelCurrentImageLoad() + imageView.sd_setImage(with: nil) imageView.animatedImage = nil imageView.image = nil + } /// Configure the cell for a giphy image set @@ -80,6 +83,7 @@ class SwiftyGiphyCollectionViewCell: UICollectionViewCell { /// - Parameter imageSet: The imageset to configure the cell with func configureFor(imageSet: GiphyImageSet) { + imageView.sd_cacheFLAnimatedImage = false imageView.sd_setShowActivityIndicatorView(true) imageView.sd_setIndicatorStyle(.gray) imageView.sd_setImage(with: imageSet.url) diff --git a/Library/SwiftyGiphyViewController.swift b/Library/SwiftyGiphyViewController.swift index d5e2570..f46c79e 100644 --- a/Library/SwiftyGiphyViewController.swift +++ b/Library/SwiftyGiphyViewController.swift @@ -7,6 +7,7 @@ // import UIKit +import SDWebImage import AVFoundation import NSTimer_Blocks @@ -226,6 +227,8 @@ public class SwiftyGiphyViewController: UIViewController { deinit { NotificationCenter.default.removeObserver(self) + SDImageCache.shared().clearMemory() + SDImageCache.shared().clearDisk(onCompletion: nil) } @objc fileprivate func dismissPicker() diff --git a/Podfile.lock b/Podfile.lock index eeded57..9cbae97 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -16,7 +16,7 @@ DEPENDENCIES: - SwiftyGiphy (from `../SwiftyGiphy`) SPEC REPOS: - https://github.com/cocoapods/specs.git: + https://github.com/CocoaPods/Specs.git: - FLAnimatedImage - NSTimer-Blocks - ObjectMapper @@ -35,4 +35,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 99ae6577f47a8d8b2d37875a1c21f2c41e5295fb -COCOAPODS: 1.7.1 +COCOAPODS: 1.8.3 diff --git a/SwiftyGiphy.podspec b/SwiftyGiphy.podspec index 2f5d26c..a58dcee 100644 --- a/SwiftyGiphy.podspec +++ b/SwiftyGiphy.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'SwiftyGiphy' - s.version = '1.3.0' + s.version = '1.4.0' s.summary = 'Provides a UI and API layer for Giphy discovery and integration.' # This description is used to generate tags and improve search results. From 2c9a75eee33373186439a55ff2c44b81aeedcaef Mon Sep 17 00:00:00 2001 From: ulmentflam Date: Thu, 24 Oct 2019 12:26:55 -0400 Subject: [PATCH 4/4] adding shared data --- .../xcschemes/SwiftyGiphySample.xcscheme | 85 +++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 SwiftyGiphy.xcodeproj/xcshareddata/xcschemes/SwiftyGiphySample.xcscheme diff --git a/SwiftyGiphy.xcodeproj/xcshareddata/xcschemes/SwiftyGiphySample.xcscheme b/SwiftyGiphy.xcodeproj/xcshareddata/xcschemes/SwiftyGiphySample.xcscheme new file mode 100644 index 0000000..556229c --- /dev/null +++ b/SwiftyGiphy.xcodeproj/xcshareddata/xcschemes/SwiftyGiphySample.xcscheme @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +