diff --git a/CHANGELOG.md b/CHANGELOG.md index f97605e..c3749b0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ -# 6.0.0-non-null-safety +## 7.0.0-non-null-safety + +* Breaking change: [SpecialText.getContent] is not include endflag now.(please check if you call getContent and your endflag length is more than 1) +* Fix demo manualDelete error #120 +## 6.0.0-non-null-safety * non-null-safety + ## 5.0.4 * Fix toolbar is not show after some behaviour #107 diff --git a/example/.flutter-plugins-dependencies b/example/.flutter-plugins-dependencies index c784121..930679c 100644 --- a/example/.flutter-plugins-dependencies +++ b/example/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"url_launcher","path":"/Users/zmt/Documents/flutter/stable/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.3.0/","dependencies":[]}],"android":[{"name":"url_launcher","path":"/Users/zmt/Documents/flutter/stable/.pub-cache/hosted/pub.flutter-io.cn/url_launcher-5.3.0/","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"url_launcher_web","path":"/Users/zmt/Documents/flutter/stable/.pub-cache/hosted/pub.flutter-io.cn/url_launcher_web-0.1.4+1/","dependencies":[]}]},"dependencyGraph":[{"name":"url_launcher","dependencies":["url_launcher_web"]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2020-11-26 16:51:04.016171","version":"1.22.4"} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"url_launcher","path":"E:\\\\Flutter\\\\flutter_source\\\\1.22.6\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.3.0\\\\","dependencies":[]}],"android":[{"name":"url_launcher","path":"E:\\\\Flutter\\\\flutter_source\\\\1.22.6\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher-5.3.0\\\\","dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"url_launcher_web","path":"E:\\\\Flutter\\\\flutter_source\\\\1.22.6\\\\.pub-cache\\\\hosted\\\\pub.flutter-io.cn\\\\url_launcher_web-0.1.5+3\\\\","dependencies":[]}]},"dependencyGraph":[{"name":"url_launcher","dependencies":["url_launcher_web"]},{"name":"url_launcher_web","dependencies":[]}],"date_created":"2021-04-24 11:52:26.206055","version":"1.22.6"} \ No newline at end of file diff --git a/example/lib/special_text/image_text.dart b/example/lib/special_text/image_text.dart index 02da469..0a1f0cd 100644 --- a/example/lib/special_text/image_text.dart +++ b/example/lib/special_text/image_text.dart @@ -22,7 +22,7 @@ class ImageText extends SpecialText { @override InlineSpan finishText() { ///content already has endflag '/' - final String text = flag + getContent() + '>'; + final String text = toString(); ///'' // var index1 = text.indexOf(''') + 1; diff --git a/example/pubspec.yaml b/example/pubspec.yaml index 939887e..b9174cc 100644 --- a/example/pubspec.yaml +++ b/example/pubspec.yaml @@ -14,21 +14,21 @@ publish_to: none version: 1.0.0+1 environment: - sdk: ">=2.6.0 <3.0.0" + sdk: ">=2.6.0 <2.12.0" flutter: ">=1.22.0" dependencies: # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. cupertino_icons: ^0.1.2 - extended_text: ^4.1.0 - + extended_text: ^6.0.0-non-null-safety + extended_text_field: path: ../ flutter: sdk: flutter loading_more_list: ^3.1.1 - oktoast: ^2.1.4 + oktoast: ^2.1.4 url_launcher: 5.3.0 @@ -36,7 +36,7 @@ dev_dependencies: ff_annotation_route: ^4.0.2 flutter_test: - sdk: flutter + sdk: flutter # For information on the generic Dart part of this file, see the # following page: https://www.dartlang.org/tools/pub/pubspec diff --git a/lib/src/extended_render_editable.dart b/lib/src/extended_render_editable.dart index e5fc80f..90db1da 100644 --- a/lib/src/extended_render_editable.dart +++ b/lib/src/extended_render_editable.dart @@ -548,6 +548,7 @@ class ExtendedRenderEditable extends ExtendedTextSelectionRenderObject { } /// Whether this rendering object is read only. + @override bool get readOnly => _readOnly; bool _readOnly = false; set readOnly(bool value) { diff --git a/pubspec.yaml b/pubspec.yaml index dc395d1..561ae9b 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: extended_text_field description: Extended official text field to build special text like inline image, @somebody, custom background etc quickly.It also support to build custom seleciton toolbar and handles. -version: 6.0.0-non-null-safety +version: 7.0.0-non-null-safety homepage: https://github.com/fluttercandies/extended_text_field environment: @@ -9,8 +9,7 @@ environment: dependencies: - extended_text_library: ^5.0.0-non-null-safety - + extended_text_library: ^6.0.0-non-null-safety flutter: sdk: flutter dev_dependencies: