diff --git a/app/lib/pages/home_page.dart b/app/lib/pages/home_page.dart index 665ce1b9..146c3088 100644 --- a/app/lib/pages/home_page.dart +++ b/app/lib/pages/home_page.dart @@ -95,38 +95,39 @@ class _HomePageState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Container( - height: MediaQuery.of(context).size.height * 0.88, - color: Colors.white, - padding: const EdgeInsets.only(left: 16.0, right: 16.0), - child: QuillEditor( - controller: _controller, - scrollController: ScrollController(), - scrollable: true, - focusNode: _focusNode, - autoFocus: false, - readOnly: false, - placeholder: 'Add content', - enableInteractiveSelection: true, - expands: false, - padding: EdgeInsets.zero, - customStyles: DefaultStyles( - h1: DefaultTextBlockStyle( - TextStyle( - fontSize: 32.0, - color: Colors.black, - height: 1.15, - fontWeight: FontWeight.w300, - ), - Tuple2(16.0, 0.0), - Tuple2(0.0, 0.0), - null), - sizeSmall: TextStyle(fontSize: 9.0), + Expanded( + flex: 20, + child: Container( + color: Colors.white, + padding: const EdgeInsets.only(left: 16.0, right: 16.0), + child: QuillEditor( + controller: _controller, + scrollController: ScrollController(), + scrollable: true, + focusNode: _focusNode, + autoFocus: false, + readOnly: false, + placeholder: 'Add content', + enableInteractiveSelection: true, + expands: false, + padding: EdgeInsets.zero, + customStyles: DefaultStyles( + h1: DefaultTextBlockStyle( + TextStyle( + fontSize: 32.0, + color: Colors.black, + height: 1.15, + fontWeight: FontWeight.w300, + ), + Tuple2(16.0, 0.0), + Tuple2(0.0, 0.0), + null), + sizeSmall: TextStyle(fontSize: 9.0), + ), ), ), ), - Padding( - padding: const EdgeInsets.all(8.0), + Expanded( child: Container( child: QuillToolbar.basic( controller: _controller, diff --git a/app/pubspec.lock b/app/pubspec.lock index 8b6e9a99..caad158c 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -110,14 +110,14 @@ packages: name: flutter_colorpicker url: "https://pub.dartlang.org" source: hosted - version: "0.4.0-nullsafety.0" + version: "0.3.5" flutter_keyboard_visibility: dependency: transitive description: name: flutter_keyboard_visibility url: "https://pub.dartlang.org" source: hosted - version: "5.0.0-nullsafety.3" + version: "5.0.0" flutter_keyboard_visibility_platform_interface: dependency: transitive description: @@ -131,7 +131,7 @@ packages: name: flutter_keyboard_visibility_web url: "https://pub.dartlang.org" source: hosted - version: "2.0.0-nullsafety.0" + version: "2.0.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -295,7 +295,7 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "2.1.5" quiver_hashcode: dependency: transitive description: @@ -342,7 +342,7 @@ packages: name: string_validator url: "https://pub.dartlang.org" source: hosted - version: "0.2.0-nullsafety.0" + version: "0.1.4" term_glyph: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: tuple url: "https://pub.dartlang.org" source: hosted - version: "2.0.0-nullsafety.0" + version: "1.0.3" typed_data: dependency: transitive description: @@ -385,6 +385,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" + universal_ui: + dependency: transitive + description: + name: universal_ui + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.8" url_launcher: dependency: transitive description: @@ -457,4 +464,6 @@ packages: version: "0.1.2" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.24.0-10.2.pre" + + flutter: ">=1.22.0" + diff --git a/lib/widgets/editor.dart b/lib/widgets/editor.dart index 2e548474..e748373e 100644 --- a/lib/widgets/editor.dart +++ b/lib/widgets/editor.dart @@ -23,6 +23,7 @@ import 'package:flutter_quill/widgets/responsive_widget.dart'; import 'package:flutter_quill/widgets/text_selection.dart'; import 'package:string_validator/string_validator.dart'; import 'package:universal_html/prefer_universal/html.dart' as html; +import 'package:universal_ui/universal_ui.dart'; import 'package:url_launcher/url_launcher.dart'; import 'box.dart'; diff --git a/pubspec.lock b/pubspec.lock index 59f3c93b..a617457c 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -89,7 +89,7 @@ packages: name: flutter_colorpicker url: "https://pub.dartlang.org" source: hosted - version: "0.4.0-nullsafety.0" + version: "0.3.5" flutter_keyboard_visibility: dependency: "direct main" description: @@ -218,7 +218,7 @@ packages: name: quiver url: "https://pub.dartlang.org" source: hosted - version: "3.0.0" + version: "2.1.5" quiver_hashcode: dependency: "direct main" description: @@ -265,7 +265,7 @@ packages: name: string_validator url: "https://pub.dartlang.org" source: hosted - version: "0.2.0-nullsafety.0" + version: "0.1.4" term_glyph: dependency: transitive description: @@ -286,7 +286,7 @@ packages: name: tuple url: "https://pub.dartlang.org" source: hosted - version: "2.0.0-nullsafety.0" + version: "1.0.3" typed_data: dependency: transitive description: @@ -308,6 +308,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.0.2" + universal_ui: + dependency: "direct main" + description: + name: universal_ui + url: "https://pub.dartlang.org" + source: hosted + version: "0.0.8" url_launcher: dependency: "direct main" description: @@ -366,4 +373,4 @@ packages: version: "0.1.2" sdks: dart: ">=2.12.0 <3.0.0" - flutter: ">=1.24.0-10.2.pre" + flutter: ">=1.22.0" diff --git a/pubspec.yaml b/pubspec.yaml index 3e87a468..e185d838 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,15 +14,17 @@ dependencies: sdk: flutter quiver_hashcode: ^2.0.0 collection: ^1.15.0 - tuple: ^2.0.0-nullsafety.0 + tuple: ^1.0.3 url_launcher: ^6.0.0 - flutter_colorpicker: ^0.4.0-nullsafety.0 - image_picker: ^0.7.0 + flutter_colorpicker: ^0.3.5 + image_picker: ^0.7.2 photo_view: ^0.10.3 universal_html: ^1.2.4 - file_picker: ^3.0.0-nullsafety.4 - string_validator: ^0.2.0-nullsafety.0 - flutter_keyboard_visibility: ^5.0.0-nullsafety.2 + file_picker: ^3.0.0 + string_validator: ^0.1.4 + flutter_keyboard_visibility: ^5.0.0 + universal_ui: ^0.0.8 + dev_dependencies: