Merge branch 'master' of https://github.com/Lickability/PinpointKit

Author: Twigz

Example/PinpointKitExample.xcodeproj/project.pbxproj

@@ -357,7 +357,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = PinpointKitExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
@@ -370,7 +370,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				INFOPLIST_FILE = PinpointKitExample/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKitExample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/PinpointKitExample/Info.plist

@@ -36,6 +36,8 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>NSPhotoLibraryUsageDescription</key>
+	<string>The example application accesses your photo library.</string>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>

Example/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - PinpointKit (1.4.0):
-    - PinpointKit/Core (= 1.4.0)
-  - PinpointKit/Core (1.4.0)
+  - PinpointKit (1.5.0):
+    - PinpointKit/Core (= 1.5.0)
+  - PinpointKit/Core (1.5.0)
   - SwiftLint (0.25.1)
 
 DEPENDENCIES:
@@ -17,7 +17,7 @@ EXTERNAL SOURCES:
     :path: "../"
 
 SPEC CHECKSUMS:
-  PinpointKit: a33c929c2e9c3b7d9a1a343fd309161b71c02d06
+  PinpointKit: a513c4623502581067f3f8b60b9cffef6c8e1025
   SwiftLint: ce933681be10c3266e82576dad676fa815a602e9
 
 PODFILE CHECKSUM: 24af8a2ca63352a72ca1cd13fc8977477eae3a12

Example/Pods/Local Podspecs/PinpointKit.podspec.json

@@ -1,10 +1,10 @@
 {
   "name": "PinpointKit",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "homepage": "https://github.com/Lickability/PinpointKit",
   "source": {
       "git": "https://github.com/Lickability/PinpointKit.git",
-      "tag": "1.4.0"
+      "tag": "1.5.0"
   },
   "summary": "A library that makes bug reporting simple for your users by allowing them to send feedback with annotated screenshots and logs.",
   "authors" : {

Example/Pods/Manifest.lock

@@ -70,6 +70,7 @@
 		DA0DA60D1C53049B0012ADBE /* PinpointKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DA0DA6021C53049B0012ADBE /* PinpointKit.framework */; };
 		F24381121D54CBAB004CC87F /* SystemLogCollectorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = F24381111D54CBAB004CC87F /* SystemLogCollectorTests.swift */; };
 		F24381151D54ECD2004CC87F /* XCTestCaseExpectationExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = F24381141D54ECD2004CC87F /* XCTestCaseExpectationExtensions.swift */; };
+		F2619BA32512C6100083286C /* RequestScreenshotCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F2619BA22512C6100083286C /* RequestScreenshotCell.swift */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -147,6 +148,7 @@
 		DA0DA6131C53049B0012ADBE /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		F24381111D54CBAB004CC87F /* SystemLogCollectorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SystemLogCollectorTests.swift; sourceTree = "<group>"; };
 		F24381141D54ECD2004CC87F /* XCTestCaseExpectationExtensions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = XCTestCaseExpectationExtensions.swift; sourceTree = "<group>"; };
+		F2619BA22512C6100083286C /* RequestScreenshotCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RequestScreenshotCell.swift; path = Core/RequestScreenshotCell.swift; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -206,6 +208,7 @@
 				4C4037F11D9EB01800305A6E /* FeedbackViewController.swift */,
 				4C4037EF1D9EB01800305A6E /* FeedbackNavigationController.swift */,
 				4C4037FC1D9EB04400305A6E /* Screenshotter.swift */,
+				F2619BA22512C6100083286C /* RequestScreenshotCell.swift */,
 				4C4037F91D9EB02300305A6E /* ScreenshotCell.swift */,
 				4C4037EE1D9EB01800305A6E /* FeedbackConfiguration.swift */,
 				4C4037F01D9EB01800305A6E /* FeedbackTableViewDataSource.swift */,
@@ -490,6 +493,7 @@
 				4C4038091D9EB0CB00305A6E /* UIView+PinpointKit.swift in Sources */,
 				4CFB58801E29464B00B64D0D /* EditImageViewControllerBarButtonItemProviding.swift in Sources */,
 				4C40382C1D9EB7A800305A6E /* ScreenshotDetector.swift in Sources */,
+				F2619BA32512C6100083286C /* RequestScreenshotCell.swift in Sources */,
 				4C4038011D9EB07000305A6E /* LogViewer.swift in Sources */,
 				4C4037FF1D9EB06900305A6E /* BasicLogViewController.swift in Sources */,
 				4C4037D51D9EAF0D00305A6E /* Editor.swift in Sources */,
@@ -686,7 +690,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -709,7 +713,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
-				MARKETING_VERSION = 1.4.0;
+				MARKETING_VERSION = 1.5.0;
 				PRODUCT_BUNDLE_IDENTIFIER = net.Lickability.PinpointKit;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;

Example/Pods/Pods.xcodeproj/project.pbxproj

@@ -24,10 +24,10 @@ public protocol FeedbackCollector: class, LogSupporting, InterfaceCustomizable {
     /**
      Begins feedback collection about a screenshot from a view controller.
 
-     - parameter screenshot:     The screenshot the user will be providing feedback on.
+     - parameter screenshot:     The screenshot the user will be providing feedback on. If the screenshot is nil, the user will be presented with a button to select a screenshot from their photo library.
      - parameter viewController: The view controller from which to present.
      */
-    func collectFeedback(with screenshot: UIImage, from viewController: UIViewController)
+    func collectFeedback(with screenshot: UIImage?, from viewController: UIViewController)
 }
 
 extension FeedbackCollector where Self: UIViewController {