refactor: Adopt Dart 3 features and simplify code

This commit introduces several refactoring changes to modernize the codebase by adopting new Dart 3 language features and simplifying widget implementations.

Key changes include:
- Replaced `navigator.pop()` with the more concise `context.pop()` from `go_router` across multiple UI files (`campfire.dart`, `move.dart`, `in_game_menu.dart`, `craft.dart`, `shared.dart`).
- Adopted constructor tear-offs and enum-like extensions for static members (e.g., `ItemStack.empty` becomes `.empty`, `Axis.vertical` becomes `.vertical`).
- Simplified widget constructors by using `.new` where possible (e.g., `const Offset.new(...)`).
- Removed redundant `elevation` property from `ChoiceChip` as it is no longer supported.
- Refactored `ItemDetails` widget in `backpack.dart` to use `Card.filled` for a cleaner implementation and improved visual consistency with the app's theme.

Author: liplum

lib/core/item/item.dart

@@ -340,7 +340,7 @@ class ItemCompPair<T extends Comp> {
 @CopyWith(skipFields: true)
 // @immutable
 class ItemStack with ExtraMixin implements JConvertibleProtocol {
-  static final empty = ItemStack(Item.empty, id: -1);
+  static final empty = ItemStack(.empty, id: -1);
   final int id;
 
   @JsonKey(fromJson: Contents.getItemMetaByName, toJson: Item.getName)
@@ -414,11 +414,11 @@ class ItemStack with ExtraMixin implements JConvertibleProtocol {
   /// ```
   ItemStack split(int massOfPart) {
     assert(massOfPart > 0, "`mass` to split must be more than 0");
-    if (massOfPart <= 0) return empty;
+    if (massOfPart <= 0) return .empty;
     assert(stackMass >= massOfPart, "Self `mass` must be more than `mass` to split.");
-    if (stackMass < massOfPart) return empty;
+    if (stackMass < massOfPart) return .empty;
     assert(canSplit, "${meta.name} can't be split.");
-    if (!canSplit) return empty;
+    if (!canSplit) return .empty;
     final selfMass = stackMass;
     // if self mass is less than or equal to mass to split, return a clone.
     if (selfMass <= massOfPart) return clone();

lib/ui/game/action/move.dart

@@ -3,6 +3,7 @@ import 'package:escape_wild/core/index.dart';
 import 'package:escape_wild/foundation.dart';
 import 'package:escape_wild/ui/game/shared.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:tabler_icons/tabler_icons.dart';
@@ -44,7 +45,7 @@ class _MoveSheetState extends State<MoveSheet> {
         leading: IconButton(
           icon: const Icon(TablerIcons.x),
           onPressed: () {
-            context.navigator.pop();
+            context.pop();
           },
         ),
       ),

lib/ui/game/backpack/backpack.dart

@@ -99,7 +99,7 @@ class _GameBackpackPageState extends State<GameBackpackPage> {
                       ItemDetails(stack: selected),
                       buildItems(player.backpack).expanded(),
                       buildButtonArea(selected),
-                    ].column(maa: MainAxisAlignment.spaceBetween))
+                    ].column(maa: .spaceBetween, spacing: 8))
               .safeArea()
               .padAll(5),
     );
@@ -140,7 +140,7 @@ class _GameBackpackPageState extends State<GameBackpackPage> {
         index = (index % itemCount).clamp(0, itemCount - 1);
         selected = player.backpack[index];
       } else {
-        selected = ItemStack.empty;
+        selected = .empty;
       }
     } else {
       await between();
@@ -157,7 +157,7 @@ class _GameBackpackPageState extends State<GameBackpackPage> {
             .autoSizeText(
               maxLines: 1,
               style: context.textTheme.headlineSmall?.copyWith(color: color),
-              textAlign: TextAlign.center,
+              textAlign: .center,
             )
             .padAll(10),
       ).expanded();
@@ -284,7 +284,7 @@ class _GameBackpackPageState extends State<GameBackpackPage> {
   Widget buildItem(ItemStack item) {
     final isSelected = selected == item;
     return AnimatedSlide(
-      offset: isSelected ? const Offset(0.015, -0.04) : Offset.zero,
+      offset: isSelected ? const .new(0.015, -0.04) : .zero,
       curve: Curves.easeInOutCubic,
       duration: const Duration(milliseconds: 300),
       child: CardButton(
@@ -307,12 +307,12 @@ UseType _matchBestUseType(Iterable<UsableComp> comps) {
   for (final comp in comps) {
     if (type == null) {
       type = comp.useType;
-    } else if (type == UseType.use) {
+    } else if (type == .use) {
       type = comp.useType;
       break;
     }
   }
-  return type ?? UseType.use;
+  return type ?? .use;
 }
 
 class ItemDetails extends StatefulWidget {
@@ -329,25 +329,25 @@ class _ItemDetailsState extends State<ItemDetails> {
 
   @override
   Widget build(BuildContext context) {
-    return [buildTop(context), buildBottom(context)].column().inCard(elevation: 4);
+    return Card.filled(
+      color: context.colorScheme.surfaceContainer,
+      clipBehavior: .hardEdge,
+      child: [buildTop(context), buildBottom(context).padSymmetric(h: 8, v: 4)].column(caa: .start),
+    );
   }
 
   Widget buildTop(BuildContext ctx) {
     return Container(
-      color: Color.lerp(ctx.theme.cardColor, ctx.colorScheme.secondary, ctx.isLightMode ? 0.2 : 0.15),
+      color: context.colorScheme.surfaceContainerHighest,
       child: ListTile(
         title: stack.displayName().text(style: ctx.textTheme.titleLarge),
         subtitle: stack.meta.l10nDescription().text(),
       ),
-    ).clipRRect(borderRadius: ctx.cardBorderRadiusTop);
+    );
   }
 
   Widget buildBottom(BuildContext ctx) {
-    return ListTile(
-      title: buildStatus(ctx),
-      //subtitle: "AAA".text(),
-      //isThreeLine: true,
-    );
+    return buildStatus(ctx);
   }
 
   Widget buildStatus(BuildContext ctx) {
@@ -359,7 +359,6 @@ class _ItemDetailsState extends State<ItemDetails> {
       entries.add(
         ChoiceChip(
           selected: isToolPref,
-          elevation: 2,
           tooltip: isToolPref ? "Unset default" : "Set default",
           selectedColor: context.fixColorBrightness(context.colorScheme.primary),
           onSelected: (newIsPref) {
@@ -381,9 +380,9 @@ class _ItemDetailsState extends State<ItemDetails> {
       entries.add(
         Chip(
           elevation: 2,
-          shape: const RoundedRectangleBorder(borderRadius: BorderRadius.all(Radius.circular(8))),
+          shape: const RoundedRectangleBorder(borderRadius: .all(.circular(8))),
           label: status.name.text(),
-          backgroundColor: Color.lerp(color, ctx.colorScheme.primary, 0.2),
+          backgroundColor: .lerp(color, ctx.colorScheme.primary, 0.2),
         ),
       );
     }

lib/ui/game/campfire/campfire.dart

@@ -11,6 +11,7 @@ import 'package:escape_wild/ui/game/shared.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_layout_grid/flutter_layout_grid.dart';
 import 'package:flutter_svg/flutter_svg.dart';
+import 'package:go_router/go_router.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:tabler_icons/tabler_icons.dart';
 
@@ -108,10 +109,10 @@ class _FireStarterAreaState extends State<FireStarterArea> {
   @override
   Widget build(BuildContext context) {
     final widgets = [buildFireStarterCell(), buildStartFireButton()];
-    if (widget.direction == Axis.vertical) {
-      return widgets.column(caa: CrossAxisAlignment.center, maa: MainAxisAlignment.spaceEvenly);
+    if (widget.direction == .vertical) {
+      return widgets.column(caa: .center, maa: .spaceEvenly);
     } else {
-      return widgets.row(caa: CrossAxisAlignment.center, maa: MainAxisAlignment.spaceEvenly);
+      return widgets.row(caa: .center, maa: .spaceEvenly);
     }
   }
 
@@ -134,7 +135,7 @@ class _FireStarterAreaState extends State<FireStarterArea> {
           setState(() {
             fireStarterSlot.toggle(selected);
           });
-          context.navigator.pop();
+          context.pop();
         },
       ),
     );
@@ -262,9 +263,9 @@ class _CookPageState extends State<CookPage> {
       [
         buildCampfireImage(),
         buildFuelState(place.fireState),
-      ].column(maa: MainAxisAlignment.spaceEvenly).flexible(flex: 4),
+      ].column(maa: .spaceEvenly).flexible(flex: 4),
       buildButtons().flexible(flex: 1),
-    ].column(maa: MainAxisAlignment.spaceBetween).padAll(5);
+    ].column(maa: .spaceBetween).padAll(5);
   }
 
   Widget buildCampfireImage() {
@@ -379,14 +380,14 @@ class _CookPageState extends State<CookPage> {
 
   Widget buildButtons() {
     if (fireState.isOff) {
-      return FireStarterArea(place: place, direction: Axis.horizontal, actionLabel: _I.restartFire);
+      return FireStarterArea(place: place, direction: .horizontal, actionLabel: _I.restartFire);
     }
     Widget btn(String text, {required double elevation, VoidCallback? onTap}) {
       return CardButton(
         elevation: elevation,
         onTap: onTap,
         child: text
-            .autoSizeText(maxLines: 1, style: context.textTheme.headlineSmall, textAlign: TextAlign.center)
+            .autoSizeText(maxLines: 1, style: context.textTheme.headlineSmall, textAlign: .center)
             .padAll(10),
       ).expanded();
     }
@@ -399,7 +400,7 @@ class _CookPageState extends State<CookPage> {
       },
     );
     final fuelBtn = btn(_I.fuel, elevation: 5, onTap: onFuel);
-    return [waitBtn, fuelBtn].row(maa: MainAxisAlignment.spaceEvenly).align(at: Alignment.bottomCenter);
+    return [waitBtn, fuelBtn].row(maa: .spaceEvenly).align(at: .bottomCenter);
   }
 
   Future<void> onFuel() async {
@@ -453,7 +454,7 @@ class StaticCampfireImage extends StatelessWidget {
         return SvgPicture.asset(
           "assets/img/campfire.svg",
           //color: context.themeColor,
-          colorFilter: ColorFilter.mode(color ?? context.themeColor, BlendMode.srcIn),
+          colorFilter: .mode(color ?? context.themeColor, .srcIn),
           placeholderBuilder: (_) => const Placeholder(),
         ).constrained(maxW: box.maxWidth, maxH: min(180, box.maxHeight * 0.8));
       },

lib/ui/game/craft/craft.dart

@@ -3,6 +3,7 @@ import 'package:escape_wild/foundation.dart';
 import 'package:escape_wild/r.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
+import 'package:go_router/go_router.dart';
 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:tabler_icons/tabler_icons.dart';
@@ -73,7 +74,7 @@ class _GameCraftPageState extends State<GameCraftPage> {
         return CardButton(
           elevation: isSelected ? 10 : 0,
           child: ListTile(
-            title: cat.l10nName().autoSizeText(maxLines: 1, style: style, textAlign: TextAlign.center),
+            title: cat.l10nName().autoSizeText(maxLines: 1, style: style, textAlign: .center),
             selected: isSelected,
             dense: true,
           ),
@@ -204,7 +205,7 @@ class _CraftingSheetState extends State<CraftingSheet> {
         leading: IconButton(
           icon: const Icon(TablerIcons.x),
           onPressed: () {
-            context.navigator.pop();
+            context.pop();
           },
         ),
         title: recipe.outputItem.l10nName().text(style: context.textTheme.titleLarge),
@@ -241,7 +242,7 @@ class _CraftingSheetState extends State<CraftingSheet> {
       matchedAll &= player.backpack.matchedAny(slot.matcher.exact.bool);
     }
     if (!matchedAll) {
-      context.navigator.pop();
+      context.pop();
     }
   }
 

lib/ui/game/in_game_menu.dart

@@ -5,6 +5,7 @@ import 'package:escape_wild/stage_manager.dart';
 import 'package:escape_wild/ui/debug/console.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:easy_localization/easy_localization.dart';
 
@@ -44,15 +45,15 @@ class _InGameMenuState extends State<_InGameMenu> {
       final json = player.toJson(Cvt);
       DB.setGameSave(json);
       await context.showTip(title: I.done, desc: "Your game is saved.", primary: I.ok);
-      context.navigator.pop();
+      context.pop();
     });
   }
 
   Widget buildShowDebugConsoleBtn() {
     return btn(_I.debugConsole, () async {
       StageManager.showDebugConsole(context);
       await Future.delayed(const Duration(milliseconds: 300));
-      context.navigator.pop();
+      context.pop();
     });
   }
 

lib/ui/game/shared.dart

@@ -7,6 +7,7 @@ import 'package:escape_wild/design/theme.dart';
 import 'package:escape_wild/foundation.dart';
 import 'package:escape_wild/r.dart';
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 import 'package:modal_bottom_sheet/modal_bottom_sheet.dart';
 import 'package:rettulf/rettulf.dart';
 import 'package:syncfusion_flutter_sliders/sliders.dart';
@@ -154,7 +155,7 @@ class NullItemCell extends StatelessWidget {
       placeholder,
       maxLines: 2,
       style: theme.nameStyle ?? ctx.textTheme.titleMedium,
-      textAlign: TextAlign.center,
+      textAlign: .center,
     ).opacity(theme.$opacity).center();
   }
 }
@@ -615,7 +616,7 @@ class ItemStackSlot with ChangeNotifier {
 
   bool get isTypeMatched => isNotEmpty && matcher.typeOnly(stack.meta);
 
-  bool get isEmpty => stack == ItemStack.empty;
+  bool get isEmpty => stack == .empty;
 
   bool get isNotEmpty => !isEmpty;
   final ItemMatcher matcher;
@@ -660,8 +661,8 @@ class ItemStackReqCell extends StatelessWidget {
     required this.slot,
     this.onTapSatisfied,
     this.onTapUnsatisfied,
-    this.satisfiedTheme = const ItemStackCellTheme(),
-    this.unsatisfiedTheme = const NullItemCellTheme(),
+    this.satisfiedTheme = const .new(),
+    this.unsatisfiedTheme = const .new(),
   });
 
   @override
@@ -696,9 +697,9 @@ class ItemStackReqAutoMatchCell extends StatelessWidget {
     required this.slot,
     this.onTapSatisfied,
     this.onTapUnsatisfied,
-    this.satisfiedTheme = const ItemStackCellTheme(),
-    this.onNotInBackpack = const ItemCellTheme(),
-    this.onInBackpack = const ItemStackCellTheme(),
+    this.satisfiedTheme = const .new(),
+    this.onNotInBackpack = const .new(),
+    this.onInBackpack = const .new(),
   });
 
   @override
@@ -811,7 +812,7 @@ class _BackpackSheetState extends State<BackpackSheet> {
               leading: IconButton(
                 icon: const Icon(TablerIcons.x),
                 onPressed: () {
-                  context.navigator.pop();
+                  context.pop();
                 },
               ),
               flexibleSpace: FlexibleSpaceBar(centerTitle: true, title: backpackTitle.text()),