Skip to content

Commit

Permalink
Merge branch 'release/1.0.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
danlozano committed Dec 22, 2016
2 parents a1e92ff + 9ab0302 commit f041fcb
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Presentr.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Presentr"
s.version = "1.0.3"
s.version = "1.0.4"
s.summary = "A simple Swift wrapper for typical custom view controller presentations."
s.description = <<-DESC
A micro framework created in Swift. Simplifies creating custom view controller presentations. Specially the typical ones we use which are a popup, an alert, or a any non-full-screen modal. Abstracts having to deal with custom presentation controllers and transitioning delegates
Expand All @@ -10,7 +10,7 @@ Pod::Spec.new do |s|
s.author = { "Daniel Lozano" => "[email protected]" }
s.social_media_url = "http://twitter.com/danlozanov"
s.platform = :ios, "9.0"
s.source = { :git => "https://github.com/icalialabs/Presentr.git", :tag => "1.0.3" }
s.source = { :git => "https://github.com/icalialabs/Presentr.git", :tag => "1.0.4" }
s.source_files = "Presentr/**/*.{swift}"
s.resources = "Presentr/**/*.{xib,ttf}"
end
2 changes: 1 addition & 1 deletion Presentr/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>1.0.3</string>
<string>1.0.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
Expand Down
4 changes: 2 additions & 2 deletions Presentr/ModalSize.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import Foundation
- Full: Full screen.
- Custom: Custom fixed size.
- Fluid: Custom percentage-based fluid size.
- SideMargin: Custom value for margins
- SideMargin: Uses side margins to calculate size.
*/
public enum ModalSize {

Expand Down Expand Up @@ -47,7 +47,7 @@ public enum ModalSize {
case .fluid(let percentage):
return floorf(Float(parentSize.width) * percentage)
case .sideMargin(let value):
return floorf(Float(parentSize.width) - value * 2)
return floorf(Float(parentSize.width) - value * 2.0)
}
}

Expand Down

0 comments on commit f041fcb

Please sign in to comment.