Added composer config for changing frames

martinmitrevski · martinmitrevski · commit 346643b6f20d · 2022-04-21T11:14:48.000+02:00
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerConfig.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/ComposerConfig.swift
@@ -0,0 +1,20 @@
+//
+// Copyright © 2022 Stream.io Inc. All rights reserved.
+//
+
+import SwiftUI
+
+/// Config for customizing the composer.
+public struct ComposerConfig {
+    
+    public var inputViewMinHeight: CGFloat
+    public var inputFont: UIFont
+    
+    public init(
+        inputViewMinHeight: CGFloat = 38,
+        inputFont: UIFont = UIFont.preferredFont(forTextStyle: .body)
+    ) {
+        self.inputViewMinHeight = inputViewMinHeight
+        self.inputFont = inputFont
+    }
+}
diff --git a/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift b/Sources/StreamChatSwiftUI/ChatChannel/Composer/MessageComposerView.swift
@@ -292,7 +292,7 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
         }
         .padding(.vertical, shouldAddVerticalPadding ? 8 : 0)
         .padding(.leading, 8)
-        .background(Color(colors.background))
+        .background(composerInputBackground)
         .overlay(
             RoundedRectangle(cornerRadius: 20)
                 .stroke(Color(colors.innerBorder))
@@ -302,6 +302,11 @@ public struct ComposerInputView<Factory: ViewFactory>: View {
         )
     }
     
+    private var composerInputBackground: Color {
+        var colors = colors
+        return Color(colors.composerInputBackground)
+    }
+    
     private var shouldAddVerticalPadding: Bool {
         !addedFileURLs.isEmpty || !addedAssets.isEmpty
     }
diff --git a/Sources/StreamChatSwiftUI/ColorPalette.swift b/Sources/StreamChatSwiftUI/ColorPalette.swift
@@ -77,6 +77,11 @@ public struct ColorPalette {
     public lazy var reactionCurrentUserColor: UIColor? = UIColor(tintColor)
     public lazy var reactionOtherUserColor: UIColor? = textLowEmphasis
     public lazy var selectedReactionBackgroundColor: UIColor? = nil
+    
+    // MARK: - Composer
+    
+    public lazy var composerPlaceholderColor: UIColor = subtitleText
+    public lazy var composerInputBackground: UIColor = background
 }
 
 // Those colors are default defined stream constants, which are fallback values if you don't implement your color theme.
diff --git a/Sources/StreamChatSwiftUI/Utils.swift b/Sources/StreamChatSwiftUI/Utils.swift
@@ -19,6 +19,7 @@ public class Utils {
     public var messageActionsResolver: MessageActionsResolving
     public var commandsConfig: CommandsConfig
     public var messageListConfig: MessageListConfig
+    public var composerConfig: ComposerConfig
     
     var messageCachingUtils = MessageCachingUtils()
     
@@ -34,6 +35,7 @@ public class Utils {
         messageActionResolver: MessageActionsResolving = MessageActionsResolver(),
         commandsConfig: CommandsConfig = DefaultCommandsConfig(),
         messageListConfig: MessageListConfig = MessageListConfig(),
+        composerConfig: ComposerConfig = ComposerConfig(),
         channelNamer: @escaping ChatChannelNamer = DefaultChatChannelNamer()
     ) {
         self.dateFormatter = dateFormatter
@@ -48,5 +50,6 @@ public class Utils {
         messageActionsResolver = messageActionResolver
         self.commandsConfig = commandsConfig
         self.messageListConfig = messageListConfig
+        self.composerConfig = composerConfig
     }
 }
diff --git a/Sources/StreamChatSwiftUI/Utils/Common/InputTextView.swift b/Sources/StreamChatSwiftUI/Utils/Common/InputTextView.swift
@@ -5,14 +5,22 @@
 import UIKit
 
 struct TextSizeConstants {
-    static let minimumHeight = 38.0
-    static let maximumHeight = 76.0
-    static let minThreshold = 38.0
+    static let composerConfig = InjectedValues[\.utils].composerConfig
+    static let defaultInputViewHeight: CGFloat = 38.0
+    static var minimumHeight: CGFloat {
+        composerConfig.inputViewMinHeight
+    }
+
+    static let maximumHeight: CGFloat = 76
+    static var minThreshold: CGFloat {
+        composerConfig.inputViewMinHeight
+    }
 }
 
 class InputTextView: UITextView {
     @Injected(\.colors) private var colors
-    
+    @Injected(\.utils) private var utils
+        
     /// Label used as placeholder for textView when it's empty.
     open private(set) lazy var placeholderLabel: UILabel = UILabel()
         .withoutAutoresizingMaskConstraints
@@ -62,7 +70,7 @@ class InputTextView: UITextView {
     open func setUpAppearance() {
         backgroundColor = .clear
         textContainer.lineFragmentPadding = 8
-        font = UIFont.preferredFont(forTextStyle: .body)
+        font = utils.composerConfig.inputFont
         textColor = colors.text
         textAlignment = .natural
         
@@ -130,6 +138,16 @@ class InputTextView: UITextView {
         }
     }
     
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        if TextSizeConstants.defaultInputViewHeight != minimumHeight {
+            let rect = layoutManager.usedRect(for: textContainer)
+            let topInset = (bounds.size.height - rect.height) / 2.0
+            textContainerInset.top = max(0, topInset)
+        }
+    }
+        
     override open func paste(_ sender: Any?) {
         super.paste(sender)
         handleTextChange()
diff --git a/StreamChatSwiftUI.xcodeproj/project.pbxproj b/StreamChatSwiftUI.xcodeproj/project.pbxproj
@@ -37,6 +37,7 @@
 		84335018274BAD4B007A1B81 /* NewChatViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84335017274BAD4B007A1B81 /* NewChatViewModel.swift */; };
 		8434E58127707F19001E1B83 /* GridPhotosView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434E58027707F19001E1B83 /* GridPhotosView.swift */; };
 		8434E583277088D9001E1B83 /* TitleWithCloseButton.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8434E582277088D9001E1B83 /* TitleWithCloseButton.swift */; };
