diff --git a/TIUIElements/Sources/Appearance/UIButton+Appearance.swift b/TIUIElements/Sources/Appearance/UIButton+Appearance.swift index d2cec3b8..971606dc 100644 --- a/TIUIElements/Sources/Appearance/UIButton+Appearance.swift +++ b/TIUIElements/Sources/Appearance/UIButton+Appearance.swift @@ -33,8 +33,6 @@ extension UIButton { public init(layout: Layout = .defaultLayout, backgroundColor: UIColor = .clear, - roundedCorners: CACornerMask = [], - cornerRadius: CGFloat = .zero, border: UIViewBorder = .init(), shadow: UIViewShadow? = nil, textAttributes: BaseTextAttributes? = nil, @@ -49,8 +47,6 @@ extension UIButton { super.init(layout: layout, backgroundColor: backgroundColor, - roundedCorners: roundedCorners, - cornerRadius: cornerRadius, border: border, shadow: shadow) } diff --git a/TIUIElements/Sources/Appearance/UILabel+Appearance.swift b/TIUIElements/Sources/Appearance/UILabel+Appearance.swift index 20312bfa..176c2389 100644 --- a/TIUIElements/Sources/Appearance/UILabel+Appearance.swift +++ b/TIUIElements/Sources/Appearance/UILabel+Appearance.swift @@ -30,8 +30,6 @@ extension UILabel { public init(layout: Layout = .defaultLayout, backgroundColor: UIColor = .clear, - roundedCorners: CACornerMask = [], - cornerRadius: CGFloat = .zero, border: UIViewBorder = .init(), shadow: UIViewShadow? = nil, textAttributes: BaseTextAttributes? = nil) { @@ -40,8 +38,6 @@ extension UILabel { super.init(layout: layout, backgroundColor: backgroundColor, - roundedCorners: roundedCorners, - cornerRadius: cornerRadius, border: border, shadow: shadow) } diff --git a/TIUIElements/Sources/Appearance/UIVIew+AppearanceConfigurable.swift b/TIUIElements/Sources/Appearance/UIVIew+AppearanceConfigurable.swift index ed5fc85a..7f016266 100644 --- a/TIUIElements/Sources/Appearance/UIVIew+AppearanceConfigurable.swift +++ b/TIUIElements/Sources/Appearance/UIVIew+AppearanceConfigurable.swift @@ -27,8 +27,8 @@ extension UIView { public func configureUIView(appearance: BaseAppearance) { backgroundColor = appearance.backgroundColor layer.masksToBounds = true - layer.maskedCorners = appearance.roundedCorners - layer.cornerRadius = appearance.cornerRadius + layer.maskedCorners = appearance.border.roundedCorners + layer.cornerRadius = appearance.border.cornerRadius layer.borderWidth = appearance.border.width layer.borderColor = appearance.border.color.cgColor diff --git a/TIUIElements/Sources/Appearance/UIView+Appearance.swift b/TIUIElements/Sources/Appearance/UIView+Appearance.swift index 1833f5ff..b2ac86d0 100644 --- a/TIUIElements/Sources/Appearance/UIView+Appearance.swift +++ b/TIUIElements/Sources/Appearance/UIView+Appearance.swift @@ -95,22 +95,16 @@ extension UIView { public var layout: Layout public var backgroundColor: UIColor - public var roundedCorners: CACornerMask - public var cornerRadius: CGFloat public var border: UIViewBorder public var shadow: UIViewShadow? public init(layout: Layout = .defaultLayout, backgroundColor: UIColor = .clear, - roundedCorners: CACornerMask = [], - cornerRadius: CGFloat = .zero, border: UIViewBorder = .init(), shadow: UIViewShadow? = nil) { self.layout = layout self.backgroundColor = backgroundColor - self.roundedCorners = roundedCorners - self.cornerRadius = cornerRadius self.border = border self.shadow = shadow } @@ -131,8 +125,7 @@ extension UIView { public init(layout: Layout = .defaultLayout, backgroundColor: UIColor = .clear, - roundedCorners: CACornerMask = [], - cornerRadius: CGFloat = .zero, + border: UIViewBorder = .init(), shadow: UIViewShadow? = nil, subviewAppearance: SubviewAppearance = .defaultAppearance) { @@ -140,8 +133,7 @@ extension UIView { super.init(layout: layout, backgroundColor: backgroundColor, - roundedCorners: roundedCorners, - cornerRadius: cornerRadius, + border: border, shadow: shadow) } } diff --git a/TIUIElements/Sources/Views/ListItemView/BaseListItemAppearance.swift b/TIUIElements/Sources/Views/ListItemView/BaseListItemAppearance.swift index 577474d1..5e4b843f 100644 --- a/TIUIElements/Sources/Views/ListItemView/BaseListItemAppearance.swift +++ b/TIUIElements/Sources/Views/ListItemView/BaseListItemAppearance.swift @@ -33,8 +33,7 @@ open class BaseListItemAppearance