Compare commits

..

No commits in common. "070fc1bc0816b1b9eb1177724f741165ebca9d5e" and "1ec32168e5d99a6a5f9673514b2e2c3c5a053843" have entirely different histories.

7 changed files with 284 additions and 727 deletions

View file

@ -12,10 +12,6 @@
- Fix starting balance not saving - Fix starting balance not saving
- Fix overlay disabling tappig on edit/delete buttons on home view - Fix overlay disabling tappig on edit/delete buttons on home view
- Allow changing dates on entries - Allow changing dates on entries
- Graph view now uses tabs
- Graphs now display correct tooltips when displaying only income or only expenses
- Change graph container style when using light mode
- Make pie chart values more visible by adding the category's corresponding color as background
# 1.0.0-alpha+5 # 1.0.0-alpha+5
- Add tests - Add tests
- Add searching through entries to homepage - Add searching through entries to homepage

View file

@ -111,16 +111,8 @@
"sortOldest":"Nejstarší první", "sortOldest":"Nejstarší první",
"sort":"Seřadit", "sort":"Seřadit",
"search":"Prohledat", "search":"Prohledat",
"expensesPerYear":"Výdaje za měsíc v roce {year}", "expensesPerYear":"Měsíční výdaje v roce {year}",
"expensesPerMonth":"Výdaje za den během měsíce {monthYear}", "expensesPerMonth":"Denní výdaje během měsíce {monthYear}",
"date":"Datum", "expensesPerCategory":"Dohromady výdaje za kategorii",
"incomePlural":"Příjmy", "date":"Datum"
"incomePerYear":"Příjmy za měsíc v roce {year}",
"incomePerMonth":"Příjmy za den během měsíce {monthYear}",
"expensesPerMonthCategory":"Výdaje podle kategorie během měsíce {monthYear}",
"expensesPerYearCategory":"Výdaje podle kategorie za rok {year}",
"incomePerYearCategory":"Příjmy podle kategorie za rok {year}",
"incomePerMonthCategory":"Příjmy podle kategorie za měsíc {monthYear}",
"selectYear":"Zvolte rok",
"selectMonth":"Zvolte měsíc a rok"
} }

View file

@ -247,71 +247,6 @@
} }
} }
}, },
"incomePerYear":"Income per month in {year}", "expensesPerCategory":"Total expenses per category",
"@incomePerYear":{ "date":"Date"
"placeholders": {
"year":{
"description": "The year of the monthly expense sum",
"example": "2024",
"type": "int"
}
}
},
"incomePerMonth":"Income per day during {monthYear}",
"@incomePerMonth":{
"placeholders": {
"monthYear":{
"description": "Month and year formatted through DateFormat class",
"example": "June, 2024",
"type": "String"
}
}
},
"date":"Date",
"incomePlural":"Income",
"@incomePlural":{
"description": "Plural form of 'Income'"
},
"expensesPerMonthCategory":"Expenses per category during {monthYear}",
"@expensesPerMonthCategory":{
"placeholders": {
"monthYear":{
"description": "Month and year formatted through DateFormat class",
"example": "June, 2024",
"type": "String"
}
}
},
"expensesPerYearCategory":"Expenses per category in {year}",
"@expensesPerYearCategory":{
"placeholders": {
"year":{
"description": "The year",
"example": "2024",
"type": "int"
}
}
},
"incomePerMonthCategory":"Income per category during {monthYear}",
"@incomePerMonthCategory":{
"placeholders": {
"monthYear":{
"description": "Month and year formatted through DateFormat class",
"example": "June, 2024",
"type": "String"
}
}
},
"incomePerYearCategory":"Income per category in {year}",
"@incomePerYearCategory":{
"placeholders": {
"year":{
"description": "The year",
"example": "2024",
"type": "int"
}
}
},
"selectYear":"Select a year",
"selectMonth":"Select a month and year"
} }

View file

