Merge branch 'dev'

pull/1577/head
Ellet 1 year ago
commit a6f7f18dda
No known key found for this signature in database
GPG Key ID: C488CC70BBCEF0D1
  1. 32
      README.md
  2. 8
      doc/custom_embed_blocks.md
  3. 224
      doc/custom_toolbar.md
  4. 24
      doc/translation.md

@ -96,10 +96,9 @@ dependencies:
<!-- Compatible versions: <!-- Compatible versions:
| flutter_quill | flutter_quill_extensions | flutter_quill_test | | flutter_quill | Flutter | Dart |
|-------------------------|--------------------------|-------------------------| |---------------|---------|-------|
| 8.6.x | 0.7.x | 0.0.5 | | 9.0.x | 3.16.x | 3.2.x |
| 8.5.x | 0.6.x | 0.0.5 |
These versions are tested and well-supported, you shouldn't get a build failure --> These versions are tested and well-supported, you shouldn't get a build failure -->
@ -126,24 +125,23 @@ connect the `QuillController` to them
using `QuillProvider` inherited widget using `QuillProvider` inherited widget
```dart ```dart
QuillProvider( QuillToolbar.simple(
configurations: QuillConfigurations( configurations: QuillSimpleToolbarConfigurations(
controller: _controller, controller: _controller,
sharedConfigurations: const QuillSharedConfigurations( sharedConfigurations: const QuillSharedConfigurations(
locale: Locale('de'), locale: Locale('de'),
), ),
), ),
child: Column( ),
children: [ Expanded(
const QuillToolbar(), child: QuillEditor.basic(
Expanded( configurations: QuillEditorConfigurations(
child: QuillEditor.basic( controller: _controller,
configurations: const QuillEditorConfigurations( readOnly: false,
readOnly: false, sharedConfigurations: const QuillSharedConfigurations(
), locale: Locale('de'),
), ),
) ),
],
), ),
) )
``` ```

@ -88,14 +88,10 @@ Future<void> _addEditNote(BuildContext context, {Document? document}) async {
) )
], ],
), ),
content: QuillProvider( content: QuillEditor.basic(
configurations: QuillConfigurations(
controller: quillEditorController,
),
child: QuillEditor.basic(
configurations: const QuillEditorConfigurations( configurations: const QuillEditorConfigurations(
controller: quillEditorController,
readOnly: false, readOnly: false,
),
), ),
), ),
), ),

