Delete deprecated Text class && Move local property to shared place

pull/1446/head
Ahmed Hnewa 2 years ago
parent a73fca1f76
commit f2aac2df29
No known key found for this signature in database
GPG Key ID: C488CC70BBCEF0D1
  1. 2
      example/lib/pages/home_page.dart
  2. 2
      example/lib/pages/read_only_page.dart
  3. 2
      example/lib/widgets/demo_scaffold.dart
  4. 2
      example/lib/widgets/time_stamp_embed_widget.dart
  5. 2
      flutter_quill_extensions/lib/embeds/builders.dart
  6. 2
      flutter_quill_extensions/lib/embeds/toolbar/camera_button.dart
  7. 2
      flutter_quill_extensions/lib/embeds/toolbar/image_video_utils.dart
  8. 2
      flutter_quill_extensions/lib/embeds/toolbar/media_button.dart
  9. 6
      flutter_quill_extensions/pubspec.yaml
  10. 2
      lib/extensions.dart
  11. 2
      lib/flutter_quill.dart
  12. 14
      lib/src/models/config/quill_configurations.dart
  13. 3
      lib/src/models/documents/nodes/leaf.dart
  14. 8
      lib/src/widgets/editor.dart
  15. 8
      lib/src/widgets/toolbar.dart
  16. 2
      lib/src/widgets/utils/provider.dart

@ -9,7 +9,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_quill/extensions.dart'; import 'package:flutter_quill/extensions.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill_extensions/flutter_quill_extensions.dart'; import 'package:flutter_quill_extensions/flutter_quill_extensions.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';

@ -1,7 +1,7 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_quill/extensions.dart'; import 'package:flutter_quill/extensions.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill_extensions/flutter_quill_extensions.dart'; import 'package:flutter_quill_extensions/flutter_quill_extensions.dart';
import '../universal_ui/universal_ui.dart'; import '../universal_ui/universal_ui.dart';

@ -5,7 +5,7 @@ import 'package:filesystem_picker/filesystem_picker.dart';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill_extensions/flutter_quill_extensions.dart'; import 'package:flutter_quill_extensions/flutter_quill_extensions.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';

@ -1,7 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
class TimeStampEmbed extends Embeddable { class TimeStampEmbed extends Embeddable {
const TimeStampEmbed( const TimeStampEmbed(

@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:flutter_quill/extensions.dart' as base; import 'package:flutter_quill/extensions.dart' as base;
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill/translations.dart'; import 'package:flutter_quill/translations.dart';
import 'package:math_keyboard/math_keyboard.dart'; import 'package:math_keyboard/math_keyboard.dart';
import 'package:universal_html/html.dart' as html; import 'package:universal_html/html.dart' as html;

@ -1,5 +1,5 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill/translations.dart'; import 'package:flutter_quill/translations.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';

@ -3,7 +3,7 @@ import 'dart:io' show File;
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_quill/extensions.dart'; import 'package:flutter_quill/extensions.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill/translations.dart'; import 'package:flutter_quill/translations.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';

@ -4,7 +4,7 @@ import 'dart:ui';
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_quill/extensions.dart'; import 'package:flutter_quill/extensions.dart';
import 'package:flutter_quill/flutter_quill.dart' hide Text; import 'package:flutter_quill/flutter_quill.dart';
import 'package:flutter_quill/translations.dart'; import 'package:flutter_quill/translations.dart';
import 'package:image_picker/image_picker.dart'; import 'package:image_picker/image_picker.dart';

@ -19,10 +19,10 @@ dependencies:
flutter: flutter:
sdk: flutter sdk: flutter
flutter_quill: ^7.4.16 # flutter_quill: ^7.5.0
# In case you are working on changes for both libraries, # In case you are working on changes for both libraries,
# flutter_quill: flutter_quill:
# path: ~/development/playground/framework_based/flutter/flutter-quill path: /Users/ahmedhnewa/development/playground/framework_based/flutter/flutter-quill
http: ^1.1.0 http: ^1.1.0
image_picker: ">=1.0.4" image_picker: ">=1.0.4"

@ -1,6 +1,6 @@
library flutter_quill.extensions; library flutter_quill.extensions;
export 'src/models/documents/nodes/leaf.dart' hide Text; export 'src/models/documents/nodes/leaf.dart';
export 'src/models/rules/insert.dart'; export 'src/models/rules/insert.dart';
export 'src/utils/platform.dart'; export 'src/utils/platform.dart';
export 'src/utils/string.dart'; export 'src/utils/string.dart';

@ -1,6 +1,6 @@
library flutter_quill; library flutter_quill;
export 'src/core/quill_configurations.dart'; export 'src/models/config/quill_configurations.dart';
export 'src/models/documents/attribute.dart'; export 'src/models/documents/attribute.dart';
export 'src/models/documents/document.dart'; export 'src/models/documents/document.dart';
export 'src/models/documents/nodes/block.dart'; export 'src/models/documents/nodes/block.dart';

@ -1,16 +1,15 @@
import 'package:flutter/foundation.dart' show immutable; import 'package:flutter/foundation.dart' show immutable;
import 'package:flutter/material.dart' show Color, Colors; import 'package:flutter/material.dart' show Color, Colors, Locale;
import '../../flutter_quill.dart'; import '../../../flutter_quill.dart';
// I will start on this in the major-update-2
/// The configurations for the toolbar widget of flutter quill
@immutable @immutable
class QuillToolbarConfigurations { class QuillToolbarConfigurations {
const QuillToolbarConfigurations(); const QuillToolbarConfigurations();
} }
/// /// The configurations for the quill editor widget of flutter quill
@immutable @immutable
class QuillEditorConfigurations { class QuillEditorConfigurations {
const QuillEditorConfigurations(); const QuillEditorConfigurations();
@ -21,12 +20,17 @@ class QuillEditorConfigurations {
class QuillSharedConfigurations { class QuillSharedConfigurations {
const QuillSharedConfigurations({ const QuillSharedConfigurations({
this.dialogBarrierColor = Colors.black54, this.dialogBarrierColor = Colors.black54,
this.locale,
}); });
// This is just example or showcase of this major update to make the library // This is just example or showcase of this major update to make the library
// more maintanable, flexible, and customizable // more maintanable, flexible, and customizable
/// The barrier color of the shown dialogs /// The barrier color of the shown dialogs
final Color dialogBarrierColor; final Color dialogBarrierColor;
/// The locale to use for the editor and toolbar, defaults to system locale
/// More https://github.com/singerdmx/flutter-quill#translation
final Locale? locale;
} }
@immutable @immutable

@ -200,9 +200,6 @@ abstract class Leaf extends Node {
} }
} }
@Deprecated('Please use [QuillText] instead')
class Text extends QuillText {}
/// A span of formatted text within a line in a Quill document. /// A span of formatted text within a line in a Quill document.
/// ///
/// Text is a leaf node of a document tree. /// Text is a leaf node of a document tree.

@ -175,7 +175,6 @@ class QuillEditor extends StatefulWidget {
this.linkActionPickerDelegate = defaultLinkActionPickerDelegate, this.linkActionPickerDelegate = defaultLinkActionPickerDelegate,
this.customStyleBuilder, this.customStyleBuilder,
this.customRecognizerBuilder, this.customRecognizerBuilder,
this.locale,
this.floatingCursorDisabled = false, this.floatingCursorDisabled = false,
this.textSelectionControls, this.textSelectionControls,
this.onImagePaste, this.onImagePaste,
@ -217,7 +216,6 @@ class QuillEditor extends StatefulWidget {
expands: expands, expands: expands,
padding: padding, padding: padding,
keyboardAppearance: keyboardAppearance ?? Brightness.light, keyboardAppearance: keyboardAppearance ?? Brightness.light,
locale: locale,
embedBuilders: embedBuilders, embedBuilders: embedBuilders,
placeholder: placeholder, placeholder: placeholder,
editorKey: editorKey, editorKey: editorKey,
@ -381,10 +379,6 @@ class QuillEditor extends StatefulWidget {
final CustomStyleBuilder? customStyleBuilder; final CustomStyleBuilder? customStyleBuilder;
final CustomRecognizerBuilder? customRecognizerBuilder; final CustomRecognizerBuilder? customRecognizerBuilder;
/// The locale to use for the editor toolbar, defaults to system locale
/// More https://github.com/singerdmx/flutter-quill#translation
final Locale? locale;
/// Delegate function responsible for showing menu with link actions on /// Delegate function responsible for showing menu with link actions on
/// mobile platforms (iOS, Android). /// mobile platforms (iOS, Android).
/// ///
@ -561,7 +555,7 @@ class QuillEditorState extends State<QuillEditor>
); );
final editor = I18n( final editor = I18n(
initialLocale: widget.locale, initialLocale: context.sharedQuillConfigurations?.locale,
child: selectionEnabled child: selectionEnabled
? _selectionGestureDetectorBuilder.build( ? _selectionGestureDetectorBuilder.build(
behavior: HitTestBehavior.translucent, behavior: HitTestBehavior.translucent,

@ -46,7 +46,6 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
this.multiRowsDisplay = true, this.multiRowsDisplay = true,
this.color, this.color,
this.customButtons = const [], this.customButtons = const [],
this.locale,
VoidCallback? afterButtonPressed, VoidCallback? afterButtonPressed,
this.sectionDividerColor, this.sectionDividerColor,
this.sectionDividerSpace, this.sectionDividerSpace,
@ -243,7 +242,6 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
toolbarIconCrossAlignment: toolbarIconCrossAlignment, toolbarIconCrossAlignment: toolbarIconCrossAlignment,
multiRowsDisplay: multiRowsDisplay, multiRowsDisplay: multiRowsDisplay,
customButtons: customButtons, customButtons: customButtons,
locale: locale,
afterButtonPressed: afterButtonPressed, afterButtonPressed: afterButtonPressed,
childrenBuilder: (context) { childrenBuilder: (context) {
final controller = context.requireQuillController; final controller = context.requireQuillController;
@ -625,10 +623,6 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
/// is given. /// is given.
final Color? color; final Color? color;
/// The locale to use for the editor toolbar, defaults to system locale
/// More https://github.com/singerdmx/flutter-quill#translation
final Locale? locale;
/// List of custom buttons /// List of custom buttons
final List<QuillCustomButton> customButtons; final List<QuillCustomButton> customButtons;
@ -652,7 +646,7 @@ class QuillToolbar extends StatelessWidget implements PreferredSizeWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return I18n( return I18n(
initialLocale: locale, initialLocale: context.sharedQuillConfigurations?.locale,
child: multiRowsDisplay child: multiRowsDisplay
? Wrap( ? Wrap(
direction: axis, direction: axis,

@ -1,7 +1,7 @@
import 'package:flutter/foundation.dart' show debugPrint, kDebugMode; import 'package:flutter/foundation.dart' show debugPrint, kDebugMode;
import 'package:flutter/widgets.dart' show InheritedWidget, BuildContext; import 'package:flutter/widgets.dart' show InheritedWidget, BuildContext;
import '../../core/quill_configurations.dart'; import '../../models/config/quill_configurations.dart';
class QuillProvider extends InheritedWidget { class QuillProvider extends InheritedWidget {
const QuillProvider({ const QuillProvider({

Loading…
Cancel
Save