feat: rotate table players
This commit is contained in:
@@ -45,7 +45,10 @@ class GameBloc extends Bloc<GameEvent, GameUiState> {
|
||||
on<PlayCardEvent>(
|
||||
(event, emit) => repository.send({'type': 'play_card', 'card': event.card}));
|
||||
on<LeaveGameEvent>((event, emit) => repository.send({'type': 'leave'}));
|
||||
on<StartTableEvent>((event, emit) => repository.send({'type': 'start_table'}));
|
||||
on<StartTableEvent>((event, emit) =>
|
||||
repository.send({'type': 'start_table', 'hands': event.hands}));
|
||||
on<RotateTableEvent>((event, emit) =>
|
||||
repository.send({'type': 'rotate_table', 'dir': event.dir}));
|
||||
on<LeaveTableEvent>((event, emit) => repository.send({'type': 'leave_table'}));
|
||||
on<ClearNoticeEvent>((event, emit) => emit(state.copyWith(clearNotice: true)));
|
||||
}
|
||||
@@ -82,7 +85,8 @@ class GameBloc extends Bloc<GameEvent, GameUiState> {
|
||||
void chooseTrump(String suit) => add(ChooseTrumpEvent(suit));
|
||||
void playCard(String card) => add(PlayCardEvent(card));
|
||||
void leave() => add(LeaveGameEvent());
|
||||
void startTable() => add(StartTableEvent());
|
||||
void startTable(int hands) => add(StartTableEvent(hands));
|
||||
void rotateTable(int dir) => add(RotateTableEvent(dir));
|
||||
void leaveTable() => add(LeaveTableEvent());
|
||||
void clearNotice() => add(ClearNoticeEvent());
|
||||
|
||||
|
||||
@@ -32,7 +32,15 @@ class PlayCardEvent extends GameEvent {
|
||||
|
||||
class LeaveGameEvent extends GameEvent {}
|
||||
|
||||
class StartTableEvent extends GameEvent {}
|
||||
class StartTableEvent extends GameEvent {
|
||||
final int hands; // تعداد دستِ انتخابی (۳/۵/۷)
|
||||
StartTableEvent(this.hands);
|
||||
}
|
||||
|
||||
class RotateTableEvent extends GameEvent {
|
||||
final int dir; // +۱/−۱ جهتِ چرخشِ جایگاهها
|
||||
RotateTableEvent(this.dir);
|
||||
}
|
||||
|
||||
class LeaveTableEvent extends GameEvent {}
|
||||
|
||||
|
||||
@@ -7,7 +7,8 @@ import '../../domain/entities/game_entities.dart';
|
||||
class LobbyPlayer {
|
||||
final String name;
|
||||
final bool host;
|
||||
const LobbyPlayer(this.name, this.host);
|
||||
final int seat; // جایگاهِ مطلق (۰..۳)
|
||||
const LobbyPlayer(this.name, this.host, this.seat);
|
||||
}
|
||||
|
||||
/// وضعیت اتاق انتظارِ میز خصوصی (دورهمی).
|
||||
@@ -15,12 +16,14 @@ class TableLobby {
|
||||
final String code;
|
||||
final List<LobbyPlayer> players;
|
||||
final bool isHost;
|
||||
final int youSeat; // جایگاهِ مطلقِ خودِ کاربر (برای چیدمانِ صحنه)
|
||||
final int remaining;
|
||||
final bool unlimited;
|
||||
const TableLobby({
|
||||
required this.code,
|
||||
required this.players,
|
||||
required this.isHost,
|
||||
required this.youSeat,
|
||||
required this.remaining,
|
||||
required this.unlimited,
|
||||
});
|
||||
@@ -29,15 +32,19 @@ class TableLobby {
|
||||
code: (j['code'] ?? '') as String,
|
||||
players: ((j['players'] as List?) ?? [])
|
||||
.map((e) => LobbyPlayer(
|
||||
(e['name'] ?? '') as String, (e['host'] ?? false) as bool))
|
||||
(e['name'] ?? '') as String,
|
||||
(e['host'] ?? false) as bool,
|
||||
(e['seat'] ?? 0) as int,
|
||||
))
|
||||
.toList(),
|
||||
isHost: (j['host'] ?? false) as bool,
|
||||
youSeat: (j['you_seat'] ?? 0) as int,
|
||||
remaining: (j['remaining'] ?? 0) as int,
|
||||
unlimited: (j['unlimited'] ?? false) as bool,
|
||||
);
|
||||
|
||||
String get sig => '$code|$isHost|$remaining|$unlimited|'
|
||||
'${players.map((p) => '${p.name}${p.host ? '*' : ''}').join(',')}';
|
||||
String get sig => '$code|$isHost|$youSeat|$remaining|$unlimited|'
|
||||
'${players.map((p) => '${p.name}${p.host ? '*' : ''}@${p.seat}').join(',')}';
|
||||
}
|
||||
|
||||
class GameUiState extends Equatable {
|
||||
|
||||
@@ -4,6 +4,7 @@ import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:go_router/go_router.dart';
|
||||
import 'package:random_avatar/random_avatar.dart';
|
||||
|
||||
import '../../../../core/network/ws_client.dart';
|
||||
import '../../../../core/theme/app_theme.dart';
|
||||
@@ -44,21 +45,32 @@ class PrivateTableScreen extends StatelessWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _LobbyView extends StatelessWidget {
|
||||
class _LobbyView extends StatefulWidget {
|
||||
final GameUiState state;
|
||||
const _LobbyView({required this.state});
|
||||
|
||||
@override
|
||||
State<_LobbyView> createState() => _LobbyViewState();
|
||||
}
|
||||
|
||||
class _LobbyViewState extends State<_LobbyView> {
|
||||
int _hands = 3; // تعداد دستِ انتخابیِ میزبان
|
||||
|
||||
void _leave() {
|
||||
context.read<GameBloc>().leaveTable();
|
||||
if (context.canPop()) context.pop();
|
||||
}
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final state = widget.state;
|
||||
final lobby = state.lobby;
|
||||
final connecting = state.connection != WsStatus.connected || lobby == null;
|
||||
|
||||
return PopScope(
|
||||
canPop: false,
|
||||
onPopInvokedWithResult: (didPop, _) {
|
||||
if (didPop) return;
|
||||
context.read<GameBloc>().leaveTable();
|
||||
if (context.canPop()) context.pop();
|
||||
if (!didPop) _leave();
|
||||
},
|
||||
child: Scaffold(
|
||||
body: GameBackground(
|
||||
@@ -67,30 +79,7 @@ class _LobbyView extends StatelessWidget {
|
||||
children: [
|
||||
Column(
|
||||
children: [
|
||||
Align(
|
||||
alignment: Alignment.centerRight,
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(10),
|
||||
child: GestureDetector(
|
||||
onTap: () {
|
||||
context.read<GameBloc>().leaveTable();
|
||||
if (context.canPop()) context.pop();
|
||||
},
|
||||
child: Container(
|
||||
width: 46,
|
||||
height: 46,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.panel,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border:
|
||||
Border.all(color: AppColors.gold, width: 1.5),
|
||||
),
|
||||
child: const Icon(Icons.arrow_back,
|
||||
color: AppColors.gold),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
_topBar(context, lobby),
|
||||
Expanded(
|
||||
child: connecting
|
||||
? const Center(
|
||||
@@ -110,42 +99,111 @@ class _LobbyView extends StatelessWidget {
|
||||
);
|
||||
}
|
||||
|
||||
// نوار بالا: بازگشت (چپ) و اشتراکگذاریِ کد (راست).
|
||||
Widget _topBar(BuildContext context, TableLobby? lobby) {
|
||||
Widget btn(IconData icon, VoidCallback onTap) => GestureDetector(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
width: 46,
|
||||
height: 46,
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.panel,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(color: AppColors.gold, width: 1.5),
|
||||
),
|
||||
child: Icon(icon, color: AppColors.gold),
|
||||
),
|
||||
);
|
||||
return Padding(
|
||||
padding: const EdgeInsets.all(10),
|
||||
child: Directionality(
|
||||
textDirection: TextDirection.ltr,
|
||||
child: Row(
|
||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||
children: [
|
||||
btn(Icons.arrow_back, _leave),
|
||||
if (lobby != null)
|
||||
btn(Icons.share, () {
|
||||
Clipboard.setData(ClipboardData(text: lobby.code));
|
||||
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(
|
||||
content: Text('کد میز کپی شد؛ برای دوستانت بفرست')));
|
||||
}),
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _content(BuildContext context, TableLobby lobby) {
|
||||
final youSeat = lobby.youSeat;
|
||||
// نگاشتِ جایگاهِ مطلق → بازیکن (خالی = بات هنگام شروع).
|
||||
final bySeat = <int, LobbyPlayer>{for (final p in lobby.players) p.seat: p};
|
||||
// چیدمان از نگاهِ خودِ کاربر: «شما» پایین، همتیمی (روبهرو) بالا، بقیه کنار.
|
||||
LobbyPlayer? seatAt(int rel) => bySeat[(youSeat + rel) % 4];
|
||||
final me = seatAt(0);
|
||||
final top = seatAt(2); // همتیمی (روبهرو)
|
||||
final left = seatAt(1);
|
||||
final right = seatAt(3);
|
||||
|
||||
return SingleChildScrollView(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 20),
|
||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
||||
child: Column(
|
||||
children: [
|
||||
const GlowText('میز دورهمی', size: 26),
|
||||
const SizedBox(height: 16),
|
||||
GamePanel(
|
||||
child: Column(children: [
|
||||
const Text('شماره میز', style: TextStyle(color: Colors.white70)),
|
||||
const SizedBox(height: 6),
|
||||
Row(mainAxisAlignment: MainAxisAlignment.center, children: [
|
||||
SelectableText(lobby.code,
|
||||
style: const TextStyle(
|
||||
color: AppColors.gold,
|
||||
fontSize: 40,
|
||||
fontWeight: FontWeight.bold,
|
||||
letterSpacing: 8)),
|
||||
IconButton(
|
||||
onPressed: () {
|
||||
Clipboard.setData(ClipboardData(text: lobby.code));
|
||||
ScaffoldMessenger.of(context).showSnackBar(
|
||||
const SnackBar(content: Text('کد کپی شد')));
|
||||
},
|
||||
icon: const Icon(Icons.copy, color: AppColors.gold),
|
||||
const Text('شماره میز', style: TextStyle(color: Colors.white70)),
|
||||
const SizedBox(height: 4),
|
||||
GlowText(lobby.code, size: 36),
|
||||
const SizedBox(height: 8),
|
||||
// میز با چهار جایگاه.
|
||||
SizedBox(
|
||||
height: 340,
|
||||
child: Stack(
|
||||
children: [
|
||||
Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 28, vertical: 36),
|
||||
child: Container(
|
||||
decoration: BoxDecoration(
|
||||
gradient: const RadialGradient(
|
||||
colors: [Color(0xFF1E7E3A), Color(0xFF0C5022)],
|
||||
radius: 0.9,
|
||||
),
|
||||
borderRadius: BorderRadius.circular(160),
|
||||
border: Border.all(color: const Color(0xFF8A5A12), width: 6),
|
||||
),
|
||||
child: const Center(
|
||||
child: GlowText('سلطان حکم', size: 18),
|
||||
),
|
||||
),
|
||||
),
|
||||
]),
|
||||
const Text('این کد را برای دوستانت بفرست',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 12)),
|
||||
]),
|
||||
Align(alignment: Alignment.topCenter, child: _seat(top, false)),
|
||||
Align(alignment: Alignment.centerLeft, child: _seat(left, false)),
|
||||
Align(
|
||||
alignment: Alignment.centerRight, child: _seat(right, false)),
|
||||
Align(alignment: Alignment.bottomCenter, child: _seat(me, true)),
|
||||
// چرخشِ جایگاهها (فقط میزبان) — تغییرِ تیمبندی.
|
||||
if (lobby.isHost) ...[
|
||||
Align(
|
||||
alignment: const Alignment(-1, -0.35),
|
||||
child: _rotateBtn(Icons.rotate_left,
|
||||
() => context.read<GameBloc>().rotateTable(-1)),
|
||||
),
|
||||
Align(
|
||||
alignment: const Alignment(1, -0.35),
|
||||
child: _rotateBtn(Icons.rotate_right,
|
||||
() => context.read<GameBloc>().rotateTable(1)),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 16),
|
||||
GamePanel(
|
||||
child: Column(children: [
|
||||
for (var i = 0; i < 4; i++) _seatRow(i, lobby),
|
||||
]),
|
||||
const SizedBox(height: 8),
|
||||
const Text('تعداد دست', style: TextStyle(color: Colors.white70)),
|
||||
const SizedBox(height: 10),
|
||||
Row(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
children: [
|
||||
for (final h in [3, 5, 7]) _handChip(h, lobby.isHost),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 20),
|
||||
if (lobby.isHost)
|
||||
@@ -154,41 +212,127 @@ class _LobbyView extends StatelessWidget {
|
||||
icon: Icons.play_arrow,
|
||||
width: double.infinity,
|
||||
colors: const [Color(0xFF3FA34D), Color(0xFF1B5E20)],
|
||||
onTap: () => context.read<GameBloc>().startTable(),
|
||||
onTap: () => context.read<GameBloc>().startTable(_hands),
|
||||
)
|
||||
else
|
||||
const Text('در انتظار شروع توسط میزبان…',
|
||||
style: TextStyle(color: AppColors.gold, fontSize: 15)),
|
||||
const SizedBox(height: 8),
|
||||
const SizedBox(height: 6),
|
||||
if (lobby.isHost)
|
||||
const Text('جایهای خالی با ربات پر میشوند',
|
||||
style: TextStyle(color: Colors.white54, fontSize: 12)),
|
||||
const SizedBox(height: 24),
|
||||
const SizedBox(height: 20),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _seatRow(int i, TableLobby lobby) {
|
||||
final filled = i < lobby.players.length;
|
||||
final p = filled ? lobby.players[i] : null;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(vertical: 6),
|
||||
child: Row(children: [
|
||||
Icon(filled ? Icons.person : Icons.person_outline,
|
||||
color: filled ? AppColors.gold : Colors.white24, size: 24),
|
||||
const SizedBox(width: 10),
|
||||
Text(
|
||||
filled ? p!.name : 'در انتظار بازیکن…',
|
||||
style: TextStyle(
|
||||
color: filled ? Colors.white : Colors.white38,
|
||||
fontSize: 15,
|
||||
fontWeight: filled ? FontWeight.bold : FontWeight.normal),
|
||||
// یک جایگاهِ بازیکن دورِ میز (آواتار + ستاره + نام).
|
||||
Widget _seat(LobbyPlayer? p, bool isYou) {
|
||||
final empty = p == null;
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Stack(
|
||||
clipBehavior: Clip.none,
|
||||
children: [
|
||||
Container(
|
||||
width: 62,
|
||||
height: 62,
|
||||
padding: const EdgeInsets.all(3),
|
||||
decoration: BoxDecoration(
|
||||
color: AppColors.bgDark,
|
||||
borderRadius: BorderRadius.circular(12),
|
||||
border: Border.all(
|
||||
color: isYou ? AppColors.gold : AppColors.goldDark,
|
||||
width: 2),
|
||||
),
|
||||
child: empty
|
||||
? const Icon(Icons.person_add_alt_1, color: Colors.white24)
|
||||
: ClipRRect(
|
||||
borderRadius: BorderRadius.circular(9),
|
||||
child: RandomAvatar(p.name),
|
||||
),
|
||||
),
|
||||
if (!empty)
|
||||
const Positioned(
|
||||
bottom: -6,
|
||||
left: -4,
|
||||
child: Icon(Icons.star, color: AppColors.gold, size: 22),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 6),
|
||||
Text(
|
||||
empty ? 'در انتظار' : (isYou ? 'شما' : p.name),
|
||||
maxLines: 1,
|
||||
overflow: TextOverflow.ellipsis,
|
||||
style: TextStyle(
|
||||
color: empty ? Colors.white38 : Colors.white,
|
||||
fontSize: 12,
|
||||
fontWeight: empty ? FontWeight.normal : FontWeight.bold,
|
||||
),
|
||||
),
|
||||
const Spacer(),
|
||||
if (p?.host == true)
|
||||
const Icon(Icons.star, color: AppColors.gold, size: 18),
|
||||
]),
|
||||
const Text('میزبان',
|
||||
style: TextStyle(color: AppColors.gold, fontSize: 10)),
|
||||
],
|
||||
);
|
||||
}
|
||||
|
||||
// دکمهی چرخشِ جایگاهها (کنارِ میز).
|
||||
Widget _rotateBtn(IconData icon, VoidCallback onTap) {
|
||||
return GestureDetector(
|
||||
onTap: onTap,
|
||||
child: Container(
|
||||
width: 44,
|
||||
height: 44,
|
||||
decoration: BoxDecoration(
|
||||
gradient: const LinearGradient(
|
||||
begin: Alignment.topCenter,
|
||||
end: Alignment.bottomCenter,
|
||||
colors: [Color(0xFF8E1B2A), Color(0xFF5A0E18)],
|
||||
),
|
||||
borderRadius: BorderRadius.circular(10),
|
||||
border: Border.all(color: AppColors.gold, width: 1.5),
|
||||
),
|
||||
child: Icon(icon, color: AppColors.gold, size: 26),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _handChip(int h, bool editable) {
|
||||
const fa = {3: '۳', 5: '۵', 7: '۷'};
|
||||
final selected = _hands == h;
|
||||
return Padding(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8),
|
||||
child: GestureDetector(
|
||||
onTap: editable ? () => setState(() => _hands = h) : null,
|
||||
child: Container(
|
||||
width: 52,
|
||||
height: 52,
|
||||
alignment: Alignment.center,
|
||||
decoration: BoxDecoration(
|
||||
shape: BoxShape.circle,
|
||||
gradient: selected
|
||||
? const LinearGradient(
|
||||
colors: [Color(0xFFE9B949), Color(0xFFB8860B)])
|
||||
: null,
|
||||
color: selected ? null : AppColors.panel,
|
||||
border: Border.all(
|
||||
color: selected ? AppColors.gold : AppColors.goldDark,
|
||||
width: 2),
|
||||
),
|
||||
child: Text(
|
||||
fa[h]!,
|
||||
style: TextStyle(
|
||||
color: selected ? const Color(0xFF3A0A12) : Colors.white,
|
||||
fontSize: 22,
|
||||
fontWeight: FontWeight.bold,
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user