@ -77,8 +77,7 @@ class ExpensesLineChart extends StatelessWidget {
(index) => LineTooltipItem( (index) => LineTooltipItem(
// Changes what's rendered on the tooltip // Changes what's rendered on the tooltip
// when clicked in the chart // when clicked in the chart
(spots[index].barIndex == 0 && (spots[index].barIndex == 0) // income chart
incomeData.isNotEmpty) // income chart
? (yearly ? (yearly
? AppLocalizations.of(context).incomeForMonth( ? AppLocalizations.of(context).incomeForMonth(
DateFormat.MMMM(locale).format( DateFormat.MMMM(locale).format(
@ -123,11 +122,14 @@ class ExpensesLineChart extends StatelessWidget {
)), )),
TextStyle(color: spots[index].bar.color), TextStyle(color: spots[index].bar.color),
children: [ children: [
if (!yearly) TextSpan(
TextSpan( text: "\n${yearly ? DateFormat.MMMM(locale).format(
text: DateTime(
"\n${DateFormat.yMMMMd(locale).format(DateTime(date.year, date.month, spots[index].spotIndex + 1))}", date.year,
), index + 1,
),
) : DateFormat.yMMMMd(locale).format(DateTime(date.year, date.month, spots[index].spotIndex + 1))}",
),
], ],
), ),
), ),
@ -135,11 +137,12 @@ class ExpensesLineChart extends StatelessWidget {
), ),
maxY: maxY, maxY: maxY,
maxX: yearly maxX: yearly
? 11 ? 12
: date.lastDay.toDouble() - : date.lastDay.toDouble() -
1, // remove 1 because we are indexing from 0 1, // remove 1 because we are indexing from 0
minY: 0, minY: 0,
minX: 0, minX: 0,
backgroundColor: Theme.of(context).colorScheme.background,
lineBarsData: [ lineBarsData: [
if (incomeData.isNotEmpty) if (incomeData.isNotEmpty)
LineChartBarData( LineChartBarData(
@ -183,16 +186,14 @@ class ExpensesLineChart extends StatelessWidget {
topTitles: const AxisTitles(), topTitles: const AxisTitles(),
leftTitles: AxisTitles( leftTitles: AxisTitles(
sideTitles: SideTitles( sideTitles: SideTitles(
reservedSize: ((expenseDataSorted.isNotEmpty && reservedSize: (NumberFormat.compact()
NumberFormat.compact(locale: locale) .format(expenseDataSorted.last)
.format(expenseDataSorted.last) .length >=
.length >= 5 ||
5) || NumberFormat.compact()
(incomeDataSorted.isNotEmpty && .format(incomeDataSorted.last)
NumberFormat.compact(locale: locale) .length >=
.format(incomeDataSorted.last) 5)
.length >=
5))
? 50 ? 50
: 25, : 25,
showTitles: true, showTitles: true,
@ -289,7 +290,7 @@ class ExpensesBarChart extends StatelessWidget {
getTooltipItem: (group, groupIndex, rod, rodIndex) => getTooltipItem: (group, groupIndex, rod, rodIndex) =>
yearly // create custom tooltips for graph bars yearly // create custom tooltips for graph bars
? BarTooltipItem( ? BarTooltipItem(
(rodIndex == 1 || incomeData.isEmpty) // expense (rodIndex == 1)
? AppLocalizations.of(context).expensesForMonth( ? AppLocalizations.of(context).expensesForMonth(
DateFormat.MMMM(locale).format( DateFormat.MMMM(locale).format(
DateTime(date.year, groupIndex + 1), DateTime(date.year, groupIndex + 1),
@ -301,7 +302,6 @@ class ExpensesBarChart extends StatelessWidget {
).format(rod.toY), ).format(rod.toY),
) )
: AppLocalizations.of(context).incomeForMonth( : AppLocalizations.of(context).incomeForMonth(
// income
DateFormat.MMMM(locale).format( DateFormat.MMMM(locale).format(
DateTime(date.year, groupIndex + 1), DateTime(date.year, groupIndex + 1),
), ),
@ -392,7 +392,6 @@ class CategoriesPieChart extends StatefulWidget {
required this.entries, required this.entries,
required this.categories, required this.categories,
required this.symbol, required this.symbol,
required this.locale,
super.key, super.key,
}); });
@ -405,9 +404,6 @@ class CategoriesPieChart extends StatefulWidget {
/// Currency symbol displayed on the chart /// Currency symbol displayed on the chart
final String symbol; final String symbol;
/// User locale
final String locale;
@override @override
State<CategoriesPieChart> createState() => _CategoriesPieChartState(); State<CategoriesPieChart> createState() => _CategoriesPieChartState();
} }
@ -469,10 +465,8 @@ class _CategoriesPieChartState extends State<CategoriesPieChart> {
sections: List<PieChartSectionData>.generate( sections: List<PieChartSectionData>.generate(
widget.categories.length, widget.categories.length,
(index) => PieChartSectionData( (index) => PieChartSectionData(
title: NumberFormat.compactCurrency( title: NumberFormat.compactCurrency(symbol: widget.symbol)
symbol: widget.symbol, .format(
locale: widget.locale,
).format(
widget.entries widget.entries
.where( .where(
(element) => (element) =>
@ -489,7 +483,6 @@ class _CategoriesPieChartState extends State<CategoriesPieChart> {
color: color:
widget.categories[index].color.calculateTextColor(), widget.categories[index].color.calculateTextColor(),
fontWeight: FontWeight.bold, fontWeight: FontWeight.bold,
backgroundColor: widget.categories[index].color,
), ),
color: widget.categories[index].color, color: widget.categories[index].color,
value: widget.entries value: widget.entries

View file

@ -1,8 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart'; import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:prasule/api/category.dart'; import 'package:prasule/api/category.dart';
@ -16,7 +14,6 @@ import 'package:prasule/util/utils.dart';
import 'package:prasule/views/settings/settings.dart'; import 'package:prasule/views/settings/settings.dart';
import 'package:prasule/views/setup.dart'; import 'package:prasule/views/setup.dart';
import 'package:shared_preferences/shared_preferences.dart'; import 'package:shared_preferences/shared_preferences.dart';
import 'package:wheel_chooser/wheel_chooser.dart';
/// Shows data from a [Wallet] in graphs /// Shows data from a [Wallet] in graphs
class GraphView extends StatefulWidget { class GraphView extends StatefulWidget {
@ -32,7 +29,9 @@ class _GraphViewState extends State<GraphView> {
Wallet? selectedWallet; Wallet? selectedWallet;
List<Wallet> wallets = []; List<Wallet> wallets = [];
String? locale; String? locale;
bool yearly = true; Set<String> yearlyBtnSet = {"monthly"};
Set<String> graphTypeSet = {"expense", "income"};
bool get yearly => yearlyBtnSet.contains("yearly");
@override @override
void didChangeDependencies() { void didChangeDependencies() {
@ -67,8 +66,6 @@ class _GraphViewState extends State<GraphView> {
return data; return data;
} }
final availableYears = <WheelChoice<int>>[];
Future<void> loadWallet() async { Future<void> loadWallet() async {
wallets = await WalletManager.listWallets(); wallets = await WalletManager.listWallets();
if (wallets.isEmpty && mounted) { if (wallets.isEmpty && mounted) {
@ -79,17 +76,6 @@ class _GraphViewState extends State<GraphView> {
return; return;
} }
selectedWallet = wallets.first; selectedWallet = wallets.first;
availableYears.clear();
for (final entry in selectedWallet!.entries) {
if (!availableYears.any((element) => element.value == entry.date.year)) {
availableYears.add(
WheelChoice<int>(
value: entry.date.year,
title: entry.date.year.toString(),
),
);
}
}
setState(() {}); setState(() {});
} }
@ -106,611 +92,275 @@ class _GraphViewState extends State<GraphView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return DefaultTabController( return Scaffold(
length: 2, floatingActionButton: Tooltip(
child: Scaffold( message: AppLocalizations.of(context).changeDate,
floatingActionButton: Tooltip( child: FloatingActionButton(
message: AppLocalizations.of(context).changeDate, child: const Icon(Icons.calendar_month),
child: FloatingActionButton( onPressed: () async {
child: const Icon(Icons.calendar_month), final firstDate = (selectedWallet!.entries
onPressed: () async { ..sort(
var selectedYear = _selectedDate.year; (a, b) => a.date.compareTo(b.date),
var selectedMonth = _selectedDate.month; ))
await showAdaptiveDialog<void>( .first
context: context, .date;
builder: (c) => AlertDialog.adaptive( final newDate = await showDatePicker(
title: Text( context: context,
yearly initialDate: DateTime(
? AppLocalizations.of(context).selectYear _selectedDate.year,
: AppLocalizations.of(context).selectMonth, _selectedDate.month,
), ),
content: LimitedBox( firstDate: firstDate,
maxHeight: MediaQuery.of(context).size.width * 0.7, lastDate: DateTime.now(),
maxWidth: MediaQuery.of(context).size.width * 0.8, initialEntryMode: yearly
child: Wrap( ? DatePickerEntryMode.input
alignment: WrapAlignment.center, : DatePickerEntryMode.calendar,
spacing: 5, initialDatePickerMode:
children: [ yearly ? DatePickerMode.year : DatePickerMode.day,
if (!yearly) );
SizedBox( if (newDate == null) return;
width: 120, _selectedDate = newDate;
height: 100, setState(() {});
child: WheelChooser<int>.choices( },
onChoiceChanged: (v) {
selectedMonth = v as int;
},
startPosition: _selectedDate.month - 1,
choices: List<WheelChoice<int>>.generate(
12,
(index) => WheelChoice(
value: index + 1,
title: DateFormat.MMMM(locale ?? "en").format(
DateTime(
_selectedDate.year,
index + 1,
),
),
),
),
),
),
SizedBox(
height: 100,
width: 80,
child: WheelChooser<int>.choices(
startPosition: availableYears.indexWhere(
(element) => element.value == _selectedDate.year,
),
onChoiceChanged: (v) {
selectedYear = v as int;
},
choices: availableYears,
),
),
],
),
),
actions: [
TextButton(
onPressed: () {
_selectedDate = DateTime(selectedYear, selectedMonth);
Navigator.of(c).pop();
},
child: Text(AppLocalizations.of(context).ok),
),
],
),
);
setState(() {});
},
),
), ),
appBar: AppBar( ),
bottom: TabBar( appBar: AppBar(
tabs: [ title: DropdownButton<int>(
Tab( value:
child: Text(AppLocalizations.of(context).expenses), (selectedWallet == null) ? -1 : wallets.indexOf(selectedWallet!),
), items: [
Tab( ...wallets.map(
child: Text(AppLocalizations.of(context).incomePlural), (e) => DropdownMenuItem(
), value: wallets.indexOf(
], e,
),
title: DropdownButton<int>(
value: (selectedWallet == null)
? -1
: wallets.indexOf(selectedWallet!),
items: [
...wallets.map(
(e) => DropdownMenuItem(
value: wallets.indexOf(
e,
),
child: Text(e.name),
), ),
child: Text(e.name),
), ),
DropdownMenuItem( ),
value: -1, DropdownMenuItem(
child: Text(AppLocalizations.of(context).newWallet), value: -1,
), child: Text(AppLocalizations.of(context).newWallet),
],
onChanged: (v) async {
if (v == null || v == -1) {
await Navigator.of(context).push(
platformRoute(
(c) => const SetupView(
newWallet: true,
),
),
);
wallets = await WalletManager.listWallets();
logger.i(wallets.length);
selectedWallet = wallets.last;
setState(() {});
return;
}
selectedWallet = wallets[v];
setState(() {});
},
),
actions: [
PopupMenuButton(
itemBuilder: (context) => [
AppLocalizations.of(context).settings,
AppLocalizations.of(context).about,
].map((e) => PopupMenuItem(value: e, child: Text(e))).toList(),
onSelected: (value) {
if (value == AppLocalizations.of(context).settings) {
Navigator.of(context)
.push(
platformRoute(
(context) => const SettingsView(),
),
)
.then((value) async {
selectedWallet =
await WalletManager.loadWallet(selectedWallet!.name);
final s = await SharedPreferences.getInstance();
chartType = s.getInt("monthlygraph") ?? 2;
setState(() {});
});
} else if (value == AppLocalizations.of(context).about) {
showAbout(context);
}
},
), ),
], ],
onChanged: (v) async {
if (v == null || v == -1) {
await Navigator.of(context).push(
platformRoute(
(c) => const SetupView(
newWallet: true,
),
),
);
wallets = await WalletManager.listWallets();
logger.i(wallets.length);
selectedWallet = wallets.last;
setState(() {});
return;
}
selectedWallet = wallets[v];
setState(() {});
},
), ),
drawer: makeDrawer(context, 2), actions: [
body: TabBarView( PopupMenuButton(
children: [ itemBuilder: (context) => [
// EXPENSE TAB AppLocalizations.of(context).settings,
SingleChildScrollView( AppLocalizations.of(context).about,
child: Center( ].map((e) => PopupMenuItem(value: e, child: Text(e))).toList(),
child: (selectedWallet == null) onSelected: (value) {
? const CircularProgressIndicator( if (value == AppLocalizations.of(context).settings) {
strokeWidth: 5, Navigator.of(context)
) .push(
: SizedBox( platformRoute(
width: MediaQuery.of(context).size.width, (context) => const SettingsView(),
height: MediaQuery.of(context).size.height, ),
child: Column( )
mainAxisAlignment: MainAxisAlignment.center, .then((value) async {
children: [ selectedWallet =
SizedBox( await WalletManager.loadWallet(selectedWallet!.name);
width: 200, final s = await SharedPreferences.getInstance();
child: Row( chartType = s.getInt("monthlygraph") ?? 2;
mainAxisAlignment: setState(() {});
MainAxisAlignment.spaceBetween, });
children: [ } else if (value == AppLocalizations.of(context).about) {
Text( showAbout(context);
AppLocalizations.of(context).monthly, }
style: const TextStyle( },
fontWeight: FontWeight.bold, ),
), ],
), ),
Switch.adaptive( drawer: makeDrawer(context, 2),
value: yearly, body: SingleChildScrollView(
onChanged: (v) async { child: Center(
yearly = v; child: (selectedWallet == null)
final s = ? const CircularProgressIndicator(
await SharedPreferences.getInstance(); strokeWidth: 5,
chartType = yearly )
? (s.getInt("yearlygraph") ?? 1) : SizedBox(
: (s.getInt("monthlygraph") ?? 2); width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
setState(() {}); child: Column(
}, mainAxisAlignment: MainAxisAlignment.center,
), children: [
Text( SegmentedButton<String>(
AppLocalizations.of(context).yearly, segments: [
style: const TextStyle( ButtonSegment<String>(
fontWeight: FontWeight.bold, value: "expense",
), label: Text(AppLocalizations.of(context).expenses),
), ),
], ButtonSegment<String>(
), value: "income",
), label: Text(AppLocalizations.of(context).income),
Container( ),
decoration: BoxDecoration( ],
borderRadius: BorderRadius.circular(8), selected: graphTypeSet,
boxShadow: (MediaQuery.of(context) multiSelectionEnabled: true,
.platformBrightness == onSelectionChanged: (selection) {
Brightness.light) graphTypeSet = selection;
? [ setState(() {});
BoxShadow( },
color: Colors.grey.withOpacity(0.5), ),
spreadRadius: 3, const SizedBox(
blurRadius: 7, height: 5,
offset: const Offset( ),
0, SegmentedButton<String>(
3, segments: [
), ButtonSegment<String>(
), value: "yearly",
] label: Text(AppLocalizations.of(context).yearly),
: null, ),
color: (MediaQuery.of(context) ButtonSegment<String>(
.platformBrightness == value: "monthly",
Brightness.dark) label: Text(AppLocalizations.of(context).monthly),
? Theme.of(context) ),
.colorScheme ],
.secondaryContainer selected: yearlyBtnSet,
: Theme.of(context).colorScheme.background, onSelectionChanged: (selection) async {
), yearlyBtnSet = selection;
child: Padding( final s = await SharedPreferences.getInstance();
padding: const EdgeInsets.all(8), chartType = yearly
child: Column( ? (s.getInt("yearlygraph") ?? 1)
children: [ : (s.getInt("monthlygraph") ?? 2);
Text( setState(() {});
yearly },
? AppLocalizations.of(context) ),
.expensesPerYear( const SizedBox(height: 5),
_selectedDate.year, Container(
) decoration: BoxDecoration(
: AppLocalizations.of(context) borderRadius: BorderRadius.circular(8),
.expensesPerMonth( color:
DateFormat.yMMMM(locale) Theme.of(context).colorScheme.secondaryContainer,
.format(_selectedDate), ),
), child: Padding(
style: const TextStyle( padding: const EdgeInsets.all(8),
fontSize: 16, child: Column(
fontWeight: FontWeight.bold, children: [
Text(
yearly
? AppLocalizations.of(context)
.expensesPerYear(_selectedDate.year)
: AppLocalizations.of(context)
.expensesPerMonth(
DateFormat.yMMMM(locale)
.format(_selectedDate),
), ),
), style: const TextStyle(
const SizedBox( fontSize: 16,
height: 15, fontWeight: FontWeight.bold,
), ),
SizedBox( ),
width: MediaQuery.of(context).size.width * const SizedBox(
0.9, height: 15,
height: ),
MediaQuery.of(context).size.height * SizedBox(
0.35, width: MediaQuery.of(context).size.width * 0.9,
child: (chartType == null) height:
? const CircularProgressIndicator() MediaQuery.of(context).size.height * 0.35,
: (chartType == 1) child: (chartType == null)
? ExpensesBarChart( ? const CircularProgressIndicator()
currency: : (chartType == 1)
selectedWallet!.currency, ? ExpensesBarChart(
date: _selectedDate, currency: selectedWallet!.currency,
locale: locale ?? "en", date: _selectedDate,
yearly: yearly, locale: locale ?? "en",
expenseData: yearly: yearly,
generateChartData( expenseData: (graphTypeSet
.contains("expense"))
? generateChartData(
EntryType.expense, EntryType.expense,
), )
incomeData: const [], : [],
) incomeData: (graphTypeSet
: Padding( .contains("income"))
padding: ? generateChartData(
const EdgeInsets.all(8), EntryType.income,
child: ExpensesLineChart( )
currency: selectedWallet! : [],
.currency, )
date: _selectedDate, : Padding(
locale: locale ?? "en", padding: const EdgeInsets.all(8),
yearly: yearly, child: ExpensesLineChart(
expenseData: currency:
generateChartData( selectedWallet!.currency,
date: _selectedDate,
locale: locale ?? "en",
yearly: yearly,
expenseData: (graphTypeSet
.contains("expense"))
? generateChartData(
EntryType.expense, EntryType.expense,
), )
incomeData: const [], : [],
), incomeData: (graphTypeSet
), .contains("income"))
), ? generateChartData(
],
),
),
),
const SizedBox(
height: 25,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
boxShadow: (MediaQuery.of(context)
.platformBrightness ==
Brightness.light)
? [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 3,
blurRadius: 7,
offset: const Offset(
0,
3,
),
),
]
: null,
color: (MediaQuery.of(context)
.platformBrightness ==
Brightness.dark)
? Theme.of(context)
.colorScheme
.secondaryContainer
: Theme.of(context).colorScheme.background,
),
width: MediaQuery.of(context).size.width * 0.95,
height: MediaQuery.of(context).size.height * 0.4,
child: Column(
children: [
const SizedBox(
height: 10,
),
Flexible(
child: Text(
textAlign: TextAlign.center,
yearly
? AppLocalizations.of(context)
.expensesPerYearCategory(
_selectedDate.year,
)
: AppLocalizations.of(context)
.expensesPerMonthCategory(
DateFormat.yMMMM(locale)
.format(_selectedDate),
),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
),
Padding(
padding: const EdgeInsets.all(6),
child: CategoriesPieChart(
// TODO: better size adaptivity without overflow
locale: locale ?? "en",
symbol: selectedWallet!.currency.symbol,
entries: selectedWallet!.entries
.where(
(element) =>
((!yearly)
? element.date.month ==
_selectedDate
.month &&
element.date.year ==
_selectedDate.year
: element.date.year ==
_selectedDate.year) &&
element.type ==
EntryType.expense,
)
.toList(),
categories: selectedWallet!.categories,
),
),
],
),
),
],
),
),
),
), // Expense Tab END
SingleChildScrollView(
child: Center(
child: (selectedWallet == null)
? const CircularProgressIndicator(
strokeWidth: 5,
)
: SizedBox(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height,
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
SizedBox(
width: 200,
child: Row(
mainAxisAlignment:
MainAxisAlignment.spaceBetween,
children: [
Text(
AppLocalizations.of(context).monthly,
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
Switch.adaptive(
value: yearly,
onChanged: (v) async {
yearly = v;
final s =
await SharedPreferences.getInstance();
chartType = yearly
? (s.getInt("yearlygraph") ?? 1)
: (s.getInt("monthlygraph") ?? 2);
setState(() {});
},
),
Text(
AppLocalizations.of(context).yearly,
style: const TextStyle(
fontWeight: FontWeight.bold,
),
),
],
),
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
boxShadow: (MediaQuery.of(context)
.platformBrightness ==
Brightness.light)
? [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 3,
blurRadius: 7,
offset: const Offset(
0,
3,
),
),
]
: null,
color: (MediaQuery.of(context)
.platformBrightness ==
Brightness.dark)
? Theme.of(context)
.colorScheme
.secondaryContainer
: Theme.of(context).colorScheme.background,
),
child: Padding(
padding: const EdgeInsets.all(8),
child: Column(
children: [
Text(
yearly
? AppLocalizations.of(context)
.incomePerYear(
_selectedDate.year,
)
: AppLocalizations.of(context)
.incomePerMonth(
DateFormat.yMMMM(locale)
.format(_selectedDate),
),
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,
),
),
const SizedBox(
height: 15,
),
SizedBox(
width: MediaQuery.of(context).size.width *
0.9,
height:
MediaQuery.of(context).size.height *
0.35,
child: (chartType == null)
? const CircularProgressIndicator()
: (chartType == 1)
? ExpensesBarChart(
currency:
selectedWallet!.currency,
date: _selectedDate,
locale: locale ?? "en",
yearly: yearly,
expenseData: const [],
incomeData: generateChartData(
EntryType.income,
),
)
: Padding(
padding:
const EdgeInsets.all(8),
child: ExpensesLineChart(
currency: selectedWallet!
.currency,
date: _selectedDate,
locale: locale ?? "en",
yearly: yearly,
expenseData: const [],
incomeData:
generateChartData(
EntryType.income, EntryType.income,
), )
), : [],
),
),
],
),
),
),
const SizedBox(
height: 25,
),
Container(
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(8),
boxShadow: (MediaQuery.of(context)
.platformBrightness ==
Brightness.light)
? [
BoxShadow(
color: Colors.grey.withOpacity(0.5),
spreadRadius: 3,
blurRadius: 7,
offset: const Offset(
0,
3,
),
),
]
: null,
color: (MediaQuery.of(context)
.platformBrightness ==
Brightness.dark)
? Theme.of(context)
.colorScheme
.secondaryContainer
: Theme.of(context).colorScheme.background,
),
width: MediaQuery.of(context).size.width * 0.95,
height: MediaQuery.of(context).size.height * 0.4,
child: Column(
children: [
const SizedBox(
height: 10,
),
Flexible(
child: Text(
yearly
? AppLocalizations.of(context)
.incomePerYearCategory(
_selectedDate.year,
)
: AppLocalizations.of(context)
.incomePerMonthCategory(
DateFormat.yMMMM(locale)
.format(_selectedDate),
), ),
style: const TextStyle( ),
fontSize: 16, ),
fontWeight: FontWeight.bold, ],
), ),
), ),
), ),
Padding( const SizedBox(
padding: const EdgeInsets.all(6), height: 25,
child: CategoriesPieChart( ),
locale: locale ?? "en", Container(
symbol: selectedWallet!.currency.symbol, decoration: BoxDecoration(
entries: selectedWallet!.entries borderRadius: BorderRadius.circular(8),
.where( color:
(element) => Theme.of(context).colorScheme.secondaryContainer,
((!yearly) ),
? element.date.month == width: MediaQuery.of(context).size.width * 0.95,
_selectedDate height: MediaQuery.of(context).size.height * 0.4,
.month && child: Column(
element.date.year == children: [
_selectedDate.year const SizedBox(
: element.date.year == height: 10,
_selectedDate.year) && ),
element.type == Text(
EntryType.income, AppLocalizations.of(context).expensesPerCategory,
) style: const TextStyle(
.toList(), fontSize: 16,
categories: selectedWallet!.categories, fontWeight: FontWeight.bold,
), ),
), ),
], Padding(
padding: const EdgeInsets.all(8),
child: CategoriesPieChart(
symbol: selectedWallet!.currency.symbol,
entries: selectedWallet!.entries,
categories: selectedWallet!.categories,
), ),
), ),
], ],
), ),
), ),
), ],
), // Income Tab END ),
], ),
), ),
), ),
); );

View file

@ -1145,14 +1145,6 @@ packages:
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.2.1" version: "1.2.1"
wheel_chooser:
dependency: "direct main"
description:
name: wheel_chooser
sha256: "3fee36f081f321c58a0b7b4afcdd92599f2ca520b3a1420084774e6b19cca1d8"
url: "https://pub.dev"
source: hosted
version: "1.1.2"
win32: win32:
dependency: transitive dependency: transitive
description: description:

View file

@ -40,7 +40,6 @@ dependencies:
settings_ui: ^2.0.2 settings_ui: ^2.0.2
shared_preferences: ^2.2.2 shared_preferences: ^2.2.2
url_launcher: ^6.2.4 url_launcher: ^6.2.4
wheel_chooser: ^1.1.2
dev_dependencies: dev_dependencies:
build_runner: ^2.4.6 build_runner: ^2.4.6