+		844CC60E2811378D0006548D /* ComposerConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 844CC60D2811378D0006548D /* ComposerConfig.swift */; };
 		8465FBBE2746873A00AF091E /* StreamChatSwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8465FBB52746873A00AF091E /* StreamChatSwiftUI.framework */; };
 		8465FCB727468B0600AF091E /* NukeUI in Frameworks */ = {isa = PBXBuildFile; productRef = 8465FCB627468B0600AF091E /* NukeUI */; };
 		8465FCBF27468B6900AF091E /* DemoAppSwiftUIApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8465FCBE27468B6900AF091E /* DemoAppSwiftUIApp.swift */; };
@@ -369,6 +370,7 @@
 		84335017274BAD4B007A1B81 /* NewChatViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NewChatViewModel.swift; sourceTree = "<group>"; };
 		8434E58027707F19001E1B83 /* GridPhotosView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GridPhotosView.swift; sourceTree = "<group>"; };
 		8434E582277088D9001E1B83 /* TitleWithCloseButton.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleWithCloseButton.swift; sourceTree = "<group>"; };
+		844CC60D2811378D0006548D /* ComposerConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposerConfig.swift; sourceTree = "<group>"; };
 		8465FBB52746873A00AF091E /* StreamChatSwiftUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = StreamChatSwiftUI.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		8465FBBD2746873A00AF091E /* StreamChatSwiftUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = StreamChatSwiftUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		8465FCBC27468B6900AF091E /* DemoAppSwiftUI.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = DemoAppSwiftUI.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -909,6 +911,7 @@
 				8465FD1A2746A95600AF091E /* ComposerHelperViews.swift */,
 				841B64C327744DB60016FF3B /* ComposerModels.swift */,
 				8465FD182746A95600AF091E /* PhotoAssetsUtils.swift */,
+				844CC60D2811378D0006548D /* ComposerConfig.swift */,
 			);
 			path = Composer;
 			sourceTree = "<group>";
@@ -1565,6 +1568,7 @@
 				8465FD6F2746A95700AF091E /* StreamChat.swift in Sources */,
 				8465FD8F2746A95700AF091E /* AttachmentUploadingStateView.swift in Sources */,
 				8465FD732746A95700AF091E /* ActionItemView.swift in Sources */,
+				844CC60E2811378D0006548D /* ComposerConfig.swift in Sources */,
 				846608E5278C865200D3D7B3 /* TypingIndicatorPlacement.swift in Sources */,
 				8465FDA72746A95700AF091E /* KeyboardHandling.swift in Sources */,
 				8465FDD72746A95800AF091E /* Appearance.swift in Sources */,

Original file line number	Diff line number	Diff line change
`@@ -292,7 +292,7 @@ public struct ComposerInputView<Factory: ViewFactory>: View {`
`292`	`292`	`}`
`293`	`293`	`.padding(.vertical, shouldAddVerticalPadding ? 8 : 0)`
`294`	`294`	`.padding(.leading, 8)`
`295`		`- .background(Color(colors.background))`
	`295`	`+ .background(composerInputBackground)`
`296`	`296`	`.overlay(`
`297`	`297`	`RoundedRectangle(cornerRadius: 20)`
`298`	`298`	`.stroke(Color(colors.innerBorder))`
`@@ -302,6 +302,11 @@ public struct ComposerInputView<Factory: ViewFactory>: View {`
`302`	`302`	`)`
`303`	`303`	`}`
`304`	`304`
	`305`	`+ private var composerInputBackground: Color {`
	`306`	`+ var colors = colors`
	`307`	`+ return Color(colors.composerInputBackground)`
	`308`	`+ }`
	`309`	`+`
`305`	`310`	`private var shouldAddVerticalPadding: Bool {`
`306`	`311`	`!addedFileURLs.isEmpty \|\| !addedAssets.isEmpty`
`307`	`312`	`}`