From 9d99d4e4e3de89193397e5a67b6e6137944c4e92 Mon Sep 17 00:00:00 2001
From: Nikita Semenov <castlelecs@gmail.com>
Date: Tue, 14 Mar 2023 18:27:40 +0300
Subject: [PATCH] feat: moved corner configuration to UIViewBorder

---
 .../Sources/Appearance/UIButton+Appearance.swift     |  4 ----
 .../Sources/Appearance/UILabel+Appearance.swift      |  4 ----
 .../Appearance/UIVIew+AppearanceConfigurable.swift   |  4 ++--
 .../Sources/Appearance/UIView+Appearance.swift       | 12 ++----------
 .../Views/ListItemView/BaseListItemAppearance.swift  |  6 ++----
 .../DefaultTitleSubtitleView+Appearance.swift        |  4 ----
 TIUIKitCore/Sources/Appearance/UIViewBorder.swift    | 10 +++++++++-
 TIUIKitCore/Sources/Appearance/ViewAppearance.swift  |  2 --
 8 files changed, 15 insertions(+), 31 deletions(-)

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<some ViewLayout>) {
         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<LeadingViewAppearance: WrappedViewAppearance,
 
     public init(layout: UIView.DefaultWrappedLayout = .defaultLayout,
                 backgroundColor: UIColor = .clear,
-                roundedCorners: CACornerMask = [],
-                cornerRadius: CGFloat = .zero,
+                border: UIViewBorder = .init(),
                 shadow: UIViewShadow? = nil,
                 leadingViewAppearance: LeadingViewAppearance = .defaultAppearance,
                 middleViewAppearance: MiddleViewAppearance = .defaultAppearance,
@@ -46,8 +45,7 @@ open class BaseListItemAppearance<LeadingViewAppearance: WrappedViewAppearance,
 
         super.init(layout: layout,
                    backgroundColor: backgroundColor,
-                   roundedCorners: roundedCorners,
-                   cornerRadius: cornerRadius,
+                   border: border,
                    shadow: shadow)
     }
 }
diff --git a/TIUIElements/Sources/Views/TitleSubtitleView/DefaultTitleSubtitleView+Appearance.swift b/TIUIElements/Sources/Views/TitleSubtitleView/DefaultTitleSubtitleView+Appearance.swift
index 4b91a8cc..dc6906a2 100644
--- a/TIUIElements/Sources/Views/TitleSubtitleView/DefaultTitleSubtitleView+Appearance.swift
+++ b/TIUIElements/Sources/Views/TitleSubtitleView/DefaultTitleSubtitleView+Appearance.swift
@@ -36,8 +36,6 @@ extension DefaultTitleSubtitleView {
 
         public init(layout: Layout = .defaultLayout,
                     backgroundColor: UIColor = .clear,
-                    roundedCorners: CACornerMask = [],
-                    cornerRadius: CGFloat = .zero,
                     border: UIViewBorder = .init(),
                     shadow: UIViewShadow? = nil,
                     titleAppearance: UILabel.DefaultAppearance = .defaultAppearance,
@@ -48,8 +46,6 @@ extension DefaultTitleSubtitleView {
 
             super.init(layout: layout,
                        backgroundColor: backgroundColor,
-                       roundedCorners: roundedCorners,
-                       cornerRadius: cornerRadius,
                        border: border,
                        shadow: shadow)
         }
diff --git a/TIUIKitCore/Sources/Appearance/UIViewBorder.swift b/TIUIKitCore/Sources/Appearance/UIViewBorder.swift
index 6aa8c0da..00389343 100644
--- a/TIUIKitCore/Sources/Appearance/UIViewBorder.swift
+++ b/TIUIKitCore/Sources/Appearance/UIViewBorder.swift
@@ -25,9 +25,17 @@ import UIKit
 public struct UIViewBorder {
     public var color: UIColor
     public var width: CGFloat
+    public var cornerRadius: CGFloat
+    public var roundedCorners: CACornerMask
+
+    public init(color: UIColor = .clear,
+                width: CGFloat = .zero,
+                cornerRadius: CGFloat = .zero,
+                roundedCorners: CACornerMask = []) {
 
-    public init(color: UIColor = .clear, width: CGFloat = .zero) {
         self.color = color
         self.width = width
+        self.cornerRadius = cornerRadius
+        self.roundedCorners = roundedCorners
     }
 }
diff --git a/TIUIKitCore/Sources/Appearance/ViewAppearance.swift b/TIUIKitCore/Sources/Appearance/ViewAppearance.swift
index 4a8001d1..322d3641 100644
--- a/TIUIKitCore/Sources/Appearance/ViewAppearance.swift
+++ b/TIUIKitCore/Sources/Appearance/ViewAppearance.swift
@@ -29,8 +29,6 @@ public protocol ViewAppearance {
 
     var layout: Layout { get }
     var backgroundColor: UIColor { get }
-    var roundedCorners: CACornerMask { get }
-    var cornerRadius: CGFloat { get }
     var border: UIViewBorder { get }
     var shadow: UIViewShadow? { get }
 }