Update pubspec + small fixes to make app run

olmps · Mar 25, 2024 · b2c6b3c · b2c6b3c
1 parent b52cf18
commit b2c6b3c
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 54 deletions.
diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>9.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '10.0'
+platform :ios, '12.0'
 
 # Disable Firebase Analytics IDFA
 # Refs: 

diff --git a/lib/application/pages/execution/execution_terminal.dart b/lib/application/pages/execution/execution_terminal.dart
@@ -256,21 +256,20 @@ class _TerminalQuillEditor extends StatelessWidget {
     );
 
     final quillEditor = quill.QuillEditor(
-      controller: quillController,
       focusNode: FocusNode(),
       scrollController: scrollController,
-      scrollable: true,
-      padding: EdgeInsets.symmetric(
-        vertical: dimens.terminalWindowHeaderHeight,
-        horizontal: context.rawSpacing(Spacing.medium),
+      configurations: quill.QuillEditorConfigurations(
+        controller: quillController,
+        scrollable: true,
+        padding: EdgeInsets.symmetric(
+            vertical: dimens.terminalWindowHeaderHeight, horizontal: context.rawSpacing(Spacing.medium)),
+        autoFocus: false,
+        readOnly: true,
+        showCursor: false,
+        expands: false,
+        enableInteractiveSelection: false,
       ),
-      autoFocus: false,
-      showCursor: false,
-      readOnly: true,
-      expands: false,
-      enableInteractiveSelection: false,
     );
-
     return FadeTransition(
       opacity: animationController.drive(CurveTween(curve: anims.defaultAnimationCurve)),
       child: quillEditor,

diff --git a/lib/application/theme/material_theme_data.dart b/lib/application/theme/material_theme_data.dart
@@ -40,13 +40,13 @@ ThemeData buildThemeData({
       elevation: 0,
       minimumSize: Size.fromHeight(minButtonHeight),
       shape: roundedCornersShape,
-      primary: primarySwatch,
-      onPrimary: textColor,
+      backgroundColor: primarySwatch,
+      foregroundColor: textColor,
     ),
   );
 
   final textButtonTheme = TextButtonThemeData(
-    style: TextButton.styleFrom(primary: secondarySwatch.shade400),
+    style: TextButton.styleFrom(foregroundColor: secondarySwatch.shade400),
   );
 
   final iconTheme = IconThemeData(color: iconColor, size: iconSize);

diff --git a/lib/application/widgets/theme/rich_text_field.dart b/lib/application/widgets/theme/rich_text_field.dart
@@ -379,35 +379,37 @@ class _ThemedEditor extends ConsumerWidget {
     final textTheme = Theme.of(context).textTheme;
 
     // Default [quill.DefaultTextBlockStyle] vertical and line spacings.
-    const zeroTuple = Tuple2<double, double>(0, 0);
+    const zeroTuple = quill.VerticalSpacing(0, 0);
 
     return quill.QuillEditor(
-      controller: controller,
       scrollController: ScrollController(),
-      scrollable: true,
-      focusNode: focus ?? FocusNode(),
-      autoFocus: !readOnly,
-      readOnly: readOnly,
-      expands: false,
-      padding: EdgeInsets.zero,
-      enableInteractiveSelection: !readOnly,
-      showCursor: !readOnly,
-      placeholder: placeholder,
-      customStyles: quill.DefaultStyles(
-        paragraph: quill.DefaultTextBlockStyle(textTheme.bodyText2!, zeroTuple, zeroTuple, null),
-        placeHolder: quill.DefaultTextBlockStyle(
-          textTheme.bodyText1!.copyWith(color: theme.neutralSwatch.shade400),
-          zeroTuple,
-          zeroTuple,
-          null,
-        ),
-        code: quill.DefaultTextBlockStyle(
-          textTheme.bodyText1!,
-          zeroTuple,
-          zeroTuple,
-          BoxDecoration(color: codeBackgroundColor),
+      configurations: quill.QuillEditorConfigurations(
+        controller: controller,
+        scrollable: true,
+        padding: EdgeInsets.zero,
+        autoFocus: !readOnly,
+        readOnly: readOnly,
+        expands: false,
+        enableInteractiveSelection: !readOnly,
+        showCursor: !readOnly,
+        placeholder: placeholder,
+        customStyles: quill.DefaultStyles(
+          paragraph: quill.DefaultTextBlockStyle(textTheme.bodyText2!, zeroTuple, zeroTuple, null),
+          placeHolder: quill.DefaultTextBlockStyle(
+            textTheme.bodyText1!.copyWith(color: theme.neutralSwatch.shade400),
+            zeroTuple,
+            zeroTuple,
+            null,
+          ),
+          code: quill.DefaultTextBlockStyle(
+            textTheme.bodyText1!,
+            zeroTuple,
+            zeroTuple,
+            BoxDecoration(color: codeBackgroundColor),
+          ),
         ),
       ),
+      focusNode: focus ?? FocusNode(),
     );
   }
 }

diff --git a/lib/application/widgets/theme/secondary_button.dart b/lib/application/widgets/theme/secondary_button.dart
@@ -14,7 +14,7 @@ class SecondaryButton extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     return ElevatedButton(
-      style: ElevatedButton.styleFrom(primary: ref.watch(themeController).neutralSwatch.shade800),
+      style: ElevatedButton.styleFrom(foregroundColor: ref.watch(themeController).neutralSwatch.shade800),
       onPressed: onPressed,
       child: child,
     );

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -25,23 +25,23 @@ dependencies:
   path: ^1.8.0
   path_provider: ^2.0.9
   url_launcher: ^6.0.20
-  package_info_plus: ^1.4.0
-  firebase_core: ^1.13.1
-  firebase_crashlytics: ^2.5.3
-  firebase_analytics: ^9.1.2
+  package_info_plus: ^6.0.0
+  firebase_core: ^2.27.1
+  firebase_crashlytics: ^3.4.19
+  firebase_analytics: ^10.8.10
 
   ###
   # Database & Storage
   ###
   sembast: ^3.2.0
-  uuid: ^3.0.6
+  uuid: ^4.3.3
 
   ###
   # State Management
   ###
-  flutter_riverpod: ^1.0.3
-  flutter_hooks: ^0.18.2+1
-  hooks_riverpod: ^1.0.3
+  flutter_riverpod: ^2.5.1
+  flutter_hooks: ^0.20.5
+  hooks_riverpod: ^2.5.1
   rxdart: ^0.27.3
 
   ###
@@ -50,7 +50,7 @@ dependencies:
   layoutr: ^1.0.0
 
   # Keep dependency locked, as we need it to be the exact same in `memo-editor`
-  flutter_quill: 4.0.10
+  flutter_quill: ^9.3.3
 
 dev_dependencies:
   flutter_test:
@@ -59,22 +59,22 @@ dev_dependencies:
   ###
   # Lint
   ###
-  strict: ^1.4.0
+  strict: ^2.0.0
 
   ###
   # Testing
   ###
-  mocktail: ^0.3.0
+  mocktail: ^1.0.3
 
   ###
   # Icon auto-generator
   ###
-  flutter_launcher_icons: "^0.9.0"
+  flutter_launcher_icons: ^0.13.1
 
   ###
   # Splash Screen auto-generator
   ###
-  flutter_native_splash: "^1.1.8"
+  flutter_native_splash: ^2.4.0
 
 flutter:
   # The following line ensures that the Material Icons font is