@ -6,134 +6,108 @@ You can use the `QuillBaseToolbar` which is the base for the `QuillToolbar`
Example: Example:
```dart ```dart
QuillProvider( QuillToolbar(
configurations: QuillConfigurations( configurations: const QuillToolbarConfigurations(
controller: _controller, buttonOptions: QuillToolbarButtonOptions(
sharedConfigurations: const QuillSharedConfigurations(), base: QuillToolbarBaseButtonOptions(
), globalIconSize: 20,
child: Column( globalIconButtonFactor: 1.4,
children: [
QuillBaseToolbar(
configurations: QuillBaseToolbarConfigurations(
toolbarSize: 15 * 2,
multiRowsDisplay: false,
childrenBuilder: (context) {
final controller = context.requireQuillController;
return [
QuillToolbarImageButton(
controller: controller,
options: const QuillToolbarImageButtonOptions(),
),
QuillToolbarHistoryButton(
controller: controller,
options:
const QuillToolbarHistoryButtonOptions(isUndo: true),
),
QuillToolbarHistoryButton(
controller: controller,
options:
const QuillToolbarHistoryButtonOptions(isUndo: false),
),
QuillToolbarToggleStyleButton(
attribute: Attribute.bold,
controller: controller,
options: const QuillToolbarToggleStyleButtonOptions(
iconData: Icons.format_bold,
iconSize: 20,
),
),
QuillToolbarToggleStyleButton(
attribute: Attribute.italic,
controller: controller,
options: const QuillToolbarToggleStyleButtonOptions(
iconData: Icons.format_italic,
iconSize: 20,
),
),
QuillToolbarToggleStyleButton(
attribute: Attribute.underline,
controller: controller,
options: const QuillToolbarToggleStyleButtonOptions(
iconData: Icons.format_underline,
iconSize: 20,
),
),
QuillToolbarClearFormatButton(
controller: controller,
options: const QuillToolbarClearFormatButtonOptions(
iconData: Icons.format_clear,
iconSize: 20,
),
),
VerticalDivider(
indent: 12,
endIndent: 12,
color: Colors.grey.shade400,
),
QuillToolbarSelectHeaderStyleButtons(
controller: controller,
options: const QuillToolbarSelectHeaderStyleButtonsOptions(
iconSize: 20,
),
),
QuillToolbarToggleStyleButton(
attribute: Attribute.ol,
controller: controller,
options: const QuillToolbarToggleStyleButtonOptions(
iconData: Icons.format_list_numbered,
iconSize: 20,
),
),
QuillToolbarToggleStyleButton(
attribute: Attribute.ul,
controller: controller,
options: const QuillToolbarToggleStyleButtonOptions(
iconData: Icons.format_list_bulleted,
iconSize: 20,
),
),
QuillToolbarToggleStyleButton(
attribute: Attribute.blockQuote,
controller: controller,
options: const QuillToolbarToggleStyleButtonOptions(
iconData: Icons.format_quote,
iconSize: 20,
),
),
VerticalDivider(
indent: 12,
endIndent: 12,
color: Colors.grey.shade400,
),
QuillToolbarIndentButton(
controller: controller,
isIncrease: true,
options: const QuillToolbarIndentButtonOptions(
iconData: Icons.format_indent_increase,
iconSize: 20,
)),
QuillToolbarIndentButton(
controller: controller,
isIncrease: false,
options: const QuillToolbarIndentButtonOptions(
iconData: Icons.format_indent_decrease,
iconSize: 20,
),
),
];
},
),
), ),
Expanded( ),
child: QuillEditor.basic( ),
configurations: const QuillEditorConfigurations( child: SingleChildScrollView(
readOnly: false, scrollDirection: Axis.horizontal,
placeholder: 'Write your notes', child: Row(
padding: EdgeInsets.all(16), children: [
IconButton(
onPressed: () => context
.read<SettingsCubit>()
.updateSettings(
state.copyWith(useCustomQuillToolbar: false)),
icon: const Icon(
Icons.width_normal,
), ),
), ),
) QuillToolbarHistoryButton(
], isUndo: true,
controller: controller,
),
QuillToolbarHistoryButton(
isUndo: false,
controller: controller,
),
QuillToolbarToggleStyleButton(
options: const QuillToolbarToggleStyleButtonOptions(),
controller: controller,
attribute: Attribute.bold,
),
QuillToolbarToggleStyleButton(
options: const QuillToolbarToggleStyleButtonOptions(),
controller: controller,
attribute: Attribute.italic,
),
QuillToolbarToggleStyleButton(
controller: controller,
attribute: Attribute.underline,
),
QuillToolbarClearFormatButton(
controller: controller,
),
const VerticalDivider(),
QuillToolbarImageButton(
controller: controller,
),
QuillToolbarCameraButton(
controller: controller,
),
QuillToolbarVideoButton(
controller: controller,
),
const VerticalDivider(),
QuillToolbarColorButton(
controller: controller,
isBackground: false,
),
QuillToolbarColorButton(
controller: controller,
isBackground: true,
),
const VerticalDivider(),
QuillToolbarSelectHeaderStyleButton(
controller: controller,
),
const VerticalDivider(),
QuillToolbarToggleCheckListButton(
controller: controller,
),
QuillToolbarToggleStyleButton(
controller: controller,
attribute: Attribute.ol,
),
QuillToolbarToggleStyleButton(
controller: controller,
attribute: Attribute.ul,
),
QuillToolbarToggleStyleButton(
controller: controller,
attribute: Attribute.inlineCode,
),
QuillToolbarToggleStyleButton(
controller: controller,
attribute: Attribute.blockQuote,
),
QuillToolbarIndentButton(
controller: controller,
isIncrease: true,
),
QuillToolbarIndentButton(
controller: controller,
isIncrease: false,
),
const VerticalDivider(),
QuillToolbarLinkStyleButton(controller: controller),
],
),
), ),
) )
``` ```

@ -3,24 +3,22 @@
The package offers translations for the quill toolbar and editor, it will follow the locale that is defined in your `WidgetsApp` for example `MaterialApp` which usually follows the system locally unless you set your own locale with: The package offers translations for the quill toolbar and editor, it will follow the locale that is defined in your `WidgetsApp` for example `MaterialApp` which usually follows the system locally unless you set your own locale with:
```dart ```dart
QuillProvider( QuillToolbar.simple(
configurations: QuillConfigurations( configurations: QuillSimpleToolbarConfigurations(
controller: _controller, controller: _controller,
sharedConfigurations: const QuillSharedConfigurations( sharedConfigurations: const QuillSharedConfigurations(
locale: Locale('fr'), // will take affect only if FlutterQuillLocalizations.delegate is not defined in the Widget app locale: Locale('de'),
), ),
), ),
child: Column( ),
children: [ Expanded(
const QuillToolbar( child: QuillEditor.basic(
configurations: QuillToolbarConfigurations(), configurations: QuillEditorConfigurations(
controller: _controller,
sharedConfigurations: const QuillSharedConfigurations(
locale: Locale('de'),
), ),
Expanded( ),
child: QuillEditor.basic(
configurations: const QuillEditorConfigurations(),
),
)
],
), ),
) )
``` ```

Loading…
Cancel
Save