Skip to content

M
Material
Commit 2989fe57 by Daniel Dahan
Options

updated numeric formatting

parent 211361da
Showing with 8 additions and 8 deletions
Source/BasicCard.swift
...@@ -37,7 +37,7 @@ public class BasicCard : MaterialCard { ...@@ -37,7 +37,7 @@ public class BasicCard : MaterialCard {
didSet { didSet {
titleLabel!.setTranslatesAutoresizingMaskIntoConstraints(false) titleLabel!.setTranslatesAutoresizingMaskIntoConstraints(false)
titleLabel!.textColor = MaterialTheme.white.color titleLabel!.textColor = MaterialTheme.white.color
titleLabel!.font = Roboto.regularWithSize(22.0) titleLabel!.font = Roboto.regularWithSize(22)
addSubview(titleLabel!) addSubview(titleLabel!)
prepareCard() prepareCard()
} }
...@@ -50,7 +50,7 @@ public class BasicCard : MaterialCard { ...@@ -50,7 +50,7 @@ public class BasicCard : MaterialCard {
didSet { didSet {
detailTextLabel!.setTranslatesAutoresizingMaskIntoConstraints(false) detailTextLabel!.setTranslatesAutoresizingMaskIntoConstraints(false)
detailTextLabel!.textColor = MaterialTheme.white.color detailTextLabel!.textColor = MaterialTheme.white.color
detailTextLabel!.font = Roboto.lightWithSize(16.0) detailTextLabel!.font = Roboto.lightWithSize(16)
detailTextLabel!.numberOfLines = 0 detailTextLabel!.numberOfLines = 0
detailTextLabel!.lineBreakMode = .ByWordWrapping detailTextLabel!.lineBreakMode = .ByWordWrapping
addSubview(detailTextLabel!) addSubview(detailTextLabel!)
......
Source/CapturePreview.swift
...@@ -210,7 +210,7 @@ public class Preview: UIView { ...@@ -210,7 +210,7 @@ public class Preview: UIView {
view.center = point view.center = point
view.hidden = false view.hidden = false
UIView.animateWithDuration(0.15, delay: 0, options: .CurveEaseInOut, animations: { _ in UIView.animateWithDuration(0.15, delay: 0, options: .CurveEaseInOut, animations: { _ in
view.layer.transform = CATransform3DMakeScale(0.5, 0.5, 1.0) view.layer.transform = CATransform3DMakeScale(0.5, 0.5, 1)
}) { _ in }) { _ in
let delayInSeconds: Double = 0.5 let delayInSeconds: Double = 0.5
let popTime: dispatch_time_t = dispatch_time(DISPATCH_TIME_NOW, Int64(delayInSeconds * Double(NSEC_PER_SEC))) let popTime: dispatch_time_t = dispatch_time(DISPATCH_TIME_NOW, Int64(delayInSeconds * Double(NSEC_PER_SEC)))
...@@ -248,8 +248,8 @@ public class Preview: UIView { ...@@ -248,8 +248,8 @@ public class Preview: UIView {
exposureBox!.hidden = false exposureBox!.hidden = false
UIView.animateWithDuration(0.15, delay: 0, options: .CurveEaseInOut, animations: { _ in UIView.animateWithDuration(0.15, delay: 0, options: .CurveEaseInOut, animations: { _ in
self.focusBox!.layer.transform = CATransform3DMakeScale(0.5, 0.5, 1.0) self.focusBox!.layer.transform = CATransform3DMakeScale(0.5, 0.5, 1)
self.exposureBox!.layer.transform = CATransform3DMakeScale(0.7, 0.7, 1.0) self.exposureBox!.layer.transform = CATransform3DMakeScale(0.7, 0.7, 1)
}) { _ in }) { _ in
let delayInSeconds: Double = 0.5 let delayInSeconds: Double = 0.5
let popTime: dispatch_time_t = dispatch_time(DISPATCH_TIME_NOW, Int64(delayInSeconds * Double(NSEC_PER_SEC))) let popTime: dispatch_time_t = dispatch_time(DISPATCH_TIME_NOW, Int64(delayInSeconds * Double(NSEC_PER_SEC)))
......
Source/ImageCard.swift
...@@ -64,7 +64,7 @@ public class ImageCard : MaterialCard { ...@@ -64,7 +64,7 @@ public class ImageCard : MaterialCard {
didSet { didSet {
titleLabel!.setTranslatesAutoresizingMaskIntoConstraints(false) titleLabel!.setTranslatesAutoresizingMaskIntoConstraints(false)
titleLabel!.textColor = MaterialTheme.white.color titleLabel!.textColor = MaterialTheme.white.color
titleLabel!.font = Roboto.regularWithSize(22.0) titleLabel!.font = Roboto.regularWithSize(22)
if nil == imageView { if nil == imageView {
addSubview(titleLabel!) addSubview(titleLabel!)
} else { } else {
...@@ -91,7 +91,7 @@ public class ImageCard : MaterialCard { ...@@ -91,7 +91,7 @@ public class ImageCard : MaterialCard {
detailTextContainer!.addSubview(detailTextLabel!) detailTextContainer!.addSubview(detailTextLabel!)
detailTextLabel!.setTranslatesAutoresizingMaskIntoConstraints(false) detailTextLabel!.setTranslatesAutoresizingMaskIntoConstraints(false)
detailTextLabel!.textColor = MaterialTheme.black.color detailTextLabel!.textColor = MaterialTheme.black.color
detailTextLabel!.font = Roboto.lightWithSize(16.0) detailTextLabel!.font = Roboto.lightWithSize(16)
detailTextLabel!.numberOfLines = 0 detailTextLabel!.numberOfLines = 0
detailTextLabel!.lineBreakMode = .ByWordWrapping detailTextLabel!.lineBreakMode = .ByWordWrapping
prepareCard() prepareCard()
......
Source/TextView.swift
...@@ -124,7 +124,7 @@ public class TextView: UITextView { ...@@ -124,7 +124,7 @@ public class TextView: UITextView {
override public func layoutSubviews() { override public func layoutSubviews() {
super.layoutSubviews() super.layoutSubviews()
label.preferredMaxLayoutWidth = textContainer.size.width - textContainer.lineFragmentPadding * 2.0 label.preferredMaxLayoutWidth = textContainer.size.width - textContainer.lineFragmentPadding * 2
} }
// //
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment