From 1aa62987994e02b9a6fca2c4323f0b52dfb7a9d7 Mon Sep 17 00:00:00 2001 From: groovinchip Date: Thu, 29 Jul 2021 11:07:17 -0400 Subject: [PATCH] chore: use MessageInputTheme in message_input.dart --- .../lib/src/message_input.dart | 36 ++++++++++--------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/packages/stream_chat_flutter/lib/src/message_input.dart b/packages/stream_chat_flutter/lib/src/message_input.dart index 2030f47a..30bfd747 100644 --- a/packages/stream_chat_flutter/lib/src/message_input.dart +++ b/packages/stream_chat_flutter/lib/src/message_input.dart @@ -288,6 +288,7 @@ class MessageInputState extends State { late final TextEditingController textEditingController; late StreamChatThemeData _streamChatTheme; + late MessageInputThemeData _messageInputTheme; bool get _hasQuotedMessage => widget.quotedMessage != null; @@ -328,7 +329,7 @@ class MessageInputState extends State { Widget build(BuildContext context) { Widget child = DecoratedBox( decoration: BoxDecoration( - color: _streamChatTheme.messageInputTheme.inputBackgroundColor, + color: _messageInputTheme.inputBackgroundColor, ), child: SafeArea( child: GestureDetector( @@ -484,7 +485,7 @@ class MessageInputState extends State { : CrossFadeState.showSecond, firstChild: sendButton, secondChild: widget.idleSendButton ?? _buildIdleSendButton(context), - duration: _streamChatTheme.messageInputTheme.sendAnimationDuration!, + duration: _messageInputTheme.sendAnimationDuration!, alignment: Alignment.center, ); } @@ -509,7 +510,7 @@ class MessageInputState extends State { ? pi : 0, child: StreamSvgIcon.emptyCircleLeft( - color: _streamChatTheme.messageInputTheme.expandButtonColor, + color: _messageInputTheme.expandButtonColor, ), ), padding: const EdgeInsets.all(0), @@ -555,17 +556,17 @@ class MessageInputState extends State { clipBehavior: Clip.hardEdge, margin: margin, decoration: BoxDecoration( - borderRadius: _streamChatTheme.messageInputTheme.borderRadius, + borderRadius: _messageInputTheme.borderRadius, gradient: _focusNode.hasFocus - ? _streamChatTheme.messageInputTheme.activeBorderGradient - : _streamChatTheme.messageInputTheme.idleBorderGradient, + ? _messageInputTheme.activeBorderGradient + : _messageInputTheme.idleBorderGradient, ), child: Padding( padding: const EdgeInsets.all(1.5), child: DecoratedBox( decoration: BoxDecoration( - borderRadius: _streamChatTheme.messageInputTheme.borderRadius, - color: _streamChatTheme.messageInputTheme.inputBackgroundColor, + borderRadius: _messageInputTheme.borderRadius, + color: _messageInputTheme.inputBackgroundColor, ), child: Column( mainAxisSize: MainAxisSize.min, @@ -583,7 +584,7 @@ class MessageInputState extends State { keyboardType: widget.keyboardType, controller: textEditingController, focusNode: _focusNode, - style: _streamChatTheme.messageInputTheme.inputTextStyle, + style: _messageInputTheme.inputTextStyle, autofocus: widget.autofocus, textAlignVertical: TextAlignVertical.center, decoration: _getInputDecoration(), @@ -599,11 +600,11 @@ class MessageInputState extends State { } InputDecoration _getInputDecoration() { - final passedDecoration = _streamChatTheme.messageInputTheme.inputDecoration; + final passedDecoration = _messageInputTheme.inputDecoration; return InputDecoration( isDense: true, hintText: _getHint(), - hintStyle: _streamChatTheme.messageInputTheme.inputTextStyle!.copyWith( + hintStyle: _messageInputTheme.inputTextStyle!.copyWith( color: _streamChatTheme.colorTheme.textLowEmphasis, ), border: const OutlineInputBorder( @@ -1685,8 +1686,8 @@ class MessageInputState extends State { color: s.isNotEmpty ? _streamChatTheme.colorTheme.disabled : (_commandsOverlay != null - ? _streamChatTheme.messageInputTheme.actionButtonColor - : _streamChatTheme.messageInputTheme.actionButtonIdleColor), + ? _messageInputTheme.actionButtonColor + : _messageInputTheme.actionButtonIdleColor), ), padding: const EdgeInsets.all(0), constraints: const BoxConstraints.tightFor( @@ -1723,8 +1724,8 @@ class MessageInputState extends State { Widget _buildAttachmentButton() => IconButton( icon: StreamSvgIcon.attach( color: _openFilePickerSection - ? _streamChatTheme.messageInputTheme.actionButtonColor - : _streamChatTheme.messageInputTheme.actionButtonIdleColor, + ? _messageInputTheme.actionButtonColor + : _messageInputTheme.actionButtonIdleColor, ), padding: const EdgeInsets.all(0), constraints: const BoxConstraints.tightFor( @@ -1959,7 +1960,7 @@ class MessageInputState extends State { padding: const EdgeInsets.all(8), child: StreamSvgIcon( assetName: _getIdleSendIcon(), - color: _streamChatTheme.messageInputTheme.sendButtonIdleColor, + color: _messageInputTheme.sendButtonIdleColor, ), ); @@ -1975,7 +1976,7 @@ class MessageInputState extends State { ), icon: StreamSvgIcon( assetName: _getSendIcon(), - color: _streamChatTheme.messageInputTheme.sendButtonColor, + color: _messageInputTheme.sendButtonColor, ), ), ); @@ -2182,6 +2183,7 @@ class MessageInputState extends State { @override void didChangeDependencies() { _streamChatTheme = StreamChatTheme.of(context); + _messageInputTheme = MessageInputTheme.of(context); if (widget.editMessage != null && !_initialized) { FocusScope.of(context).requestFocus(_focusNode); _initialized = true;