From 17695aed725cc2cd4dfb622ad0c5c9a7e32062bf Mon Sep 17 00:00:00 2001 From: Alspb Date: Tue, 11 Jun 2024 00:51:55 +0100 Subject: [PATCH] Search bar: translations added, minor fixes --- .../toolbar/buttons/search/search_button.dart | 10 ++++----- .../toolbar/buttons/search/search_dialog.dart | 22 +++++++++++++------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/lib/src/widgets/toolbar/buttons/search/search_button.dart b/lib/src/widgets/toolbar/buttons/search/search_button.dart index 23209cae..ade8edce 100644 --- a/lib/src/widgets/toolbar/buttons/search/search_button.dart +++ b/lib/src/widgets/toolbar/buttons/search/search_button.dart @@ -59,11 +59,9 @@ class QuillToolbarSearchButton extends StatelessWidget { (context.loc.search); } - // Color _dialogBarrierColor(BuildContext context) { - // return options.dialogBarrierColor ?? - // context.quillSharedConfigurations?.dialogBarrierColor ?? - // Colors.black54; - // } + Color _dialogBarrierColor(BuildContext context) { + return options.dialogBarrierColor ?? Colors.transparent; + } QuillDialogTheme? _dialogTheme(BuildContext context) { return options.dialogTheme ?? @@ -124,7 +122,7 @@ class QuillToolbarSearchButton extends StatelessWidget { return; } await showDialog( - barrierColor: Colors.transparent, + barrierColor: _dialogBarrierColor(context), context: context, builder: (_) => FlutterQuillLocalizationsWidget( child: QuillToolbarSearchDialog( diff --git a/lib/src/widgets/toolbar/buttons/search/search_dialog.dart b/lib/src/widgets/toolbar/buttons/search/search_dialog.dart index 87e7508b..19e041ef 100644 --- a/lib/src/widgets/toolbar/buttons/search/search_dialog.dart +++ b/lib/src/widgets/toolbar/buttons/search/search_dialog.dart @@ -45,6 +45,7 @@ class QuillToolbarSearchDialog extends StatefulWidget { const QuillToolbarSearchDialog({ required this.controller, this.dialogTheme, + this.text, this.childBuilder, this.searchBarAlignment, super.key, @@ -52,6 +53,7 @@ class QuillToolbarSearchDialog extends StatefulWidget { final QuillController controller; final QuillDialogTheme? dialogTheme; + final String? text; final QuillToolbarSearchDialogChildBuilder? childBuilder; final AlignmentGeometry? searchBarAlignment; @@ -62,7 +64,7 @@ class QuillToolbarSearchDialog extends StatefulWidget { class QuillToolbarSearchDialogState extends State { final TextEditingController _textController = TextEditingController(); - String _text = ''; + late String _text; List _offsets = []; int _index = 0; bool _caseSensitive = false; @@ -70,6 +72,12 @@ class QuillToolbarSearchDialogState extends State { bool _searchSettingsUnfolded = false; Timer? _searchTimer; + @override + void initState() { + super.initState(); + _text = widget.text ?? ''; + } + @override void dispose() { _textController.dispose(); @@ -120,7 +128,7 @@ class QuillToolbarSearchDialogState extends State { children: [ IconButton( icon: const Icon(Icons.close), - tooltip: 'Close', + tooltip: context.loc.close, visualDensity: VisualDensity.compact, onPressed: () { Navigator.of(context).pop(); @@ -129,7 +137,7 @@ class QuillToolbarSearchDialogState extends State { IconButton( icon: const Icon(Icons.more_vert), isSelected: _caseSensitive || _wholeWord, - tooltip: 'Search settings', + tooltip: context.loc.searchSettings, visualDensity: VisualDensity.compact, onPressed: () { setState(() { @@ -175,8 +183,8 @@ class QuillToolbarSearchDialogState extends State { controlAffinity: ListTileControlAffinity.leading, visualDensity: VisualDensity.compact, contentPadding: EdgeInsets.zero, - title: const Text( - 'Case sensitive', + title: Text( + context.loc.caseSensitive, maxLines: 1, overflow: TextOverflow.ellipsis, ), @@ -194,8 +202,8 @@ class QuillToolbarSearchDialogState extends State { controlAffinity: ListTileControlAffinity.leading, visualDensity: VisualDensity.compact, contentPadding: EdgeInsets.zero, - title: const Text( - 'Whole word', + title: Text( + context.loc.wholeWord, maxLines: 1, overflow: TextOverflow.ellipsis, ),