Merge pull request #64 from Jshewmaker/fix--double-faced-cards

Jshewmaker · web-flow · commit fde16876ea56 · 2026-02-23T14:15:18.000-05:00
fix: double faced cards
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -29,6 +29,12 @@
       "type": "dart",
       "program": "lib/main_production.dart",
       "args": ["--flavor", "production", "--target", "lib/main_production.dart"]
+    },
+    {
+      "name": "Launch UI Gallery",
+      "request": "launch",
+      "type": "dart",
+      "program": "packages/app_ui/gallery/lib/main.dart"
     }
   ]
 }
diff --git a/analysis_options.yaml b/analysis_options.yaml
@@ -1,7 +1,7 @@
 analyzer:
   errors:
     omit_local_variable_types: ignore
-include: package:very_good_analysis/analysis_options.5.1.0.yaml
+include: package:very_good_analysis/analysis_options.yaml
 linter:
   rules:
     public_member_api_docs: false
diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/production.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/production.xcscheme
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -34,6 +35,7 @@
       buildConfiguration = "Debug-production"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/lib/game/bloc/game_bloc.dart b/lib/game/bloc/game_bloc.dart
@@ -150,14 +150,18 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     try {
       for (final player in _players) {
         final opponents = state.playerList
-            .map((p) => Opponent(
-                  playerId: p.id,
-                  damages: [
-                    CommanderDamage(
-                        damageType: DamageType.commander, amount: 0),
-                    CommanderDamage(damageType: DamageType.partner, amount: 0),
-                  ],
-                ))
+            .map(
+              (p) => Opponent(
+                playerId: p.id,
+                damages: [
+                  CommanderDamage(
+                    damageType: DamageType.commander,
+                    amount: 0,
+                  ),
+                  CommanderDamage(damageType: DamageType.partner, amount: 0),
+                ],
+              ),
+            )
             .toList();
 
         final resetPlayer = player.copyWith(
@@ -198,12 +202,12 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     final restored = _playerRepository.restorePreviousGameState();
     if (restored) {
       // Emit restored state as running, clear winner/error
-      emit(state.copyWith(
-        status: GameStatus.running,
-        playerList: _playerRepository.getPlayers(),
-        winner: null,
-        error: null,
-      ));
+      emit(
+        state.copyWith(
+          status: GameStatus.running,
+          playerList: _playerRepository.getPlayers(),
+        ),
+      );
       // Dispatch TimerStartEvent to TimerBloc
       // (Assumes context or a callback is available; see note below)
       // context.read<TimerBloc>().add(const TimerStartEvent());
@@ -243,8 +247,11 @@ class GameBloc extends Bloc<GameEvent, GameState> {
     final alivePlayers =
         event.players.where((p) => p.state == PlayerModelState.active).toList();
     if (alivePlayers.isEmpty && state.status == GameStatus.running) {
-      add(GameFinishEvent(
-          winner: event.players.firstWhere((p) => p.placement == 1)));
+      add(
+        GameFinishEvent(
+          winner: event.players.firstWhere((p) => p.placement == 1),
+        ),
+      );
     }
   }
 
diff --git a/lib/life_counter/view/game_over_page.dart b/lib/life_counter/view/game_over_page.dart
@@ -428,7 +428,7 @@ class WinnerWidget extends StatelessWidget {
               style: Theme.of(context).textTheme.titleMedium,
             ),
             Text(
-              _formatDuration(gameDuration ?? 0),
+              _formatDuration(gameDuration),
               style: Theme.of(context).textTheme.titleLarge,
             ),
           ],
diff --git a/lib/login/view/login_view.dart b/lib/login/view/login_view.dart
@@ -6,12 +6,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:form_inputs/form_inputs.dart';
 import 'package:go_router/go_router.dart';
+import 'package:magic_yeti/app/utils/device_info_provider.dart';
 import 'package:magic_yeti/home/home_page.dart';
 import 'package:magic_yeti/l10n/l10n.dart';
 import 'package:magic_yeti/login/login.dart';
 import 'package:magic_yeti/reset_password/reset_password.dart';
 import 'package:magic_yeti/sign_up/sign_up.dart';
-import 'package:magic_yeti/app/utils/device_info_provider.dart';
 
 class LoginView extends StatelessWidget {
   const LoginView({super.key});
diff --git a/lib/player/view/bloc/player_customization_bloc.dart b/lib/player/view/bloc/player_customization_bloc.dart
@@ -37,7 +37,10 @@ class PlayerCustomizationBloc
       );
 
       final filteredCards = cardList.data
-          .where((card) => card.typeLine.toLowerCase().contains('legendary'))
+          .where(
+            (card) =>
+                card.typeLine?.toLowerCase().contains('legendary') ?? false,
+          )
           .toList();
       emit(
         state.copyWith(
@@ -88,7 +91,10 @@ class PlayerCustomizationBloc
   ) {
     final cardList = event.showOnlyLegendary
         ? state.cardList?.data
-            .where((card) => card.typeLine.toLowerCase().contains('legendary'))
+            .where(
+              (card) =>
+                  card.typeLine?.toLowerCase().contains('legendary') ?? false,
+            )
             .toList()
         : state.cardList?.data ?? [];
 
diff --git a/lib/sign_up/view/sign_up_form.dart b/lib/sign_up/view/sign_up_form.dart
@@ -9,7 +9,6 @@ import 'package:go_router/go_router.dart';
 import 'package:magic_yeti/home/home_page.dart';
 import 'package:magic_yeti/l10n/l10n.dart';
 import 'package:magic_yeti/login/login.dart';
-import 'package:magic_yeti/onboarding/onboarding.dart';
 import 'package:magic_yeti/sign_up/sign_up.dart';
 
 class SignUpForm extends StatelessWidget {
diff --git a/packages/analytics_repository/analytics_repository/pubspec.yaml b/packages/analytics_repository/analytics_repository/pubspec.yaml
@@ -14,4 +14,4 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mocktail: ^1.0.3
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^10.1.0
diff --git a/packages/api_client/lib/src/models/card_models/card.dart b/packages/api_client/lib/src/models/card_models/card.dart
@@ -120,7 +120,7 @@ class MagicCard extends Equatable {
   final String? power;
   final List<String>? producedMana;
   final String? toughness;
-  final String typeLine;
+  final String? typeLine;
   final String? oracleText;
   final List<String>? colors;
   final List<String>? colorIndicator;
diff --git a/packages/api_client/lib/src/models/card_models/card.g.dart b/packages/api_client/lib/src/models/card_models/card.g.dart
diff --git a/packages/api_client/pubspec.yaml b/packages/api_client/pubspec.yaml
@@ -8,12 +8,12 @@ environment:
 
 dev_dependencies:
   build_runner: ^2.4.6
-  json_serializable: ^6.7.1
+  json_serializable: ^6.12.0
   mocktail: ^0.3.0
   test: ^1.19.2
-  very_good_analysis: ^5.0.0
+  very_good_analysis: ^10.1.0
 
 dependencies:
   equatable: ^2.0.5
   http: ^1.1.0
-  json_annotation: ^4.8.1
+  json_annotation: ^4.10.0
diff --git a/packages/app_config_repository/app_config_repository/pubspec.yaml b/packages/app_config_repository/app_config_repository/pubspec.yaml
@@ -3,19 +3,19 @@ description: Dart package which manages the app configuration domain.
 publish_to: none
 
 environment:
-  sdk: "^3.3.0"
+  sdk: ">=3.1.0 <4.0.0"
 
 dependencies:
   equatable: ^2.0.5
   flutter:
     sdk: flutter
-  json_annotation: ^4.8.1
+  json_annotation: ^4.10.0
   plugin_platform_interface: ^2.1.8
-  very_good_analysis: ^5.1.0
+  very_good_analysis: ^10.1.0
 
 dev_dependencies:
   build_runner: ^2.4.8
   flutter_test:
     sdk: flutter
-  json_serializable: ^6.7.1
+  json_serializable: ^6.12.0
   mocktail: ^1.0.3
diff --git a/packages/app_config_repository/fake_app_config_repository/pubspec.yaml b/packages/app_config_repository/fake_app_config_repository/pubspec.yaml
@@ -13,4 +13,4 @@ dependencies:
 dev_dependencies:
   mocktail: ^1.0.3
   test: ^1.25.2
-  very_good_analysis: ^5.1.0
+  very_good_analysis: ^10.1.0
diff --git a/packages/app_ui/gallery/.gitignore b/packages/app_ui/gallery/.gitignore
@@ -5,9 +5,11 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
 migrate_working_dir/
 
 # IntelliJ related
diff --git a/packages/app_ui/gallery/ios/Flutter/AppFrameworkInfo.plist b/packages/app_ui/gallery/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>13.0</string>
 </dict>
 </plist>
diff --git a/packages/app_ui/gallery/ios/Runner.xcodeproj/project.pbxproj b/packages/app_ui/gallery/ios/Runner.xcodeproj/project.pbxproj
@@ -168,7 +168,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					331C8080294A63A400263BE5 = {
@@ -344,7 +344,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -472,7 +472,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -521,7 +521,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
diff --git a/packages/app_ui/gallery/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/packages/app_ui/gallery/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1300"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       shouldUseLaunchSchemeArgsEnv = "YES">
       <MacroExpansion>
          <BuildableReference
@@ -54,11 +55,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      customLLDBInitFile = "$(SRCROOT)/Flutter/ephemeral/flutter_lldbinit"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      enableGPUValidationMode = "1"
       allowLocationSimulation = "YES">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/packages/app_ui/gallery/ios/Runner/AppDelegate.swift b/packages/app_ui/gallery/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,
diff --git a/packages/app_ui/gallery/pubspec.yaml b/packages/app_ui/gallery/pubspec.yaml
@@ -39,7 +39,7 @@ dev_dependencies:
   flutter_lints: ^2.0.0
   flutter_test:
     sdk: flutter
-  very_good_analysis: ^5.0.0
+  very_good_analysis: ^10.1.0
   
 
 # For information on the generic Dart part of this file, see the
diff --git a/packages/app_ui/pubspec.yaml b/packages/app_ui/pubspec.yaml
@@ -4,8 +4,8 @@ version: 0.1.0+1
 publish_to: none
 
 environment:
-  sdk: ">=2.19.0 <3.0.0"
-  flutter: 3.7.0
+  sdk: ">=3.1.0 <4.0.0"
+
 
 dependencies:
   dotted_decoration: ^2.0.0
@@ -19,7 +19,7 @@ dev_dependencies:
   flutter_test:
     sdk: flutter
   mocktail: ^0.3.0
-  very_good_analysis: ^4.0.0
+  very_good_analysis: ^10.1.0
 
 flutter:
   uses-material-design: true
diff --git a/packages/authentication_client/authentication_client/pubspec.yaml b/packages/authentication_client/authentication_client/pubspec.yaml
@@ -10,4 +10,4 @@ dependencies:
 
 dev_dependencies:
   test: ^1.25.2
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^10.1.0
diff --git a/packages/authentication_client/firebase_authentication_client/pubspec.yaml b/packages/authentication_client/firebase_authentication_client/pubspec.yaml
@@ -4,7 +4,7 @@ version: 0.1.0+1
 publish_to: none
 
 environment:
-  sdk: "^3.3.0"
+  sdk: ">=3.1.0 <4.0.0"
 
 dependencies:
   authentication_client:
@@ -24,5 +24,5 @@ dev_dependencies:
     sdk: flutter
   mocktail: ^1.0.3
   test: ^1.25.2
-  very_good_analysis: ^5.1.0
+  very_good_analysis: ^10.1.0
   
diff --git a/packages/firebase_database_repository/pubspec.yaml b/packages/firebase_database_repository/pubspec.yaml
@@ -8,15 +8,15 @@ environment:
 
 dev_dependencies:
   build_runner: ^2.4.7
-  json_serializable: ^6.9.4
+  json_serializable: ^6.12.0
   mocktail: ^1.0.0
   test: ^1.19.2
-  very_good_analysis: ^5.1.0
+  very_good_analysis: ^10.1.0
 
 dependencies:
   cloud_firestore: ^5.5.0
   equatable: ^2.0.5
-  json_annotation: ^4.9.0
+  json_annotation: ^4.10.0
   player_repository:
     path: ../player_repository
   uuid: ^4.2.1
diff --git a/packages/form_inputs/pubspec.yaml b/packages/form_inputs/pubspec.yaml
@@ -10,4 +10,4 @@ dependencies:
 
 dev_dependencies:
   test: ^1.25.2
-  very_good_analysis: ^6.0.0
+  very_good_analysis: ^10.1.0
diff --git a/packages/player_repository/pubspec.yaml b/packages/player_repository/pubspec.yaml
diff --git a/packages/scryfall_repository/pubspec.yaml b/packages/scryfall_repository/pubspec.yaml
diff --git a/packages/user_repository/pubspec.yaml b/packages/user_repository/pubspec.yaml
diff --git a/pubspec.lock b/pubspec.lock
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,12 @@`
`29`	`29`	`"type": "dart",`
`30`	`30`	`"program": "lib/main_production.dart",`
`31`	`31`	`"args": ["--flavor", "production", "--target", "lib/main_production.dart"]`
	`32`	`+ },`
	`33`	`+ {`
	`34`	`+ "name": "Launch UI Gallery",`
	`35`	`+ "request": "launch",`
	`36`	`+ "type": "dart",`
	`37`	`+ "program": "packages/app_ui/gallery/lib/main.dart"`
`32`	`38`	`}`
`33`	`39`	`]`
`34`	`40`	`}`