From 76da49480460592fd524264a729b9c915d60395b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 12 Feb 2024 19:28:10 +0100 Subject: [PATCH 01/12] chore: require full screen on ios --- ios/Runner/Info.plist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist index a403f42..caa66d2 100644 --- a/ios/Runner/Info.plist +++ b/ios/Runner/Info.plist @@ -36,6 +36,8 @@ LaunchScreen UIMainStoryboardFile Main + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait -- 2.45.2 From aeda571f3531fd2d06a509c50d93e90b19fd0dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 21:58:18 +0100 Subject: [PATCH 02/12] chore: upgrade flutter --- .flutter | 2 +- pubspec.lock | 328 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 285 insertions(+), 45 deletions(-) diff --git a/.flutter b/.flutter index b7e7d46..1751123 160000 --- a/.flutter +++ b/.flutter @@ -1 +1 @@ -Subproject commit b7e7d46a046ba8a22897a514bf2311a0f81ab198 +Subproject commit 1751123cde4ffad08ae27bdee4f8ddebd033fe76 diff --git a/pubspec.lock b/pubspec.lock index d5f3b26..9a68996 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -109,10 +109,10 @@ packages: dependency: transitive description: name: built_value - sha256: a3ec2e0f967bc47f69f95009bb93db936288d61d5343b9436e378b28a2f830c6 + sha256: fedde275e0a6b798c3296963c5cd224e3e1b55d0e478d5b7e65e6b540f363a0e url: "https://pub.dev" source: hosted - version: "8.9.0" + version: "8.9.1" characters: dependency: transitive description: @@ -129,6 +129,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" + chunked_stream: + dependency: transitive + description: + name: chunked_stream + sha256: b2fde5f81d780f0c1699b8347cae2e413412ae947fc6e64727cc48c6bb54c95c + url: "https://pub.dev" + source: hosted + version: "1.4.2" + circular_buffer: + dependency: transitive + description: + name: circular_buffer + sha256: "2889afcfc97aa0d9a4930ae5fdf206aea7d0ac88a3649acec9130565cd8f45d8" + url: "https://pub.dev" + source: hosted + version: "0.11.0" cli_util: dependency: transitive description: @@ -161,6 +177,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" + completer_ex: + dependency: transitive + description: + name: completer_ex + sha256: "7bc3b65fb581c999891fdee0aaa3b5194b50329e0ccda28eb119ebedfec4b852" + url: "https://pub.dev" + source: hosted + version: "4.0.0" convert: dependency: transitive description: @@ -185,6 +209,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" + csv: + dependency: transitive + description: + name: csv + sha256: "63ed2871dd6471193dffc52c0e6c76fb86269c00244d244297abbb355c84a86e" + url: "https://pub.dev" + source: hosted + version: "5.1.1" cupertino_icons: dependency: "direct main" description: @@ -201,6 +233,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.20" + dart_console2: + dependency: transitive + description: + name: dart_console2 + sha256: "300833ffdd8c465d454cb5007c7f29d28ac8246af5abd922f8c490e1e87c894f" + url: "https://pub.dev" + source: hosted + version: "3.0.0" dart_style: dependency: transitive description: @@ -209,14 +249,38 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.4" + dcli: + dependency: transitive + description: + name: dcli + sha256: "0319f6cf59f3af23aead1098c2d99ccbd5525e025a77f8d021eea90431263746" + url: "https://pub.dev" + source: hosted + version: "3.3.5" + dcli_core: + dependency: transitive + description: + name: dcli_core + sha256: "60782bcd669b88bfbde729c63dad891443a6e17d16f7c24fd5a8e2e3960f432a" + url: "https://pub.dev" + source: hosted + version: "3.3.5" + dcli_terminal: + dependency: transitive + description: + name: dcli_terminal + sha256: "4d68792b83da509206028b6c028353fbb5fb41cd75a694affd86e2f2016f6897" + url: "https://pub.dev" + source: hosted + version: "0.2.0" dio: dependency: "direct main" description: name: dio - sha256: "797e1e341c3dd2f69f2dad42564a6feff3bfb87187d05abb93b9609e6f1645c3" + sha256: "49af28382aefc53562459104f64d16b9dfd1e8ef68c862d5af436cc8356ce5a8" url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "5.4.1" dots_indicator: dependency: transitive description: @@ -277,10 +341,10 @@ packages: dependency: "direct main" description: name: fl_chart - sha256: b5e2b0f13d93f8c532b5a2786bfb44580de1f50b927bf95813fa1af617e9caf8 + sha256: "00b74ae680df6b1135bdbea00a7d1fc072a9180b7c3f3702e4b19a9943f5ed7d" url: "https://pub.dev" source: hosted - version: "0.66.1" + version: "0.66.2" flex_color_picker: dependency: "direct main" description: @@ -319,10 +383,10 @@ packages: dependency: "direct main" description: name: flutter_iconpicker - sha256: ad21bb678fd315f5c4f4eab2c9489779f818a3cbb77e20a7460d685bc44ddaf4 + sha256: "84279d322f1542a97bf09b780a859eb766a0af64b7de1aae4b51377771916b88" url: "https://pub.dev" source: hosted - version: "3.3.3" + version: "3.4.4" flutter_keyboard_visibility: dependency: transitive description: @@ -450,11 +514,27 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.0" + fsm2: + dependency: transitive + description: + name: fsm2 + sha256: "7cfc5503617e88f352f224e6715afb345bd23bd2a23e83d2b1ea977014f0111a" + url: "https://pub.dev" + source: hosted + version: "3.0.0" fuchsia_remote_debug_protocol: dependency: transitive description: flutter source: sdk version: "0.0.0" + functional_data: + dependency: transitive + description: + name: functional_data + sha256: aefdec4365452283b2a7cf420a3169654d51d3e9553069a22d76680d7a9d7c3d + url: "https://pub.dev" + source: hosted + version: "1.1.1" glob: dependency: transitive description: @@ -463,6 +543,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" + globbing: + dependency: transitive + description: + name: globbing + sha256: "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d" + url: "https://pub.dev" + source: hosted + version: "1.0.0" graphs: dependency: transitive description: @@ -499,10 +587,18 @@ packages: dependency: transitive description: name: image - sha256: "49a0d4b0c12402853d3f227fe7c315601b238d126aa4caa5dbb2dcf99421aa4a" + sha256: "4c68bfd5ae83e700b5204c1e74451e7bf3cf750e6843c6e158289cf56bda018e" url: "https://pub.dev" source: hosted - version: "4.1.6" + version: "4.1.7" + ini: + dependency: transitive + description: + name: ini + sha256: "12a76c53591ffdf86d1265be3f986888a6dfeb34a85957774bc65912d989a173" + url: "https://pub.dev" + source: hosted + version: "2.1.0" integration_test: dependency: "direct dev" description: flutter @@ -540,6 +636,14 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" + json2yaml: + dependency: transitive + description: + name: json2yaml + sha256: da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51 + url: "https://pub.dev" + source: hosted + version: "3.0.1" json_annotation: dependency: "direct main" description: @@ -560,26 +664,26 @@ packages: dependency: transitive description: name: leak_tracker - sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa" + sha256: cdd14e3836065a1f6302a236ec8b5f700695c803c57ae11a1c84df31e6bcf831 url: "https://pub.dev" source: hosted - version: "10.0.0" + version: "10.0.3" leak_tracker_flutter_testing: dependency: transitive description: name: leak_tracker_flutter_testing - sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0 + sha256: "9b2ef90589911d665277464e0482b209d39882dffaaf4ef69a3561a3354b2ebc" url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.2" leak_tracker_testing: dependency: transitive description: name: leak_tracker_testing - sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47 + sha256: fd3cd66cb2bcd7b50dcd3b413af49d78051f809c8b3f6e047962765c15a0d23d url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "3.0.0" lints: dependency: transitive description: @@ -588,6 +692,14 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" + lists: + dependency: transitive + description: + name: lists + sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27" + url: "https://pub.dev" + source: hosted + version: "1.0.1" logger: dependency: "direct main" description: @@ -756,6 +868,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" + posix: + dependency: transitive + description: + name: posix + sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a + url: "https://pub.dev" + source: hosted + version: "6.0.1" process: dependency: transitive description: @@ -780,6 +900,22 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" + pubspec_lock: + dependency: transitive + description: + name: pubspec_lock + sha256: ed5fc1ecd0cdc0e14475a091afcb2c4cbb00e74cebff17635e9abbec18d76cc4 + url: "https://pub.dev" + source: hosted + version: "3.0.2" + pubspec_manager: + dependency: transitive + description: + name: pubspec_manager + sha256: bddf87f12c7507205d0a5741096164e88b65ebe6cbb285c5a8e798e87f3518d0 + url: "https://pub.dev" + source: hosted + version: "1.0.0-alpha.16" pubspec_parse: dependency: transitive description: @@ -788,6 +924,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.3" + scope: + dependency: transitive + description: + name: scope + sha256: "80cf1cb727791fdaaa4131817974a6084815ed59b9ab02ef352c3a1badea488b" + url: "https://pub.dev" + source: hosted + version: "4.1.0" settings_ui: dependency: "direct main" description: @@ -796,6 +940,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" + settings_yaml: + dependency: transitive + description: + name: settings_yaml + sha256: c568c79a1a2e48235d7f6cb06a78b15867879cc1995796dd324b9bc125e6b077 + url: "https://pub.dev" + source: hosted + version: "8.0.1" shared_preferences: dependency: "direct main" description: @@ -840,10 +992,10 @@ packages: dependency: transitive description: name: shared_preferences_web - sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" + sha256: "9aee1089b36bd2aafe06582b7d7817fd317ef05fc30e6ba14bff247d0933042a" url: "https://pub.dev" source: hosted - version: "2.2.2" + version: "2.3.0" shared_preferences_windows: dependency: transitive description: @@ -884,6 +1036,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" + simple_logger: + dependency: transitive + description: + name: simple_logger + sha256: bd3f09099a890f5f66cd27a39e5422f4e27b5e7cf4c5a7331569e86d89846898 + url: "https://pub.dev" + source: hosted + version: "1.9.0+3" sky_engine: dependency: transitive description: flutter @@ -929,6 +1089,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" + sprintf: + dependency: transitive + description: + name: sprintf + sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" + url: "https://pub.dev" + source: hosted + version: "7.0.0" stack_trace: dependency: transitive description: @@ -937,6 +1105,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.11.1" + stacktrace_impl: + dependency: transitive + description: + name: stacktrace_impl + sha256: a42791862f672151d7f5a12911bf607c5b6d600f15f4f2457ef4ec92bfcf561b + url: "https://pub.dev" + source: hosted + version: "2.3.0" stream_channel: dependency: transitive description: @@ -961,6 +1137,22 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" + strings: + dependency: transitive + description: + name: strings + sha256: b33f40c4dd3e597bf6d9e7f4f4dc282dad0f19b07d9f320cb5c2183859cbccf5 + url: "https://pub.dev" + source: hosted + version: "3.1.1" + sum_types: + dependency: transitive + description: + name: sum_types + sha256: c0a0fad9a518d011987e1d9f27fc336194294e55dafdc3699363e52aa5776e09 + url: "https://pub.dev" + source: hosted + version: "0.3.5" sync_http: dependency: transitive description: @@ -969,6 +1161,22 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.1" + synchronized: + dependency: transitive + description: + name: synchronized + sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" + url: "https://pub.dev" + source: hosted + version: "3.1.0+1" + system_info2: + dependency: transitive + description: + name: system_info2 + sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9" + url: "https://pub.dev" + source: hosted + version: "4.0.0" term_glyph: dependency: transitive description: @@ -981,26 +1189,26 @@ packages: dependency: "direct dev" description: name: test - sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f + sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073" url: "https://pub.dev" source: hosted - version: "1.24.9" + version: "1.25.2" test_api: dependency: transitive description: name: test_api - sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" + sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f" url: "https://pub.dev" source: hosted - version: "0.6.1" + version: "0.7.0" test_core: dependency: transitive description: name: test_core - sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a + sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4" url: "https://pub.dev" source: hosted - version: "0.5.9" + version: "0.6.0" timing: dependency: transitive description: @@ -1009,6 +1217,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" + tree_iterator: + dependency: transitive + description: + name: tree_iterator + sha256: bf3e797743cbf16366c40fb481a83cd7a2a30f36240a633de27e7ef1549b8b34 + url: "https://pub.dev" + source: hosted + version: "3.0.0" typed_data: dependency: transitive description: @@ -1017,30 +1233,38 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" + unicode: + dependency: transitive + description: + name: unicode + sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1" + url: "https://pub.dev" + source: hosted + version: "0.3.1" url_launcher: dependency: "direct main" description: name: url_launcher - sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c + sha256: "0ecc004c62fd3ed36a2ffcbe0dd9700aee63bd7532d0b642a488b1ec310f492e" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f" + sha256: d4ed0711849dd8e33eb2dd69c25db0d0d3fdc37e0a62e629fe32f57a22db2745 url: "https://pub.dev" source: hosted - version: "6.2.2" + version: "6.3.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" + sha256: "9149d493b075ed740901f3ee844a38a00b33116c7c5c10d7fb27df8987fb51d5" url: "https://pub.dev" source: hosted - version: "6.2.4" + version: "6.2.5" url_launcher_linux: dependency: transitive description: @@ -1061,18 +1285,18 @@ packages: dependency: transitive description: name: url_launcher_platform_interface - sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b + sha256: "3692a459204a33e04bc94f5fb91158faf4f2c8903281ddd82915adecdb1a901d" url: "https://pub.dev" source: hosted - version: "2.2.3" + version: "2.3.0" url_launcher_windows: dependency: transitive description: @@ -1081,6 +1305,22 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" + uuid: + dependency: transitive + description: + name: uuid + sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 + url: "https://pub.dev" + source: hosted + version: "4.3.3" + validators2: + dependency: transitive + description: + name: validators2 + sha256: "5c63054b2f47b6a3f39e0d0e3f5d38829db4545250144a34c9e1585466de4814" + url: "https://pub.dev" + source: hosted + version: "5.0.0" vector_math: dependency: transitive description: @@ -1101,10 +1341,10 @@ packages: dependency: transitive description: name: vm_service - sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957 + sha256: a2662fb1f114f4296cf3f5a50786a2d888268d7776cf681aa17d660ffa23b246 url: "https://pub.dev" source: hosted - version: "13.0.0" + version: "14.0.0" watcher: dependency: transitive description: @@ -1117,18 +1357,18 @@ packages: dependency: transitive description: name: web - sha256: "4188706108906f002b3a293509234588823c8c979dc83304e229ff400c996b05" + sha256: "1d9158c616048c38f712a6646e317a3426da10e884447626167240d45209cbad" url: "https://pub.dev" source: hosted - version: "0.4.2" + version: "0.5.0" web_socket_channel: dependency: transitive description: name: web_socket_channel - sha256: "939ab60734a4f8fa95feacb55804fa278de28bdeef38e616dc08e44a84adea23" + sha256: "1d8e795e2a8b3730c41b8a98a2dff2e0fb57ae6f0764a1c46ec5915387d257b2" url: "https://pub.dev" source: hosted - version: "2.4.3" + version: "2.4.4" webdriver: dependency: transitive description: @@ -1157,10 +1397,10 @@ packages: dependency: transitive description: name: win32 - sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" + sha256: "5a751eddf9db89b3e5f9d50c20ab8612296e4e8db69009788d6c8b060a84191c" url: "https://pub.dev" source: hosted - version: "5.2.0" + version: "4.1.4" xdg_directories: dependency: transitive description: @@ -1186,5 +1426,5 @@ packages: source: hosted version: "3.1.2" sdks: - dart: ">=3.3.0-279.1.beta <4.0.0" - flutter: ">=3.16.0" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.19.0" -- 2.45.2 From 4d7144267e0ea3c5ad9536805b2607347e5cfcc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 22:53:10 +0100 Subject: [PATCH 03/12] fix: downgrade iconpicker --- pubspec.lock | 244 +-------------------------------------------------- pubspec.yaml | 2 +- 2 files changed, 3 insertions(+), 243 deletions(-) diff --git a/pubspec.lock b/pubspec.lock index 9a68996..adbb95b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -129,22 +129,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.3" - chunked_stream: - dependency: transitive - description: - name: chunked_stream - sha256: b2fde5f81d780f0c1699b8347cae2e413412ae947fc6e64727cc48c6bb54c95c - url: "https://pub.dev" - source: hosted - version: "1.4.2" - circular_buffer: - dependency: transitive - description: - name: circular_buffer - sha256: "2889afcfc97aa0d9a4930ae5fdf206aea7d0ac88a3649acec9130565cd8f45d8" - url: "https://pub.dev" - source: hosted - version: "0.11.0" cli_util: dependency: transitive description: @@ -177,14 +161,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.18.0" - completer_ex: - dependency: transitive - description: - name: completer_ex - sha256: "7bc3b65fb581c999891fdee0aaa3b5194b50329e0ccda28eb119ebedfec4b852" - url: "https://pub.dev" - source: hosted - version: "4.0.0" convert: dependency: transitive description: @@ -209,14 +185,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.3" - csv: - dependency: transitive - description: - name: csv - sha256: "63ed2871dd6471193dffc52c0e6c76fb86269c00244d244297abbb355c84a86e" - url: "https://pub.dev" - source: hosted - version: "5.1.1" cupertino_icons: dependency: "direct main" description: @@ -233,14 +201,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.20" - dart_console2: - dependency: transitive - description: - name: dart_console2 - sha256: "300833ffdd8c465d454cb5007c7f29d28ac8246af5abd922f8c490e1e87c894f" - url: "https://pub.dev" - source: hosted - version: "3.0.0" dart_style: dependency: transitive description: @@ -249,30 +209,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.3.4" - dcli: - dependency: transitive - description: - name: dcli - sha256: "0319f6cf59f3af23aead1098c2d99ccbd5525e025a77f8d021eea90431263746" - url: "https://pub.dev" - source: hosted - version: "3.3.5" - dcli_core: - dependency: transitive - description: - name: dcli_core - sha256: "60782bcd669b88bfbde729c63dad891443a6e17d16f7c24fd5a8e2e3960f432a" - url: "https://pub.dev" - source: hosted - version: "3.3.5" - dcli_terminal: - dependency: transitive - description: - name: dcli_terminal - sha256: "4d68792b83da509206028b6c028353fbb5fb41cd75a694affd86e2f2016f6897" - url: "https://pub.dev" - source: hosted - version: "0.2.0" dio: dependency: "direct main" description: @@ -383,10 +319,10 @@ packages: dependency: "direct main" description: name: flutter_iconpicker - sha256: "84279d322f1542a97bf09b780a859eb766a0af64b7de1aae4b51377771916b88" + sha256: ad21bb678fd315f5c4f4eab2c9489779f818a3cbb77e20a7460d685bc44ddaf4 url: "https://pub.dev" source: hosted - version: "3.4.4" + version: "3.3.3" flutter_keyboard_visibility: dependency: transitive description: @@ -514,27 +450,11 @@ packages: url: "https://pub.dev" source: hosted version: "3.2.0" - fsm2: - dependency: transitive - description: - name: fsm2 - sha256: "7cfc5503617e88f352f224e6715afb345bd23bd2a23e83d2b1ea977014f0111a" - url: "https://pub.dev" - source: hosted - version: "3.0.0" fuchsia_remote_debug_protocol: dependency: transitive description: flutter source: sdk version: "0.0.0" - functional_data: - dependency: transitive - description: - name: functional_data - sha256: aefdec4365452283b2a7cf420a3169654d51d3e9553069a22d76680d7a9d7c3d - url: "https://pub.dev" - source: hosted - version: "1.1.1" glob: dependency: transitive description: @@ -543,14 +463,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.2" - globbing: - dependency: transitive - description: - name: globbing - sha256: "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d" - url: "https://pub.dev" - source: hosted - version: "1.0.0" graphs: dependency: transitive description: @@ -591,14 +503,6 @@ packages: url: "https://pub.dev" source: hosted version: "4.1.7" - ini: - dependency: transitive - description: - name: ini - sha256: "12a76c53591ffdf86d1265be3f986888a6dfeb34a85957774bc65912d989a173" - url: "https://pub.dev" - source: hosted - version: "2.1.0" integration_test: dependency: "direct dev" description: flutter @@ -636,14 +540,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.7" - json2yaml: - dependency: transitive - description: - name: json2yaml - sha256: da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51 - url: "https://pub.dev" - source: hosted - version: "3.0.1" json_annotation: dependency: "direct main" description: @@ -692,14 +588,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.0" - lists: - dependency: transitive - description: - name: lists - sha256: "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27" - url: "https://pub.dev" - source: hosted - version: "1.0.1" logger: dependency: "direct main" description: @@ -868,14 +756,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.5.1" - posix: - dependency: transitive - description: - name: posix - sha256: a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a - url: "https://pub.dev" - source: hosted - version: "6.0.1" process: dependency: transitive description: @@ -900,22 +780,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.1.4" - pubspec_lock: - dependency: transitive - description: - name: pubspec_lock - sha256: ed5fc1ecd0cdc0e14475a091afcb2c4cbb00e74cebff17635e9abbec18d76cc4 - url: "https://pub.dev" - source: hosted - version: "3.0.2" - pubspec_manager: - dependency: transitive - description: - name: pubspec_manager - sha256: bddf87f12c7507205d0a5741096164e88b65ebe6cbb285c5a8e798e87f3518d0 - url: "https://pub.dev" - source: hosted - version: "1.0.0-alpha.16" pubspec_parse: dependency: transitive description: @@ -924,14 +788,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.3" - scope: - dependency: transitive - description: - name: scope - sha256: "80cf1cb727791fdaaa4131817974a6084815ed59b9ab02ef352c3a1badea488b" - url: "https://pub.dev" - source: hosted - version: "4.1.0" settings_ui: dependency: "direct main" description: @@ -940,14 +796,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.0.2" - settings_yaml: - dependency: transitive - description: - name: settings_yaml - sha256: c568c79a1a2e48235d7f6cb06a78b15867879cc1995796dd324b9bc125e6b077 - url: "https://pub.dev" - source: hosted - version: "8.0.1" shared_preferences: dependency: "direct main" description: @@ -1036,14 +884,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.4" - simple_logger: - dependency: transitive - description: - name: simple_logger - sha256: bd3f09099a890f5f66cd27a39e5422f4e27b5e7cf4c5a7331569e86d89846898 - url: "https://pub.dev" - source: hosted - version: "1.9.0+3" sky_engine: dependency: transitive description: flutter @@ -1089,14 +929,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" stack_trace: dependency: transitive description: @@ -1105,14 +937,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.11.1" - stacktrace_impl: - dependency: transitive - description: - name: stacktrace_impl - sha256: a42791862f672151d7f5a12911bf607c5b6d600f15f4f2457ef4ec92bfcf561b - url: "https://pub.dev" - source: hosted - version: "2.3.0" stream_channel: dependency: transitive description: @@ -1137,22 +961,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.2.0" - strings: - dependency: transitive - description: - name: strings - sha256: b33f40c4dd3e597bf6d9e7f4f4dc282dad0f19b07d9f320cb5c2183859cbccf5 - url: "https://pub.dev" - source: hosted - version: "3.1.1" - sum_types: - dependency: transitive - description: - name: sum_types - sha256: c0a0fad9a518d011987e1d9f27fc336194294e55dafdc3699363e52aa5776e09 - url: "https://pub.dev" - source: hosted - version: "0.3.5" sync_http: dependency: transitive description: @@ -1161,22 +969,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.3.1" - synchronized: - dependency: transitive - description: - name: synchronized - sha256: "539ef412b170d65ecdafd780f924e5be3f60032a1128df156adad6c5b373d558" - url: "https://pub.dev" - source: hosted - version: "3.1.0+1" - system_info2: - dependency: transitive - description: - name: system_info2 - sha256: "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9" - url: "https://pub.dev" - source: hosted - version: "4.0.0" term_glyph: dependency: transitive description: @@ -1217,14 +1009,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.1" - tree_iterator: - dependency: transitive - description: - name: tree_iterator - sha256: bf3e797743cbf16366c40fb481a83cd7a2a30f36240a633de27e7ef1549b8b34 - url: "https://pub.dev" - source: hosted - version: "3.0.0" typed_data: dependency: transitive description: @@ -1233,14 +1017,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.3.2" - unicode: - dependency: transitive - description: - name: unicode - sha256: "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1" - url: "https://pub.dev" - source: hosted - version: "0.3.1" url_launcher: dependency: "direct main" description: @@ -1305,22 +1081,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.1" - uuid: - dependency: transitive - description: - name: uuid - sha256: cd210a09f7c18cbe5a02511718e0334de6559871052c90a90c0cca46a4aa81c8 - url: "https://pub.dev" - source: hosted - version: "4.3.3" - validators2: - dependency: transitive - description: - name: validators2 - sha256: "5c63054b2f47b6a3f39e0d0e3f5d38829db4545250144a34c9e1585466de4814" - url: "https://pub.dev" - source: hosted - version: "5.0.0" vector_math: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index b4873e0..a1d91b3 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: flutter: sdk: flutter flutter_file_dialog: ^3.0.2 - flutter_iconpicker: ^3.2.4 + flutter_iconpicker: <3.4.0 flutter_localizations: sdk: flutter flutter_slidable: ^3.0.0 -- 2.45.2 From a6872408faaf705563b3fd79074c0aa660aed9f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 22:53:38 +0100 Subject: [PATCH 04/12] fix: set kotlin version everywhere --- android/settings.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/settings.gradle b/android/settings.gradle index 1d6d19b..985a6e2 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -20,7 +20,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" id "com.android.application" version "7.3.0" apply false - id "org.jetbrains.kotlin.android" version "1.7.10" apply false + id "org.jetbrains.kotlin.android" version "1.9.22" apply false } include ":app" -- 2.45.2 From e5e803057ae3ddd8f9c8f1c92b30b4437748f3a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 22:53:51 +0100 Subject: [PATCH 05/12] fix: localization mistakes --- lib/l10n/app_cs.arb | 2 +- lib/l10n/app_en.arb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/l10n/app_cs.arb b/lib/l10n/app_cs.arb index 5b6a09c..83b55c2 100644 --- a/lib/l10n/app_cs.arb +++ b/lib/l10n/app_cs.arb @@ -7,7 +7,7 @@ "next": "Další", "back": "Zpět", "finish": "Dokončit", - "errorEmptyName": "Název peněženky nemůže být prázdný!", + "errorEmptyName": "Název nemůže být prázdný!", "welcome": "Vítejte!", "welcomeAboutPrasule": "Prašule je správce výdajů navržený pro lidi, kteří nechtějí vyplňovat každý malý detail.", "welcomeInstruction": "Na této obrazovce si nastavíte svoji 'peněženku', ve které budou zaznamenány vaše výdaje uspořádané do kategorií, které si nastavíte hned potom.", diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb index 4281354..9d49ef4 100644 --- a/lib/l10n/app_en.arb +++ b/lib/l10n/app_en.arb @@ -7,7 +7,7 @@ "next": "Next", "back": "Back", "finish": "Finish", - "errorEmptyName": "Wallet name cannot be empty", + "errorEmptyName": "Name cannot be empty", "welcome": "Welcome!", "welcomeAboutPrasule": "Prašule is an expense tracker tool designed for people, who don't want to spend too much time filling in all the little details.", "welcomeInstruction": "On this screen you will set up your 'wallet', in which you will track your expenses categorized under categories, which you can later set in the settings menu.", -- 2.45.2 From 4a3f097b024c0ad66dcdb31d8c46dba4ee933eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 22:58:01 +0100 Subject: [PATCH 06/12] fix: showing created entry after OCR --- lib/views/home.dart | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/views/home.dart b/lib/views/home.dart index 58c72fb..23c82e9 100644 --- a/lib/views/home.dart +++ b/lib/views/home.dart @@ -247,7 +247,9 @@ class _HomeViewState extends State { .then((value) async { wallets = await WalletManager.listWallets(); selectedWallet = await WalletManager.loadWallet( - selectedWallet!.name,); + selectedWallet!.name, + ); + setState(() {}); }); } else if (value == AppLocalizations.of(context).about) { showAbout(context); @@ -650,7 +652,7 @@ class _HomeViewState extends State { await showAdaptiveDialog( context: context, builder: (c) => StatefulBuilder( - builder: (ctx, setState) => AlertDialog.adaptive( + builder: (ctx, setDialogState) => AlertDialog.adaptive( actions: [ TextButton( onPressed: () async { @@ -764,7 +766,7 @@ class _HomeViewState extends State { 1 && !value)) return; selectedLanguages[index] = value; - setState(() {}); + setDialogState(() {}); }, ), const SizedBox( -- 2.45.2 From c7e40b12b7da9325adde3fd676b30611897e901b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 22:59:08 +0100 Subject: [PATCH 07/12] fix: icons in iconpicker per platform --- lib/views/settings/edit_categories.dart | 8 ++++++++ lib/views/setup.dart | 18 ++++++++++++++---- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/lib/views/settings/edit_categories.dart b/lib/views/settings/edit_categories.dart index 1de0cf8..d6cf5ad 100644 --- a/lib/views/settings/edit_categories.dart +++ b/lib/views/settings/edit_categories.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:dynamic_color/dynamic_color.dart'; import 'package:flex_color_picker/flex_color_picker.dart'; @@ -152,6 +153,13 @@ class _EditCategoriesViewState extends State { onTap: () async { final icon = await showIconPicker( context, + iconPackModes: [ + if (!Platform.isIOS && !Platform.isMacOS) + IconPack.material, + if (Platform.isIOS || Platform.isMacOS) + IconPack.cupertino, + ], + // adaptiveDialog: true, ); if (icon != null) { selectedWallet!.categories[i].icon = icon; diff --git a/lib/views/setup.dart b/lib/views/setup.dart index e97a659..f07a572 100644 --- a/lib/views/setup.dart +++ b/lib/views/setup.dart @@ -1,4 +1,5 @@ import 'dart:async'; +import 'dart:io'; import 'package:currency_picker/currency_picker.dart'; import 'package:dynamic_color/dynamic_color.dart'; @@ -153,10 +154,11 @@ class _SetupViewState extends State { return; } final wallet = Wallet( - name: name, - currency: _selectedCurrency, - categories: categories, - starterBalance: double.parse(_balanceController.text),); + name: name, + currency: _selectedCurrency, + categories: categories, + starterBalance: double.parse(_balanceController.text), + ); await WalletManager.saveWallet(wallet); if (widget.newWallet && context.mounted) { @@ -340,6 +342,14 @@ class _SetupViewState extends State { onTap: () async { final icon = await showIconPicker( context, + iconPackModes: [ + if (!Platform.isIOS && + !Platform.isMacOS) + IconPack.material, + if (Platform.isIOS || Platform.isMacOS) + IconPack.cupertino, + ], + // adaptiveDialog: true, ); if (icon != null) categories[i].icon = icon; final materialEnabled = -- 2.45.2 From af04accabfb0aa955e56e1b44eab7bfe5802efdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 23:26:02 +0100 Subject: [PATCH 08/12] fix: update state after creating recurring entry --- lib/views/recurring_view.dart | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/views/recurring_view.dart b/lib/views/recurring_view.dart index cc2f4c1..faa6cde 100644 --- a/lib/views/recurring_view.dart +++ b/lib/views/recurring_view.dart @@ -125,14 +125,16 @@ class _RecurringEntriesViewState extends State { floatingActionButton: FloatingActionButton( child: const Icon(Icons.add), onPressed: () { - Navigator.of(context).push( - platformRoute( - (p0) => CreateRecurringEntryView( - w: selectedWallet!, - locale: locale, - ), - ), - ); + Navigator.of(context) + .push( + platformRoute( + (p0) => CreateRecurringEntryView( + w: selectedWallet!, + locale: locale, + ), + ), + ) + .then((value) => setState(() {})); }, ), body: Center( -- 2.45.2 From bd17e12e1b91c816031cac8b4d7df527c5f6355b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 23:26:11 +0100 Subject: [PATCH 09/12] fix: show correct indicator on pie chart --- lib/util/graphs.dart | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/lib/util/graphs.dart b/lib/util/graphs.dart index 6ad292e..3abf042 100644 --- a/lib/util/graphs.dart +++ b/lib/util/graphs.dart @@ -428,11 +428,39 @@ class _CategoriesPieChartState extends State { (index) => Padding( padding: const EdgeInsets.all(8), child: Indicator( - size: touchedIndex == index ? 18 : 16, + size: (touchedIndex != -1 && + touchedIndex == + widget.categories + .where( + (element) => widget.entries + .where( + (w) => + w.category.id == + element + .id, // TODO: more elegant fix + ) + .isNotEmpty, + ) + .toList() + .indexOf(widget.categories[index])) + ? 18 + : 16, color: widget.categories[index].color, text: widget.categories[index].name, textStyle: TextStyle( - fontWeight: (touchedIndex == index) + fontWeight: (touchedIndex != -1 && + touchedIndex == + widget.categories + .where( + (element) => widget.entries + .where( + (w) => + w.category.id == element.id, + ) + .isNotEmpty, + ) + .toList() + .indexOf(widget.categories[index])) ? FontWeight.bold : FontWeight.normal, ), -- 2.45.2 From 15d2590a8ef5a631183b6d16fd12a61700be507a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 23:30:31 +0100 Subject: [PATCH 10/12] docs: update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 00c4570..f1f88fa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.1.0 +- Fix indicators for Pie Chart +- Fix entries not showing up immediately after creation +- Fix localization errors # 1.0.0 - Change icon -- 2.45.2 From 7c8535b99df6539fb91b790d27cf94815e027a7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 23:30:45 +0100 Subject: [PATCH 11/12] chore: bump version --- pubspec.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index a1d91b3..8a2a40a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,7 +1,7 @@ name: prasule description: Open-source private expense tracker -version: 1.0.0+6 +version: 1.1.0+7 environment: sdk: '>=3.1.0-262.2.beta <4.0.0' -- 2.45.2 From 85fefda4d8f70dd3c1856bfbf51bce3451a748ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Caras?= Date: Mon, 26 Feb 2024 23:33:43 +0100 Subject: [PATCH 12/12] chore: bump version in about dialog --- lib/util/utils.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/util/utils.dart b/lib/util/utils.dart index 45dfc37..5c84324 100644 --- a/lib/util/utils.dart +++ b/lib/util/utils.dart @@ -12,7 +12,7 @@ void showAbout(BuildContext context) { context: context, applicationLegalese: AppLocalizations.of(context).license, applicationName: "Prašule", - applicationVersion: "1.0.0", + applicationVersion: "1.1.0", applicationIcon: const CircleAvatar( backgroundImage: AssetImage("assets/icon/full_ico.png"), ), -- 2.45.2