admin/marco.pms.mobileapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Refactor TeamBottomSheet and TeamMembersBottomSheet to use BaseBottomSheet for improved UI consistency

Browse Source
This commit is contained in:
Vaibhav Surve 2025-08-02 15:22:24 +05:30
parent 2518b65cb7
commit 0f0eb51c15
5 changed files with 178 additions and 227 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
lib/helpers/widgets/my_team_model_sheet.dart
View File

@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:marco/helpers/widgets/avatar.dart'; import 'package:marco/helpers/widgets/avatar.dart';
import 'package:marco/helpers/widgets/my_text.dart'; import 'package:marco/helpers/widgets/my_text.dart';
import 'package:marco/helpers/widgets/my_spacing.dart';
import 'package:marco/helpers/utils/base_bottom_sheet.dart';
class TeamBottomSheet { class TeamBottomSheet {
static void show({ static void show({
@ -9,46 +11,61 @@ class TeamBottomSheet {
}) { }) {
showModalBottomSheet( showModalBottomSheet(
context: context, context: context,
shape: const RoundedRectangleBorder( isScrollControlled: true,
borderRadius: BorderRadius.vertical(top: Radius.circular(12)), backgroundColor: Colors.transparent,
), builder: (_) {
backgroundColor: Colors.white, return BaseBottomSheet(
builder: (_) => Padding( title: 'Team Members',
padding: const EdgeInsets.symmetric(vertical: 8, horizontal: 12), onCancel: () => Navigator.pop(context),
child: Column( onSubmit: () {},
mainAxisSize: MainAxisSize.min, showButtons: false,
crossAxisAlignment: CrossAxisAlignment.start, child: _TeamMemberList(teamMembers: teamMembers),
children: [ );
// Title and Close Icon },
Row( );
mainAxisAlignment: MainAxisAlignment.spaceBetween, }
children: [ }
MyText.bodyLarge("Team Members", fontWeight: 600),
IconButton( class _TeamMemberList extends StatelessWidget {
icon: const Icon(Icons.close, size: 20, color: Colors.black54), final List<dynamic> teamMembers;
onPressed: () => Navigator.pop(context),
), const _TeamMemberList({required this.teamMembers});
],
), @override
const Divider(thickness: 1.2), Widget build(BuildContext context) {
// Team Member Rows if (teamMembers.isEmpty) {
...teamMembers.map((member) => _buildTeamMemberRow(member)), return Center(
], child: Padding(
), padding: const EdgeInsets.symmetric(vertical: 20),
), child: MyText.bodySmall(
); "No team members found.",
} fontWeight: 600,
color: Colors.grey,
static Widget _buildTeamMemberRow(dynamic member) { ),
return Padding( ),
padding: const EdgeInsets.symmetric(vertical: 8), );
child: Row( }
children: [
Avatar(firstName: member.firstName, lastName: '', size: 36), return ListView.separated(
const SizedBox(width: 10), shrinkWrap: true,
MyText.bodyMedium(member.firstName, fontWeight: 500), physics: const NeverScrollableScrollPhysics(),
], itemCount: teamMembers.length,
), separatorBuilder: (_, __) => const Divider(thickness: 0.8, height: 12),
itemBuilder: (_, index) {
final member = teamMembers[index];
final String name = member.firstName ?? 'Unnamed';
return Padding(
padding: const EdgeInsets.symmetric(vertical: 4),
child: Row(
children: [
Avatar(firstName: member.firstName, lastName: '', size: 36),
MySpacing.width(10),
MyText.bodyMedium(name, fontWeight: 500),
],
),
);
},
); );
} }
} }

109
lib/helpers/widgets/team_members_bottom_sheet.dart
View File

@ -3,6 +3,7 @@ import 'package:marco/helpers/widgets/my_text.dart';
import 'package:marco/helpers/widgets/avatar.dart'; import 'package:marco/helpers/widgets/avatar.dart';
import 'package:marco/helpers/widgets/my_spacing.dart'; import 'package:marco/helpers/widgets/my_spacing.dart';
import 'package:marco/model/directory/contact_bucket_list_model.dart'; import 'package:marco/model/directory/contact_bucket_list_model.dart';
import 'package:marco/helpers/utils/base_bottom_sheet.dart';
class TeamMembersBottomSheet { class TeamMembersBottomSheet {
static void show( static void show(
@ -14,7 +15,7 @@ class TeamMembersBottomSheet {
}) { }) {
final ownerId = bucket.createdBy.id; final ownerId = bucket.createdBy.id;
// Ensure owner is first // Ensure owner is listed first
members.sort((a, b) { members.sort((a, b) {
if (a.id == ownerId) return -1; if (a.id == ownerId) return -1;
if (b.id == ownerId) return 1; if (b.id == ownerId) return 1;
@ -25,59 +26,59 @@ class TeamMembersBottomSheet {
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
isDismissible: true, builder: (_) {
enableDrag: true, return BaseBottomSheet(
builder: (context) { title: 'Bucket Details',
return SafeArea( onCancel: () => Navigator.pop(context),
child: Container( onSubmit: () {}, // Not used, but required
decoration: const BoxDecoration( showButtons: false,
color: Colors.white, child: _TeamContent(
borderRadius: BorderRadius.vertical(top: Radius.circular(16)), bucket: bucket,
), members: members,
child: DraggableScrollableSheet( canEdit: canEdit,
expand: false, onEdit: onEdit,
initialChildSize: 0.75, ownerId: ownerId,
minChildSize: 0.55,
maxChildSize: 0.95,
builder: (context, scrollController) {
return Column(
children: [
MySpacing.height(8),
_buildGrabHandle(),
MySpacing.height(10),
MyText.titleMedium('Bucket Details', fontWeight: 700),
MySpacing.height(12),
_buildHeader(bucket, canEdit, onEdit),
_buildInfo(bucket, members.length, canEdit),
MySpacing.height(6),
_buildMembersTitle(),
MySpacing.height(4),
Expanded(child: _buildMemberList(members, ownerId, scrollController)),
MySpacing.height(8),
],
);
},
),
), ),
); );
}, },
); );
} }
}
static Widget _buildGrabHandle() { class _TeamContent extends StatelessWidget {
return Container( final ContactBucket bucket;
width: 36, final List<dynamic> members;
height: 4, final bool canEdit;
decoration: BoxDecoration( final VoidCallback? onEdit;
color: Colors.grey.shade300, final String ownerId;
borderRadius: BorderRadius.circular(2),
), const _TeamContent({
required this.bucket,
required this.members,
required this.canEdit,
this.onEdit,
required this.ownerId,
});
@override
Widget build(BuildContext context) {
return Column(
children: [
_buildHeader(),
_buildInfo(),
_buildMembersTitle(),
MySpacing.height(8),
SizedBox(
height: 300,
child: _buildMemberList(),
),
],
); );
} }
static Widget _buildHeader(ContactBucket bucket, bool canEdit, VoidCallback? onEdit) { Widget _buildHeader() {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.symmetric(horizontal: 4),
child: Row( child: Row(
children: [ children: [
Expanded( Expanded(
@ -94,9 +95,9 @@ class TeamMembersBottomSheet {
); );
} }
static Widget _buildInfo(ContactBucket bucket, int totalMembers, bool canEdit) { Widget _buildInfo() {
return Padding( return Padding(
padding: const EdgeInsets.symmetric(horizontal: 16), padding: const EdgeInsets.only(bottom: 12),
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
@ -121,7 +122,7 @@ class TeamMembersBottomSheet {
const Icon(Icons.ios_share_outlined, size: 14, color: Colors.grey), const Icon(Icons.ios_share_outlined, size: 14, color: Colors.grey),
const SizedBox(width: 4), const SizedBox(width: 4),
MyText.labelSmall( MyText.labelSmall(
'Shared with ($totalMembers)', 'Shared with (${members.length})',
fontWeight: 600, fontWeight: 600,
color: Colors.indigo, color: Colors.indigo,
), ),
@ -139,21 +140,21 @@ class TeamMembersBottomSheet {
), ),
], ],
), ),
MySpacing.height(8), MySpacing.height(12),
const Divider(thickness: 1), const Divider(thickness: 1),
], ],
), ),
); );
} }
static Widget _buildMembersTitle() { Widget _buildMembersTitle() {
return Padding( return Align(
padding: const EdgeInsets.symmetric(horizontal: 16), alignment: Alignment.centerLeft,
child: MyText.labelLarge('Shared with', fontWeight: 700, color: Colors.black), child: MyText.labelLarge('Shared with', fontWeight: 700, color: Colors.black),
); );
} }
static Widget _buildMemberList(List<dynamic> members, String ownerId, ScrollController scrollController) { Widget _buildMemberList() {
if (members.isEmpty) { if (members.isEmpty) {
return Center( return Center(
child: MyText.bodySmall( child: MyText.bodySmall(
@ -165,10 +166,8 @@ class TeamMembersBottomSheet {
} }
return ListView.separated( return ListView.separated(
controller: scrollController,
itemCount: members.length, itemCount: members.length,
padding: const EdgeInsets.symmetric(horizontal: 16), separatorBuilder: (_, __) => const SizedBox(height: 6),
separatorBuilder: (_, __) => const SizedBox(height: 4),
itemBuilder: (context, index) { itemBuilder: (context, index) {
final member = members[index]; final member = members[index];
final firstName = member.firstName ?? ''; final firstName = member.firstName ?? '';

3
lib/model/dailyTaskPlaning/assign_task_bottom_sheet .dart
View File

@ -70,9 +70,6 @@ class _AssignTaskBottomSheetState extends State<AssignTaskBottomSheet> {
onCancel: () => Get.back(), onCancel: () => Get.back(),
onSubmit: _onAssignTaskPressed, onSubmit: _onAssignTaskPressed,
isSubmitting: controller.isAssigningTask.value, isSubmitting: controller.isAssigningTask.value,
submitText: "Assign Task",
submitIcon: Icons.check_circle_outline,
submitColor: Colors.indigo,
)); ));
} }

158
lib/model/dailyTaskPlaning/daily_progress_report_filter.dart
View File

@ -1,10 +1,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:marco/controller/permission_controller.dart';
import 'package:marco/controller/dashboard/daily_task_controller.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:marco/controller/dashboard/daily_task_controller.dart';
import 'package:marco/controller/permission_controller.dart';
import 'package:marco/helpers/utils/base_bottom_sheet.dart';
import 'package:marco/helpers/widgets/my_text.dart'; import 'package:marco/helpers/widgets/my_text.dart';
class DailyProgressReportFilter extends StatefulWidget { class DailyProgressReportFilter extends StatelessWidget {
final DailyTaskController controller; final DailyTaskController controller;
final PermissionController permissionController; final PermissionController permissionController;
@ -14,20 +15,9 @@ class DailyProgressReportFilter extends StatefulWidget {
required this.permissionController, required this.permissionController,
}); });
@override
State<DailyProgressReportFilter> createState() =>
_DailyProgressReportFilterState();
}
class _DailyProgressReportFilterState extends State<DailyProgressReportFilter> {
@override
void initState() {
super.initState();
}
String getLabelText() { String getLabelText() {
final startDate = widget.controller.startDateTask; final startDate = controller.startDateTask;
final endDate = widget.controller.endDateTask; final endDate = controller.endDateTask;
if (startDate != null && endDate != null) { if (startDate != null && endDate != null) {
final start = DateFormat('dd MM yyyy').format(startDate); final start = DateFormat('dd MM yyyy').format(startDate);
final end = DateFormat('dd MM yyyy').format(endDate); final end = DateFormat('dd MM yyyy').format(endDate);
@ -38,105 +28,55 @@ class _DailyProgressReportFilterState extends State<DailyProgressReportFilter> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SafeArea( return BaseBottomSheet(
child: Padding( title: "Filter Tasks",
padding: EdgeInsets.only( onCancel: () => Navigator.pop(context),
bottom: MediaQuery.of(context).viewInsets.bottom,
), onSubmit: () {
child: SingleChildScrollView( Navigator.pop(context, {
child: Column( 'startDate': controller.startDateTask,
mainAxisSize: MainAxisSize.min, 'endDate': controller.endDateTask,
children: [ });
Padding( },
padding: const EdgeInsets.only(top: 12, bottom: 8), child: Column(
child: Center( crossAxisAlignment: CrossAxisAlignment.start,
child: Container( children: [
width: 40, MyText.titleSmall("Select Date Range", fontWeight: 600),
height: 4, const SizedBox(height: 8),
decoration: BoxDecoration( InkWell(
color: Colors.grey[400], borderRadius: BorderRadius.circular(10),
borderRadius: BorderRadius.circular(4), onTap: () => controller.selectDateRangeForTaskData(
), context,
), controller,
), ),
child: Ink(
decoration: BoxDecoration(
color: Colors.grey.shade100,
border: Border.all(color: Colors.grey.shade400),
borderRadius: BorderRadius.circular(10),
), ),
const Divider(), padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 14),
Padding( child: Row(
padding: EdgeInsets.fromLTRB(16, 12, 16, 4), children: [
child: Align( Icon(Icons.date_range, color: Colors.blue.shade600),
alignment: Alignment.centerLeft, const SizedBox(width: 12),
child: MyText.titleSmall( Expanded(
"Select Date Range", child: Text(
fontWeight: 600, getLabelText(),
), style: const TextStyle(
), fontSize: 16,
), color: Colors.black87,
Padding( fontWeight: FontWeight.w500,
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
child: InkWell(
borderRadius: BorderRadius.circular(10),
onTap: () => widget.controller.selectDateRangeForTaskData(
context,
widget.controller,
),
child: Ink(
decoration: BoxDecoration(
color: Colors.grey.shade100,
border: Border.all(color: Colors.grey.shade400),
borderRadius: BorderRadius.circular(10),
),
padding: const EdgeInsets.symmetric(
horizontal: 16, vertical: 14),
child: Row(
children: [
Icon(Icons.date_range, color: Colors.blue.shade600),
const SizedBox(width: 12),
Expanded(
child: Text(
getLabelText(),
style: const TextStyle(
fontSize: 16,
color: Colors.black87,
fontWeight: FontWeight.w500,
),
overflow: TextOverflow.ellipsis,
),
),
const Icon(Icons.arrow_drop_down, color: Colors.grey),
],
),
),
),
),
const Divider(),
Padding(
padding:
const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
child: SizedBox(
width: double.infinity,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
padding: const EdgeInsets.symmetric(vertical: 12),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
), ),
overflow: TextOverflow.ellipsis,
), ),
child: const Text('Apply Filter'),
onPressed: () {
WidgetsBinding.instance.addPostFrameCallback((_) {
Navigator.pop(context, {
'startDate': widget.controller.startDateTask,
'endDate': widget.controller.endDateTask,
});
});
},
), ),
), const Icon(Icons.arrow_drop_down, color: Colors.grey),
],
), ),
], ),
), ),
), ],
), ),
); );
} }

38
lib/view/taskPlaning/daily_progress.dart
View File

@ -205,29 +205,27 @@ class _DailyProgressReportScreenState extends State<DailyProgressReportScreen>
} }
Future<void> _openFilterSheet() async { Future<void> _openFilterSheet() async {
final result = await showModalBottomSheet<Map<String, dynamic>>( final result = await showModalBottomSheet<Map<String, dynamic>>(
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
backgroundColor: Colors.white, backgroundColor: Colors.transparent,
shape: const RoundedRectangleBorder( builder: (context) => DailyProgressReportFilter(
borderRadius: BorderRadius.vertical(top: Radius.circular(12)), controller: dailyTaskController,
), permissionController: permissionController,
builder: (context) => DailyProgressReportFilter( ),
controller: dailyTaskController, );
permissionController: permissionController,
),
);
if (result != null) { if (result != null) {
final selectedProjectId = result['projectId'] as String?; final selectedProjectId = result['projectId'] as String?;
if (selectedProjectId != null && if (selectedProjectId != null &&
selectedProjectId != dailyTaskController.selectedProjectId) { selectedProjectId != dailyTaskController.selectedProjectId) {
dailyTaskController.selectedProjectId = selectedProjectId; dailyTaskController.selectedProjectId = selectedProjectId;
await dailyTaskController.fetchTaskData(selectedProjectId); await dailyTaskController.fetchTaskData(selectedProjectId);
dailyTaskController.update(['daily_progress_report_controller']); dailyTaskController.update(['daily_progress_report_controller']);
}
} }
} }
}
Future<void> _refreshData() async { Future<void> _refreshData() async {
final projectId = dailyTaskController.selectedProjectId; final projectId = dailyTaskController.selectedProjectId;