Improved layout, fixed transaction popup
This commit is contained in:
@@ -1,11 +1,10 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
import 'package:tunas/domains/account/account_bloc.dart';
|
||||
import 'package:tunas/domains/category/category_bloc.dart';
|
||||
import 'package:tunas/domains/transaction/transaction_bloc.dart';
|
||||
|
||||
import 'autocomplete_input.dart';
|
||||
|
||||
class TransactionForm extends StatelessWidget {
|
||||
|
||||
const TransactionForm({super.key});
|
||||
@@ -13,11 +12,16 @@ class TransactionForm extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
_TransactionDateInput(),
|
||||
const SizedBox(height: 10,),
|
||||
_TransactionCategoryInput(),
|
||||
const SizedBox(height: 10,),
|
||||
_TransactionDescriptionInput(),
|
||||
const SizedBox(height: 10,),
|
||||
_TransactionAccountInput(),
|
||||
const SizedBox(height: 10,),
|
||||
_TransactionValueInput()
|
||||
],
|
||||
);
|
||||
@@ -41,11 +45,19 @@ class _TransactionDateInput extends StatelessWidget {
|
||||
context: context,
|
||||
firstDate: DateTime.fromMicrosecondsSinceEpoch(0),
|
||||
lastDate: DateTime.now()
|
||||
).then((value) => context.read<TransactionBloc>().add(TransactionDateChange(value)));
|
||||
).then((value) {
|
||||
if (value != null) {
|
||||
context.read<TransactionBloc>().add(TransactionDateChange(value));
|
||||
}
|
||||
});
|
||||
},
|
||||
decoration: InputDecoration(
|
||||
icon: const Icon(Icons.calendar_month),
|
||||
hintText: 'Date',
|
||||
errorText: state.transactionDate.isNotValid ? state.transactionDate.error?.message : null
|
||||
errorText: state.transactionDate.isNotValid ? state.transactionDate.error?.message : null,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
),
|
||||
)
|
||||
)
|
||||
@@ -61,12 +73,18 @@ class _TransactionCategoryInput extends StatelessWidget {
|
||||
buildWhen: (previous, current) => previous.transactionCategory != current.transactionCategory,
|
||||
builder: (context, state) => SizedBox(
|
||||
width: 500,
|
||||
child: AutocompleteInput(
|
||||
options: categoryState.categories.map((e) => e.label).toList(),
|
||||
hintText: 'Category',
|
||||
initialValue: state.transactionCategory.value,
|
||||
errorText: state.transactionCategory.isNotValid ? state.transactionCategory.error?.message : null,
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionCategoryChange(value)),
|
||||
child: DropdownButtonFormField<String>(
|
||||
value: state.transactionCategory.value.toString() == '' ? null : state.transactionCategory.value.toString(),
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionCategoryChange(value!)),
|
||||
items: categoryState.categories.map((e) => DropdownMenuItem(value: e.label, child: Text(e.label))).toList(),
|
||||
decoration: InputDecoration(
|
||||
icon: const Icon(Icons.category),
|
||||
hintText: 'Category',
|
||||
errorText: state.transactionCategory.isNotValid ? state.transactionCategory.error?.message : null,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -80,11 +98,16 @@ class _TransactionDescriptionInput extends StatelessWidget {
|
||||
buildWhen: (previous, current) => previous.transactionDescription != current.transactionDescription,
|
||||
builder: (context, state) => SizedBox(
|
||||
width: 500,
|
||||
child: TextField(
|
||||
child: TextFormField(
|
||||
decoration: InputDecoration(
|
||||
icon: const Icon(Icons.description),
|
||||
hintText: 'Description',
|
||||
errorText: state.transactionDescription.isNotValid ? state.transactionDescription.error?.message : null
|
||||
errorText: state.transactionDescription.isNotValid ? state.transactionDescription.error?.message : null,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
),
|
||||
initialValue: state.transactionDescription.value,
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionDescriptionChange(value))
|
||||
)
|
||||
),
|
||||
@@ -95,16 +118,23 @@ class _TransactionDescriptionInput extends StatelessWidget {
|
||||
class _TransactionAccountInput extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final accountState = context.watch<AccountBloc>().state;
|
||||
return BlocBuilder<TransactionBloc, TransactionState>(
|
||||
buildWhen: (previous, current) => previous.transactionAccount != current.transactionAccount,
|
||||
builder: (context, state) => SizedBox(
|
||||
width: 500,
|
||||
child: AutocompleteInput(
|
||||
options: state.accountsTotals.keys.toList(),
|
||||
hintText: 'Account',
|
||||
initialValue: state.transactionAccount.value,
|
||||
errorText: state.transactionAccount.isNotValid ? state.transactionAccount.error?.message : null,
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionAccountChange(value)),
|
||||
child: DropdownButtonFormField<String>(
|
||||
value: state.transactionAccount.value.toString() == '' ? null : state.transactionAccount.value.toString(),
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionAccountChange(value!)),
|
||||
items: accountState.subAccounts.map((e) => DropdownMenuItem(value: e, child: Text(e))).toList(),
|
||||
decoration: InputDecoration(
|
||||
icon: const Icon(Icons.account_box),
|
||||
hintText: 'Account',
|
||||
errorText: state.transactionAccount.isNotValid ? state.transactionAccount.error?.message : null,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
@@ -118,12 +148,17 @@ class _TransactionValueInput extends StatelessWidget {
|
||||
buildWhen: (previous, current) => previous.transactionValue != current.transactionValue,
|
||||
builder: (context, state) => SizedBox(
|
||||
width: 500,
|
||||
child: TextField(
|
||||
child: TextFormField(
|
||||
keyboardType: TextInputType.number,
|
||||
decoration: InputDecoration(
|
||||
icon: const Icon(Icons.euro),
|
||||
hintText: '\$\$\$',
|
||||
errorText: state.transactionValue.isNotValid ? state.transactionValue.error?.message : null
|
||||
errorText: state.transactionValue.isNotValid ? state.transactionValue.error?.message : null,
|
||||
border: OutlineInputBorder(
|
||||
borderRadius: BorderRadius.circular(5),
|
||||
),
|
||||
),
|
||||
initialValue: state.transactionValue.value.toString(),
|
||||
onChanged: (value) => context.read<TransactionBloc>().add(TransactionValueChange(value))
|
||||
)
|
||||
),
|
||||
|
||||
Reference in New Issue
Block a user