Added new images

zzhangyx · Aug 5, 2015 · b957edd · b957edd
1 parent 77dd042
commit b957edd
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 6 deletions.
diff --git a/Demo/ImagePickerDemo/Podfile.lock b/Demo/ImagePickerDemo/Podfile.lock
@@ -9,6 +9,6 @@ EXTERNAL SOURCES:
     :path: ../../
 
 SPEC CHECKSUMS:
-  ImagePicker: 1ed5022e28822e85d18c5de7e68bb56851c8bd7a
+  ImagePicker: 32becfa25b8e9179e60c45411b577340d35e3e32
 
 COCOAPODS: 0.37.2
diff --git a/ImagePicker.podspec b/ImagePicker.podspec
@@ -10,6 +10,7 @@ Pod::Spec.new do |s|
   s.platform     = :ios, '8.0'
   s.requires_arc = true
   s.source_files = 'Source/**/*'
-# s.frameworks = 'UIKit', 'MapKit'
+  s.resource_bundles = { 'ImagePicker' => ['Images/*.{png}'] }
+  s.frameworks = 'AVFoundation'
 # s.dependency 'AFNetworking', '~> 2.3'
 end
diff --git a/Source/Images/cameraIcon.png → Images/cameraIcon.png b/Source/Images/cameraIcon.png → Images/cameraIcon.png
diff --git a/Source/Images/[email protected] → Images/[email protected] b/Source/Images/[email protected] → Images/[email protected]
diff --git a/Source/Images/[email protected] → Images/[email protected] b/Source/Images/[email protected] → Images/[email protected]
diff --git a/Source/Images/flashIcon.png → Images/flashIcon.png b/Source/Images/flashIcon.png → Images/flashIcon.png
diff --git a/Source/Images/[email protected] → Images/[email protected] b/Source/Images/[email protected] → Images/[email protected]
diff --git a/Source/Images/[email protected] → Images/[email protected] b/Source/Images/[email protected] → Images/[email protected]
diff --git a/Source/TopView/TopView.swift b/Source/TopView/TopView.swift
@@ -10,20 +10,27 @@ class TopView: UIView {
 
   lazy var flashButton: UIButton = {
     let button = UIButton()
-    let file = NSBundle.mainBundle().pathForResource("flashIcon", ofType: "png")!
-    let image = UIImage(contentsOfFile: file)
+    let bundlePath = NSBundle(forClass: self.classForCoder).resourcePath?.stringByAppendingString("/ImagePicker.bundle")
+    let bundle = NSBundle(path: bundlePath!)
+    let traitCollection = UITraitCollection(displayScale: 2)
+    let image = UIImage(named: "flashIcon", inBundle: bundle, compatibleWithTraitCollection: traitCollection)
 
     button.setImage(image, forState: .Normal)
+    button.setTitle("AUTO", forState: .Normal)
+    button.setTranslatesAutoresizingMaskIntoConstraints(false)
 
     return button
     }()
 
   lazy var rotateCamera: UIButton = {
     let button = UIButton()
-    let file = NSBundle.mainBundle().pathForResource("cameraIcon", ofType: "png")!
-    let image = UIImage(contentsOfFile: file)
+    let bundlePath = NSBundle(forClass: self.classForCoder).resourcePath?.stringByAppendingString("/ImagePicker.bundle")
+    let bundle = NSBundle(path: bundlePath!)
+    let traitCollection = UITraitCollection(displayScale: 2)
+    let image = UIImage(named: "cameraIcon", inBundle: bundle, compatibleWithTraitCollection: traitCollection)
 
     button.setImage(image, forState: .Normal)
+    button.setTranslatesAutoresizingMaskIntoConstraints(false)
 
     return button
     }()