n8r/rluv_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Migrate away from helpers package

Browse Source
This commit is contained in:
Nathan Anderson
2024-09-10 15:03:32 -06:00
parent ddba989576
commit 1172e650aa
19 changed files with 370 additions and 723 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/budget/widgets/add_budget_category_dialog.dart
+22 -52
View File
@@ -1,7 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:helpers/helpers/print.dart';
import 'package:rluv/global/styles.dart';
import 'package:rluv/models/budget.dart';
import 'package:rluv/models/budget_category_model.dart';
@@ -17,12 +15,10 @@ class BudgetCategoryDialog extends ConsumerStatefulWidget {
final BudgetCategory? category;
@override
ConsumerState<BudgetCategoryDialog> createState() =>
_AddBudgetCategoryDialogState();
ConsumerState<BudgetCategoryDialog> createState() => _AddBudgetCategoryDialogState();
}
class _AddBudgetCategoryDialogState
extends ConsumerState<BudgetCategoryDialog> {
class _AddBudgetCategoryDialogState extends ConsumerState<BudgetCategoryDialog> {
late final Budget? budget;
final categoryNameController = TextEditingController();
final amountController = TextEditingController();
@@ -65,12 +61,11 @@ class _AddBudgetCategoryDialogState
return Container();
}
return SizedBox(
width: BuildMedia(context).width * Styles.dialogScreenWidthFactor,
width: MediaQuery.of(context).size.width * Styles.dialogScreenWidthFactor,
child: Stack(
children: [
Padding(
padding:
const EdgeInsets.symmetric(vertical: 18.0, horizontal: 32.0),
padding: const EdgeInsets.symmetric(vertical: 18.0, horizontal: 32.0),
child: Form(
key: formKey,
child: Column(
@@ -78,9 +73,7 @@ class _AddBudgetCategoryDialogState
children: [
Padding(
padding: const EdgeInsets.only(bottom: 18.0),
child: Text(widget.category == null
? 'Add Category:'
: 'Edit Category'),
child: Text(widget.category == null ? 'Add Category:' : 'Edit Category'),
),
Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
@@ -149,8 +142,7 @@ class _AddBudgetCategoryDialogState
],
),
Padding(
padding: const EdgeInsets.symmetric(
vertical: 6.0, horizontal: 16.0),
padding: const EdgeInsets.symmetric(vertical: 6.0, horizontal: 16.0),
child: SizedBox(
height: 76,
child: ListView.builder(
@@ -164,23 +156,21 @@ class _AddBudgetCategoryDialogState
} else {
setState(() => selectedColorIndex = -1);
}
printBlue(selectedColorIndex);
print(selectedColorIndex);
},
child: Padding(
padding: const EdgeInsets.all(8.0),
child: AnimatedContainer(
decoration: selectedColorIndex == index
? BoxDecoration(
borderRadius:
BorderRadius.circular(15.0),
borderRadius: BorderRadius.circular(15.0),
border: Border.all(
color: Styles.washedStone,
width: 2.0,
),
)
: BoxDecoration(
borderRadius:
BorderRadius.circular(5.0),
borderRadius: BorderRadius.circular(5.0),
border: Border.all(
color: Colors.transparent,
width: 2.0,
@@ -205,8 +195,7 @@ class _AddBudgetCategoryDialogState
decoration: BoxDecoration(
color: colors[index],
shape: BoxShape.circle,
border: Border.all(
color: Colors.black, width: 1.5),
border: Border.all(color: Colors.black, width: 1.5),
),
),
],
@@ -227,8 +216,7 @@ class _AddBudgetCategoryDialogState
color: Styles.expensesRed,
text: 'DELETE',
onPressed: () {
if (formKey.currentState != null &&
formKey.currentState!.validate()) {
if (formKey.currentState != null && formKey.currentState!.validate()) {
removeCategory().then((success) {
Navigator.pop(context);
if (success) {
@@ -254,8 +242,7 @@ class _AddBudgetCategoryDialogState
color: Styles.lavender,
text: 'SAVE',
onPressed: () {
if (formKey.currentState != null &&
formKey.currentState!.validate()) {
if (formKey.currentState != null && formKey.currentState!.validate()) {
submitCategory(colors[selectedColorIndex]).then((_) {
Navigator.pop(context);
showSnack(
@@ -282,7 +269,7 @@ class _AddBudgetCategoryDialogState
Future submitCategory(Color categoryColor) async {
if (formKey.currentState != null && !formKey.currentState!.validate()) {
printPink('Failed validation');
print('Failed validation');
return;
}
Map<String, dynamic>? budgetData;
@@ -296,58 +283,41 @@ class _AddBudgetCategoryDialogState
name: categoryNameController.text,
);
budgetData = await ref
.read(apiProvider.notifier)
.post(path: 'budget_category', data: newBudget.toJson());
budgetData = await ref.read(apiProvider.notifier).post(path: 'budget_category', data: newBudget.toJson());
success = budgetData != null ? budgetData['success'] as bool : false;
if (success) {
ref
.read(dashboardProvider.notifier)
.add({'budget_categories': budgetData});
ref.read(dashboardProvider.notifier).add({'budget_categories': budgetData});
}
} else {
final newBudget =
BudgetCategory.copyWith(category: widget.category!, data: {
final newBudget = BudgetCategory.copyWith(category: widget.category!, data: {
'amount': double.parse(amountController.text),
'color': categoryColor,
'name': categoryNameController.text
});
budgetData = await ref
.read(apiProvider.notifier)
.put(path: 'budget_category', data: newBudget.toJson());
budgetData = await ref.read(apiProvider.notifier).put(path: 'budget_category', data: newBudget.toJson());
success = budgetData != null ? budgetData['success'] as bool : false;
if (success) {
ref
.read(dashboardProvider.notifier)
.update({'budget_categories': budgetData});
ref.read(dashboardProvider.notifier).update({'budget_categories': budgetData});
}
}
if (success) {
showSnack(
ref: ref,
text: widget.category == null
? 'Added budget category!'
: 'Updated category!',
text: widget.category == null ? 'Added budget category!' : 'Updated category!',
type: SnackType.error);
} else {
showSnack(
ref: ref,
text: widget.category == null
? 'Could not add budget category'
: 'Could not update category',
text: widget.category == null ? 'Could not add budget category' : 'Could not update category',
type: SnackType.error);
}
}
Future<bool> removeCategory() async {
final res = await ref
.read(apiProvider.notifier)
.delete(path: 'budget_category', data: {'id': widget.category!.id});
final res = await ref.read(apiProvider.notifier).delete(path: 'budget_category', data: {'id': widget.category!.id});
final success = res != null ? res['success'] as bool : false;
if (success) {
ref
.read(dashboardProvider.notifier)
.removeWithId('budget_categories', widget.category!.id!);
ref.read(dashboardProvider.notifier).removeWithId('budget_categories', widget.category!.id!);
}
return success;
}
lib/features/budget/widgets/add_transaction_dialog.dart
+24 -49
View File
@@ -1,7 +1,6 @@
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:rluv/global/utils.dart';
import '../../../global/api.dart';
@@ -18,8 +17,7 @@ class TransactionDialog extends ConsumerStatefulWidget {
final Transaction? transaction;
@override
ConsumerState<TransactionDialog> createState() =>
_AddTransactionDialogState();
ConsumerState<TransactionDialog> createState() => _AddTransactionDialogState();
}
class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
@@ -37,8 +35,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
@override
void initState() {
if (widget.transaction != null) {
amountController =
TextEditingController(text: widget.transaction!.amount.toString());
amountController = TextEditingController(text: widget.transaction!.amount.toString());
memoController = TextEditingController(text: widget.transaction!.memo);
transactionType = widget.transaction!.type;
selectedDate = widget.transaction!.date;
@@ -53,8 +50,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
}
final u = ref.read(userProvider);
if (u == null) {
WidgetsBinding.instance.addPostFrameCallback(
(_) => ref.read(jwtProvider.notifier).revokeToken());
WidgetsBinding.instance.addPostFrameCallback((_) => ref.read(jwtProvider.notifier).revokeToken());
} else {
user = u;
}
@@ -65,10 +61,9 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
@override
Widget build(BuildContext context) {
if (user == null) return Container();
final List<BudgetCategory> budgetCategories =
ref.read(budgetCategoriesProvider);
final List<BudgetCategory> budgetCategories = ref.read(budgetCategoriesProvider);
return SizedBox(
width: BuildMedia(context).width * Styles.dialogScreenWidthFactor,
width: MediaQuery.of(context).size.width * Styles.dialogScreenWidthFactor,
child: budgetCategories.isEmpty
? const Padding(
padding: EdgeInsets.all(8.0),
@@ -91,25 +86,21 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
onTap: transactionType == TransactionType.expense
? null
: () {
setState(() => transactionType =
TransactionType.expense);
setState(() => transactionType = TransactionType.expense);
},
child: AnimatedContainer(
height: 38,
width: 80,
decoration: BoxDecoration(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0)),
color: transactionType ==
TransactionType.expense
topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0)),
color: transactionType == TransactionType.expense
? Styles.lavender
: Styles.washedStone),
duration: const Duration(milliseconds: 300),
child: const Padding(
padding: EdgeInsets.all(8.0),
child: Text('Expense',
style: TextStyle(fontSize: 16)),
child: Text('Expense', style: TextStyle(fontSize: 16)),
),
),
),
@@ -117,25 +108,20 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
onTap: transactionType == TransactionType.income
? null
: () {
setState(() => transactionType =
TransactionType.income);
setState(() => transactionType = TransactionType.income);
},
child: AnimatedContainer(
height: 38,
width: 80,
decoration: BoxDecoration(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(8.0),
topRight: Radius.circular(8.0)),
topLeft: Radius.circular(8.0), topRight: Radius.circular(8.0)),
color:
transactionType == TransactionType.income
? Styles.lavender
: Styles.washedStone),
transactionType == TransactionType.income ? Styles.lavender : Styles.washedStone),
duration: const Duration(milliseconds: 300),
child: const Padding(
padding: EdgeInsets.all(8.0),
child: Text('Income',
style: TextStyle(fontSize: 16)),
child: Text('Income', style: TextStyle(fontSize: 16)),
),
),
),
@@ -208,9 +194,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
width: 18,
decoration: BoxDecoration(
shape: BoxShape.circle,
border: Border.all(
color: Colors.black,
width: 1.5),
border: Border.all(color: Colors.black, width: 1.5),
color: e.color,
),
),
@@ -226,8 +210,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
if (kDebugMode) {
print('${value.name} selected');
}
setState(() =>
selectedBudgetCategory = value);
setState(() => selectedBudgetCategory = value);
}
},
),
@@ -247,7 +230,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
),
),
Container(
width: BuildMedia(context).width * 0.65,
width: MediaQuery.of(context).size.width * 0.65,
height: 100,
decoration: Styles.boxLavenderBubble,
child: TextFormField(
@@ -266,12 +249,12 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
text: 'ADD',
color: Styles.lavender,
onPressed: () => submitTransaction().then((_) {
Navigator.pop(context);
if (mounted) {
Navigator.pop(context);
}
showSnack(
ref: ref,
text: widget.transaction != null
? 'Transaction updated!'
: 'Transaction added!',
text: widget.transaction != null ? 'Transaction updated!' : 'Transaction added!',
type: SnackType.success,
);
}),
@@ -289,9 +272,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
data: Transaction.copyWith(widget.transaction!, {
'memo': memoController.text.isNotEmpty ? memoController.text : null,
'amount': double.parse(amountController.text),
'budget_category_id': transactionType == TransactionType.income
? null
: selectedBudgetCategory.id,
'budget_category_id': transactionType == TransactionType.income ? null : selectedBudgetCategory.id,
}).toJson());
} else {
data = await ref.read(apiProvider.notifier).post(
@@ -299,15 +280,11 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
data: Transaction(
amount: double.parse(amountController.text),
createdByUserId: user!.id!,
budgetCategoryId: transactionType == TransactionType.income
? null
: selectedBudgetCategory.id,
budgetCategoryId: transactionType == TransactionType.income ? null : selectedBudgetCategory.id,
budgetId: user!.budgetId,
date: DateTime.now(),
type: transactionType,
memo: memoController.text.isNotEmpty
? memoController.text
: null)
memo: memoController.text.isNotEmpty ? memoController.text : null)
.toJson());
}
final success = data != null ? data['success'] as bool : false;
@@ -320,9 +297,7 @@ class _AddTransactionDialogState extends ConsumerState<TransactionDialog> {
} else {
showSnack(
ref: ref,
text: widget.transaction != null
? 'Failed to edit transaction'
: 'Failed to add transaction',
text: widget.transaction != null ? 'Failed to edit transaction' : 'Failed to add transaction',
type: SnackType.error);
}
}
lib/features/budget/widgets/budget_category_bar.dart
+1 -4
View File
@@ -1,7 +1,6 @@
import 'dart:math';
import 'package:flutter/material.dart';
import 'package:helpers/helpers/print.dart';
import 'package:rluv/features/budget/widgets/add_budget_category_dialog.dart';
import 'package:rluv/global/utils.dart';
import 'package:rluv/models/budget_category_model.dart';
@@ -45,8 +44,7 @@ class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
}
});
final innerHeight = widget.height - widget.innerPadding * 2;
final isBright =
getBrightness(widget.budgetCategory.color) == Brightness.light;
final isBright = getBrightness(widget.budgetCategory.color) == Brightness.light;
final textStyle = TextStyle(
fontSize: 14,
fontWeight: FontWeight.bold,
@@ -155,7 +153,6 @@ class _BudgetCategoryBarState extends State<BudgetCategoryBar> {
if (!name.contains(' ') || name.indexOf(' ') == name.length - 1) {
return name;
}
printLime('here');
final words = name.split(' ');
int index = 0;
String firstLine = words[index];
lib/features/budget/widgets/budget_net_bar.dart
+4 -12
View File
@@ -1,14 +1,9 @@
import 'package:flutter/material.dart';
import 'package:helpers/helpers.dart';
import 'package:rluv/global/styles.dart';
import 'package:rluv/global/utils.dart';
class BudgetNetBar extends StatelessWidget {
const BudgetNetBar(
{super.key,
required this.isPositive,
required this.net,
required this.expected});
const BudgetNetBar({super.key, required this.isPositive, required this.net, required this.expected});
final bool isPositive;
final double net;
@@ -16,7 +11,7 @@ class BudgetNetBar extends StatelessWidget {
@override
Widget build(BuildContext context) {
final screenWidth = BuildMedia(context).width;
final screenWidth = MediaQuery.of(context).size.width;
return Container(
width: screenWidth * 0.85,
decoration: BoxDecoration(
@@ -25,8 +20,7 @@ class BudgetNetBar extends StatelessWidget {
),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 12.0),
child:
Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
child: Row(mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [
Text(
isPositive ? 'Income' : 'Expenses',
style: const TextStyle(
@@ -35,9 +29,7 @@ class BudgetNetBar extends StatelessWidget {
),
Text(
'${net.currency()} / ${expected.currency()}',
style: TextStyle(
fontSize: 20,
color: isPositive ? Styles.incomeGreen : Styles.expensesRed),
style: TextStyle(fontSize: 20, color: isPositive ? Styles.incomeGreen : Styles.expensesRed),
),
]),
),
lib/features/budget/widgets/transaction_list_item.dart
+12 -33
View File
@@ -1,6 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:helpers/helpers/misc_build/build_media.dart';
import 'package:intl/intl.dart';
import 'package:rluv/features/budget/screens/transactions_listview.dart';
import 'package:rluv/features/budget/widgets/add_transaction_dialog.dart';
@@ -19,8 +18,7 @@ class TransactionListItem extends ConsumerStatefulWidget {
final int index;
@override
ConsumerState<TransactionListItem> createState() =>
_TransactionListItemState();
ConsumerState<TransactionListItem> createState() => _TransactionListItemState();
}
class _TransactionListItemState extends ConsumerState<TransactionListItem> {
@@ -54,17 +52,13 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
child: Padding(
padding: const EdgeInsets.only(top: 8.0, left: 8.0, bottom: 8.0),
child: ClipRRect(
borderRadius: const BorderRadius.only(
topLeft: Radius.circular(10.0),
bottomLeft: Radius.circular(10.0)),
borderRadius: const BorderRadius.only(topLeft: Radius.circular(10.0), bottomLeft: Radius.circular(10.0)),
child: AnimatedContainer(
curve: Curves.easeOut,
duration: const Duration(milliseconds: 200),
height: cardHeight,
decoration: const BoxDecoration(
borderRadius: BorderRadius.only(
topLeft: Radius.circular(10.0),
bottomLeft: Radius.circular(10.0)),
borderRadius: BorderRadius.only(topLeft: Radius.circular(10.0), bottomLeft: Radius.circular(10.0)),
color: Styles.washedStone,
),
child: Row(
@@ -74,19 +68,16 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
duration: const Duration(milliseconds: 200),
height: cardHeight,
width: 6,
color: transaction!.type == TransactionType.income
? Styles.incomeBlue
: Styles.expensesOrange),
color: transaction!.type == TransactionType.income ? Styles.incomeBlue : Styles.expensesOrange),
SizedBox(
width: BuildMedia(context).width * 0.65,
width: MediaQuery.of(context).size.width * 0.65,
child: Padding(
padding: const EdgeInsets.only(left: 8.0),
child: Column(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(DateFormat('EEE MMM d, h:mm a')
.format(transaction!.date)),
Text(DateFormat('EEE MMM d, h:mm a').format(transaction!.date)),
Row(
children: [
const SizedBox(
@@ -101,9 +92,7 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
),
],
Text(
transaction!.type == TransactionType.income
? 'Income'
: budgetCategory!.name,
transaction!.type == TransactionType.income ? 'Income' : budgetCategory!.name,
style: const TextStyle(fontSize: 20),
),
],
@@ -125,9 +114,7 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
transaction!.amount.currency(),
style: TextStyle(
fontSize: 24,
color: transaction!.type == TransactionType.income
? Styles.incomeGreen
: Styles.expensesRed),
color: transaction!.type == TransactionType.income ? Styles.incomeGreen : Styles.expensesRed),
),
if (showDetails) ...[
IconButton(
@@ -140,8 +127,7 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
builder: (context) => Dialog(
backgroundColor: Styles.dialogColor,
shape: Styles.dialogShape,
child:
TransactionDialog(transaction: transaction),
child: TransactionDialog(transaction: transaction),
),
);
},
@@ -182,21 +168,14 @@ class _TransactionListItemState extends ConsumerState<TransactionListItem> {
}
Future deleteTransaction() async {
final res = await ref
.read(apiProvider.notifier)
.delete(path: 'transaction', data: {'id': transaction!.id});
final res = await ref.read(apiProvider.notifier).delete(path: 'transaction', data: {'id': transaction!.id});
final success = res != null ? res['success'] as bool : false;
if (success) {
ref
.read(dashboardProvider.notifier)
.removeWithId('transactions', transaction!.id!);
ref.read(dashboardProvider.notifier).removeWithId('transactions', transaction!.id!);
showSnack(ref: ref, text: 'Transaction removed', type: SnackType.success);
} else {
showSnack(
ref: ref,
text: 'Could not delete transaction',
type: SnackType.error);
showSnack(ref: ref, text: 'Could not delete transaction', type: SnackType.error);
}
}
}