Commit 2ea0efcd by Orkhan Alikhanov

Updated code style for DialogView

parent 8c2aa5f7
...@@ -33,6 +33,30 @@ ...@@ -33,6 +33,30 @@
import UIKit import UIKit
private struct Constants {
struct titleArea {
static let insets = UIEdgeInsets(top: 24, left: 24, bottom: 20, right: 24)
}
struct contentArea {
static let insets = UIEdgeInsets(top: 0, left: 24, bottom: 24, right: 24)
static let insetsNoTitle = UIEdgeInsets(top: 20, left: 24, bottom: 24, right: 24)
}
struct buttonArea {
static let insets = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)
static let insetsStacked = UIEdgeInsets(top: 6, left: 8, bottom: 14, right: 8)
}
struct button {
static let insets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
static let minWidth: CGFloat = 64
static let height: CGFloat = 36
static let interimStacked: CGFloat = 12
static let interim: CGFloat = 8
}
}
private class DialogScrollView: UIScrollView { private class DialogScrollView: UIScrollView {
/// A weak reference to DialogView. /// A weak reference to DialogView.
weak var dialogView: DialogView? weak var dialogView: DialogView?
...@@ -99,14 +123,14 @@ open class DialogView: View, Themeable { ...@@ -99,14 +123,14 @@ open class DialogView: View, Themeable {
open override func sizeThatFits(_ size: CGSize) -> CGSize { open override func sizeThatFits(_ size: CGSize) -> CGSize {
var w: CGFloat = 0 var w: CGFloat = 0
func setW(_ newW: CGFloat) { func setMaxWidth(_ width: CGFloat) {
w = max(w, newW) w = max(w, width)
w = min(w, size.width) w = min(w, size.width)
} }
setW(titleAreaSizeThatFits(width: size.width).width) setMaxWidth(titleAreaSizeThatFits(width: size.width).width)
setW(buttonAreaSizeThatFits(width: size.width).width) setMaxWidth(buttonAreaSizeThatFits(width: size.width).width)
setW(contentAreaSizeThatFits(width: size.width).width) setMaxWidth(contentAreaSizeThatFits(width: size.width).width)
var h: CGFloat = 0 var h: CGFloat = 0
h += titleAreaSizeThatFits(width: w).height h += titleAreaSizeThatFits(width: w).height
...@@ -404,27 +428,3 @@ private extension UILabel { ...@@ -404,27 +428,3 @@ private extension UILabel {
return empty return empty
} }
} }
private struct Constants {
struct titleArea {
static let insets = UIEdgeInsets(top: 24, left: 24, bottom: 20, right: 24)
}
struct contentArea {
static let insets = UIEdgeInsets(top: 0, left: 24, bottom: 24, right: 24)
static let insetsNoTitle = UIEdgeInsets(top: 20, left: 24, bottom: 24, right: 24)
}
struct buttonArea {
static let insets = UIEdgeInsets(top: 8, left: 8, bottom: 8, right: 8)
static let insetsStacked = UIEdgeInsets(top: 6, left: 8, bottom: 14, right: 8)
}
struct button {
static let insets = UIEdgeInsets(top: 0, left: 8, bottom: 0, right: 8)
static let minWidth: CGFloat = 64
static let height: CGFloat = 36
static let interimStacked: CGFloat = 12
static let interim: CGFloat = 8
}
}
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