Skip to content

Commit

Permalink
Merge pull request #10 from prynt/preparePodRelease
Browse files Browse the repository at this point in the history
Bump version number
  • Loading branch information
HHK1 authored Oct 3, 2017
2 parents 22873d3 + 97fe873 commit 9164359
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 6 deletions.
1 change: 1 addition & 0 deletions .swift-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
4.0
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.

## [Unreleased]

### Added
### Changed

## [2.0.0]

### Added

- Support for swift 4
Expand Down Expand Up @@ -49,8 +54,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
## [0.1.0] - 2017-03-29
### Added
- Add a first version of the trimmer view

-
[Unreleased]: https://github.com/prynt/PryntTrimmerView/compare/1.0.1...master
[2.0.0]: https://github.com/prynt/PryntTrimmerView/compare/1.0.1...2.0.0
[1.0.1]: https://github.com/prynt/PryntTrimmerView/compare/1.0.0...1.0.1
[1.0.0]: https://github.com/prynt/PryntTrimmerView/compare/0.2.0...1.0.0
[0.2.0]: https://github.com/prynt/PryntTrimmerView/compare/0.1.0...0.2.0
2 changes: 1 addition & 1 deletion PryntTrimmerView.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

Pod::Spec.new do |s|
s.name = 'PryntTrimmerView'
s.version = '1.0.1'
s.version = '2.0.0'
s.summary = 'A set of tools written in swift to help you trim and crop a video.'

s.description = <<-DESC
Expand Down
10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ A set of tools written in swift to crop and trim videos.

To run the example project, clone the repo, and run `pod install` from the Example directory first.

### Trimming
### Trimming

![](https://media.giphy.com/media/GwZGkLiKxZcTm/giphy.gif)

Expand All @@ -31,9 +31,11 @@ it, simply add the following line to your Podfile:
pod "PryntTrimmerView"
```

For swift 3 compatibility, you can use version 1.0.1 or below.

## Usage

### Trimming
### Trimming

Create a `TrimmerView` instance (in interface builder or through code), and add it to your view hierarchy.

Expand All @@ -44,7 +46,7 @@ trimmerView.delegate = self

Access the `startTime` and `endTime` property to know where to trim your asset. You can use the `TrimmerViewDelegate` to link the trimmer with an `AVPlayer` and provide the end user with a preview. See the `VideoTrimmerViewController` inside the project to see an example.

You can also customize the trimmer view by changing its colors:
You can also customize the trimmer view by changing its colors:
```
trimmerView.handleColor = UIColor.white
trimmerView.mainColor = UIColor.orange
Expand All @@ -53,7 +55,7 @@ trimmerView.positionBarColor = UIColor.white

### Cropping

Create an instance of the `VideoCropView` and add it to your view hierarchy, then load your video into the crop view: `videoCropView.asset = asset`.
Create an instance of the `VideoCropView` and add it to your view hierarchy, then load your video into the crop view: `videoCropView.asset = asset`.

You can set the aspect ratio you want using the `setAspectRatio` method. Once you are satisfied with the portion of the asset you want to crop, call `getImageCropFrame` to retrieve the select frame. See the `VideoCropperViewController` in the example app for an actual example of how to crop the video for export.

Expand Down

0 comments on commit 9164359

Please sign in to comment.