Merge pull request #16 from shortcut/feature/multiple-corner-rounding…

…-support Added simple corner rounding support for text messages
EnesKaraosman · Oct 11, 2021 · 80dd800 · 80dd800
2 parents 46fbb00 + 8f066ba
commit 80dd800
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/Sources/SwiftyChat/Common/Other/RoundedCornerShape.swift b/Sources/SwiftyChat/Common/Other/RoundedCornerShape.swift
@@ -0,0 +1,19 @@
+//
+//  RoundedCornerShape.swift
+//  
+//
+//  Created by Karl Söderberg on 2021-10-11.
+//
+
+import SwiftUI
+
+struct RoundedCornerShape: Shape {
+
+    var radius: CGFloat = .infinity
+    var corners: UIRectCorner = .allCorners
+
+    func path(in rect: CGRect) -> Path {
+        let path = UIBezierPath(roundedRect: rect, byRoundingCorners: corners, cornerRadii: CGSize(width: radius, height: radius))
+        return Path(path.cgPath)
+    }
+}
diff --git a/Sources/SwiftyChat/MessageCells/TextCell.swift b/Sources/SwiftyChat/MessageCells/TextCell.swift
@@ -42,9 +42,11 @@ internal struct TextCell<Message: ChatMessage>: View {
             .foregroundColor(cellStyle.textStyle.textColor)
             .padding(cellStyle.textPadding)
             .background(cellStyle.cellBackgroundColor)
-            .clipShape(RoundedRectangle(cornerRadius: cellStyle.cellCornerRadius))
+            .clipShape(RoundedCornerShape(radius: cellStyle.cellCornerRadius, corners: cellStyle.cellRoundedCorners)
+)
             .overlay(
-                RoundedRectangle(cornerRadius: cellStyle.cellCornerRadius)
+
+                RoundedCornerShape(radius: cellStyle.cellCornerRadius, corners: cellStyle.cellRoundedCorners)
                 .stroke(
                     cellStyle.cellBorderColor,
                     lineWidth: cellStyle.cellBorderWidth
@@ -91,9 +93,9 @@ internal struct TextCell<Message: ChatMessage>: View {
         .frame(width: textWidth, height: textHeight)
         .padding(cellStyle.textPadding)
         .background(cellStyle.cellBackgroundColor)
-        .clipShape(RoundedRectangle(cornerRadius: cellStyle.cellCornerRadius))
+        .clipShape(RoundedCornerShape(radius: cellStyle.cellCornerRadius, corners: cellStyle.cellRoundedCorners))
         .overlay(
-            RoundedRectangle(cornerRadius: cellStyle.cellCornerRadius)
+            RoundedCornerShape(radius: cellStyle.cellCornerRadius, corners: cellStyle.cellRoundedCorners)
             .stroke(
                 cellStyle.cellBorderColor,
                 lineWidth: cellStyle.cellBorderWidth

diff --git a/Sources/SwiftyChat/Styles/TextCellStyle.swift b/Sources/SwiftyChat/Styles/TextCellStyle.swift
@@ -6,6 +6,7 @@
 //
 
 import SwiftUI
+import UIKit
 
 public struct TextCellStyle: CommonViewStyle {
 
@@ -21,6 +22,7 @@ public struct TextCellStyle: CommonViewStyle {
     public let cellBorderWidth: CGFloat
     public let cellShadowRadius: CGFloat
     public let cellShadowColor: Color
+    public let cellRoundedCorners: UIRectCorner
 
     public init(
         textStyle: CommonTextStyle = CommonTextStyle(
@@ -35,7 +37,8 @@ public struct TextCellStyle: CommonViewStyle {
         cellBorderColor: Color = .clear,
         cellBorderWidth: CGFloat = 1,
         cellShadowRadius: CGFloat = 3,
-        cellShadowColor: Color = .secondary
+        cellShadowColor: Color = .secondary,
+        cellRoundedCorners: UIRectCorner = .allCorners
     ) {
         self.textStyle = textStyle
         self.textPadding = textPadding
@@ -46,6 +49,7 @@ public struct TextCellStyle: CommonViewStyle {
         self.cellBorderWidth = cellBorderWidth
         self.cellShadowRadius = cellShadowRadius
         self.cellShadowColor = cellShadowColor
+        self.cellRoundedCorners = cellRoundedCorners
     }
 
 }
diff --git a/SwiftyChatExample/SwiftyChatExample/Extensions.swift b/SwiftyChatExample/SwiftyChatExample/Extensions.swift
@@ -24,14 +24,16 @@ internal extension ChatMessageCellStyle {
             attributedTextStyle: .init(textColor: .black),
             cellBackgroundColor: Color.chatGray,
             cellBorderWidth: 0,
-            cellShadowRadius: 0
+            cellShadowRadius: 0,
+            cellRoundedCorners: [.topRight, .bottomRight, .bottomLeft]
         ),
         outgoingTextStyle: .init(
             textStyle: .init(textColor: .white, font: futuraFont),
             textPadding: 16,
             cellBackgroundColor: Color.chatBlue,
             cellBorderWidth: 0,
-            cellShadowRadius: 0
+            cellShadowRadius: 0,
+            cellRoundedCorners: [.topLeft, .bottomRight, .bottomLeft]
         ),
         incomingAvatarStyle: .init(imageStyle: .init(imageSize: .zero))
     )