Merge pull request #6 from Giphy/v1.0.1

v1.0.1
Giphy · Jul 17, 2019 · 19fc359 · 19fc359
2 parents da64225 + a809924
commit 19fc359
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 20 deletions.
diff --git a/Docs.md b/Docs.md
@@ -4,8 +4,9 @@
 
 #### Requirements 
 - iOS 10 or later  
-- Cocoapods v1.7.1  
+- Cocoapods v1.7.1 or later 
 - A Giphy API key from [Giphy Developer Portal](https://developers.giphy.com/dashboard/?create=true).
+- Xcode 10.2 or later 
 
 
 #### CocoaPods
@@ -62,6 +63,8 @@ Create a new `GiphyViewController`, which takes care of most of the magic.
 let giphy = GiphyViewController()
 ```
 
+Create a new `GiphyViewController` every time you want to show GIPHY (maintaining a reference to the same `GiphyViewController` object isn't necesssary and can impact performance and lead to unexpected results) 
+
 ### Settings
 - **Theme**: set the theme to be `.dark` or `.light`.
 ```swift
@@ -119,9 +122,11 @@ giphy.delegate = self
 ```
 
 ```swift
-extension YourController: GiphyDelegate {
-   func didSelectMedia(_ media: GPHMedia) {
-        // your user tapped a GIF! 
+extension YourController: GiphyDelegate { 
+   func didSelectMedia(giphyViewController: GiphyViewController, media: GPHMedia)   {
+
+        // your user tapped a GIF!   
+        giphyViewController.dismiss(animated: true, completion: nil) 
    }
 
    func didDismiss(controller: GiphyViewController?) {

diff --git a/Objective C/ExampleObjectiveC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/Objective C/ExampleObjectiveC.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/Objective C/ExampleObjectiveC/ViewController.m b/Objective C/ExampleObjectiveC/ViewController.m
@@ -38,6 +38,9 @@ - (void)didSelectMedia:(GPHMedia * _Nonnull) media {
 }
 
 - (void)didDismissWithController:(GiphyViewController *)controller {
-    NSLog(@"dismissed");
+}
+
+- (void)didSelectMediaWithGiphyViewController:(GiphyViewController * _Nonnull)giphyViewController media:(GPHMedia * _Nonnull)media {
+
 }
 @end
diff --git a/Objective C/Podfile b/Objective C/Podfile
@@ -1,5 +1,5 @@
 
 use_frameworks!
 target "ExampleObjectiveC" do 
-pod 'Giphy'
+pod 'Giphy', :podspec => 'https://s3.amazonaws.com/sdk.mobile.giphy.com/SDK/1.0.1/Giphy.podspec'
 end
diff --git a/Objective C/Podfile.lock b/Objective C/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - DeepDiff (2.2.0)
-  - Giphy (1.0):
+  - Giphy (1.0.1):
     - DeepDiff (~> 2.2.0)
     - libwebp
     - PINCache
@@ -31,21 +31,24 @@ PODS:
   - PINCache (2.3)
 
 DEPENDENCIES:
-  - Giphy
+  - Giphy (from `https://s3.amazonaws.com/sdk.mobile.giphy.com/SDK/1.0.1/Giphy.podspec`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - DeepDiff
-    - Giphy
     - libwebp
     - PINCache
 
+EXTERNAL SOURCES:
+  Giphy:
+    :podspec: https://s3.amazonaws.com/sdk.mobile.giphy.com/SDK/1.0.1/Giphy.podspec
+
 SPEC CHECKSUMS:
   DeepDiff: e329bc46dd14ca788d8ec08d34420799ba1d77f2
-  Giphy: 976029d54b1fa1926ffeda884519f9129e490044
+  Giphy: 95cdf4e9028e192d2ed65b4f0cdd599f656b69da
   libwebp: b068a3bd7c45f7460f6715be7bed1a18fd5d6b48
   PINCache: ce36ed282031b92fc7733ffe831f474ff80fddc2
 
-PODFILE CHECKSUM: 2ac72808236d2735ecd2d58d3452880bac498b7c
+PODFILE CHECKSUM: fdc75eebffb9b72c70c76f604b2799c93ba06d05
 
-COCOAPODS: 1.7.1
+COCOAPODS: 1.7.2
diff --git a/Swift/Example/ViewController.swift b/Swift/Example/ViewController.swift
@@ -302,8 +302,8 @@ extension ViewController: SettingsDelegate {
 } 
 
 extension ViewController: GiphyDelegate {
-    func didSelectMedia(_ media: GPHMedia) {
-        dismiss(animated: true, completion: { [weak self] in
+    func didSelectMedia(giphyViewController: GiphyViewController, media: GPHMedia) {
+        giphyViewController.dismiss(animated: true, completion: { [weak self] in
             self?.addMessageToConversation(text: nil, media: media)
             guard self?.conversation.count ?? 0 > 7 else { return }
             DispatchQueue.main.asyncAfter(deadline: .now() + 2.0) { [weak self] in

diff --git a/Swift/Podfile b/Swift/Podfile
@@ -1,5 +1,6 @@
 
 use_frameworks!
 target "Example" do 
-pod 'Giphy'
+pod 'Giphy', :podspec => 'https://s3.amazonaws.com/sdk.mobile.giphy.com/SDK/1.0.1/Giphy.podspec'
+
 end
diff --git a/Swift/Podfile.lock b/Swift/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - DeepDiff (2.2.0)
-  - Giphy (1.0):
+  - Giphy (1.0.1):
     - DeepDiff (~> 2.2.0)
     - libwebp
     - PINCache
@@ -31,21 +31,24 @@ PODS:
   - PINCache (2.3)
 
 DEPENDENCIES:
-  - Giphy
+  - Giphy (from `https://s3.amazonaws.com/sdk.mobile.giphy.com/SDK/1.0.1/Giphy.podspec`)
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
     - DeepDiff
-    - Giphy
     - libwebp
     - PINCache
 
+EXTERNAL SOURCES:
+  Giphy:
+    :podspec: https://s3.amazonaws.com/sdk.mobile.giphy.com/SDK/1.0.1/Giphy.podspec
+
 SPEC CHECKSUMS:
   DeepDiff: e329bc46dd14ca788d8ec08d34420799ba1d77f2
-  Giphy: 976029d54b1fa1926ffeda884519f9129e490044
+  Giphy: 95cdf4e9028e192d2ed65b4f0cdd599f656b69da
   libwebp: b068a3bd7c45f7460f6715be7bed1a18fd5d6b48
   PINCache: ce36ed282031b92fc7733ffe831f474ff80fddc2
 
-PODFILE CHECKSUM: 1f6c8dc7b516e93843dc4421cd9aea8f50ab8389
+PODFILE CHECKSUM: 0346df985f6398fd36f3d139aca42c318c9eb75d
 
 COCOAPODS: 1.7.2