Add option to disable stacking

Author: CodeDoctorDE

app/lib/bloc/settings.dart

@@ -54,6 +54,7 @@ class SetonixSettings with SetonixSettingsMappable implements LeapSettings {
   final String? lastVersion;
   @override
   final bool nativeTitleBar;
+  final bool stackedCards;
   final bool showConnectYour, showConnectNetwork;
   final GameProperty gameProperty;
   final List<ListGameServer> servers;
@@ -74,6 +75,7 @@ class SetonixSettings with SetonixSettingsMappable implements LeapSettings {
     this.lastVersion,
     this.gameProperty = const GameProperty(),
     this.servers = const [],
+    this.stackedCards = true,
     this.highContrast = false,
     this.zoom = 1,
     this.swamps = const [],
@@ -112,6 +114,7 @@ class SetonixSettings with SetonixSettingsMappable implements LeapSettings {
         zoom: prefs.getDouble('zoom') ?? 1,
         swamps: prefs.getStringList('swamps') ?? [],
         scrollSensitivity: prefs.getDouble('scrollSensitivity') ?? 1,
+        stackedCards: prefs.getBool('stackedCards') ?? true,
         density: ThemeDensity.values.byName(
           prefs.getString('density') ?? ThemeDensity.system.name,
         ),
@@ -133,6 +136,7 @@ class SetonixSettings with SetonixSettingsMappable implements LeapSettings {
     } else {
       await prefs.setString('last_version', lastVersion!);
     }
+    await prefs.setBool('stackedCards', stackedCards);
     await prefs.setString('gameProperty', gameProperty.toJson());
     await prefs.setStringList(
         'servers', servers.map((e) => e.toJson()).toList());
@@ -260,6 +264,11 @@ class SettingsCubit extends Cubit<SetonixSettings>
     return save();
   }
 
+  Future<void> changeStackedCards(bool value) {
+    emit(state.copyWith(stackedCards: value));
+    return save();
+  }
+
   Future<void> importSettings(String data) {
     final settings = SetonixSettingsMapper.fromJson(data);
     emit(settings);

app/lib/bloc/settings.mapper.dart

@@ -117,6 +117,9 @@ class SetonixSettingsMapper extends ClassMapperBase<SetonixSettings> {
   static List<ListGameServer> _$servers(SetonixSettings v) => v.servers;
   static const Field<SetonixSettings, List<ListGameServer>> _f$servers =
       Field('servers', _$servers, opt: true, def: const []);
+  static bool _$stackedCards(SetonixSettings v) => v.stackedCards;
+  static const Field<SetonixSettings, bool> _f$stackedCards =
+      Field('stackedCards', _$stackedCards, opt: true, def: true);
   static bool _$highContrast(SetonixSettings v) => v.highContrast;
   static const Field<SetonixSettings, bool> _f$highContrast =
       Field('highContrast', _$highContrast, opt: true, def: false);
@@ -145,6 +148,7 @@ class SetonixSettingsMapper extends ClassMapperBase<SetonixSettings> {
     #lastVersion: _f$lastVersion,
     #gameProperty: _f$gameProperty,
     #servers: _f$servers,
+    #stackedCards: _f$stackedCards,
     #highContrast: _f$highContrast,
     #zoom: _f$zoom,
     #swamps: _f$swamps,
@@ -164,6 +168,7 @@ class SetonixSettingsMapper extends ClassMapperBase<SetonixSettings> {
         lastVersion: data.dec(_f$lastVersion),
         gameProperty: data.dec(_f$gameProperty),
         servers: data.dec(_f$servers),
+        stackedCards: data.dec(_f$stackedCards),
         highContrast: data.dec(_f$highContrast),
         zoom: data.dec(_f$zoom),
         swamps: data.dec(_f$swamps),
@@ -240,6 +245,7 @@ abstract class SetonixSettingsCopyWith<$R, $In extends SetonixSettings, $Out>
       String? lastVersion,
       GameProperty? gameProperty,
       List<ListGameServer>? servers,
+      bool? stackedCards,
       bool? highContrast,
       double? zoom,
       List<String>? swamps,
@@ -281,6 +287,7 @@ class _SetonixSettingsCopyWithImpl<$R, $Out>
           Object? lastVersion = $none,
           GameProperty? gameProperty,
           List<ListGameServer>? servers,
+          bool? stackedCards,
           bool? highContrast,
           double? zoom,
           List<String>? swamps,
@@ -297,6 +304,7 @@ class _SetonixSettingsCopyWithImpl<$R, $Out>
         if (lastVersion != $none) #lastVersion: lastVersion,
         if (gameProperty != null) #gameProperty: gameProperty,
         if (servers != null) #servers: servers,
+        if (stackedCards != null) #stackedCards: stackedCards,
         if (highContrast != null) #highContrast: highContrast,
         if (zoom != null) #zoom: zoom,
         if (swamps != null) #swamps: swamps,
@@ -316,6 +324,7 @@ class _SetonixSettingsCopyWithImpl<$R, $Out>
       lastVersion: data.get(#lastVersion, or: $value.lastVersion),
       gameProperty: data.get(#gameProperty, or: $value.gameProperty),
       servers: data.get(#servers, or: $value.servers),
+      stackedCards: data.get(#stackedCards, or: $value.stackedCards),
       highContrast: data.get(#highContrast, or: $value.highContrast),
       zoom: data.get(#zoom, or: $value.zoom),
       swamps: data.get(#swamps, or: $value.swamps),

app/lib/board/hand/item.dart

@@ -122,12 +122,12 @@ abstract class HandItem<T> extends PositionComponent
   @override
   Future<void> onLoad() async {
     super.onLoad();
+    _sprite.size = Vector2.all(height - labelHeight);
     _sprite.sprite = game.blankSprite;
     add(_sprite);
   }
 
   void _resetPosition() {
-    _sprite.position = Vector2(0, labelHeight);
     priority = priorityNormal;
     if (!_label.isMounted) add(_label);
     final cursor = _cursorHitbox;

app/lib/board/hand/view.dart

@@ -97,7 +97,7 @@ class GameHand extends CustomPainterComponent
       previousState.showDuplicates != newState.showDuplicates ||
       previousState.searchTerm != newState.searchTerm;
   static const itemAngle = 0.01;
-  static const activeItemWidth = 95;
+  static const activeItemWidth = 100;
   static const itemWidth = 60;
   static const itemYOffset = 3;
   void _layoutChildren() {
@@ -108,15 +108,19 @@ class GameHand extends CustomPainterComponent
 
     children.toList().whereType<HandItem>().forEachIndexed((index, element) {
       final double activeRelative = active - index;
-      final angle = activeRelative * itemAngle;
-      element.angle = angle;
       // Figure out how "active" this item is (0 = fully active, 1 = inactive)
       final progress = 1 - activeRelative.abs().clamp(0, 1);
-      final currentWidth = itemWidth + (activeItemWidth - itemWidth) * progress;
+      var x = center.x + 128 * activeRelative;
+      var y = center.y;
+      if (game.settingsCubit.state.stackedCards) {
+        final currentWidth =
+            itemWidth + (activeItemWidth - itemWidth) * progress;
 
-      final offset = activeRelative <= -1 ? -activeItemWidth / 2 : 0;
-      final y = center.y + itemYOffset * activeRelative.abs();
-      final x = center.x + offset + activeRelative * currentWidth;
+        final offset = activeRelative <= -1 ? -activeItemWidth / 2 : 0;
+        y = center.y + itemYOffset * activeRelative.abs();
+        x = center.x + offset + activeRelative * currentWidth;
+        element.angle = activeRelative * itemAngle;
+      }
 
       element.changeLabelVisibility(activeRelative.abs() >= 1);
 

app/lib/l10n/app_en.arb

@@ -249,5 +249,6 @@
   "desktop": "Desktop",
   "compact": "Compact",
   "standard": "Standard",
-  "comfortable": "Comfortable"
+  "comfortable": "Comfortable",
+  "stackedCards": "Stacked cards"
 }

app/lib/pages/settings/personalization.dart

@@ -102,17 +102,7 @@ class PersonalizationSettingsPage extends StatelessWidget {
                               .read<SettingsCubit>()
                               .changeHighContrast(value),
                         ),
-                      ]),
-                ),
-              ),
-              if (!kIsWeb && (Platform.isWindows || Platform.isLinux))
-                Card(
-                  margin: settingsCardMargin,
-                  child: Padding(
-                    padding: settingsCardPadding,
-                    child: Column(
-                        crossAxisAlignment: CrossAxisAlignment.stretch,
-                        children: [
+                        if (!kIsWeb && (Platform.isWindows || Platform.isLinux))
                           SwitchListTile(
                             value: state.nativeTitleBar,
                             title: Text(
@@ -123,9 +113,29 @@ class PersonalizationSettingsPage extends StatelessWidget {
                                 .read<SettingsCubit>()
                                 .changeNativeTitleBar(value),
                           ),
-                        ]),
-                  ),
+                      ]),
                 ),
+              ),
+              Card(
+                margin: settingsCardMargin,
+                child: Padding(
+                  padding: settingsCardPadding,
+                  child: Column(
+                      crossAxisAlignment: CrossAxisAlignment.stretch,
+                      children: [
+                        SwitchListTile(
+                          title:
+                              Text(AppLocalizations.of(context).stackedCards),
+                          secondary:
+                              const PhosphorIcon(PhosphorIconsLight.stack),
+                          value: state.stackedCards,
+                          onChanged: (value) => context
+                              .read<SettingsCubit>()
+                              .changeStackedCards(value),
+                        ),
+                      ]),
+                ),
+              ),
             ]);
           },
         ));