From 69e4de70752bc5a53e83f3dc51e7b6d87dabcc8e Mon Sep 17 00:00:00 2001 From: X Code Date: Sun, 30 Jan 2022 23:42:03 -0800 Subject: [PATCH] Refactor code --- lib/src/widgets/default_styles.dart | 3 ++- lib/src/widgets/editor.dart | 17 ----------------- lib/src/widgets/link.dart | 17 +++++++++++++++++ lib/src/widgets/text_line.dart | 5 ++++- 4 files changed, 23 insertions(+), 19 deletions(-) diff --git a/lib/src/widgets/default_styles.dart b/lib/src/widgets/default_styles.dart index 438ca7cf..76cb50e0 100644 --- a/lib/src/widgets/default_styles.dart +++ b/lib/src/widgets/default_styles.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; import 'package:tuple/tuple.dart'; -import '../../flutter_quill.dart'; +import '../models/documents/attribute.dart'; import '../models/documents/style.dart'; import '../utils/platform.dart'; +import 'style_widgets/checkbox_point.dart'; class QuillStyles extends InheritedWidget { const QuillStyles({ diff --git a/lib/src/widgets/editor.dart b/lib/src/widgets/editor.dart index 617b5fb0..13766063 100644 --- a/lib/src/widgets/editor.dart +++ b/lib/src/widgets/editor.dart @@ -23,23 +23,6 @@ import 'link.dart'; import 'raw_editor.dart'; import 'text_selection.dart'; -const linkPrefixes = [ - 'mailto:', // email - 'tel:', // telephone - 'sms:', // SMS - 'callto:', - 'wtai:', - 'market:', - 'geopoint:', - 'ymsgr:', - 'msnim:', - 'gtalk:', // Google Talk - 'skype:', - 'sip:', // Lync - 'whatsapp:', - 'http' -]; - /// Base interface for the editor state which defines contract used by /// various mixins. abstract class EditorState extends State diff --git a/lib/src/widgets/link.dart b/lib/src/widgets/link.dart index 34cfe419..ae1a9331 100644 --- a/lib/src/widgets/link.dart +++ b/lib/src/widgets/link.dart @@ -6,6 +6,23 @@ import '../models/documents/attribute.dart'; import '../models/documents/nodes/node.dart'; import '../translations/toolbar.i18n.dart'; +const linkPrefixes = [ + 'mailto:', // email + 'tel:', // telephone + 'sms:', // SMS + 'callto:', + 'wtai:', + 'market:', + 'geopoint:', + 'ymsgr:', + 'msnim:', + 'gtalk:', // Google Talk + 'skype:', + 'sip:', // Lync + 'whatsapp:', + 'http' +]; + /// List of possible actions returned from [LinkActionPickerDelegate]. enum LinkMenuAction { /// Launch the link diff --git a/lib/src/widgets/text_line.dart b/lib/src/widgets/text_line.dart index 8fa53e57..9d98254e 100644 --- a/lib/src/widgets/text_line.dart +++ b/lib/src/widgets/text_line.dart @@ -8,8 +8,9 @@ import 'package:flutter/services.dart'; import 'package:tuple/tuple.dart'; import 'package:url_launcher/url_launcher.dart'; -import '../../flutter_quill.dart'; +import '../models/documents/attribute.dart'; import '../models/documents/nodes/container.dart' as container_node; +import '../models/documents/nodes/leaf.dart'; import '../models/documents/nodes/leaf.dart' as leaf; import '../models/documents/nodes/line.dart'; import '../models/documents/nodes/node.dart'; @@ -17,7 +18,9 @@ import '../models/documents/style.dart'; import '../utils/color.dart'; import '../utils/platform.dart'; import 'box.dart'; +import 'controller.dart'; import 'cursor.dart'; +import 'default_styles.dart'; import 'delegate.dart'; import 'keyboard_listener.dart'; import 'link.dart';