@@ -658,10 +658,9 @@ Future<void> _uploadFiles({
658
658
}
659
659
660
660
abstract class _AttachUploadsButton extends StatelessWidget {
661
- const _AttachUploadsButton ({required this .contentController, required this .contentFocusNode });
661
+ const _AttachUploadsButton ({required this .controller });
662
662
663
- final ComposeContentController contentController;
664
- final FocusNode contentFocusNode;
663
+ final ComposeBoxController controller;
665
664
666
665
IconData get icon;
667
666
String tooltip (ZulipLocalizations zulipLocalizations);
@@ -689,8 +688,8 @@ abstract class _AttachUploadsButton extends StatelessWidget {
689
688
690
689
await _uploadFiles (
691
690
context: context,
692
- contentController: contentController ,
693
- contentFocusNode: contentFocusNode,
691
+ contentController: controller.content ,
692
+ contentFocusNode: controller. contentFocusNode,
694
693
files: files);
695
694
}
696
695
@@ -762,7 +761,7 @@ Future<Iterable<_File>> _getFilePickerFiles(BuildContext context, FileType type)
762
761
}
763
762
764
763
class _AttachFileButton extends _AttachUploadsButton {
765
- const _AttachFileButton ({required super .contentController, required super .contentFocusNode });
764
+ const _AttachFileButton ({required super .controller });
766
765
767
766
@override
768
767
IconData get icon => ZulipIcons .attach_file;
@@ -778,7 +777,7 @@ class _AttachFileButton extends _AttachUploadsButton {
778
777
}
779
778
780
779
class _AttachMediaButton extends _AttachUploadsButton {
781
- const _AttachMediaButton ({required super .contentController, required super .contentFocusNode });
780
+ const _AttachMediaButton ({required super .controller });
782
781
783
782
@override
784
783
IconData get icon => ZulipIcons .image;
@@ -795,7 +794,7 @@ class _AttachMediaButton extends _AttachUploadsButton {
795
794
}
796
795
797
796
class _AttachFromCameraButton extends _AttachUploadsButton {
798
- const _AttachFromCameraButton ({required super .contentController, required super .contentFocusNode });
797
+ const _AttachFromCameraButton ({required super .controller });
799
798
800
799
@override
801
800
IconData get icon => ZulipIcons .camera;
@@ -1096,11 +1095,10 @@ abstract class _ComposeBoxBody extends StatelessWidget {
1096
1095
shape: const RoundedRectangleBorder (
1097
1096
borderRadius: BorderRadius .all (Radius .circular (4 )))));
1098
1097
1099
- final ComposeBoxController (: content, : contentFocusNode) = controller;
1100
1098
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 ),
1104
1102
];
1105
1103
1106
1104
final topicInput = buildTopicInput ();
0 commit comments