Merge pull request #1508 from matthiasn/quill_upgrade

Upgrade flutter_quill lib

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Changed:
+- Upgrade flutter_quill lib
+
+## [0.8.328] - 2023-04-23
+### Changed:
 - Show audio player inline in linked entries
 
 ## [0.8.327] - 2023-04-22

lib/blocs/journal/entry_cubit.dart

@@ -17,7 +17,6 @@ import 'package:lotti/services/editor_state_service.dart';
 import 'package:lotti/services/time_service.dart';
 import 'package:lotti/utils/platform.dart';
 import 'package:lotti/widgets/journal/editor/editor_tools.dart';
-import 'package:tuple/tuple.dart';
 
 class EntryCubit extends Cubit<EntryState> {
   EntryCubit({
@@ -57,7 +56,7 @@ class EntryCubit extends Cubit<EntryState> {
         selection: _editorStateService.getSelection(entryId),
       );
 
-      controller.changes.listen((Tuple3<Delta, Delta, ChangeSource> event) {
+      controller.changes.listen((DocChange event) {
         final delta = deltaFromController(controller);
         _editorStateService.saveTempState(
           id: entryId,

lib/widgets/journal/editor/editor_styles.dart

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_quill/flutter_quill.dart';
 import 'package:google_fonts/google_fonts.dart';
 import 'package:lotti/themes/theme.dart';
-import 'package:tuple/tuple.dart';
 
 DefaultStyles customEditorStyles({
   required Color textColor,
@@ -14,35 +13,35 @@ DefaultStyles customEditorStyles({
         fontSize: fontSizeLarge,
         color: textColor,
       ),
-      const Tuple2(0, 0),
-      const Tuple2(0, 0),
+      const VerticalSpacing(0, 0),
+      const VerticalSpacing(0, 0),
       null,
     ),
     h2: DefaultTextBlockStyle(
       GoogleFonts.plusJakartaSans(
         fontSize: 20,
         color: textColor,
       ),
-      const Tuple2(8, 0),
-      const Tuple2(0, 0),
+      const VerticalSpacing(8, 0),
+      const VerticalSpacing(0, 0),
       null,
     ),
     h3: DefaultTextBlockStyle(
       GoogleFonts.plusJakartaSans(
         fontSize: 18,
         color: textColor,
       ),
-      const Tuple2(8, 0),
-      const Tuple2(0, 0),
+      const VerticalSpacing(8, 0),
+      const VerticalSpacing(0, 0),
       null,
     ),
     paragraph: DefaultTextBlockStyle(
       GoogleFonts.plusJakartaSans(
         fontSize: fontSizeMedium,
         color: textColor,
       ),
-      const Tuple2(2, 0),
-      const Tuple2(0, 0),
+      const VerticalSpacing(2, 0),
+      const VerticalSpacing(0, 0),
       null,
     ),
     bold: GoogleFonts.plusJakartaSans(
@@ -63,8 +62,8 @@ DefaultStyles customEditorStyles({
         fontSize: fontSizeMedium,
         color: textColor,
       ),
-      const Tuple2(4, 0),
-      const Tuple2(0, 0),
+      const VerticalSpacing(4, 0),
+      const VerticalSpacing(0, 0),
       null,
       null,
     ),
@@ -73,8 +72,8 @@ DefaultStyles customEditorStyles({
         fontSize: fontSizeMedium,
         color: Colors.black,
       ),
-      const Tuple2(0, 0),
-      const Tuple2(0, 0),
+      const VerticalSpacing(0, 0),
+      const VerticalSpacing(0, 0),
       BoxDecoration(
         color: codeBlockBackground,
         borderRadius: BorderRadius.circular(8),

pubspec.lock

@@ -461,8 +461,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: be47a76
-      resolved-ref: be47a76ab161a583d6453e10aed80712be922cdb
+      ref: "1beb378"
+      resolved-ref: "1beb378908b00a47c6bd236bc9e78699eac31b15"
       url: "https://github.com/matthiasn/delta_markdown.git"
     source: git
     version: "0.7.0"
@@ -862,10 +862,10 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_quill
-      sha256: "7c7652fa32c8c1791d671acf58e72e571b9f4c43fc192ca11c245f9ab9a1a473"
+      sha256: f8e9456f10f23fecd5a8630c99eedf102b884b5ca09fb23490a3c88cf996e57c
       url: "https://pub.dev"
     source: hosted
-    version: "6.4.4"
+    version: "7.1.10"
   flutter_secure_storage:
     dependency: "direct main"
     description:
@@ -993,14 +993,6 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "7.2.0"
-  gettext_parser:
-    dependency: transitive
-    description:
-      name: gettext_parser
-      sha256: "9565c9dd1033ec125e1fbc7ccba6c0d2d753dd356122ba1a17e6aa7dc868f34a"
-      url: "https://pub.dev"
-    source: hosted
-    version: "0.2.0"
   glados:
     dependency: "direct dev"
     description:
@@ -1102,10 +1094,10 @@ packages:
     dependency: transitive
     description:
       name: i18n_extension
-      sha256: f3b60575f30ba835d405fcb41ac28ce8efe7caa5812fd93074eaffae7877cb70
+      sha256: cd25e5f648ad01364755faedc6d7bb1217201e8da954ec308d9abac4fd150efe
       url: "https://pub.dev"
     source: hosted
-    version: "7.0.0"
+    version: "8.0.0"
   image:
     dependency: transitive
     description:
@@ -2007,7 +1999,7 @@ packages:
     source: hosted
     version: "1.9.1"
   sprintf:
-    dependency: "direct overridden"
+    dependency: transitive
     description:
       name: sprintf
       sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23"
@@ -2370,10 +2362,10 @@ packages:
     dependency: "direct main"
     description:
       name: visibility_detector
-      sha256: "15c54a459ec2c17b4705450483f3d5a2858e733aee893dcee9d75fd04814940d"
+      sha256: dd5cc11e13494f432d15939c3aa8ae76844c42b723398643ce9addb88a5ed420
       url: "https://pub.dev"
     source: hosted
-    version: "0.3.3"
+    version: "0.4.0+2"
   vm_service:
     dependency: transitive
     description:

pubspec.yaml

@@ -1,7 +1,7 @@
 name: lotti
 description: Achieve your goals and keep your data private with Lotti.
 publish_to: 'none'
-version: 0.9.328+2026
+version: 0.9.329+2027
 
 msix_config:
   display_name: LottiApp
@@ -39,7 +39,7 @@ dependencies:
   delta_markdown:
     git:
       url: https://github.com/matthiasn/delta_markdown.git
-      ref: be47a76
+      ref: 1beb378
 
   device_info_plus: ^8.0.0
   drift: ^2.2.0
@@ -75,7 +75,7 @@ dependencies:
   flutter_map: ^3.1.0
   flutter_markdown: ^0.6.9+1
   flutter_native_timezone: ^2.0.0
-  flutter_quill: ^6.4.3
+  flutter_quill: ^7.1.10
   flutter_secure_storage: ^8.0.0
   flutter_sliding_tutorial: ^2.0.0
   flutter_svg: ^2.0.0
@@ -138,15 +138,14 @@ dependencies:
   tuple: ^2.0.0
   url_launcher: ^6.1.2
   uuid: ^3.0.4
-  visibility_detector: ^0.3.3
+  visibility_detector: ^0.4.0+2
   wechat_assets_picker: ^8.4.1
   week_of_year: ^2.0.0
   window_manager: ^0.3.0
 
 dependency_overrides:
   intl: ^0.18.0
   rxdart: ^0.27.1
-  sprintf: ^7.0.0
   xml: ^6.1.0
 
 dev_dependencies: