diff --git a/luckychit/lib/interfaces/manager/combined_draw_dialog.dart b/luckychit/lib/interfaces/manager/combined_draw_dialog.dart index 24d6aa0..192e70c 100644 --- a/luckychit/lib/interfaces/manager/combined_draw_dialog.dart +++ b/luckychit/lib/interfaces/manager/combined_draw_dialog.dart @@ -4,7 +4,6 @@ import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'dart:math' as math; import '../../core/services/chit_group_service.dart'; import '../../core/models/chit_group.dart'; -import '../../shared/widgets/draw_animation_selector.dart'; import '../../shared/widgets/recording_overlay.dart'; import '../../core/services/screen_recording_service.dart'; import 'draw_animation_page.dart'; @@ -529,42 +528,8 @@ class _CombinedDrawDialogState extends State } Widget _buildDrawInProgress() { - return Column( - children: [ - Text( - 'Choose Your Draw Animation', - style: TextStyle( - fontSize: 20.sp, - fontWeight: FontWeight.bold, - color: Colors.purple.shade700, - ), - ), - SizedBox(height: 16.h), - Text( - 'Select the animation type that works best for your group size', - textAlign: TextAlign.center, - style: TextStyle( - fontSize: 14.sp, - color: Colors.grey.shade600, - height: 1.4, - ), - ), - SizedBox(height: 24.h), - Center( - child: DrawAnimationSelector( - members: _eligibleMembers, - onDrawComplete: (winnerId) { - final winner = _eligibleMembers.firstWhere((m) => m['id'] == winnerId); - _onDrawComplete(winnerId, winner); - }, - serverSeed: _serverSeed, - clientSeed: null, - nonce: _nonce, - animationDuration: const Duration(seconds: 4), - ), - ), - ], - ); + // This method is no longer used - we navigate to full screen immediately + return const SizedBox.shrink(); } Widget _buildDrawResult() { diff --git a/luckychit/lib/shared/widgets/draw_animation_selector.dart b/luckychit/lib/shared/widgets/draw_animation_selector.dart index aca92ea..09e46cf 100644 --- a/luckychit/lib/shared/widgets/draw_animation_selector.dart +++ b/luckychit/lib/shared/widgets/draw_animation_selector.dart @@ -167,10 +167,12 @@ class _DrawAnimationSelectorState extends State { ), ), child: Row( + crossAxisAlignment: CrossAxisAlignment.start, children: [ Container( width: 24.w, height: 24.w, + margin: EdgeInsets.only(top: 2.h), decoration: BoxDecoration( color: isSelected ? Colors.purple.shade600 : Colors.grey.shade400, shape: BoxShape.circle, @@ -179,23 +181,27 @@ class _DrawAnimationSelectorState extends State { ? Icon(Icons.check, color: Colors.white, size: 16.w) : null, ), - SizedBox(width: 16.w), + SizedBox(width: 12.w), Expanded( child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ Row( children: [ - Text( - _getAnimationName(type), - style: TextStyle( - fontSize: 16.sp, - fontWeight: FontWeight.w600, - color: isSelected ? Colors.purple.shade800 : Colors.grey.shade800, + Flexible( + child: Text( + _getAnimationName(type), + style: TextStyle( + fontSize: 16.sp, + fontWeight: FontWeight.w600, + color: isSelected ? Colors.purple.shade800 : Colors.grey.shade800, + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, ), ), if (isRecommended) ...[ - SizedBox(width: 8.w), + SizedBox(width: 6.w), Container( padding: EdgeInsets.symmetric(horizontal: 8.w, vertical: 2.h), decoration: BoxDecoration( @@ -214,21 +220,25 @@ class _DrawAnimationSelectorState extends State { ], ], ), - SizedBox(height: 4.h), + SizedBox(height: 6.h), Text( _getAnimationDescription(type), style: TextStyle( fontSize: 12.sp, color: Colors.grey.shade600, + height: 1.3, ), + maxLines: 2, + overflow: TextOverflow.ellipsis, ), ], ), ), + SizedBox(width: 12.w), Icon( _getAnimationIcon(type), color: isSelected ? Colors.purple.shade600 : Colors.grey.shade400, - size: 24.w, + size: 28.w, ), ], ),