From 6a9da33283cf0ac2b9249f66c756d317c3207fc9 Mon Sep 17 00:00:00 2001 From: gltron Date: Sat, 20 Apr 2024 21:06:25 +0200 Subject: [PATCH] updated libs, fixed transaction form --- lib/clients/storage/json_storage_client.dart | 16 ++-- lib/domains/account/account_bloc.dart | 4 +- lib/domains/transaction/transaction_bloc.dart | 10 +-- .../stats/widgets/global_total_chart.dart | 2 +- .../monthly_categories_total_chart.dart | 3 +- .../widgets/transaction_form.dart | 5 +- pubspec.lock | 89 +++++++++---------- pubspec.yaml | 9 +- 8 files changed, 70 insertions(+), 68 deletions(-) diff --git a/lib/clients/storage/json_storage_client.dart b/lib/clients/storage/json_storage_client.dart index 14623c2..716d9a9 100644 --- a/lib/clients/storage/json_storage_client.dart +++ b/lib/clients/storage/json_storage_client.dart @@ -20,11 +20,17 @@ class JsonStorageClient { } Future _getJson(String filename) async { - final dir = await getApplicationDocumentsDirectory(); - final file = File('${dir.path}/$filename'); - if (!file.existsSync()) { - file.createSync(); + final rootDirectory = Platform.isAndroid ? await getExternalStorageDirectory() : await getApplicationDocumentsDirectory(); + + final appDirectory = Directory('${rootDirectory!.path}/krezus'); + if (!appDirectory.existsSync()) { + appDirectory.createSync(); } - return file; + + final targetFile = File('${rootDirectory.path}/krezus/$filename'); + if (!targetFile.existsSync()) { + targetFile.createSync(); + } + return targetFile; } } \ No newline at end of file diff --git a/lib/domains/account/account_bloc.dart b/lib/domains/account/account_bloc.dart index 2c660f9..a8f4a58 100644 --- a/lib/domains/account/account_bloc.dart +++ b/lib/domains/account/account_bloc.dart @@ -75,7 +75,7 @@ class AccountBloc extends Bloc { } _onAccountImportCSV(AccountImportCSV event, Emitter emit) async { - int colorIndex = 0; + // int colorIndex = 0; FilePickerResult? result = await FilePicker.platform.pickFiles(); final csvPath = result?.files.first.path; @@ -172,7 +172,7 @@ class AccountBloc extends Bloc { } _onAccountEditLabel(AccountEditLabel event, Emitter emit) { - Account account = event.account; + // Account account = event.account; // TODO check for existance, rename every transaction } diff --git a/lib/domains/transaction/transaction_bloc.dart b/lib/domains/transaction/transaction_bloc.dart index d1c3a1f..65e3fdb 100644 --- a/lib/domains/transaction/transaction_bloc.dart +++ b/lib/domains/transaction/transaction_bloc.dart @@ -167,11 +167,11 @@ class TransactionBloc extends Bloc { emit(state.copyWith( currentTransaction: null, - transactionDate: const TransactionDate.pure(), - transactionCategory: const TransactionCategory.pure(), - transactionDescription: const TransactionDescription.pure(), - transactionAccount: const TransactionAccount.pure(), - transactionValue: const TransactionValue.pure(), + // transactionDate: const TransactionDate.pure(), + // transactionCategory: const TransactionCategory.pure(), + // transactionDescription: const TransactionDescription.pure(), + // transactionAccount: const TransactionAccount.pure(), + // transactionValue: const TransactionValue.pure(), transactions: transactions, transactionsLines: computeResult.list, transactionsLinesFiltered: _applyCategoryFilter(computeResult.list), diff --git a/lib/pages/stats/widgets/global_total_chart.dart b/lib/pages/stats/widgets/global_total_chart.dart index 465e7da..4635dd4 100644 --- a/lib/pages/stats/widgets/global_total_chart.dart +++ b/lib/pages/stats/widgets/global_total_chart.dart @@ -29,7 +29,7 @@ class GlobalTotalChart extends StatelessWidget { lineTouchData: LineTouchData( touchTooltipData: LineTouchTooltipData( maxContentWidth: 100, - tooltipBgColor: Theme.of(context).colorScheme.primaryContainer, + getTooltipColor: (LineBarSpot _) => Theme.of(context).colorScheme.primaryContainer, getTooltipItems: (touchedSpots) { return touchedSpots.map((LineBarSpot touchedSpot) { final textStyle = TextStyle( diff --git a/lib/pages/stats/widgets/monthly_categories_total_chart.dart b/lib/pages/stats/widgets/monthly_categories_total_chart.dart index b0a02be..764a108 100644 --- a/lib/pages/stats/widgets/monthly_categories_total_chart.dart +++ b/lib/pages/stats/widgets/monthly_categories_total_chart.dart @@ -94,7 +94,8 @@ class MonthlyCategoriesTotalChart extends StatelessWidget { enabled: true, handleBuiltInTouches: false, touchTooltipData: BarTouchTooltipData( - tooltipBgColor: Colors.transparent, + // tooltipBgColor: Colors.transparent, + getTooltipColor: (BarChartGroupData _) => Colors.transparent, tooltipMargin: 0, getTooltipItem:(group, groupIndex, rod, rodIndex) { String value = NumberFormat("#00").format(rod.toY); diff --git a/lib/pages/transactions/widgets/transaction_form.dart b/lib/pages/transactions/widgets/transaction_form.dart index 2d071f3..996ea25 100644 --- a/lib/pages/transactions/widgets/transaction_form.dart +++ b/lib/pages/transactions/widgets/transaction_form.dart @@ -37,8 +37,11 @@ class _TransactionDateInput extends StatelessWidget { builder: (context, state) => SizedBox( width: 500, child: TextFormField( - initialValue: DateFormat('dd-MM-yyyy', 'fr_FR').format(state.transactionDate.value ?? DateTime.now()), keyboardType: TextInputType.datetime, + readOnly: true, + controller: TextEditingController( + text: DateFormat('dd-MM-yyyy', 'fr_FR').format(state.transactionDate.value ?? DateTime.now()), + ), onTap: () { FocusScope.of(context).requestFocus(FocusNode()); showDatePicker( diff --git a/pubspec.lock b/pubspec.lock index 27f36a4..1c7e95a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -13,10 +13,10 @@ packages: dependency: transitive description: name: args - sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + sha256: "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a" url: "https://pub.dev" source: hosted - version: "2.4.2" + version: "2.5.0" async: dependency: transitive description: @@ -29,10 +29,10 @@ packages: dependency: transitive description: name: bloc - sha256: f53a110e3b48dcd78136c10daa5d51512443cea5e1348c9d80a320095fa2db9e + sha256: "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e" url: "https://pub.dev" source: hosted - version: "8.1.3" + version: "8.1.4" boolean_selector: dependency: transitive description: @@ -89,6 +89,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + cross_file: + dependency: transitive + description: + name: cross_file + sha256: fedaadfa3a6996f75211d835aaeb8fede285dae94262485698afd832371b9a5e + url: "https://pub.dev" + source: hosted + version: "0.3.3+8" crypto: dependency: transitive description: @@ -101,26 +109,26 @@ packages: dependency: "direct main" description: name: csv - sha256: "63ed2871dd6471193dffc52c0e6c76fb86269c00244d244297abbb355c84a86e" + sha256: c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c url: "https://pub.dev" source: hosted - version: "5.1.1" + version: "6.0.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + sha256: ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6 url: "https://pub.dev" source: hosted - version: "1.0.6" + version: "1.0.8" dynamic_color: dependency: "direct main" description: name: dynamic_color - sha256: a866f1f8947bfdaf674d7928e769eac7230388a2e7a2542824fad4bb5b87be3b + sha256: eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d url: "https://pub.dev" source: hosted - version: "1.6.9" + version: "1.7.0" equatable: dependency: "direct main" description: @@ -149,10 +157,10 @@ packages: dependency: "direct main" description: name: file_picker - sha256: "4e42aacde3b993c5947467ab640882c56947d9d27342a5b6f2895b23956954a6" + sha256: d1d0ac3966b36dc3e66eeefb40280c17feb87fa2099c6e22e6a1fc959327bd03 url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "8.0.0+1" fixnum: dependency: transitive description: @@ -165,26 +173,26 @@ packages: dependency: "direct main" description: name: fl_chart - sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d" + sha256: "2b7c1f5d867da9a054661641c8f499c55c47c39acccb97b3bc673f5fa9a39e74" url: "https://pub.dev" source: hosted - version: "0.66.2" + version: "0.67.0" flex_color_picker: dependency: "direct main" description: name: flex_color_picker - sha256: "0871edc170153cfc3de316d30625f40a85daecfa76ce541641f3cc0ec7757cbf" + sha256: "5c846437069fb7afdd7ade6bf37e628a71d2ab0787095ddcb1253bf9345d5f3a" url: "https://pub.dev" source: hosted - version: "3.3.1" + version: "3.4.1" flex_seed_scheme: dependency: transitive description: name: flex_seed_scheme - sha256: "29c12aba221eb8a368a119685371381f8035011d18de5ba277ad11d7dfb8657f" + sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01" url: "https://pub.dev" source: hosted - version: "1.4.0" + version: "1.5.0" flutter: dependency: "direct main" description: flutter @@ -194,10 +202,10 @@ packages: dependency: "direct main" description: name: flutter_bloc - sha256: "87325da1ac757fcc4813e6b34ed5dd61169973871fdf181d6c2109dd6935ece1" + sha256: f0ecf6e6eb955193ca60af2d5ca39565a86b8a142452c5b24d96fb477428f4d2 url: "https://pub.dev" source: hosted - version: "8.1.4" + version: "8.1.5" flutter_keyboard_visibility: dependency: transitive description: @@ -258,23 +266,18 @@ packages: dependency: "direct dev" description: name: flutter_lints - sha256: e2a421b7e59244faef694ba7b30562e489c2b489866e505074eb005cd7060db7 + sha256: "9e8c3858111da373efc5aa341de011d9bd23e2c5c5e0c62bccf32438e192d7b1" url: "https://pub.dev" source: hosted - version: "3.0.1" - flutter_localizations: - dependency: "direct main" - description: flutter - source: sdk - version: "0.0.0" + version: "3.0.2" flutter_plugin_android_lifecycle: dependency: transitive description: name: flutter_plugin_android_lifecycle - sha256: b068ffc46f82a55844acfa4fdbb61fad72fa2aef0905548419d97f0f95c456da + sha256: "8cf40eebf5dec866a6d1956ad7b4f7016e6c0cc69847ab946833b7d43743809f" url: "https://pub.dev" source: hosted - version: "2.0.17" + version: "2.0.19" flutter_test: dependency: "direct dev" description: flutter @@ -309,14 +312,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.7" - intl: - dependency: "direct main" - description: - name: intl - sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" - url: "https://pub.dev" - source: hosted - version: "0.18.1" js: dependency: transitive description: @@ -393,18 +388,18 @@ packages: dependency: "direct main" description: name: path_provider - sha256: b27217933eeeba8ff24845c34003b003b2b22151de3c908d0e679e8fe1aa078b + sha256: c9e7d3a4cd1410877472158bee69963a4579f78b68c65a2b7d40d1a7a88bb161 url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.3" path_provider_android: dependency: transitive description: name: path_provider_android - sha256: "477184d672607c0a3bf68fbbf601805f92ef79c82b64b4d6eb318cbca4c48668" + sha256: a248d8146ee5983446bf03ed5ea8f6533129a12b11f12057ad1b4a67a2b3b41d url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.2.4" path_provider_foundation: dependency: transitive description: @@ -497,18 +492,18 @@ packages: dependency: transitive description: name: pointycastle - sha256: "43ac87de6e10afabc85c445745a7b799e04de84cebaa4fd7bf55a5e1e9604d29" + sha256: "79fbafed02cfdbe85ef3fd06c7f4bc2cbcba0177e61b765264853d4253b21744" url: "https://pub.dev" source: hosted - version: "3.7.4" + version: "3.9.0" provider: dependency: transitive description: name: provider - sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" + sha256: c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c url: "https://pub.dev" source: hosted - version: "6.1.1" + version: "6.1.2" rxdart: dependency: "direct main" description: @@ -590,10 +585,10 @@ packages: dependency: "direct main" description: name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + sha256: "814e9e88f21a176ae1359149021870e87f7cddaf633ab678a5d2b0bff7fd1ba8" url: "https://pub.dev" source: hosted - version: "4.3.3" + version: "4.4.0" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 7011f61..c28a525 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -12,17 +12,14 @@ dependencies: sdk: flutter cupertino_icons: ^1.0.2 - fl_chart: ^0.66.2 + fl_chart: ^0.67.0 logging: ^1.2.0 flutter_bloc: ^8.1.4 path_provider: ^2.1.1 equatable: ^2.0.5 rxdart: ^0.27.7 - file_picker: ^6.1.1 - csv: ^5.1.1 - flutter_localizations: - sdk: flutter - intl: any + file_picker: ^8.0.0+1 + csv: ^6.0.0 formz: ^0.7.0 uuid: ^4.3.2 flutter_typeahead: ^5.2.0