diff --git a/lib/view/expense/expense_filter_bottom_sheet.dart b/lib/view/expense/expense_filter_bottom_sheet.dart index 31b0306..210242b 100644 --- a/lib/view/expense/expense_filter_bottom_sheet.dart +++ b/lib/view/expense/expense_filter_bottom_sheet.dart @@ -38,7 +38,6 @@ class ExpenseFilterBottomSheet extends StatelessWidget { Get.back(); }, submitText: 'Submit', - submitColor: Colors.indigo, submitIcon: Icons.check_circle_outline, child: SingleChildScrollView( controller: scrollController, diff --git a/lib/view/expense/expense_screen.dart b/lib/view/expense/expense_screen.dart index 2dd072b..39d14af 100644 --- a/lib/view/expense/expense_screen.dart +++ b/lib/view/expense/expense_screen.dart @@ -11,6 +11,7 @@ import 'package:marco/view/expense/expense_filter_bottom_sheet.dart'; import 'package:marco/helpers/widgets/expense/expense_main_components.dart'; import 'package:marco/helpers/utils/permission_constants.dart'; import 'package:marco/helpers/widgets/my_refresh_indicator.dart'; +import 'package:marco/helpers/utils/mixins/ui_mixin.dart'; class ExpenseMainScreen extends StatefulWidget { const ExpenseMainScreen({super.key}); @@ -20,7 +21,7 @@ class ExpenseMainScreen extends StatefulWidget { } class _ExpenseMainScreenState extends State - with SingleTickerProviderStateMixin { + with SingleTickerProviderStateMixin,UIMixin { late TabController _tabController; final searchController = TextEditingController(); final expenseController = Get.put(ExpenseController()); @@ -139,7 +140,7 @@ class _ExpenseMainScreenState extends State floatingActionButton: permissionController.hasPermission(Permissions.expenseUpload) ? FloatingActionButton.extended( - backgroundColor: Colors.red, + backgroundColor: contentTheme.primary, onPressed: showAddExpenseBottomSheet, icon: const Icon(Icons.add, color: Colors.white), label: const Text(