diff --git a/luckychit/lib/interfaces/manager/group_details_page.dart b/luckychit/lib/interfaces/manager/group_details_page.dart index 5df76b2..91fcaf1 100644 --- a/luckychit/lib/interfaces/manager/group_details_page.dart +++ b/luckychit/lib/interfaces/manager/group_details_page.dart @@ -92,23 +92,30 @@ class _GroupDetailsPageState extends State with SingleTickerPr iconTheme: IconThemeData(color: Colors.grey.shade800), elevation: 0, actions: [ - if (widget.group.isForming) - PopupMenuButton( - icon: Icon(Icons.person_add, size: 24.w, color: Colors.blue.shade600), - onSelected: (value) { - if (value == 'select') { - _showMemberSelectionDialog(context); - } else if (value == 'add_user') { - _showAddUserDialog(context); - } - }, - itemBuilder: (context) => [ + // Actions menu - always visible + PopupMenuButton( + icon: Icon(Icons.more_vert, size: 24.w, color: Colors.grey.shade700), + tooltip: 'More Options', + onSelected: (value) { + if (value == 'select' && widget.group.isForming) { + _showMemberSelectionDialog(context); + } else if (value == 'add_user' && widget.group.isForming) { + _showAddUserDialog(context); + } else if (value == 'add_past_draw') { + _showAddPastDrawDialog(context); + } else if (value == 'add_past_payments') { + _showAddPastPaymentsDialog(context); + } + }, + itemBuilder: (context) => [ + // Add members options (only for forming groups) + if (widget.group.isForming) ...[ PopupMenuItem( value: 'select', child: Row( children: [ Icon(Icons.people_alt, color: Colors.blue.shade600), - SizedBox(width: 8.w), + SizedBox(width: 12.w), const Text('Select Members'), ], ), @@ -118,48 +125,36 @@ class _GroupDetailsPageState extends State with SingleTickerPr child: Row( children: [ Icon(Icons.person_add, color: Colors.green.shade600), - SizedBox(width: 8.w), + SizedBox(width: 12.w), const Text('Add New User'), ], ), ), + const PopupMenuDivider(), ], - ), - // Backfill menu for imported/active groups - if (widget.group.isActive) - PopupMenuButton( - icon: Icon(Icons.more_vert, size: 24.w, color: Colors.grey.shade700), - tooltip: 'More Options', - onSelected: (value) { - if (value == 'add_past_draw') { - _showAddPastDrawDialog(context); - } else if (value == 'add_past_payments') { - _showAddPastPaymentsDialog(context); - } - }, - itemBuilder: (context) => [ - PopupMenuItem( - value: 'add_past_draw', - child: Row( - children: [ - Icon(Icons.history, color: Colors.blue.shade600), - SizedBox(width: 12.w), - const Text('Add Past Draw Result'), - ], - ), + // Backfill options (always available) + PopupMenuItem( + value: 'add_past_draw', + child: Row( + children: [ + Icon(Icons.history, color: Colors.blue.shade600), + SizedBox(width: 12.w), + const Text('Add Past Draw Result'), + ], ), - PopupMenuItem( - value: 'add_past_payments', - child: Row( - children: [ - Icon(Icons.payment_outlined, color: Colors.green.shade600), - SizedBox(width: 12.w), - const Text('Add Past Payments'), - ], - ), + ), + PopupMenuItem( + value: 'add_past_payments', + child: Row( + children: [ + Icon(Icons.payment_outlined, color: Colors.green.shade600), + SizedBox(width: 12.w), + const Text('Add Past Payments'), + ], ), - ], - ), + ), + ], + ), ], bottom: PreferredSize( preferredSize: Size.fromHeight(64.h),