hernik/prasule
1
0
Fork 0
Code Issues 9 Pull requests 2 Projects Releases 3 Activity Actions

chore: merge for new version #26

Merged
hernik merged 10 commits from dev into main 2024-01-22 23:37:09 +01:00
Conversation 0 Commits 10 Files changed 27 +285 -163
5 changed files with 285 additions and 163 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 91fc0bb607 - Show all commits

22
lib/api/wallet.dart
View file

@ -160,6 +160,28 @@ 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",

5
lib/l10n/app_cs.arb
View file

@ -87,5 +87,8 @@
"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."
} }

5
lib/l10n/app_en.arb
View file

@ -203,5 +203,8 @@
"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."
} }

12
lib/util/graphs.dart
View file

@ -150,10 +150,10 @@ class ExpensesLineChart extends StatelessWidget {
isStrokeCapRound: true, isStrokeCapRound: true,
dotData: const FlDotData(show: false), dotData: const FlDotData(show: false),
belowBarData: BarAreaData(), belowBarData: BarAreaData(),
color: color: ((MediaQuery.of(context).platformBrightness ==
(MediaQuery.of(context).platformBrightness == Brightness.dark) 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,
@ -167,10 +167,10 @@ class ExpensesLineChart extends StatelessWidget {
isStrokeCapRound: true, isStrokeCapRound: true,
dotData: const FlDotData(show: false), dotData: const FlDotData(show: false),
belowBarData: BarAreaData(), belowBarData: BarAreaData(),
color: color: ((MediaQuery.of(context).platformBrightness ==
(MediaQuery.of(context).platformBrightness == Brightness.dark) 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

128
lib/views/home.dart
View file

@ -222,7 +222,86 @@ class _HomeViewState extends State<HomeView> {
), ),
], ],
) )
: GroupedListView( : Column(
children: [
Text(
NumberFormat.compactCurrency(
locale: locale,
symbol: selectedWallet!.currency.symbol,
).format(selectedWallet!.calculateCurrentBalance()),
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 22,
),
),
const SizedBox(
height: 5,
),
if (selectedWallet!.calculateMonthStatus(
DateTime.now().month,
DateTime.now().year,
) ==
0)
Text(AppLocalizations.of(context).evenMoney)
else
RichText(
text: TextSpan(
children: [
TextSpan(
text: AppLocalizations.of(context)
.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,
).format(
selectedWallet!.calculateMonthStatus(
DateTime.now().month,
DateTime.now().year,
),
),
),
TextSpan(
text: AppLocalizations.of(context)
.balanceStatusB,
),
],
),
),
const SizedBox(
height: 10,
),
Expanded(
child: GroupedListView(
groupHeaderBuilder: (element) => Text( groupHeaderBuilder: (element) => Text(
DateFormat.yMMMM(locale).format(element.date), DateFormat.yMMMM(locale).format(element.date),
style: TextStyle( style: TextStyle(
@ -231,7 +310,8 @@ class _HomeViewState extends State<HomeView> {
), ),
elements: selectedWallet!.entries, elements: selectedWallet!.entries,
itemComparator: (a, b) => b.date.compareTo(a.date), itemComparator: (a, b) => b.date.compareTo(a.date),
groupBy: (e) => DateFormat.yMMMM(locale).format(e.date), groupBy: (e) =>
DateFormat.yMMMM(locale).format(e.date),
groupComparator: (a, b) { groupComparator: (a, b) {
// TODO: better sorting algorithm lol // TODO: better sorting algorithm lol
final yearA = RegExp(r'\d+').firstMatch(a); final yearA = RegExp(r'\d+').firstMatch(a);
@ -273,17 +353,22 @@ class _HomeViewState extends State<HomeView> {
.then( .then(
(editedEntry) { (editedEntry) {
if (editedEntry == null) return; if (editedEntry == null) return;
selectedWallet!.entries.remove(element); selectedWallet!.entries
selectedWallet!.entries.add(editedEntry); .remove(element);
WalletManager.saveWallet(selectedWallet!); selectedWallet!.entries
.add(editedEntry);
WalletManager.saveWallet(
selectedWallet!,
);
setState(() {}); setState(() {});
}, },
); );
}, },
backgroundColor: backgroundColor:
Theme.of(context).colorScheme.secondary, Theme.of(context).colorScheme.secondary,
foregroundColor: foregroundColor: Theme.of(context)
Theme.of(context).colorScheme.onSecondary, .colorScheme
.onSecondary,
icon: Icons.edit, icon: Icons.edit,
), ),
SlidableAction( SlidableAction(
@ -296,16 +381,19 @@ class _HomeViewState extends State<HomeView> {
showDialog( showDialog(
context: context, context: context,
builder: (cx) => PlatformDialog( builder: (cx) => PlatformDialog(
title: title: AppLocalizations.of(context)
AppLocalizations.of(context).sureDialog, .sureDialog,
content: Text( content: Text(
AppLocalizations.of(context).deleteSure, AppLocalizations.of(context)
.deleteSure,
), ),
actions: [ actions: [
PlatformButton( PlatformButton(
text: AppLocalizations.of(context).yes, text: AppLocalizations.of(context)
.yes,
onPressed: () { onPressed: () {
selectedWallet?.entries.removeWhere( selectedWallet?.entries
.removeWhere(
(e) => e.id == element.id, (e) => e.id == element.id,
); );
@ -317,7 +405,8 @@ class _HomeViewState extends State<HomeView> {
}, },
), ),
PlatformButton( PlatformButton(
text: AppLocalizations.of(context).no, text: AppLocalizations.of(context)
.no,
onPressed: () { onPressed: () {
Navigator.of(cx).pop(); Navigator.of(cx).pop();
}, },
@ -339,8 +428,8 @@ class _HomeViewState extends State<HomeView> {
padding: const EdgeInsets.all(8), padding: const EdgeInsets.all(8),
child: Icon( child: Icon(
element.category.icon, element.category.icon,
color: color: element.category.color
element.category.color.calculateTextColor(), .calculateTextColor(),
), ),
), ),
), ),
@ -350,10 +439,12 @@ class _HomeViewState extends State<HomeView> {
children: [ children: [
TextSpan( TextSpan(
text: NumberFormat.currency( text: NumberFormat.currency(
symbol: selectedWallet!.currency.symbol, symbol:
selectedWallet!.currency.symbol,
).format(element.data.amount), ).format(element.data.amount),
style: TextStyle( style: TextStyle(
color: (element.type == EntryType.income) color: (element.type ==
EntryType.income)
? (MediaQuery.of(context) ? (MediaQuery.of(context)
.platformBrightness == .platformBrightness ==
Brightness.dark) Brightness.dark)
@ -391,6 +482,9 @@ class _HomeViewState extends State<HomeView> {
), ),
), ),
), ),
],
),
),
), ),
); );
} }