Vaibhav Surve
29f759ca9d
- Updated ReimbursementBottomSheet to use BaseBottomSheet for consistent styling and functionality. - Improved input field decorations and added spacing helpers for better layout. - Simplified the employee selection process and integrated it into the new design. - Refactored ExpenseDetailScreen to utilize controller initialization method. - Enhanced ExpenseFilterBottomSheet with a cleaner structure and improved field handling. - Removed unnecessary wrapper for ExpenseFilterBottomSheet and integrated it directly into the expense screen.
466 lines
15 KiB
Dart
466 lines
15 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:get/get.dart';
|
|
import 'package:marco/controller/project_controller.dart';
|
|
import 'package:marco/controller/expense/expense_screen_controller.dart';
|
|
import 'package:marco/helpers/utils/date_time_utils.dart';
|
|
import 'package:marco/helpers/widgets/my_spacing.dart';
|
|
import 'package:marco/helpers/widgets/my_text.dart';
|
|
import 'package:marco/model/expense/expense_list_model.dart';
|
|
import 'package:marco/view/expense/expense_detail_screen.dart';
|
|
import 'package:marco/model/expense/add_expense_bottom_sheet.dart';
|
|
import 'package:marco/view/expense/expense_filter_bottom_sheet.dart';
|
|
import 'package:marco/helpers/widgets/my_custom_skeleton.dart';
|
|
|
|
class ExpenseMainScreen extends StatefulWidget {
|
|
const ExpenseMainScreen({super.key});
|
|
|
|
@override
|
|
State<ExpenseMainScreen> createState() => _ExpenseMainScreenState();
|
|
}
|
|
|
|
class _ExpenseMainScreenState extends State<ExpenseMainScreen> {
|
|
final RxBool isHistoryView = false.obs;
|
|
final TextEditingController searchController = TextEditingController();
|
|
final RxString searchQuery = ''.obs;
|
|
|
|
final ProjectController projectController = Get.find<ProjectController>();
|
|
final ExpenseController expenseController = Get.put(ExpenseController());
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
expenseController.fetchExpenses(); // Initial data load
|
|
}
|
|
|
|
void _refreshExpenses() {
|
|
expenseController.fetchExpenses();
|
|
}
|
|
|
|
void _openFilterBottomSheet(BuildContext context) {
|
|
showModalBottomSheet(
|
|
context: context,
|
|
isScrollControlled: true,
|
|
backgroundColor: Colors.transparent,
|
|
builder: (context) {
|
|
return ExpenseFilterBottomSheet(
|
|
expenseController: expenseController,
|
|
scrollController: ScrollController(),
|
|
);
|
|
},
|
|
);
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Scaffold(
|
|
backgroundColor: Colors.white,
|
|
appBar: _ExpenseAppBar(projectController: projectController),
|
|
body: SafeArea(
|
|
child: Column(
|
|
children: [
|
|
_SearchAndFilter(
|
|
searchController: searchController,
|
|
onChanged: (value) => searchQuery.value = value,
|
|
onFilterTap: () => _openFilterBottomSheet(context),
|
|
onRefreshTap: _refreshExpenses,
|
|
),
|
|
_ToggleButtons(isHistoryView: isHistoryView),
|
|
Expanded(
|
|
child: Obx(() {
|
|
if (expenseController.isLoading.value) {
|
|
return SkeletonLoaders.expenseListSkeletonLoader();
|
|
}
|
|
|
|
if (expenseController.errorMessage.isNotEmpty) {
|
|
return Center(
|
|
child: MyText.bodyMedium(
|
|
expenseController.errorMessage.value,
|
|
color: Colors.red,
|
|
),
|
|
);
|
|
}
|
|
|
|
if (expenseController.expenses.isEmpty) {
|
|
return Center(child: MyText.bodyMedium("No expenses found."));
|
|
}
|
|
|
|
final filteredList =
|
|
expenseController.expenses.where((expense) {
|
|
final query = searchQuery.value.toLowerCase();
|
|
return query.isEmpty ||
|
|
expense.expensesType.name.toLowerCase().contains(query) ||
|
|
expense.supplerName.toLowerCase().contains(query) ||
|
|
expense.paymentMode.name.toLowerCase().contains(query);
|
|
}).toList();
|
|
|
|
// Sort by latest transaction date
|
|
filteredList.sort(
|
|
(a, b) => b.transactionDate.compareTo(a.transactionDate));
|
|
|
|
final now = DateTime.now();
|
|
final currentMonthList = filteredList
|
|
.where((e) =>
|
|
e.transactionDate.month == now.month &&
|
|
e.transactionDate.year == now.year)
|
|
.toList();
|
|
|
|
final historyList = filteredList
|
|
.where((e) => e.transactionDate
|
|
.isBefore(DateTime(now.year, now.month, 1)))
|
|
.toList();
|
|
|
|
final listToShow =
|
|
isHistoryView.value ? historyList : currentMonthList;
|
|
|
|
return _ExpenseList(expenseList: listToShow);
|
|
}),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
floatingActionButton: FloatingActionButton(
|
|
backgroundColor: Colors.red,
|
|
onPressed: showAddExpenseBottomSheet,
|
|
child: const Icon(Icons.add, color: Colors.white),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
///---------------------- APP BAR ----------------------///
|
|
class _ExpenseAppBar extends StatelessWidget implements PreferredSizeWidget {
|
|
final ProjectController projectController;
|
|
|
|
const _ExpenseAppBar({required this.projectController});
|
|
|
|
@override
|
|
Size get preferredSize => const Size.fromHeight(72);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return PreferredSize(
|
|
preferredSize: preferredSize,
|
|
child: AppBar(
|
|
backgroundColor: const Color(0xFFF5F5F5),
|
|
elevation: 0.5,
|
|
automaticallyImplyLeading: false,
|
|
titleSpacing: 0,
|
|
title: Padding(
|
|
padding: MySpacing.xy(16, 0),
|
|
child: Row(
|
|
children: [
|
|
IconButton(
|
|
icon: const Icon(Icons.arrow_back_ios_new,
|
|
color: Colors.black, size: 20),
|
|
onPressed: () => Get.offNamed('/dashboard'),
|
|
),
|
|
MySpacing.width(8),
|
|
Expanded(
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
MyText.titleLarge(
|
|
'Expenses',
|
|
fontWeight: 700,
|
|
color: Colors.black,
|
|
),
|
|
MySpacing.height(2),
|
|
GetBuilder<ProjectController>(
|
|
builder: (_) {
|
|
final projectName =
|
|
projectController.selectedProject?.name ??
|
|
'Select Project';
|
|
return InkWell(
|
|
child: Row(
|
|
children: [
|
|
const Icon(Icons.work_outline,
|
|
size: 14, color: Colors.grey),
|
|
MySpacing.width(4),
|
|
Expanded(
|
|
child: MyText.bodySmall(
|
|
projectName,
|
|
fontWeight: 600,
|
|
overflow: TextOverflow.ellipsis,
|
|
color: Colors.grey[700],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
},
|
|
)
|
|
],
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
///---------------------- SEARCH AND FILTER ----------------------///
|
|
class _SearchAndFilter extends StatelessWidget {
|
|
final TextEditingController searchController;
|
|
final ValueChanged<String> onChanged;
|
|
final VoidCallback onFilterTap;
|
|
final VoidCallback onRefreshTap;
|
|
|
|
const _SearchAndFilter({
|
|
required this.searchController,
|
|
required this.onChanged,
|
|
required this.onFilterTap,
|
|
required this.onRefreshTap,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final ExpenseController expenseController = Get.find<ExpenseController>();
|
|
|
|
return Padding(
|
|
padding: MySpacing.fromLTRB(12, 10, 12, 0),
|
|
child: Row(
|
|
children: [
|
|
Expanded(
|
|
child: SizedBox(
|
|
height: 35,
|
|
child: TextField(
|
|
controller: searchController,
|
|
onChanged: onChanged,
|
|
decoration: InputDecoration(
|
|
contentPadding: const EdgeInsets.symmetric(horizontal: 12),
|
|
prefixIcon:
|
|
const Icon(Icons.search, size: 20, color: Colors.grey),
|
|
hintText: 'Search expenses...',
|
|
filled: true,
|
|
fillColor: Colors.white,
|
|
border: OutlineInputBorder(
|
|
borderRadius: BorderRadius.circular(10),
|
|
borderSide: BorderSide(color: Colors.grey.shade300),
|
|
),
|
|
enabledBorder: OutlineInputBorder(
|
|
borderRadius: BorderRadius.circular(10),
|
|
borderSide: BorderSide(color: Colors.grey.shade300),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
MySpacing.width(8),
|
|
Tooltip(
|
|
message: 'Refresh Data',
|
|
child: InkWell(
|
|
borderRadius: BorderRadius.circular(24),
|
|
onTap: onRefreshTap,
|
|
child: const Padding(
|
|
padding: EdgeInsets.all(0),
|
|
child: Icon(Icons.refresh, color: Colors.green, size: 28),
|
|
),
|
|
),
|
|
),
|
|
MySpacing.width(8),
|
|
Obx(() {
|
|
final bool showRedDot = expenseController.isFilterApplied;
|
|
return IconButton(
|
|
onPressed: onFilterTap,
|
|
icon: Stack(
|
|
clipBehavior: Clip.none,
|
|
children: [
|
|
const Icon(Icons.tune, color: Colors.black, size: 24),
|
|
if (showRedDot)
|
|
Positioned(
|
|
top: -1,
|
|
right: -1,
|
|
child: Container(
|
|
width: 10,
|
|
height: 10,
|
|
decoration: BoxDecoration(
|
|
color: Colors.red,
|
|
shape: BoxShape.circle,
|
|
border: Border.all(
|
|
color: Colors.white,
|
|
width: 1.5,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
///---------------------- TOGGLE BUTTONS ----------------------///
|
|
class _ToggleButtons extends StatelessWidget {
|
|
final RxBool isHistoryView;
|
|
|
|
const _ToggleButtons({required this.isHistoryView});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Padding(
|
|
padding: MySpacing.fromLTRB(8, 12, 8, 5),
|
|
child: Obx(() {
|
|
return Container(
|
|
padding: const EdgeInsets.all(2),
|
|
decoration: BoxDecoration(
|
|
color: const Color(0xFFF0F0F0),
|
|
borderRadius: BorderRadius.circular(10),
|
|
boxShadow: [
|
|
BoxShadow(
|
|
color: Colors.black.withOpacity(0.05),
|
|
blurRadius: 4,
|
|
offset: const Offset(0, 2),
|
|
),
|
|
],
|
|
),
|
|
child: Row(
|
|
children: [
|
|
_ToggleButton(
|
|
label: 'Expenses',
|
|
icon: Icons.receipt_long,
|
|
selected: !isHistoryView.value,
|
|
onTap: () => isHistoryView.value = false,
|
|
),
|
|
_ToggleButton(
|
|
label: 'History',
|
|
icon: Icons.history,
|
|
selected: isHistoryView.value,
|
|
onTap: () => isHistoryView.value = true,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ToggleButton extends StatelessWidget {
|
|
final String label;
|
|
final IconData icon;
|
|
final bool selected;
|
|
final VoidCallback onTap;
|
|
|
|
const _ToggleButton({
|
|
required this.label,
|
|
required this.icon,
|
|
required this.selected,
|
|
required this.onTap,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return Expanded(
|
|
child: GestureDetector(
|
|
onTap: onTap,
|
|
child: AnimatedContainer(
|
|
duration: const Duration(milliseconds: 200),
|
|
padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 10),
|
|
decoration: BoxDecoration(
|
|
color: selected ? Colors.red : Colors.transparent,
|
|
borderRadius: BorderRadius.circular(8),
|
|
),
|
|
child: Row(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: [
|
|
Icon(icon,
|
|
size: 16, color: selected ? Colors.white : Colors.grey),
|
|
const SizedBox(width: 6),
|
|
MyText.bodyMedium(
|
|
label,
|
|
color: selected ? Colors.white : Colors.grey,
|
|
fontWeight: 600,
|
|
),
|
|
],
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
///---------------------- EXPENSE LIST ----------------------///
|
|
class _ExpenseList extends StatelessWidget {
|
|
final List<ExpenseModel> expenseList;
|
|
|
|
const _ExpenseList({required this.expenseList});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
if (expenseList.isEmpty) {
|
|
return Center(child: MyText.bodyMedium('No expenses found.'));
|
|
}
|
|
final expenseController = Get.find<ExpenseController>();
|
|
return ListView.separated(
|
|
padding: const EdgeInsets.fromLTRB(12, 12, 12, 80),
|
|
itemCount: expenseList.length,
|
|
separatorBuilder: (_, __) =>
|
|
Divider(color: Colors.grey.shade300, height: 20),
|
|
itemBuilder: (context, index) {
|
|
final expense = expenseList[index];
|
|
|
|
final formattedDate = DateTimeUtils.convertUtcToLocal(
|
|
expense.transactionDate.toIso8601String(),
|
|
format: 'dd MMM yyyy, hh:mm a',
|
|
);
|
|
|
|
return GestureDetector(
|
|
onTap: () async {
|
|
final result = await Get.to(
|
|
() => ExpenseDetailScreen(expenseId: expense.id),
|
|
arguments: {'expense': expense},
|
|
);
|
|
|
|
// If status was updated, refresh expenses
|
|
if (result == true) {
|
|
expenseController.fetchExpenses();
|
|
}
|
|
},
|
|
child: Padding(
|
|
padding: const EdgeInsets.symmetric(vertical: 4),
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
children: [
|
|
Row(
|
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
children: [
|
|
MyText.bodyMedium(
|
|
expense.expensesType.name,
|
|
fontWeight: 600,
|
|
),
|
|
MyText.bodyMedium(
|
|
'₹ ${expense.amount.toStringAsFixed(2)}',
|
|
fontWeight: 600,
|
|
),
|
|
],
|
|
),
|
|
const SizedBox(height: 6),
|
|
Row(
|
|
children: [
|
|
MyText.bodySmall(
|
|
formattedDate,
|
|
fontWeight: 500,
|
|
),
|
|
const Spacer(),
|
|
MyText.bodySmall(
|
|
expense.status.name,
|
|
fontWeight: 500,
|
|
),
|
|
],
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
},
|
|
);
|
|
}
|
|
}
|