Update to flutter 2.10, cleanup errors and warnings

lib/_spikes/optimized_drag_stack/optimized_drag_stack.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:cached_network_image/cached_network_image.dart';
-import 'package:flutter/gestures.dart';
 import 'package:flutter/material.dart';
 import 'package:random_color/random_color.dart';
 

lib/_spikes/popup_menu_spike/popup_panel_spike.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter_folio/_widgets/alignments.dart';

lib/_utils/color_utils.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/cupertino.dart';
 
 class ColorUtils {

lib/_utils/native_window_utils/titlebar_wrappers/linux_title_bar.dart

@@ -1,5 +1,4 @@
 import 'package:bitsdojo_window/bitsdojo_window.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_utils/native_window_utils/titlebar_wrappers/linux_title_bar_buttons.dart';
 import 'package:flutter_folio/themes.dart';

lib/_utils/native_window_utils/titlebar_wrappers/macos_title_bar.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_utils/native_window_utils/macos_window_utils.dart';
 

lib/_utils/native_window_utils/titlebar_wrappers/windows_title_bar.dart

@@ -1,5 +1,4 @@
 import 'package:bitsdojo_window/bitsdojo_window.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 
 /// Native TitleBar for Windows, uses BitDojo platform

lib/_utils/string_utils.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 
 class StringUtils {

lib/_widgets/clickable_extensions.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 
 extension ClickableExtensions on Widget {
   Widget clickable(void Function() action, {bool opaque = true}) {

lib/commands/pick_images_command.dart

@@ -25,7 +25,7 @@ class PickImagesCommand extends BaseAppCommand {
     } else {
       if (enableCamera) {
         final picker = ImagePicker();
-        images = [PickedImage()..path = (await picker.getImage(source: ImageSource.camera))?.path];
+        images = [PickedImage()..path = (await picker.pickImage(source: ImageSource.camera))?.path];
       } else {
         int maxImages = 24; // Need to pick some limit
         // Get assets

lib/data/book_data.dart

@@ -1,5 +1,4 @@
 import 'dart:math';
-import 'dart:ui';
 
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
@@ -19,9 +18,9 @@ abstract class FirebaseDoc {
 
 /// One book, contains many pages
 @freezed
+@JsonSerializable(explicitToJson: true)
 class ScrapBookData with _$ScrapBookData implements FirebaseDoc {
   const ScrapBookData._();
-  @JsonSerializable(explicitToJson: true)
   factory ScrapBookData({
     @Default("") String documentId,
     String? key,
@@ -68,9 +67,9 @@ class ScrapBookData with _$ScrapBookData implements FirebaseDoc {
 
 // One page in a ScrapBook, contains many placed items's
 @freezed
+@JsonSerializable(explicitToJson: true)
 class ScrapPageData with _$ScrapPageData implements FirebaseDoc {
   const ScrapPageData._();
-  @JsonSerializable(explicitToJson: true)
   factory ScrapPageData({
     @Default("") String documentId,
     String? key,
@@ -87,9 +86,9 @@ class ScrapPageData with _$ScrapPageData implements FirebaseDoc {
 // A scrap that is in the "pile" for some book. Not tied to any specific page.
 // A scrap will capture time and location whenever possible, and optionally contain multiple photos or some text
 @freezed
+@JsonSerializable(explicitToJson: true)
 class ScrapItem with _$ScrapItem implements FirebaseDoc {
   const ScrapItem._();
-  @JsonSerializable(explicitToJson: true)
   factory ScrapItem({
     @Default("") String documentId,
     String? key,
@@ -108,9 +107,9 @@ class ScrapItem with _$ScrapItem implements FirebaseDoc {
 // A Scrap that has been placed onto a page, it has a position, rotation and scale.
 // It may have a reference to a scrapId from the pile, or it may just be a piece of content itself
 @freezed
+@JsonSerializable(explicitToJson: true)
 class PlacedScrapItem with _$PlacedScrapItem implements FirebaseDoc {
   const PlacedScrapItem._();
-  @JsonSerializable(explicitToJson: true)
   factory PlacedScrapItem({
     @Default("") String documentId,
     String? key,
@@ -165,8 +164,8 @@ class PlacedScrapItem with _$PlacedScrapItem implements FirebaseDoc {
 class BoxStyle with _$BoxStyle {
   const BoxStyle._();
   factory BoxStyle({
-    @JsonKey(fromJson: _colorFromJson, toJson: _colorToJson) @Default(Colors.transparent) Color bgColor,
-    @JsonKey(fromJson: _colorFromJson, toJson: _colorToJson) @Default(Colors.black) Color fgColor,
+    Color bgColor,
+    Color fgColor,
     @Default(BoxFonts.Lato) BoxFonts font,
     @Default(TextAlign.start) TextAlign align,
   }) = _BoxStyle;

lib/main_app_scaffold.dart

@@ -1,5 +1,4 @@
 import 'package:anchored_popups/anchored_popups.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_widgets/decorated_container.dart';
 import 'package:flutter_folio/commands/commands.dart' as commands;

lib/services/firebase/firebase_service_firedart.dart

@@ -2,7 +2,6 @@ import 'dart:convert';
 
 import 'package:firedart/auth/user_gateway.dart';
 import 'package:firedart/firedart.dart';
-import 'package:firedart/firestore/models.dart';
 import 'package:flutter_folio/data/app_user.dart';
 import 'package:flutter_folio/services/firebase/firebase_service.dart';
 import 'package:shared_preferences/shared_preferences.dart';

lib/styled_widgets/app_logo_text.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_folio/core_packages.dart';
 
 class AppLogoText extends StatelessWidget {

lib/styled_widgets/buttons/raw_styled_btn.dart

@@ -1,11 +1,9 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_folio/_utils/string_utils.dart';
 import 'package:flutter_folio/_widgets/decorated_container.dart';
 import 'package:flutter_folio/_widgets/positioned_all.dart';
 import 'package:flutter_folio/_widgets/rounded_card.dart';
 import 'package:flutter_folio/core_packages.dart';
-import 'package:provider/provider.dart';
 
 class BtnColors {
   BtnColors({required this.bg, required this.fg, this.outline});

lib/styled_widgets/buttons/styled_buttons.dart

@@ -1,9 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/core_packages.dart';
 import 'package:flutter_folio/models/app_model.dart';
-import 'package:provider/provider.dart';
-
-import 'raw_styled_btn.dart';
 
 export 'raw_styled_btn.dart';
 

lib/styled_widgets/context_menus/context_menu_widgets.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/core_packages.dart';
-import 'package:flutter_folio/styled_widgets/app_icons.dart';
 
 class ContextMenuIcon extends StatelessWidget {
   final AppIcons icon;

lib/styled_widgets/context_menus/styled_context_menu_overlay.dart

@@ -2,7 +2,6 @@ import 'package:context_menus/context_menus.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/core_packages.dart';
 import 'package:flutter_folio/styled_widgets/context_menus/context_menu_widgets.dart';
-import 'package:flutter_folio/themes.dart';
 
 class StyledContextMenuOverlay extends StatelessWidget {
   const StyledContextMenuOverlay({Key? key, required this.child}) : super(key: key);

lib/styled_widgets/styled_bottom_sheet.dart

@@ -1,7 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_widgets/decorated_container.dart';
 import 'package:flutter_folio/core_packages.dart';
-import 'package:provider/provider.dart';
 
 class StyledBottomSheet extends StatelessWidget {
   const StyledBottomSheet({required this.child, Key? key}) : super(key: key);

lib/styled_widgets/styled_page_scaffold.dart

@@ -3,8 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_folio/_utils/input_utils.dart';
 import 'package:flutter_folio/core_packages.dart';
 
-import 'context_menus/app_context_menu.dart';
-
 class StyledPageScaffold extends StatelessWidget {
   const StyledPageScaffold({Key? key, required this.body}) : super(key: key);
   final Widget body;

lib/styled_widgets/toaster.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/core_packages.dart';
-import 'package:flutter_folio/styles.dart';
 
 class Toaster {
   static void showToast(BuildContext context, String content) {

lib/themes.dart

@@ -75,9 +75,9 @@ class AppTheme {
       colorScheme: ColorScheme(
           brightness: isDark ? Brightness.dark : Brightness.light,
           primary: accent1,
-          primaryVariant: shift(accent1, .1),
+          primaryContainer: shift(accent1, .1),
           secondary: accent1,
-          secondaryVariant: shift(accent1, .1),
+          secondaryContainer: shift(accent1, .1),
           background: bg1,
           surface: surface1,
           onBackground: mainTextColor,
@@ -95,7 +95,6 @@ class AppTheme {
           selectionHandleColor: Colors.transparent,
           selectionColor: surface1,
         ),
-        buttonColor: accent1,
         highlightColor: shift(accent1, .1),
         toggleableActiveColor: accent1);
     // All done, return the ThemeData

lib/views/app_title_bar/rounded_profile_button.dart

@@ -33,7 +33,7 @@ class RoundedProfileBtn extends StatelessWidget {
   }
 
   void _showProfileSheet(BuildContext context) {
-    showStyledBottomSheet(context,
+    showStyledBottomSheet<void>(context,
         child: Container(
           padding: EdgeInsets.all(Insets.xl),
           child: const UserProfileForm(bottomSheet: true),

lib/views/app_title_bar/touch_mode_toggle_btn.dart

@@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_folio/_widgets/decorated_container.dart';
 import 'package:flutter_folio/core_packages.dart';
 import 'package:flutter_folio/models/app_model.dart';
-import 'package:flutter_folio/themes.dart';
 
 /// Toggles the current 'enableTouchMode' settings.
 /// This widget treats density inversely to the rest of the app, as it is meant to indicate the mode the user wants to switch to.

lib/views/auth_page/auth_form.dart

@@ -7,7 +7,6 @@ import 'package:flutter_folio/_utils/input_utils.dart';
 import 'package:flutter_folio/_widgets/mixins/loading_state_mixin.dart';
 import 'package:flutter_folio/commands/app/authenticate_user_command.dart';
 import 'package:flutter_folio/core_packages.dart';
-import 'package:flutter_folio/styled_widgets/styled_load_spinner.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AuthForm extends StatefulWidget {

lib/views/auth_page/device_screens.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_widgets/animated/animated_scale.dart' as amscale;
 import 'package:flutter_folio/_widgets/gradient_container.dart';

lib/views/editor_page/draggable_page_menu/draggable_page_title_btn.dart

@@ -1,15 +1,13 @@
 import 'package:context_menus/context_menus.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_folio/_utils/color_utils.dart';
+import 'package:flutter_folio/_utils/timed/debouncer.dart';
 import 'package:flutter_folio/commands/books/delete_page_command.dart';
 import 'package:flutter_folio/commands/books/update_page_command.dart';
 import 'package:flutter_folio/core_packages.dart';
 import 'package:flutter_folio/data/book_data.dart';
 import 'package:flutter_folio/models/app_model.dart';
 
-import '../../../_utils/timed/debouncer.dart';
-
 class DraggablePageTitleBtn extends StatefulWidget {
   const DraggablePageTitleBtn(
     this.page, {

lib/views/editor_page/editor_page.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_utils/device_info.dart';
 import 'package:flutter_folio/_widgets/alignments.dart';
@@ -93,7 +91,7 @@ class _EditorPageState extends State<EditorPage> {
   }
 
   void _handleScrapPilePressed(BuildContext context, String bookId) {
-    showStyledBottomSheet(context,
+    showStyledBottomSheet<void>(context,
         child: SizedBox(
           height: context.heightPx * .6,
           // Show scrap-pile picker in a bottom-sheet

lib/views/editor_page/empty_editor_view.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/core_packages.dart';
-import 'package:flutter_folio/styled_widgets/styled_spacers.dart';
 
 class EmptyEditorView extends StatelessWidget {
   const EmptyEditorView({Key? key, required this.readOnly}) : super(key: key);

lib/views/editor_page/networked_scrapboard.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_utils/data_utils.dart';
 import 'package:flutter_folio/commands/books/delete_page_scrap_command.dart';

lib/views/editor_page/panels/content_picker_emoji_panel.dart

@@ -1,12 +1,10 @@
 import 'package:enum_to_string/enum_to_string.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_folio/_utils/notifications/close_notification.dart';
 import 'package:flutter_folio/_utils/string_utils.dart';
 import 'package:flutter_folio/commands/books/create_placed_scraps_command.dart';
 import 'package:flutter_folio/core_packages.dart';
 import 'package:flutter_folio/data/book_data.dart';
-import 'package:flutter_folio/styled_widgets/emoji.dart';
 
 class ContentPickerEmojiPanel extends StatefulWidget {
   const ContentPickerEmojiPanel({Key? key, required this.isVisible, required this.bookId, required this.pageId})

lib/views/editor_page/panels/content_picker_tab_menu.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:anchored_popups/anchored_popup_region.dart';
 import 'package:anchored_popups/anchored_popups.dart';
 import 'package:flutter/material.dart';

lib/views/editor_page/placed_scrap_renderer.dart

@@ -1,5 +1,3 @@
-import 'dart:ui';
-
 import 'package:auto_size_text/auto_size_text.dart';
 import 'package:context_menus/context_menus.dart';
 import 'package:enum_to_string/enum_to_string.dart';
@@ -9,7 +7,6 @@ import 'package:flutter_folio/_widgets/app_image.dart';
 import 'package:flutter_folio/commands/books/update_placed_scrap_command.dart';
 import 'package:flutter_folio/core_packages.dart';
 import 'package:flutter_folio/data/book_data.dart';
-import 'package:flutter_folio/styled_widgets/emoji.dart';
 import 'package:flutter_folio/views/editor_page/placed_scrap_keyboard_listener.dart';
 
 import '../../_utils/timed/debouncer.dart';

lib/views/editor_page/scrap_popup_editor/animated_menu_panel.dart

@@ -1,7 +1,6 @@
 import 'dart:math';
 
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_folio/core_packages.dart';
 
 class AnimatedMenuPanel extends StatefulWidget {

lib/views/editor_page/scrap_popup_editor/scrap_popup_panel_alignment.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter/scheduler.dart';
 import 'package:flutter_folio/core_packages.dart';
 
 class ScrapPopupPanelAlignment extends StatelessWidget {

lib/views/editor_page/scrapboard/movable_scrap.dart

@@ -1,8 +1,6 @@
 import 'dart:math';
 
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/rendering.dart';
 import 'package:flutter_folio/_widgets/listenable_builder.dart';
 import 'package:flutter_folio/_widgets/sized_and_translated.dart';
 import 'package:flutter_folio/core_packages.dart';
@@ -115,14 +113,12 @@ class MovableScrapState extends State<MovableScrap> {
 }
 
 class _DraggableHitArea extends StatelessWidget {
-  const _DraggableHitArea(this.state, {Key? key, required this.child, this.isEnabled = true}) : super(key: key);
+  const _DraggableHitArea(this.state, {Key? key, required this.child}) : super(key: key);
   final MovableScrapState state;
   final Widget child;
-  final bool isEnabled;
 
   @override
   Widget build(BuildContext context) {
-    if (isEnabled == false) return child;
     return MouseRegion(
       cursor: SystemMouseCursors.click,
       onEnter: (_) => state.widget.onMouseOverChanged.call(true),