Skip to content

Commit 802a41f

Browse files
demchenkoalexdemchenkoalex
committed
Code refactor
1 parent 145fef6 commit 802a41f

21 files changed

+139
-157
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 1.6.5
2+
3+
- **BREAKING CHANGE**: `PreviewTapOptions` -> `TextMessageOptions`
4+
15
## 1.6.4
26

37
- **BREAKING CHANGE**: Add `InputOptions`. `onTextChanged`, `onTextFieldTap` and `sendButtonVisibilityMode` are now under `InputOptions` class, just move the same values to `inputOptions: InputOptions()`.

‎lib/flutter_chat_ui.dart‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ export 'src/chat_theme.dart';
55
export 'src/models/bubble_rtl_alignment.dart';
66
export 'src/models/emoji_enlargement_behavior.dart';
77
export 'src/models/input_clear_mode.dart';
8-
export 'src/models/preview_tap_options.dart';
98
export 'src/models/send_button_visibility_mode.dart';
109
export 'src/util.dart' show formatBytes, isConsistsOfEmojis;
11-
export 'src/widgets/attachment_button.dart';
1210
export 'src/widgets/chat.dart';
1311
export 'src/widgets/chat_list.dart';
14-
export 'src/widgets/file_message.dart';
1512
export 'src/widgets/image_gallery.dart';
16-
export 'src/widgets/image_message.dart';
17-
export 'src/widgets/input.dart';
18-
export 'src/widgets/input_text_field_controller.dart';
19-
export 'src/widgets/message.dart';
20-
export 'src/widgets/send_button.dart';
21-
export 'src/widgets/text_message.dart';
13+
export 'src/widgets/input/attachment_button.dart';
14+
export 'src/widgets/input/input.dart';
15+
export 'src/widgets/input/input_text_field_controller.dart';
16+
export 'src/widgets/input/send_button.dart';
17+
export 'src/widgets/message/file_message.dart';
18+
export 'src/widgets/message/image_message.dart';
19+
export 'src/widgets/message/message.dart';
20+
export 'src/widgets/message/message_status.dart';
21+
export 'src/widgets/message/text_message.dart';
22+
export 'src/widgets/message/user_avatar.dart';
23+
export 'src/widgets/message/user_name.dart';
2224
export 'src/widgets/unread_header.dart';
23-
export 'src/widgets/user_avatar.dart';
24-
export 'src/widgets/user_name.dart';

lib/src/widgets/pattern_style.dart renamed to lib/src/models/pattern_style.dart

File renamed without changes.

‎lib/src/models/preview_tap_options.dart‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎lib/src/widgets/chat.dart‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@ import '../models/date_header.dart';
1313
import '../models/emoji_enlargement_behavior.dart';
1414
import '../models/message_spacer.dart';
1515
import '../models/preview_image.dart';
16-
import '../models/preview_tap_options.dart';
1716
import '../models/unread_header_data.dart';
1817
import '../util.dart';
1918
import 'chat_list.dart';
2019
import 'image_gallery.dart';
21-
import 'inherited_chat_theme.dart';
22-
import 'inherited_l10n.dart';
23-
import 'inherited_user.dart';
24-
import 'input.dart';
25-
import 'message.dart';
26-
import 'text_message.dart';
20+
import 'input/input.dart';
21+
import 'message/message.dart';
22+
import 'message/text_message.dart';
23+
import 'state/inherited_chat_theme.dart';
24+
import 'state/inherited_l10n.dart';
25+
import 'state/inherited_user.dart';
2726
import 'unread_header.dart';
2827

