Compare commits
No commits in common. "805fc2bf1771b207462c52f49e0854affdd0ab8c" and "96e672f1d5cbd2cbda8207241dea7b7e4ea74588" have entirely different histories.
805fc2bf17
...
96e672f1d5
6 changed files with 164 additions and 286 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
# prasule
|
# prasule
|
||||||
[](https://codemagic.io/apps/64faee78aae8c48abc70dbc6/64faee78aae8c48abc70dbc5/latest_build) [](https://git.mnau.xyz/hernik/prasule/issues?q=&type=all&sort=&state=open&labels=144&milestone=0&project=0&assignee=0&poster=0) [](https://wakatime.com/badge/user/17178fab-a33c-430f-a764-7b3f26c7b966/project/bf1f40b0-c8c0-4f72-8ad6-c861ecdcc90c) [](https://www.conventionalcommits.org/en/v1.0.0/) [](https://nogithub.codeberg.page)
|
[](https://codemagic.io/apps/64faee78aae8c48abc70dbc6/64faee78aae8c48abc70dbc5/latest_build) [](https://git.mnau.xyz/hernik/prasule/issues?q=&type=all&sort=&state=open&labels=144&milestone=0&project=0&assignee=0&poster=0) [](https://wakatime.com/badge/user/17178fab-a33c-430f-a764-7b3f26c7b966/project/bf1f40b0-c8c0-4f72-8ad6-c861ecdcc90c)
|
||||||
|
|
||||||
Expense manager
|
Expense manager
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -160,28 +160,6 @@ class Wallet {
|
||||||
await WalletManager.saveWallet(this);
|
await WalletManager.saveWallet(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Returns the current balance
|
|
||||||
///
|
|
||||||
/// Basically just takes *starterBalance* and adds all the entries to it
|
|
||||||
double calculateCurrentBalance() {
|
|
||||||
var toAdd = 0.0;
|
|
||||||
for (final e in entries) {
|
|
||||||
toAdd += (e.type == EntryType.income) ? e.data.amount : -e.data.amount;
|
|
||||||
}
|
|
||||||
return starterBalance + toAdd;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns the amount that was made/lost during a month
|
|
||||||
double calculateMonthStatus(int month, int year) {
|
|
||||||
var f = 0.0;
|
|
||||||
for (final e in entries.where(
|
|
||||||
(element) => element.date.year == year && element.date.month == month,
|
|
||||||
)) {
|
|
||||||
f += (e.type == EntryType.income) ? e.data.amount : -e.data.amount;
|
|
||||||
}
|
|
||||||
return f;
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Empty wallet used for placeholders
|
/// Empty wallet used for placeholders
|
||||||
static final Wallet empty = Wallet(
|
static final Wallet empty = Wallet(
|
||||||
name: "Empty",
|
name: "Empty",
|
||||||
|
|
|
||||||
|
|
@ -87,8 +87,5 @@
|
||||||
"dayCounter":"{count, plural, =1{den} few{dny} many{dnů} other{dnů} }",
|
"dayCounter":"{count, plural, =1{den} few{dny} many{dnů} other{dnů} }",
|
||||||
"yearCounter":"{count, plural, =1{rok} few{rok} many{let} other{let} }",
|
"yearCounter":"{count, plural, =1{rok} few{rok} many{let} other{let} }",
|
||||||
"recurEvery":"{count, plural, =1{Opakovat každý} few{Opakovat každé} many{Opakovat každých} other{Opakovat každých}}",
|
"recurEvery":"{count, plural, =1{Opakovat každý} few{Opakovat každé} many{Opakovat každých} other{Opakovat každých}}",
|
||||||
"startingWithDate": "počínaje datem",
|
"startingWithDate": "počínaje datem"
|
||||||
"evenMoney":"Váš stav je stejný jako minulý měsíc.",
|
|
||||||
"balanceStatusA": "Váš stav je ",
|
|
||||||
"balanceStatusB": " oproti minulému měsíci."
|
|
||||||
}
|
}
|
||||||
|
|
@ -203,8 +203,5 @@
|
||||||
"startingWithDate": "starting",
|
"startingWithDate": "starting",
|
||||||
"@startingWithDate":{
|
"@startingWithDate":{
|
||||||
"description": "Shown after 'Recur every X Y', e.g. 'Recur every 2 month starting 20th June 2023'"
|
"description": "Shown after 'Recur every X Y', e.g. 'Recur every 2 month starting 20th June 2023'"
|
||||||
},
|
}
|
||||||
"evenMoney":"You're on the same balance as last month.",
|
|
||||||
"balanceStatusA": "Your balance is ",
|
|
||||||
"balanceStatusB": " compared to last month."
|
|
||||||
}
|
}
|
||||||
|
|
@ -150,11 +150,11 @@ class ExpensesLineChart extends StatelessWidget {
|
||||||
isStrokeCapRound: true,
|
isStrokeCapRound: true,
|
||||||
dotData: const FlDotData(show: false),
|
dotData: const FlDotData(show: false),
|
||||||
belowBarData: BarAreaData(),
|
belowBarData: BarAreaData(),
|
||||||
color: ((MediaQuery.of(context).platformBrightness ==
|
color:
|
||||||
Brightness.dark)
|
(MediaQuery.of(context).platformBrightness == Brightness.dark)
|
||||||
? Colors.green.shade300
|
? Colors.green.shade300
|
||||||
: Colors.green)
|
: Colors.green
|
||||||
.harmonizeWith(Theme.of(context).colorScheme.primary),
|
.harmonizeWith(Theme.of(context).colorScheme.primary),
|
||||||
spots: List.generate(
|
spots: List.generate(
|
||||||
yearly ? 12 : date.lastDay,
|
yearly ? 12 : date.lastDay,
|
||||||
(index) => FlSpot(index.toDouble(), incomeData[index]),
|
(index) => FlSpot(index.toDouble(), incomeData[index]),
|
||||||
|
|
@ -167,11 +167,11 @@ class ExpensesLineChart extends StatelessWidget {
|
||||||
isStrokeCapRound: true,
|
isStrokeCapRound: true,
|
||||||
dotData: const FlDotData(show: false),
|
dotData: const FlDotData(show: false),
|
||||||
belowBarData: BarAreaData(),
|
belowBarData: BarAreaData(),
|
||||||
color: ((MediaQuery.of(context).platformBrightness ==
|
color:
|
||||||
Brightness.dark)
|
(MediaQuery.of(context).platformBrightness == Brightness.dark)
|
||||||
? Colors.red.shade300
|
? Colors.red.shade300
|
||||||
: Colors.red)
|
: Colors.red
|
||||||
.harmonizeWith(Theme.of(context).colorScheme.primary),
|
.harmonizeWith(Theme.of(context).colorScheme.primary),
|
||||||
spots: List.generate(
|
spots: List.generate(
|
||||||
yearly
|
yearly
|
||||||
? 12
|
? 12
|
||||||
|
|
|
||||||
|
|
@ -222,267 +222,173 @@ class _HomeViewState extends State<HomeView> {
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
: Column(
|
: GroupedListView(
|
||||||
children: [
|
groupHeaderBuilder: (element) => Text(
|
||||||
Text(
|
DateFormat.yMMMM(locale).format(element.date),
|
||||||
NumberFormat.compactCurrency(
|
style: TextStyle(
|
||||||
locale: locale,
|
color: Theme.of(context).colorScheme.primary,
|
||||||
symbol: selectedWallet!.currency.symbol,
|
),
|
||||||
).format(selectedWallet!.calculateCurrentBalance()),
|
),
|
||||||
style: const TextStyle(
|
elements: selectedWallet!.entries,
|
||||||
fontWeight: FontWeight.bold,
|
itemComparator: (a, b) => b.date.compareTo(a.date),
|
||||||
fontSize: 22,
|
groupBy: (e) => DateFormat.yMMMM(locale).format(e.date),
|
||||||
|
groupComparator: (a, b) {
|
||||||
|
// TODO: better sorting algorithm lol
|
||||||
|
final yearA = RegExp(r'\d+').firstMatch(a);
|
||||||
|
if (yearA == null) return 0;
|
||||||
|
final yearB = RegExp(r'\d+').firstMatch(b);
|
||||||
|
if (yearB == null) return 0;
|
||||||
|
final compareYears = int.parse(yearB.group(0)!)
|
||||||
|
.compareTo(int.parse(yearA.group(0)!));
|
||||||
|
if (compareYears != 0) return compareYears;
|
||||||
|
final months = List<String>.generate(
|
||||||
|
12,
|
||||||
|
(index) => DateFormat.MMMM(locale).format(
|
||||||
|
DateTime(2023, index + 1),
|
||||||
),
|
),
|
||||||
|
);
|
||||||
|
final monthA = RegExp('[^0-9 ]+').firstMatch(a);
|
||||||
|
if (monthA == null) return 0;
|
||||||
|
final monthB = RegExp('[^0-9 ]+').firstMatch(b);
|
||||||
|
if (monthB == null) return 0;
|
||||||
|
return months.indexOf(monthB.group(0)!).compareTo(
|
||||||
|
months.indexOf(monthA.group(0)!),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
itemBuilder: (context, element) => Slidable(
|
||||||
|
endActionPane: ActionPane(
|
||||||
|
motion: const ScrollMotion(),
|
||||||
|
children: [
|
||||||
|
SlidableAction(
|
||||||
|
onPressed: (c) {
|
||||||
|
Navigator.of(context)
|
||||||
|
.push<WalletSingleEntry>(
|
||||||
|
MaterialPageRoute(
|
||||||
|
builder: (c) => CreateSingleEntryView(
|
||||||
|
w: selectedWallet!,
|
||||||
|
editEntry: element,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
)
|
||||||
|
.then(
|
||||||
|
(editedEntry) {
|
||||||
|
if (editedEntry == null) return;
|
||||||
|
selectedWallet!.entries.remove(element);
|
||||||
|
selectedWallet!.entries.add(editedEntry);
|
||||||
|
WalletManager.saveWallet(selectedWallet!);
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
|
);
|
||||||
|
},
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.secondary,
|
||||||
|
foregroundColor:
|
||||||
|
Theme.of(context).colorScheme.onSecondary,
|
||||||
|
icon: Icons.edit,
|
||||||
|
),
|
||||||
|
SlidableAction(
|
||||||
|
backgroundColor:
|
||||||
|
Theme.of(context).colorScheme.error,
|
||||||
|
foregroundColor:
|
||||||
|
Theme.of(context).colorScheme.onError,
|
||||||
|
icon: Icons.delete,
|
||||||
|
onPressed: (c) {
|
||||||
|
showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (cx) => PlatformDialog(
|
||||||
|
title:
|
||||||
|
AppLocalizations.of(context).sureDialog,
|
||||||
|
content: Text(
|
||||||
|
AppLocalizations.of(context).deleteSure,
|
||||||
|
),
|
||||||
|
actions: [
|
||||||
|
PlatformButton(
|
||||||
|
text: AppLocalizations.of(context).yes,
|
||||||
|
onPressed: () {
|
||||||
|
selectedWallet?.entries.removeWhere(
|
||||||
|
(e) => e.id == element.id,
|
||||||
|
);
|
||||||
|
|
||||||
|
WalletManager.saveWallet(
|
||||||
|
selectedWallet!,
|
||||||
|
);
|
||||||
|
Navigator.of(cx).pop();
|
||||||
|
setState(() {});
|
||||||
|
},
|
||||||
|
),
|
||||||
|
PlatformButton(
|
||||||
|
text: AppLocalizations.of(context).no,
|
||||||
|
onPressed: () {
|
||||||
|
Navigator.of(cx).pop();
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
const SizedBox(
|
child: ListTile(
|
||||||
height: 5,
|
leading: Container(
|
||||||
),
|
decoration: BoxDecoration(
|
||||||
if (selectedWallet!.calculateMonthStatus(
|
borderRadius: BorderRadius.circular(16),
|
||||||
DateTime.now().month,
|
color: element.category.color,
|
||||||
DateTime.now().year,
|
),
|
||||||
) ==
|
child: Padding(
|
||||||
0)
|
padding: const EdgeInsets.all(8),
|
||||||
Text(AppLocalizations.of(context).evenMoney)
|
child: Icon(
|
||||||
else
|
element.category.icon,
|
||||||
RichText(
|
color:
|
||||||
|
element.category.color.calculateTextColor(),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
title: Text(element.data.name),
|
||||||
|
subtitle: RichText(
|
||||||
text: TextSpan(
|
text: TextSpan(
|
||||||
children: [
|
children: [
|
||||||
TextSpan(
|
TextSpan(
|
||||||
text: AppLocalizations.of(context)
|
text: NumberFormat.currency(
|
||||||
.balanceStatusA,
|
|
||||||
),
|
|
||||||
TextSpan(
|
|
||||||
style: TextStyle(
|
|
||||||
color: (selectedWallet!
|
|
||||||
.calculateMonthStatus(
|
|
||||||
DateTime.now().month,
|
|
||||||
DateTime.now().year,
|
|
||||||
) >
|
|
||||||
0
|
|
||||||
? ((MediaQuery.of(context)
|
|
||||||
.platformBrightness ==
|
|
||||||
Brightness.dark)
|
|
||||||
? Colors.green.shade300
|
|
||||||
: Colors.green)
|
|
||||||
.harmonizeWith(
|
|
||||||
Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.primary,
|
|
||||||
)
|
|
||||||
: ((MediaQuery.of(context)
|
|
||||||
.platformBrightness ==
|
|
||||||
Brightness.dark)
|
|
||||||
? Colors.red.shade300
|
|
||||||
: Colors.red)
|
|
||||||
.harmonizeWith(
|
|
||||||
Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.primary,
|
|
||||||
)),
|
|
||||||
),
|
|
||||||
text: NumberFormat.compactCurrency(
|
|
||||||
locale: locale,
|
|
||||||
symbol: selectedWallet!.currency.symbol,
|
symbol: selectedWallet!.currency.symbol,
|
||||||
).format(
|
).format(element.data.amount),
|
||||||
selectedWallet!.calculateMonthStatus(
|
style: TextStyle(
|
||||||
DateTime.now().month,
|
color: (element.type == EntryType.income)
|
||||||
DateTime.now().year,
|
? (MediaQuery.of(context)
|
||||||
),
|
.platformBrightness ==
|
||||||
|
Brightness.dark)
|
||||||
|
? Colors.green.shade300
|
||||||
|
: Colors.green.harmonizeWith(
|
||||||
|
Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.primary,
|
||||||
|
)
|
||||||
|
: (MediaQuery.of(context)
|
||||||
|
.platformBrightness ==
|
||||||
|
Brightness.dark)
|
||||||
|
? Colors.red.shade300
|
||||||
|
: Colors.red.harmonizeWith(
|
||||||
|
Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.primary,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
TextSpan(
|
TextSpan(
|
||||||
text: AppLocalizations.of(context)
|
text:
|
||||||
.balanceStatusB,
|
" | ${DateFormat.MMMd(locale).format(element.date)}",
|
||||||
|
style: TextStyle(
|
||||||
|
color: Theme.of(context)
|
||||||
|
.colorScheme
|
||||||
|
.background
|
||||||
|
.calculateTextColor(),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
const SizedBox(
|
|
||||||
height: 10,
|
|
||||||
),
|
),
|
||||||
Expanded(
|
),
|
||||||
child: GroupedListView(
|
|
||||||
groupHeaderBuilder: (element) => Text(
|
|
||||||
DateFormat.yMMMM(locale).format(element.date),
|
|
||||||
style: TextStyle(
|
|
||||||
color: Theme.of(context).colorScheme.primary,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
elements: selectedWallet!.entries,
|
|
||||||
itemComparator: (a, b) => b.date.compareTo(a.date),
|
|
||||||
groupBy: (e) =>
|
|
||||||
DateFormat.yMMMM(locale).format(e.date),
|
|
||||||
groupComparator: (a, b) {
|
|
||||||
// TODO: better sorting algorithm lol
|
|
||||||
final yearA = RegExp(r'\d+').firstMatch(a);
|
|
||||||
if (yearA == null) return 0;
|
|
||||||
final yearB = RegExp(r'\d+').firstMatch(b);
|
|
||||||
if (yearB == null) return 0;
|
|
||||||
final compareYears = int.parse(yearB.group(0)!)
|
|
||||||
.compareTo(int.parse(yearA.group(0)!));
|
|
||||||
if (compareYears != 0) return compareYears;
|
|
||||||
final months = List<String>.generate(
|
|
||||||
12,
|
|
||||||
(index) => DateFormat.MMMM(locale).format(
|
|
||||||
DateTime(2023, index + 1),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
final monthA = RegExp('[^0-9 ]+').firstMatch(a);
|
|
||||||
if (monthA == null) return 0;
|
|
||||||
final monthB = RegExp('[^0-9 ]+').firstMatch(b);
|
|
||||||
if (monthB == null) return 0;
|
|
||||||
return months.indexOf(monthB.group(0)!).compareTo(
|
|
||||||
months.indexOf(monthA.group(0)!),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
itemBuilder: (context, element) => Slidable(
|
|
||||||
endActionPane: ActionPane(
|
|
||||||
motion: const ScrollMotion(),
|
|
||||||
children: [
|
|
||||||
SlidableAction(
|
|
||||||
onPressed: (c) {
|
|
||||||
Navigator.of(context)
|
|
||||||
.push<WalletSingleEntry>(
|
|
||||||
MaterialPageRoute(
|
|
||||||
builder: (c) => CreateSingleEntryView(
|
|
||||||
w: selectedWallet!,
|
|
||||||
editEntry: element,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
.then(
|
|
||||||
(editedEntry) {
|
|
||||||
if (editedEntry == null) return;
|
|
||||||
selectedWallet!.entries
|
|
||||||
.remove(element);
|
|
||||||
selectedWallet!.entries
|
|
||||||
.add(editedEntry);
|
|
||||||
WalletManager.saveWallet(
|
|
||||||
selectedWallet!,
|
|
||||||
);
|
|
||||||
setState(() {});
|
|
||||||
},
|
|
||||||
);
|
|
||||||
},
|
|
||||||
backgroundColor:
|
|
||||||
Theme.of(context).colorScheme.secondary,
|
|
||||||
foregroundColor: Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.onSecondary,
|
|
||||||
icon: Icons.edit,
|
|
||||||
),
|
|
||||||
SlidableAction(
|
|
||||||
backgroundColor:
|
|
||||||
Theme.of(context).colorScheme.error,
|
|
||||||
foregroundColor:
|
|
||||||
Theme.of(context).colorScheme.onError,
|
|
||||||
icon: Icons.delete,
|
|
||||||
onPressed: (c) {
|
|
||||||
showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (cx) => PlatformDialog(
|
|
||||||
title: AppLocalizations.of(context)
|
|
||||||
.sureDialog,
|
|
||||||
content: Text(
|
|
||||||
AppLocalizations.of(context)
|
|
||||||
.deleteSure,
|
|
||||||
),
|
|
||||||
actions: [
|
|
||||||
PlatformButton(
|
|
||||||
text: AppLocalizations.of(context)
|
|
||||||
.yes,
|
|
||||||
onPressed: () {
|
|
||||||
selectedWallet?.entries
|
|
||||||
.removeWhere(
|
|
||||||
(e) => e.id == element.id,
|
|
||||||
);
|
|
||||||
|
|
||||||
WalletManager.saveWallet(
|
|
||||||
selectedWallet!,
|
|
||||||
);
|
|
||||||
Navigator.of(cx).pop();
|
|
||||||
setState(() {});
|
|
||||||
},
|
|
||||||
),
|
|
||||||
PlatformButton(
|
|
||||||
text: AppLocalizations.of(context)
|
|
||||||
.no,
|
|
||||||
onPressed: () {
|
|
||||||
Navigator.of(cx).pop();
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
child: ListTile(
|
|
||||||
leading: Container(
|
|
||||||
decoration: BoxDecoration(
|
|
||||||
borderRadius: BorderRadius.circular(16),
|
|
||||||
color: element.category.color,
|
|
||||||
),
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.all(8),
|
|
||||||
child: Icon(
|
|
||||||
element.category.icon,
|
|
||||||
color: element.category.color
|
|
||||||
.calculateTextColor(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
title: Text(element.data.name),
|
|
||||||
subtitle: RichText(
|
|
||||||
text: TextSpan(
|
|
||||||
children: [
|
|
||||||
TextSpan(
|
|
||||||
text: NumberFormat.currency(
|
|
||||||
symbol:
|
|
||||||
selectedWallet!.currency.symbol,
|
|
||||||
).format(element.data.amount),
|
|
||||||
style: TextStyle(
|
|
||||||
color: (element.type ==
|
|
||||||
EntryType.income)
|
|
||||||
? (MediaQuery.of(context)
|
|
||||||
.platformBrightness ==
|
|
||||||
Brightness.dark)
|
|
||||||
? Colors.green.shade300
|
|
||||||
: Colors.green.harmonizeWith(
|
|
||||||
Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.primary,
|
|
||||||
)
|
|
||||||
: (MediaQuery.of(context)
|
|
||||||
.platformBrightness ==
|
|
||||||
Brightness.dark)
|
|
||||||
? Colors.red.shade300
|
|
||||||
: Colors.red.harmonizeWith(
|
|
||||||
Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.primary,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
TextSpan(
|
|
||||||
text:
|
|
||||||
" | ${DateFormat.MMMd(locale).format(element.date)}",
|
|
||||||
style: TextStyle(
|
|
||||||
color: Theme.of(context)
|
|
||||||
.colorScheme
|
|
||||||
.background
|
|
||||||
.calculateTextColor(),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue