Skip to content
This repository has been archived by the owner on Jul 1, 2022. It is now read-only.

Commit

Permalink
Merge branch 'release/1.2.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
AlexLittlejohn committed Aug 25, 2016
2 parents 96bb527 + 021a465 commit 139e56b
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ALCameraViewController.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = "ALCameraViewController"
spec.version = "1.2.2"
spec.version = "1.2.3"
spec.summary = "A camera view controller with custom image picker and image cropping. Written in Swift."
spec.source = { :git => "https://github.com/AlexLittlejohn/ALCameraViewController.git", :tag => spec.version.to_s }
spec.requires_arc = true
Expand Down
8 changes: 5 additions & 3 deletions ALCameraViewController/Utilities/CameraGlobals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
//

import UIKit
import AVFoundation

internal let itemSpacing: CGFloat = 1
internal let columns: CGFloat = 4
Expand All @@ -16,7 +17,8 @@ internal let scale = UIScreen.mainScreen().scale
public class CameraGlobals {
public static let shared = CameraGlobals()

var bundle = NSBundle(forClass: CameraViewController.self)
var stringsTable = "CameraView"
var photoLibraryThumbnailSize = CGSizeMake(thumbnailDimension, thumbnailDimension)
public var bundle = NSBundle(forClass: CameraViewController.self)
public var stringsTable = "CameraView"
public var photoLibraryThumbnailSize = CGSizeMake(thumbnailDimension, thumbnailDimension)
public var defaultCameraPosition = AVCaptureDevicePosition.Back
}
2 changes: 1 addition & 1 deletion ALCameraViewController/Views/CameraView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class CameraView: UIView {

let focusView = CropOverlay(frame: CGRect(x: 0, y: 0, width: 80, height: 80))

public var currentPosition = AVCaptureDevicePosition.Back
public var currentPosition = CameraGlobals.shared.defaultCameraPosition

public func startSession() {
dispatch_async(cameraQueue) {
Expand Down

0 comments on commit 139e56b

Please sign in to comment.