2928
/// Entry widget, represents the complete chat. If you wrap it in [SafeArea] and
@@ -75,7 +74,6 @@ class Chat extends StatefulWidget {
7574
this.onMessageVisibilityChanged,
7675
this.onPreviewDataFetched,
7776
required this.onSendPressed,
78-
this.previewTapOptions = const PreviewTapOptions(),
7977
this.scrollController,
8078
this.scrollPhysics,
8179
this.scrollToUnreadOptions = const ScrollToUnreadOptions(),
@@ -242,9 +240,6 @@ class Chat extends StatefulWidget {
242240
/// See [Input.onSendPressed].
243241
final void Function(types.PartialText) onSendPressed;
244242

245-
/// See [Message.previewTapOptions].
246-
final PreviewTapOptions previewTapOptions;
247-
248243
/// See [ChatList.scrollController].
249244
/// If provided, you cannot use the scroll to message functionality.
250245
final AutoScrollController? scrollController;
@@ -540,7 +535,6 @@ class ChatState extends State<Chat> {
540535
},
541536
onMessageVisibilityChanged: widget.onMessageVisibilityChanged,
542537
onPreviewDataFetched: _onPreviewDataFetched,
543-
previewTapOptions: widget.previewTapOptions,
544538
roundBorder: map['nextMessageInGroup'] == true,
545539
showAvatar: map['nextMessageInGroup'] == false,
546540
showName: map['showName'] == true,

‎lib/src/widgets/chat_list.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ import 'package:flutter/foundation.dart' show kIsWeb;
33
import 'package:flutter/material.dart';
44
import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
55

6-
import 'inherited_chat_theme.dart';
7-
import 'inherited_user.dart';
86
import 'patched_sliver_animated_list.dart';
7+
import 'state/inherited_chat_theme.dart';
8+
import 'state/inherited_user.dart';
99

1010
/// Animated list that handles automatic animations and pagination.
1111
class ChatList extends StatefulWidget {

lib/src/widgets/attachment_button.dart renamed to lib/src/widgets/input/attachment_button.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22

3-
import 'inherited_chat_theme.dart';
4-
import 'inherited_l10n.dart';
3+
import '../state/inherited_chat_theme.dart';
4+
import '../state/inherited_l10n.dart';
55

66
/// A class that represents attachment button widget.
77
class AttachmentButton extends StatelessWidget {

lib/src/widgets/input.dart renamed to lib/src/widgets/input/input.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ import 'package:flutter/material.dart';
33
import 'package:flutter/services.dart';
44
import 'package:flutter_chat_types/flutter_chat_types.dart' as types;
55

6-
import '../models/input_clear_mode.dart';
7-
import '../models/send_button_visibility_mode.dart';
6+
import '../../models/input_clear_mode.dart';
7+
import '../../models/send_button_visibility_mode.dart';
8+
import '../state/inherited_chat_theme.dart';
9+
import '../state/inherited_l10n.dart';
810
import 'attachment_button.dart';
9-
import 'inherited_chat_theme.dart';
10-
import 'inherited_l10n.dart';
1111
import 'input_text_field_controller.dart';
1212
import 'send_button.dart';
1313

lib/src/widgets/input_text_field_controller.dart renamed to lib/src/widgets/input/input_text_field_controller.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
22

3-
import 'pattern_style.dart';
3+
import '../../models/pattern_style.dart';
44

55
/// Controller for the [TextField] on [Input] widget
66
/// To highlighting the matches for pattern

lib/src/widgets/send_button.dart renamed to lib/src/widgets/input/send_button.dart

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'package:flutter/material.dart';
22

3-
import 'inherited_chat_theme.dart';
4-
import 'inherited_l10n.dart';
3+
import '../state/inherited_chat_theme.dart';
4+
import '../state/inherited_l10n.dart';
55

66
/// A class that represents send button widget.
77
class SendButton extends StatelessWidget {
@@ -21,12 +21,7 @@ class SendButton extends StatelessWidget {
2121
@override
2222
Widget build(BuildContext context) => Container(
2323
margin: InheritedChatTheme.of(context).theme.sendButtonMargin ??
24-
const EdgeInsetsDirectional.fromSTEB(
25-
0,
26-
0,
27-
8,
28-
0,
29-
),
24+
const EdgeInsetsDirectional.fromSTEB(0, 0, 8, 0),
3025
child: IconButton(
3126
constraints: const BoxConstraints(
3227
minHeight: 24,

0 commit comments

Comments
 (0)