Skip to content

Commit e1fc763

Browse files
committed
compose [nfc]: Pass controller down (6/6); _AttachUploadsButton
1 parent 29470d3 commit e1fc763

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

lib/widgets/compose_box.dart

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -658,10 +658,9 @@ Future<void> _uploadFiles({
658658
}
659659

660660
abstract class _AttachUploadsButton extends StatelessWidget {
661-
const _AttachUploadsButton({required this.contentController, required this.contentFocusNode});
661+
const _AttachUploadsButton({required this.controller});
662662

663-
final ComposeContentController contentController;
664-
final FocusNode contentFocusNode;
663+
final ComposeBoxController controller;
665664

666665
IconData get icon;
667666
String tooltip(ZulipLocalizations zulipLocalizations);
@@ -689,8 +688,8 @@ abstract class _AttachUploadsButton extends StatelessWidget {
689688

690689
await _uploadFiles(
691690
context: context,
692-
contentController: contentController,
693-
contentFocusNode: contentFocusNode,
691+
contentController: controller.content,
692+
contentFocusNode: controller.contentFocusNode,
694693
files: files);
695694
}
696695

@@ -762,7 +761,7 @@ Future<Iterable<_File>> _getFilePickerFiles(BuildContext context, FileType type)
762761
}
763762

764763
class _AttachFileButton extends _AttachUploadsButton {
765-
const _AttachFileButton({required super.contentController, required super.contentFocusNode});
764+
const _AttachFileButton({required super.controller});
766765

767766
@override
768767
IconData get icon => ZulipIcons.attach_file;
@@ -778,7 +777,7 @@ class _AttachFileButton extends _AttachUploadsButton {
778777
}
779778

780779
class _AttachMediaButton extends _AttachUploadsButton {
781-
const _AttachMediaButton({required super.contentController, required super.contentFocusNode});
780+
const _AttachMediaButton({required super.controller});
782781

783782
@override
784783
IconData get icon => ZulipIcons.image;
@@ -795,7 +794,7 @@ class _AttachMediaButton extends _AttachUploadsButton {
795794
}
796795

797796
class _AttachFromCameraButton extends _AttachUploadsButton {
798-
const _AttachFromCameraButton({required super.contentController, required super.contentFocusNode});
797+
const _AttachFromCameraButton({required super.controller});
799798

800799
@override
801800
IconData get icon => ZulipIcons.camera;
@@ -1096,11 +1095,10 @@ abstract class _ComposeBoxBody extends StatelessWidget {
10961095
shape: const RoundedRectangleBorder(
10971096
borderRadius: BorderRadius.all(Radius.circular(4)))));
10981097

1099-
final ComposeBoxController(:content, :contentFocusNode) = controller;
11001098
final composeButtons = [
1101-
_AttachFileButton(contentController: content, contentFocusNode: contentFocusNode),
1102-
_AttachMediaButton(contentController: content, contentFocusNode: contentFocusNode),
1103-
_AttachFromCameraButton(contentController: content, contentFocusNode: contentFocusNode),
1099+
_AttachFileButton(controller: controller),
1100+
_AttachMediaButton(controller: controller),
1101+
_AttachFromCameraButton(controller: controller),
11041102
];
11051103

11061104
final topicInput = buildTopicInput();

0 commit comments

Comments
 (0)