From ce0966fca2266efaee8cabf08623aa88f448e1c5 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Fri, 18 Sep 2026 13:44:09 +0300 Subject: [PATCH] =?UTF-8?q?feat(app):=20Flutter-=D0=BA=D0=BB=D0=B8=D0=B5?= =?UTF-8?q?=D0=BD=D1=82=20=E2=80=94=20=D0=BB=D0=BE=D0=B3=D0=B8=D0=BD,=20?= =?UTF-8?q?=D0=B4=D0=B0=D1=88=D0=B1=D0=BE=D1=80=D0=B4,=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=BA=D0=B8,=20=D0=BA=D0=B0=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D0=BE=D1=80=D0=B8=D0=B8,=20=D1=82=D1=80=D0=B0=D0=BD=D0=B7?= =?UTF-8?q?=D0=B0=D0=BA=D1=86=D0=B8=D0=B8,=20=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Riverpod + go_router с auth-guard, NavigationRail на широком экране и bottom bar на узком. Токены в flutter_secure_storage, на web access живёт в памяти. Интерцептор подставляет токен и делает ровно один refresh на 401. Деньги приходят строками и форматируются через Decimal: парсить их в double значило бы терять копейки ровно там, где бэкенд их бережёт. --- app/.gitignore | 48 ++ app/.metadata | 39 + app/README.md | 12 + app/analysis_options.yaml | 14 + app/android/.gitignore | 14 + app/android/app/build.gradle.kts | 49 ++ app/android/app/src/debug/AndroidManifest.xml | 7 + app/android/app/src/main/AndroidManifest.xml | 45 ++ .../fintracker/fintracker_app/MainActivity.kt | 5 + .../res/drawable-v21/launch_background.xml | 12 + .../main/res/drawable/launch_background.xml | 12 + .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 544 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 442 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 721 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 1031 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 1443 bytes .../app/src/main/res/values-night/styles.xml | 18 + .../app/src/main/res/values/styles.xml | 18 + .../app/src/profile/AndroidManifest.xml | 7 + app/android/build.gradle.kts | 24 + app/android/gradle.properties | 6 + .../gradle/wrapper/gradle-wrapper.properties | 5 + app/android/settings.gradle.kts | 26 + app/lib/app.dart | 30 + app/lib/core/api/api_client.dart | 75 ++ app/lib/core/api/common_providers.dart | 16 + app/lib/core/app_info.dart | 4 + app/lib/core/auth/auth_controller.dart | 109 +++ app/lib/core/auth/token_store.dart | 15 + app/lib/core/config.dart | 11 + app/lib/core/theme/chart_colors.dart | 21 + app/lib/core/theme/theme_controller.dart | 28 + app/lib/core/utils/ru_date.dart | 56 ++ app/lib/core/widgets/async_value_view.dart | 49 ++ app/lib/core/widgets/empty_state.dart | 30 + app/lib/core/widgets/money_text.dart | 34 + app/lib/features/accounts/accounts_page.dart | 208 ++++++ app/lib/features/accounts/providers.dart | 16 + app/lib/features/cashflow/cashflow_page.dart | 209 ++++++ app/lib/features/cashflow/providers.dart | 10 + .../features/categories/categories_page.dart | 248 +++++++ app/lib/features/categories/providers.dart | 29 + app/lib/features/home/home_page.dart | 478 +++++++++++++ app/lib/features/home/providers.dart | 66 ++ app/lib/features/login/login_page.dart | 96 +++ app/lib/features/rules/providers.dart | 20 + app/lib/features/rules/rules_page.dart | 377 ++++++++++ app/lib/features/settings/settings_page.dart | 89 +++ app/lib/features/shell/app_shell.dart | 94 +++ app/lib/features/sync/sync_page.dart | 276 ++++++++ app/lib/features/transactions/providers.dart | 160 +++++ .../transactions/transaction_row.dart | 83 +++ .../transactions/transactions_page.dart | 347 +++++++++ app/lib/main.dart | 9 + app/lib/router.dart | 55 ++ app/linux/.gitignore | 1 + app/linux/CMakeLists.txt | 128 ++++ app/linux/flutter/CMakeLists.txt | 88 +++ .../flutter/generated_plugin_registrant.cc | 15 + .../flutter/generated_plugin_registrant.h | 15 + app/linux/flutter/generated_plugins.cmake | 25 + app/linux/runner/CMakeLists.txt | 26 + app/linux/runner/main.cc | 6 + app/linux/runner/my_application.cc | 148 ++++ app/linux/runner/my_application.h | 21 + app/pubspec.lock | 670 ++++++++++++++++++ app/pubspec.yaml | 31 + app/test/app_shell_test.dart | 26 + app/test/date_query_interceptor_test.dart | 38 + app/test/home_page_test.dart | 51 ++ app/test/money_text_test.dart | 10 + app/test/rules_page_test.dart | 31 + app/test/transaction_row_test.dart | 51 ++ app/test/widget_test.dart | 9 + app/web/favicon.png | Bin 0 -> 917 bytes app/web/icons/Icon-192.png | Bin 0 -> 5292 bytes app/web/icons/Icon-512.png | Bin 0 -> 8252 bytes app/web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes app/web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes app/web/index.html | 46 ++ app/web/manifest.json | 35 + app/windows/.gitignore | 17 + app/windows/CMakeLists.txt | 108 +++ app/windows/flutter/CMakeLists.txt | 109 +++ .../flutter/generated_plugin_registrant.cc | 14 + .../flutter/generated_plugin_registrant.h | 15 + app/windows/flutter/generated_plugins.cmake | 25 + app/windows/runner/CMakeLists.txt | 40 ++ app/windows/runner/Runner.rc | 121 ++++ app/windows/runner/flutter_window.cpp | 71 ++ app/windows/runner/flutter_window.h | 33 + app/windows/runner/main.cpp | 43 ++ app/windows/runner/resource.h | 16 + app/windows/runner/resources/app_icon.ico | Bin 0 -> 33772 bytes app/windows/runner/runner.exe.manifest | 14 + app/windows/runner/utils.cpp | 69 ++ app/windows/runner/utils.h | 19 + app/windows/runner/win32_window.cpp | 288 ++++++++ app/windows/runner/win32_window.h | 102 +++ 99 files changed, 6284 insertions(+) create mode 100644 app/.gitignore create mode 100644 app/.metadata create mode 100644 app/README.md create mode 100644 app/analysis_options.yaml create mode 100644 app/android/.gitignore create mode 100644 app/android/app/build.gradle.kts create mode 100644 app/android/app/src/debug/AndroidManifest.xml create mode 100644 app/android/app/src/main/AndroidManifest.xml create mode 100644 app/android/app/src/main/kotlin/ru/fintracker/fintracker_app/MainActivity.kt create mode 100644 app/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 app/android/app/src/main/res/drawable/launch_background.xml create mode 100644 app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 app/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 app/android/app/src/main/res/values-night/styles.xml create mode 100644 app/android/app/src/main/res/values/styles.xml create mode 100644 app/android/app/src/profile/AndroidManifest.xml create mode 100644 app/android/build.gradle.kts create mode 100644 app/android/gradle.properties create mode 100644 app/android/gradle/wrapper/gradle-wrapper.properties create mode 100644 app/android/settings.gradle.kts create mode 100644 app/lib/app.dart create mode 100644 app/lib/core/api/api_client.dart create mode 100644 app/lib/core/api/common_providers.dart create mode 100644 app/lib/core/app_info.dart create mode 100644 app/lib/core/auth/auth_controller.dart create mode 100644 app/lib/core/auth/token_store.dart create mode 100644 app/lib/core/config.dart create mode 100644 app/lib/core/theme/chart_colors.dart create mode 100644 app/lib/core/theme/theme_controller.dart create mode 100644 app/lib/core/utils/ru_date.dart create mode 100644 app/lib/core/widgets/async_value_view.dart create mode 100644 app/lib/core/widgets/empty_state.dart create mode 100644 app/lib/core/widgets/money_text.dart create mode 100644 app/lib/features/accounts/accounts_page.dart create mode 100644 app/lib/features/accounts/providers.dart create mode 100644 app/lib/features/cashflow/cashflow_page.dart create mode 100644 app/lib/features/cashflow/providers.dart create mode 100644 app/lib/features/categories/categories_page.dart create mode 100644 app/lib/features/categories/providers.dart create mode 100644 app/lib/features/home/home_page.dart create mode 100644 app/lib/features/home/providers.dart create mode 100644 app/lib/features/login/login_page.dart create mode 100644 app/lib/features/rules/providers.dart create mode 100644 app/lib/features/rules/rules_page.dart create mode 100644 app/lib/features/settings/settings_page.dart create mode 100644 app/lib/features/shell/app_shell.dart create mode 100644 app/lib/features/sync/sync_page.dart create mode 100644 app/lib/features/transactions/providers.dart create mode 100644 app/lib/features/transactions/transaction_row.dart create mode 100644 app/lib/features/transactions/transactions_page.dart create mode 100644 app/lib/main.dart create mode 100644 app/lib/router.dart create mode 100644 app/linux/.gitignore create mode 100644 app/linux/CMakeLists.txt create mode 100644 app/linux/flutter/CMakeLists.txt create mode 100644 app/linux/flutter/generated_plugin_registrant.cc create mode 100644 app/linux/flutter/generated_plugin_registrant.h create mode 100644 app/linux/flutter/generated_plugins.cmake create mode 100644 app/linux/runner/CMakeLists.txt create mode 100644 app/linux/runner/main.cc create mode 100644 app/linux/runner/my_application.cc create mode 100644 app/linux/runner/my_application.h create mode 100644 app/pubspec.lock create mode 100644 app/pubspec.yaml create mode 100644 app/test/app_shell_test.dart create mode 100644 app/test/date_query_interceptor_test.dart create mode 100644 app/test/home_page_test.dart create mode 100644 app/test/money_text_test.dart create mode 100644 app/test/rules_page_test.dart create mode 100644 app/test/transaction_row_test.dart create mode 100644 app/test/widget_test.dart create mode 100644 app/web/favicon.png create mode 100644 app/web/icons/Icon-192.png create mode 100644 app/web/icons/Icon-512.png create mode 100644 app/web/icons/Icon-maskable-192.png create mode 100644 app/web/icons/Icon-maskable-512.png create mode 100644 app/web/index.html create mode 100644 app/web/manifest.json create mode 100644 app/windows/.gitignore create mode 100644 app/windows/CMakeLists.txt create mode 100644 app/windows/flutter/CMakeLists.txt create mode 100644 app/windows/flutter/generated_plugin_registrant.cc create mode 100644 app/windows/flutter/generated_plugin_registrant.h create mode 100644 app/windows/flutter/generated_plugins.cmake create mode 100644 app/windows/runner/CMakeLists.txt create mode 100644 app/windows/runner/Runner.rc create mode 100644 app/windows/runner/flutter_window.cpp create mode 100644 app/windows/runner/flutter_window.h create mode 100644 app/windows/runner/main.cpp create mode 100644 app/windows/runner/resource.h create mode 100644 app/windows/runner/resources/app_icon.ico create mode 100644 app/windows/runner/runner.exe.manifest create mode 100644 app/windows/runner/utils.cpp create mode 100644 app/windows/runner/utils.h create mode 100644 app/windows/runner/win32_window.cpp create mode 100644 app/windows/runner/win32_window.h diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..79f7eca --- /dev/null +++ b/app/.gitignore @@ -0,0 +1,48 @@ +# Miscellaneous +*.class +*.log +*.pyc +*.swp +.DS_Store +.atom/ +.build/ +.buildlog/ +.history +.svn/ +.swiftpm/ +migrate_working_dir/ + +# IntelliJ related +*.iml +*.ipr +*.iws +.idea/ + +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ + +# Flutter/Dart/Pub related +**/doc/api/ +**/ios/Flutter/.last_build_id +.dart_tool/ +.flutter-plugins-dependencies +.pub-cache/ +.pub/ +/build/ +/coverage/ + +# Symbolication related +app.*.symbols + +# Obfuscation related +app.*.map.json + +# Android Studio will place build artifacts here +/android/app/debug +/android/app/profile +/android/app/release + +# Widget Preview related +.widget_preview/ diff --git a/app/.metadata b/app/.metadata new file mode 100644 index 0000000..87df591 --- /dev/null +++ b/app/.metadata @@ -0,0 +1,39 @@ +# This file tracks properties of this Flutter project. +# Used by Flutter tool to assess capabilities and perform upgrades etc. +# +# This file should be version controlled and should not be manually edited. + +version: + revision: "nixpkgs000000000000000000000000000000000" + channel: "stable" + +project_type: app + +# Tracks metadata for the flutter migrate command +migration: + platforms: + - platform: root + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: android + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: linux + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: web + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + - platform: windows + create_revision: nixpkgs000000000000000000000000000000000 + base_revision: nixpkgs000000000000000000000000000000000 + + # User provided section + + # List of Local paths (relative to this file) that should be + # ignored by the migrate tool. + # + # Files that are not part of the templates will be ignored by default. + unmanaged_files: + - 'lib/main.dart' + - 'ios/Runner.xcodeproj/project.pbxproj' diff --git a/app/README.md b/app/README.md new file mode 100644 index 0000000..86fc42f --- /dev/null +++ b/app/README.md @@ -0,0 +1,12 @@ +# fintracker_app + +Flutter-клиент fin-tracker (web, Linux, Windows, Android). + +```bash +nix develop .#app # из корня репозитория +cd app && flutter pub get +flutter run -d chrome --dart-define=API_BASE_URL=http://127.0.0.1:8000 +flutter build web # Caddy раздаёт app/build/web +``` + +Клиент API — `packages/api_client`, генерируется `just gen-client` из `openapi/openapi.json`. diff --git a/app/analysis_options.yaml b/app/analysis_options.yaml new file mode 100644 index 0000000..12c6d5a --- /dev/null +++ b/app/analysis_options.yaml @@ -0,0 +1,14 @@ +include: package:flutter_lints/flutter.yaml + +analyzer: + exclude: + - packages/api_client/** # generated by `just gen-client` + - build/** + - android/** + - web/** + - windows/** + - linux/** + +linter: + rules: + prefer_single_quotes: true diff --git a/app/android/.gitignore b/app/android/.gitignore new file mode 100644 index 0000000..be3943c --- /dev/null +++ b/app/android/.gitignore @@ -0,0 +1,14 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java +.cxx/ + +# Remember to never publicly share your keystore. +# See https://flutter.dev/to/reference-keystore +key.properties +**/*.keystore +**/*.jks diff --git a/app/android/app/build.gradle.kts b/app/android/app/build.gradle.kts new file mode 100644 index 0000000..aa0458d --- /dev/null +++ b/app/android/app/build.gradle.kts @@ -0,0 +1,49 @@ +plugins { + id("com.android.application") + // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins. + id("dev.flutter.flutter-gradle-plugin") +} + +android { + namespace = "ru.fintracker.fintracker_app" + compileSdk = flutter.compileSdkVersion + ndkVersion = flutter.ndkVersion + + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + defaultConfig { + // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). + applicationId = "ru.fintracker.fintracker_app" + // You can update the following values to match your application needs. + // For more information, see: https://flutter.dev/to/review-gradle-config. + minSdk = flutter.minSdkVersion + targetSdk = flutter.targetSdkVersion + // Uses the version code from pubspec.yaml. When using split APKs, 1000 * ABI_VERSION + // is added automatically by Flutter. (https://developer.android.com/studio/build/configure-apk-splits#configure-APK-versions) + // You can force using the value of versionCode by specifying the `-P force-version-code-ignoring-abi=true` + // flag during build. + versionCode = flutter.versionCode + versionName = flutter.versionName + } + + buildTypes { + release { + // TODO: Add your own signing config for the release build. + // Signing with the debug keys for now, so `flutter run --release` works. + signingConfig = signingConfigs.getByName("debug") + } + } +} + +kotlin { + compilerOptions { + jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 + } +} + +flutter { + source = "../.." +} diff --git a/app/android/app/src/debug/AndroidManifest.xml b/app/android/app/src/debug/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/app/android/app/src/debug/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/android/app/src/main/AndroidManifest.xml b/app/android/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..28b3b32 --- /dev/null +++ b/app/android/app/src/main/AndroidManifest.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/android/app/src/main/kotlin/ru/fintracker/fintracker_app/MainActivity.kt b/app/android/app/src/main/kotlin/ru/fintracker/fintracker_app/MainActivity.kt new file mode 100644 index 0000000..a88f7b7 --- /dev/null +++ b/app/android/app/src/main/kotlin/ru/fintracker/fintracker_app/MainActivity.kt @@ -0,0 +1,5 @@ +package ru.fintracker.fintracker_app + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity : FlutterActivity() diff --git a/app/android/app/src/main/res/drawable-v21/launch_background.xml b/app/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 0000000..f74085f --- /dev/null +++ b/app/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/app/android/app/src/main/res/drawable/launch_background.xml b/app/android/app/src/main/res/drawable/launch_background.xml new file mode 100644 index 0000000..304732f --- /dev/null +++ b/app/android/app/src/main/res/drawable/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..db77bb4b7b0906d62b1847e87f15cdcacf6a4f29 GIT binary patch literal 544 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY3?!3`olAj~WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2!h8bpbvhu0Wd6uZuB!w&u2PAxD2eNXD>P5D~Wn-+_Wa#27Xc zC?Zj|6r#X(-D3u$NCt}(Ms06KgJ4FxJVv{GM)!I~&n8Bnc94O7-Hd)cjDZswgC;Qs zO=b+9!WcT8F?0rF7!Uys2bs@gozCP?z~o%U|N3vA*22NaGQG zlg@K`O_XuxvZ&Ks^m&R!`&1=spLvfx7oGDKDwpwW`#iqdw@AL`7MR}m`rwr|mZgU`8P7SBkL78fFf!WnuYWm$5Z0 zNXhDbCv&49sM544K|?c)WrFfiZvCi9h0O)B3Pgg&ebxsLQ05GG~ AQ2+n{ literal 0 HcmV?d00001 diff --git a/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..17987b79bb8a35cc66c3c1fd44f5a5526c1b78be GIT binary patch literal 442 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA3?vioaBc-sk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5Xx&nMcT!A!W`0S9QKQy;}1Cl^CgaH=;G9cpY;r$Q>i*pfB zP2drbID<_#qf;rPZx^FqH)F_D#*k@@q03KywUtLX8Ua?`H+NMzkczFPK3lFz@i_kW%1NOn0|D2I9n9wzH8m|-tHjsw|9>@K=iMBhxvkv6m8Y-l zytQ?X=U+MF$@3 zt`~i=@j|6y)RWMK--}M|=T`o&^Ni>IoWKHEbBXz7?A@mgWoL>!*SXo`SZH-*HSdS+ yn*9;$7;m`l>wYBC5bq;=U}IMqLzqbYCidGC!)_gkIk_C@Uy!y&wkt5C($~2D>~)O*cj@FGjOCM)M>_ixfudOh)?xMu#Fs z#}Y=@YDTwOM)x{K_j*Q;dPdJ?Mz0n|pLRx{4n|)f>SXlmV)XB04CrSJn#dS5nK2lM zrZ9#~WelCp7&e13Y$jvaEXHskn$2V!!DN-nWS__6T*l;H&Fopn?A6HZ-6WRLFP=R` zqG+CE#d4|IbyAI+rJJ`&x9*T`+a=p|0O(+s{UBcyZdkhj=yS1>AirP+0R;mf2uMgM zC}@~JfByORAh4SyRgi&!(cja>F(l*O+nd+@4m$|6K6KDn_&uvCpV23&>G9HJp{xgg zoq1^2_p9@|WEo z*X_Uko@K)qYYv~>43eQGMdbiGbo>E~Q& zrYBH{QP^@Sti!`2)uG{irBBq@y*$B zi#&(U-*=fp74j)RyIw49+0MRPMRU)+a2r*PJ$L5roHt2$UjExCTZSbq%V!HeS7J$N zdG@vOZB4v_lF7Plrx+hxo7(fCV&}fHq)$ literal 0 HcmV?d00001 diff --git a/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..d5f1c8d34e7a88e3f88bea192c3a370d44689c3c GIT binary patch literal 1031 zcmeAS@N?(olHy`uVBq!ia0vp^6F``Q8Ax83A=Cw=BuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrIztFa`(sgt!6~Yi|1%a`XoT0ojZ}lNrNjb9xjc(B0U1_% zz5^97Xt*%oq$rQy4?0GKNfJ44uvxI)gC`h-NZ|&0-7(qS@?b!5r36oQ}zyZrNO3 zMO=Or+<~>+A&uN&E!^Sl+>xE!QC-|oJv`ApDhqC^EWD|@=#J`=d#Xzxs4ah}w&Jnc z$|q_opQ^2TrnVZ0o~wh<3t%W&flvYGe#$xqda2bR_R zvPYgMcHgjZ5nSA^lJr%;<&0do;O^tDDh~=pIxA#coaCY>&N%M2^tq^U%3DB@ynvKo}b?yu-bFc-u0JHzced$sg7S3zqI(2 z#Km{dPr7I=pQ5>FuK#)QwK?Y`E`B?nP+}U)I#c1+FM*1kNvWG|a(TpksZQ3B@sD~b zpQ2)*V*TdwjFOtHvV|;OsiDqHi=6%)o4b!)x$)%9pGTsE z-JL={-Ffv+T87W(Xpooq<`r*VzWQcgBN$$`u}f>-ZQI1BB8ykN*=e4rIsJx9>z}*o zo~|9I;xof literal 0 HcmV?d00001 diff --git a/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6372eebdb28e45604e46eeda8dd24651419bc0 GIT binary patch literal 1443 zcmb`G{WsKk6vsdJTdFg%tJav9_E4vzrOaqkWF|A724Nly!y+?N9`YV6wZ}5(X(D_N(?!*n3`|_r0Hc?=PQw&*vnU?QTFY zB_MsH|!j$PP;I}?dppoE_gA(4uc!jV&0!l7_;&p2^pxNo>PEcNJv za5_RT$o2Mf!<+r?&EbHH6nMoTsDOa;mN(wv8RNsHpG)`^ymG-S5By8=l9iVXzN_eG%Xg2@Xeq76tTZ*dGh~Lo9vl;Zfs+W#BydUw zCkZ$o1LqWQO$FC9aKlLl*7x9^0q%0}$OMlp@Kk_jHXOjofdePND+j!A{q!8~Jn+s3 z?~~w@4?egS02}8NuulUA=L~QQfm;MzCGd)XhiftT;+zFO&JVyp2mBww?;QByS_1w! zrQlx%{^cMj0|Bo1FjwY@Q8?Hx0cIPF*@-ZRFpPc#bBw{5@tD(5%sClzIfl8WU~V#u zm5Q;_F!wa$BSpqhN>W@2De?TKWR*!ujY;Yylk_X5#~V!L*Gw~;$%4Q8~Mad z@`-kG?yb$a9cHIApZDVZ^U6Xkp<*4rU82O7%}0jjHlK{id@?-wpN*fCHXyXh(bLt* zPc}H-x0e4E&nQ>y%B-(EL=9}RyC%MyX=upHuFhAk&MLbsF0LP-q`XnH78@fT+pKPW zu72MW`|?8ht^tz$iC}ZwLp4tB;Q49K!QCF3@!iB1qOI=?w z7In!}F~ij(18UYUjnbmC!qKhPo%24?8U1x{7o(+?^Zu0Hx81|FuS?bJ0jgBhEMzf< zCgUq7r2OCB(`XkKcN-TL>u5y#dD6D!)5W?`O5)V^>jb)P)GBdy%t$uUMpf$SNV31$ zb||OojAbvMP?T@$h_ZiFLFVHDmbyMhJF|-_)HX3%m=CDI+ID$0^C>kzxprBW)hw(v zr!Gmda);ICoQyhV_oP5+C%?jcG8v+D@9f?Dk*!BxY}dazmrT@64UrP3hlslANK)bq z$67n83eh}OeW&SV@HG95P|bjfqJ7gw$e+`Hxo!4cx`jdK1bJ>YDSpGKLPZ^1cv$ek zIB?0S<#tX?SJCLWdMd{-ME?$hc7A$zBOdIJ)4!KcAwb=VMov)nK;9z>x~rfT1>dS+ zZ6#`2v@`jgbqq)P22H)Tx2CpmM^o1$B+xT6`(v%5xJ(?j#>Q$+rx_R|7TzDZe{J6q zG1*EcU%tE?!kO%^M;3aM6JN*LAKUVb^xz8-Pxo#jR5(-KBeLJvA@-gxNHx0M-ZJLl z;#JwQoh~9V?`UVo#}{6ka@II>++D@%KqGpMdlQ}?9E*wFcf5(#XQnP$Dk5~%iX^>f z%$y;?M0BLp{O3a(-4A?ewryHrrD%cx#Q^%KY1H zNre$ve+vceSLZcNY4U(RBX&)oZn*Py()h)XkE?PL$!bNb{N5FVI2Y%LKEm%yvpyTP z(1P?z~7YxD~Rf<(a@_y` literal 0 HcmV?d00001 diff --git a/app/android/app/src/main/res/values-night/styles.xml b/app/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 0000000..06952be --- /dev/null +++ b/app/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/android/app/src/main/res/values/styles.xml b/app/android/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..cb1ef88 --- /dev/null +++ b/app/android/app/src/main/res/values/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/app/android/app/src/profile/AndroidManifest.xml b/app/android/app/src/profile/AndroidManifest.xml new file mode 100644 index 0000000..399f698 --- /dev/null +++ b/app/android/app/src/profile/AndroidManifest.xml @@ -0,0 +1,7 @@ + + + + diff --git a/app/android/build.gradle.kts b/app/android/build.gradle.kts new file mode 100644 index 0000000..dbee657 --- /dev/null +++ b/app/android/build.gradle.kts @@ -0,0 +1,24 @@ +allprojects { + repositories { + google() + mavenCentral() + } +} + +val newBuildDir: Directory = + rootProject.layout.buildDirectory + .dir("../../build") + .get() +rootProject.layout.buildDirectory.value(newBuildDir) + +subprojects { + val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name) + project.layout.buildDirectory.value(newSubprojectBuildDir) +} +subprojects { + project.evaluationDependsOn(":app") +} + +tasks.register("clean") { + delete(rootProject.layout.buildDirectory) +} diff --git a/app/android/gradle.properties b/app/android/gradle.properties new file mode 100644 index 0000000..e96108c --- /dev/null +++ b/app/android/gradle.properties @@ -0,0 +1,6 @@ +org.gradle.jvmargs=-Xmx8G -XX:MaxMetaspaceSize=4G -XX:ReservedCodeCacheSize=512m -XX:+HeapDumpOnOutOfMemoryError +android.useAndroidX=true +# This newDsl flag was added by the Flutter template +android.newDsl=false +# This builtInKotlin flag was added by the Flutter template +android.builtInKotlin=false diff --git a/app/android/gradle/wrapper/gradle-wrapper.properties b/app/android/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a20f2c4 --- /dev/null +++ b/app/android/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-all.zip diff --git a/app/android/settings.gradle.kts b/app/android/settings.gradle.kts new file mode 100644 index 0000000..b28021a --- /dev/null +++ b/app/android/settings.gradle.kts @@ -0,0 +1,26 @@ +pluginManagement { + val flutterSdkPath = + run { + val properties = java.util.Properties() + file("local.properties").inputStream().use { properties.load(it) } + val flutterSdkPath = properties.getProperty("flutter.sdk") + require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" } + flutterSdkPath + } + + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") + + repositories { + google() + mavenCentral() + gradlePluginPortal() + } +} + +plugins { + id("dev.flutter.flutter-plugin-loader") version "1.0.0" + id("com.android.application") version "9.1.0" apply false + id("org.jetbrains.kotlin.android") version "2.4.0" apply false +} + +include(":app") diff --git a/app/lib/app.dart b/app/lib/app.dart new file mode 100644 index 0000000..01cef7a --- /dev/null +++ b/app/lib/app.dart @@ -0,0 +1,30 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_localizations/flutter_localizations.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import 'core/theme/theme_controller.dart'; +import 'router.dart'; + +class FinTrackerApp extends ConsumerWidget { + const FinTrackerApp({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final router = ref.watch(routerProvider); + final themeMode = ref.watch(themeModeProvider); + return MaterialApp.router( + title: 'fin-tracker', + routerConfig: router, + themeMode: themeMode, + theme: ThemeData(colorSchemeSeed: const Color(0xFF2E6F5E), useMaterial3: true), + darkTheme: ThemeData( + colorSchemeSeed: const Color(0xFF2E6F5E), + brightness: Brightness.dark, + useMaterial3: true, + ), + locale: const Locale('ru'), + supportedLocales: const [Locale('ru'), Locale('en')], + localizationsDelegates: GlobalMaterialLocalizations.delegates, + ); + } +} diff --git a/app/lib/core/api/api_client.dart b/app/lib/core/api/api_client.dart new file mode 100644 index 0000000..3eec9d5 --- /dev/null +++ b/app/lib/core/api/api_client.dart @@ -0,0 +1,75 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../auth/auth_controller.dart'; +import '../config.dart'; + +/// Authenticated client: bearer header on every call, one transparent refresh on 401. +final apiProvider = Provider((ref) { + final dio = Dio(BaseOptions( + baseUrl: apiBaseUrl(), + connectTimeout: const Duration(seconds: 10), + receiveTimeout: const Duration(seconds: 30), + )); + dio.interceptors.add(DateQueryInterceptor()); + dio.interceptors.add(_AuthInterceptor(ref)); + return FintrackerApi(dio: dio, interceptors: const []); +}); + +/// Query dates as `YYYY-MM-DD`, which is what `format: date` in the spec means. +/// +/// openapi-generator types a `format: date` query parameter as `DateTime` and hands it to +/// Dio unconverted, so the wire value becomes `DateTime.toString()` — +/// `2026-09-18 10:31:29.084`, which FastAPI rejects with 422. Every date-typed query +/// parameter in the spec is a `date` (none is a `date-time`), so truncating here is exactly +/// the intended encoding rather than a lossy guess. Lives in the app, not in the generated +/// package, because `just gen-client` overwrites the latter. +class DateQueryInterceptor extends Interceptor { + @override + void onRequest(RequestOptions options, RequestInterceptorHandler handler) { + options.queryParameters = { + for (final e in options.queryParameters.entries) + e.key: e.value is DateTime ? _isoDate(e.value as DateTime) : e.value, + }; + handler.next(options); + } + + static String _isoDate(DateTime d) => + '${d.year.toString().padLeft(4, '0')}-' + '${d.month.toString().padLeft(2, '0')}-' + '${d.day.toString().padLeft(2, '0')}'; +} + +class _AuthInterceptor extends QueuedInterceptor { + _AuthInterceptor(this._ref); + final Ref _ref; + + @override + void onRequest(RequestOptions options, RequestInterceptorHandler handler) { + final token = _ref.read(authControllerProvider).accessToken; + if (token != null) options.headers['Authorization'] = 'Bearer $token'; + handler.next(options); + } + + @override + Future onError(DioException err, ErrorInterceptorHandler handler) async { + final retried = err.requestOptions.extra['retried'] == true; + if (err.response?.statusCode != 401 || retried) return handler.next(err); + + final auth = _ref.read(authControllerProvider.notifier); + if (!await auth.refreshSession()) { + await auth.logout(); + return handler.next(err); + } + final token = _ref.read(authControllerProvider).accessToken; + final opts = err.requestOptions + ..headers['Authorization'] = 'Bearer $token' + ..extra['retried'] = true; + try { + handler.resolve(await Dio(BaseOptions(baseUrl: opts.baseUrl)).fetch(opts)); + } on DioException catch (e) { + handler.next(e); + } + } +} diff --git a/app/lib/core/api/common_providers.dart b/app/lib/core/api/common_providers.dart new file mode 100644 index 0000000..c6915af --- /dev/null +++ b/app/lib/core/api/common_providers.dart @@ -0,0 +1,16 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import 'api_client.dart'; + +/// The signed-in user, used by Обзор and Настройки. +final meProvider = FutureProvider((ref) async { + final r = await ref.watch(apiProvider).getAuthApi().authMe(); + return r.data!; +}); + +/// Backend health, used by Обзор. +final healthProvider = FutureProvider((ref) async { + final r = await ref.watch(apiProvider).getHealthApi().healthCheck(); + return r.data!; +}); diff --git a/app/lib/core/app_info.dart b/app/lib/core/app_info.dart new file mode 100644 index 0000000..721e640 --- /dev/null +++ b/app/lib/core/app_info.dart @@ -0,0 +1,4 @@ +/// Mirrors the `version:` line in `pubspec.yaml`. Flutter has no runtime +/// pubspec reader without an extra dependency (`package_info_plus`), so this +/// is a hand-maintained literal for now — bump it alongside pubspec.yaml. +const appVersion = '0.1.0+1'; diff --git a/app/lib/core/auth/auth_controller.dart b/app/lib/core/auth/auth_controller.dart new file mode 100644 index 0000000..72fa907 --- /dev/null +++ b/app/lib/core/auth/auth_controller.dart @@ -0,0 +1,109 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../config.dart'; +import 'token_store.dart'; + +enum AuthStatus { unknown, signedOut, signedIn } + +class AuthState { + const AuthState(this.status, {this.accessToken, this.email}); + final AuthStatus status; + final String? accessToken; + final String? email; + + bool get signedIn => status == AuthStatus.signedIn; +} + +final tokenStoreProvider = Provider((_) => TokenStore()); + +/// A bare Dio for auth calls: no auth interceptor, so a refresh can never recurse. +final authDioProvider = Provider( + (_) => Dio(BaseOptions( + baseUrl: apiBaseUrl(), + connectTimeout: const Duration(seconds: 10), + receiveTimeout: const Duration(seconds: 20), + )), +); + +final authControllerProvider = NotifierProvider(AuthController.new); + +class AuthController extends Notifier { + @override + AuthState build() { + Future.microtask(_restore); + return const AuthState(AuthStatus.unknown); + } + + AuthApi get _api => AuthApi(ref.read(authDioProvider)); + TokenStore get _store => ref.read(tokenStoreProvider); + + Future _restore() async { + final refresh = await _store.readRefresh(); + if (refresh == null) { + state = const AuthState(AuthStatus.signedOut); + return; + } + final ok = await refreshSession(refresh); + if (!ok) state = const AuthState(AuthStatus.signedOut); + } + + Future login(String email, String password) async { + try { + final r = await _api.authLogin(loginRequest: LoginRequest(email: email, password: password)); + await _accept(r.data!); + return null; + } on DioException catch (e) { + return problemMessage(e); + } + } + + /// Exchange a refresh token for a new pair. Returns false when it is no longer valid. + Future refreshSession([String? refresh]) async { + final token = refresh ?? await _store.readRefresh(); + if (token == null) return false; + try { + final r = await _api.authRefresh(refreshRequest: RefreshRequest(refreshToken: token)); + await _accept(r.data!); + return true; + } on DioException catch (e) { + if (e.response?.statusCode == 401) await _store.clear(); + return false; + } + } + + Future _accept(TokenPair pair) async { + await _store.writeRefresh(pair.refreshToken); + state = AuthState(AuthStatus.signedIn, accessToken: pair.accessToken, email: state.email); + } + + Future logout() async { + final refresh = await _store.readRefresh(); + if (refresh != null) { + try { + await _api.authLogout(refreshRequest: RefreshRequest(refreshToken: refresh)); + } on DioException { + // the server may already consider it revoked; local state wins + } + } + await _store.clear(); + state = const AuthState(AuthStatus.signedOut); + } +} + +/// Human-readable text from an RFC 7807 body, falling back to the transport error. +String problemMessage(DioException e) { + final data = e.response?.data; + if (data is Map) { + final detail = data['detail'] ?? data['title']; + if (detail is String && detail.isNotEmpty) return detail; + } + return switch (e.type) { + DioExceptionType.connectionError || + DioExceptionType.connectionTimeout || + DioExceptionType.receiveTimeout => + 'Сервер недоступен', + _ => e.message ?? 'Ошибка запроса', + }; +} diff --git a/app/lib/core/auth/token_store.dart b/app/lib/core/auth/token_store.dart new file mode 100644 index 0000000..1d86ee0 --- /dev/null +++ b/app/lib/core/auth/token_store.dart @@ -0,0 +1,15 @@ +import 'package:flutter_secure_storage/flutter_secure_storage.dart'; + +/// Refresh token at rest: Keystore / libsecret / DPAPI; on web — localStorage +/// (single-user, TLS-only deployment; see plan §7 open question 1). +class TokenStore { + TokenStore([FlutterSecureStorage? storage]) + : _storage = storage ?? const FlutterSecureStorage(); + + final FlutterSecureStorage _storage; + static const _refreshKey = 'refresh_token'; + + Future readRefresh() => _storage.read(key: _refreshKey); + Future writeRefresh(String token) => _storage.write(key: _refreshKey, value: token); + Future clear() => _storage.delete(key: _refreshKey); +} diff --git a/app/lib/core/config.dart b/app/lib/core/config.dart new file mode 100644 index 0000000..73f03c1 --- /dev/null +++ b/app/lib/core/config.dart @@ -0,0 +1,11 @@ +import 'package:flutter/foundation.dart'; + +/// Backend origin. Override at build time: +/// `flutter run --dart-define=API_BASE_URL=https://fin.example.com`. +/// On web the default is the page's own origin (Caddy serves app and API together). +String apiBaseUrl() { + const fromEnv = String.fromEnvironment('API_BASE_URL'); + if (fromEnv.isNotEmpty) return fromEnv; + if (kIsWeb) return Uri.base.origin; + return 'http://127.0.0.1:8000'; +} diff --git a/app/lib/core/theme/chart_colors.dart b/app/lib/core/theme/chart_colors.dart new file mode 100644 index 0000000..a55ef20 --- /dev/null +++ b/app/lib/core/theme/chart_colors.dart @@ -0,0 +1,21 @@ +import 'package:flutter/material.dart'; + +/// Fixed categorical order from the design system's palette (dataviz skill): +/// slot 1 blue, slot 2 orange, slot 3 aqua, slot 4 yellow, slot 5 magenta. +/// Assigned to entities in this fixed order — never cycled, never by rank. +class ChartColors { + const ChartColors._(); + + static const slot1Blue = Color(0xFF2A78D6); + static const slot2Orange = Color(0xFFEB6834); + static const slot3Aqua = Color(0xFF1BAF7A); + static const slot4Yellow = Color(0xFFEDA100); + static const slot5Magenta = Color(0xFFE87BA4); + + /// This app's fixed assignment for cashflow charts. + static const income = slot1Blue; + static const expense = slot2Orange; + static const baseline = slot3Aqua; + static const oneOff = slot4Yellow; + static const savingsTransfer = slot5Magenta; +} diff --git a/app/lib/core/theme/theme_controller.dart b/app/lib/core/theme/theme_controller.dart new file mode 100644 index 0000000..caa845f --- /dev/null +++ b/app/lib/core/theme/theme_controller.dart @@ -0,0 +1,28 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:shared_preferences/shared_preferences.dart'; + +const _prefsKey = 'theme_mode'; + +final themeModeProvider = NotifierProvider(ThemeModeController.new); + +/// Persists the chosen [ThemeMode] to this device via `shared_preferences`. +class ThemeModeController extends Notifier { + @override + ThemeMode build() { + Future.microtask(_restore); + return ThemeMode.system; + } + + Future _restore() async { + final prefs = await SharedPreferences.getInstance(); + final saved = prefs.getString(_prefsKey); + state = ThemeMode.values.asNameMap()[saved] ?? ThemeMode.system; + } + + Future setMode(ThemeMode mode) async { + state = mode; + final prefs = await SharedPreferences.getInstance(); + await prefs.setString(_prefsKey, mode.name); + } +} diff --git a/app/lib/core/utils/ru_date.dart b/app/lib/core/utils/ru_date.dart new file mode 100644 index 0000000..b9cf46f --- /dev/null +++ b/app/lib/core/utils/ru_date.dart @@ -0,0 +1,56 @@ +/// Russian month/date helpers that avoid needing `initializeDateFormatting` +/// (which `intl`'s locale-aware `DateFormat` symbols require) for the small +/// set of formats this app needs. +library; + +const _monthsNominative = [ + 'январь', + 'февраль', + 'март', + 'апрель', + 'май', + 'июнь', + 'июль', + 'август', + 'сентябрь', + 'октябрь', + 'ноябрь', + 'декабрь', +]; + +const _monthsShort = [ + 'янв', + 'фев', + 'мар', + 'апр', + 'май', + 'июн', + 'июл', + 'авг', + 'сен', + 'окт', + 'ноя', + 'дек', +]; + +/// `'сентябрь 2026'`. +String ruMonthYear(DateTime d) { + final name = _monthsNominative[d.month - 1]; + return '${name[0].toUpperCase()}${name.substring(1)} ${d.year}'; +} + +/// `'сен 2026'`, for compact chart/table labels. +String ruMonthYearShort(DateTime d) => '${_monthsShort[d.month - 1]} ${d.year}'; + +/// `'2026-09'`, the `month` query parameter format the API expects. +String monthKey(DateTime d) => '${d.year.toString().padLeft(4, '0')}-${d.month.toString().padLeft(2, '0')}'; + +/// Parses a `'YYYY-MM'` key back into a [DateTime] (first of month, UTC). +DateTime parseMonthKey(String key) { + final parts = key.split('-'); + return DateTime.utc(int.parse(parts[0]), int.parse(parts[1])); +} + +/// `'12.09.2026'`. +String ruDate(DateTime d) => + '${d.day.toString().padLeft(2, '0')}.${d.month.toString().padLeft(2, '0')}.${d.year}'; diff --git a/app/lib/core/widgets/async_value_view.dart b/app/lib/core/widgets/async_value_view.dart new file mode 100644 index 0000000..4de54c9 --- /dev/null +++ b/app/lib/core/widgets/async_value_view.dart @@ -0,0 +1,49 @@ +import 'package:dio/dio.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../auth/auth_controller.dart'; + +/// Renders an [AsyncValue]: the data on success, a spinner while loading, and +/// a retry-capable error view otherwise. Keeps the loading/error boilerplate +/// out of every screen that watches a provider. +class AsyncValueView extends StatelessWidget { + const AsyncValueView({required this.value, required this.data, this.onRetry, super.key}); + + final AsyncValue value; + final Widget Function(T data) data; + final VoidCallback? onRetry; + + @override + Widget build(BuildContext context) { + return value.when( + data: data, + loading: () => const Center( + child: Padding( + padding: EdgeInsets.all(24), + child: CircularProgressIndicator(), + ), + ), + error: (error, _) => Center( + child: Padding( + padding: const EdgeInsets.all(24), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(Icons.error_outline, color: Theme.of(context).colorScheme.error, size: 32), + const SizedBox(height: 8), + Text(_message(error), textAlign: TextAlign.center), + if (onRetry != null) ...[ + const SizedBox(height: 12), + FilledButton.tonal(onPressed: onRetry, child: const Text('Повторить')), + ], + ], + ), + ), + ), + ); + } + + static String _message(Object error) => + error is DioException ? problemMessage(error) : error.toString(); +} diff --git a/app/lib/core/widgets/empty_state.dart b/app/lib/core/widgets/empty_state.dart new file mode 100644 index 0000000..a637858 --- /dev/null +++ b/app/lib/core/widgets/empty_state.dart @@ -0,0 +1,30 @@ +import 'package:flutter/material.dart'; + +/// A centered placeholder for a screen or list section with nothing to show yet. +class EmptyState extends StatelessWidget { + const EmptyState({required this.message, this.icon = Icons.inbox_outlined, super.key}); + + final String message; + final IconData icon; + + @override + Widget build(BuildContext context) { + return Center( + child: Padding( + padding: const EdgeInsets.all(24), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(icon, size: 48, color: Theme.of(context).colorScheme.outline), + const SizedBox(height: 12), + Text( + message, + textAlign: TextAlign.center, + style: Theme.of(context).textTheme.bodyLarge, + ), + ], + ), + ), + ); + } +} diff --git a/app/lib/core/widgets/money_text.dart b/app/lib/core/widgets/money_text.dart new file mode 100644 index 0000000..5001c62 --- /dev/null +++ b/app/lib/core/widgets/money_text.dart @@ -0,0 +1,34 @@ +import 'package:decimal/decimal.dart'; +import 'package:flutter/material.dart'; +import 'package:intl/intl.dart'; + +/// Currency symbols for the instruments we expect to see. Falls back to the +/// ISO code itself (e.g. 'USDT') when we don't have a nicer glyph. +const _currencySymbols = { + 'RUB': '₽', + 'USD': '\$', + 'EUR': '€', +}; + +/// Formats a decimal-string amount (as the API sends it, to avoid double +/// rounding errors) with `intl`'s ru_RU rules and a currency symbol. +class MoneyText extends StatelessWidget { + const MoneyText(this.amount, {required this.currency, super.key, this.style}); + + /// The amount as a string, e.g. `'1234.5'` — never a [double]. + final String amount; + final String currency; + final TextStyle? style; + + static String format(String amount, String currency) { + final value = Decimal.parse(amount).toDouble(); + final symbol = _currencySymbols[currency] ?? currency; + final formatter = NumberFormat.currency(locale: 'ru_RU', symbol: symbol, decimalDigits: 2); + return formatter.format(value); + } + + @override + Widget build(BuildContext context) { + return Text(format(amount, currency), style: style); + } +} diff --git a/app/lib/features/accounts/accounts_page.dart b/app/lib/features/accounts/accounts_page.dart new file mode 100644 index 0000000..4cc636b --- /dev/null +++ b/app/lib/features/accounts/accounts_page.dart @@ -0,0 +1,208 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; +import '../../core/auth/auth_controller.dart'; +import '../../core/widgets/async_value_view.dart'; +import '../../core/widgets/empty_state.dart'; +import '../../core/widgets/money_text.dart'; +import 'providers.dart'; + +const _roleOrder = [AccountRole.liquid, AccountRole.savings, AccountRole.investment, AccountRole.debt]; + +String _roleLabel(AccountRole role) => switch (role) { + AccountRole.liquid => 'Ликвидные', + AccountRole.savings => 'Сбережения', + AccountRole.investment => 'Инвестиции', + AccountRole.debt => 'Долги', + AccountRole.unknownDefaultOpenApi => 'Неизвестно', + }; + +String _kindLabel(AccountKind kind) => switch (kind) { + AccountKind.zmCash => 'Наличные', + AccountKind.zmCard => 'Карта', + AccountKind.zmChecking => 'Расчётный счёт', + AccountKind.zmDeposit => 'Вклад', + AccountKind.zmLoan => 'Кредит', + AccountKind.zmEmoney => 'Электронные деньги', + AccountKind.zmDebt => 'Долг', + AccountKind.broker => 'Брокерский счёт', + AccountKind.manualAsset => 'Актив вручную', + AccountKind.unknownDefaultOpenApi => 'Неизвестно', + }; + +/// Счета: every account grouped by role, with in-place role and +/// include-in-net-worth edits (`PATCH /accounts/{id}`). Archived accounts +/// collapse into their own section at the bottom regardless of role. +class AccountsPage extends ConsumerWidget { + const AccountsPage({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final accounts = ref.watch(accountsProvider); + + return Scaffold( + appBar: AppBar(title: const Text('Счета')), + body: RefreshIndicator( + onRefresh: () async => ref.invalidate(accountsProvider), + child: AsyncValueView( + value: accounts, + onRetry: () => ref.invalidate(accountsProvider), + data: (rows) { + if (rows.isEmpty) { + return ListView( + children: const [ + EmptyState( + icon: Icons.account_balance_outlined, + message: 'Счетов ещё нет — нужна синхронизация.', + ), + ], + ); + } + final active = rows.where((a) => !a.archived).toList(); + final archived = rows.where((a) => a.archived).toList(); + return ListView( + padding: const EdgeInsets.all(16), + children: [ + for (final role in _roleOrder) + if (active.any((a) => a.role == role)) + _RoleSection( + title: _roleLabel(role), + accounts: active.where((a) => a.role == role).toList(), + ), + if (archived.isNotEmpty) + ExpansionTile( + title: Text('Архивные (${archived.length})'), + initiallyExpanded: false, + children: [for (final a in archived) _AccountTile(account: a)], + ), + ], + ); + }, + ), + ), + ); + } +} + +class _RoleSection extends StatelessWidget { + const _RoleSection({required this.title, required this.accounts}); + + final String title; + final List accounts; + + @override + Widget build(BuildContext context) { + return Padding( + padding: const EdgeInsets.only(bottom: 16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.only(bottom: 4), + child: Text(title, style: Theme.of(context).textTheme.titleMedium), + ), + for (final a in accounts) _AccountTile(account: a), + ], + ), + ); + } +} + +class _AccountTile extends ConsumerStatefulWidget { + const _AccountTile({required this.account}); + + final AccountOut account; + + @override + ConsumerState<_AccountTile> createState() => _AccountTileState(); +} + +class _AccountTileState extends ConsumerState<_AccountTile> { + bool _saving = false; + + Future _patch(AccountPatch patch) async { + setState(() => _saving = true); + try { + await ref.read(apiProvider).getAccountsApi().accountsPatch( + accountId: widget.account.id, + accountPatch: patch, + ); + ref.invalidate(accountsProvider); + } on DioException catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } finally { + if (mounted) setState(() => _saving = false); + } + } + + @override + Widget build(BuildContext context) { + final a = widget.account; + return Card( + child: Padding( + padding: const EdgeInsets.fromLTRB(16, 8, 16, 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(a.name, style: Theme.of(context).textTheme.titleSmall), + Text( + '${_kindLabel(a.kind)} · ${a.currency}', + style: Theme.of(context).textTheme.bodySmall, + ), + ], + ), + ), + MoneyText( + a.balance ?? '0', + currency: a.currency, + style: Theme.of(context).textTheme.titleMedium, + ), + ], + ), + const SizedBox(height: 4), + Row( + children: [ + Expanded( + child: DropdownButtonFormField( + initialValue: a.role, + isDense: true, + decoration: const InputDecoration(labelText: 'Роль', isDense: true), + items: [ + for (final r in _roleOrder) + DropdownMenuItem(value: r, child: Text(_roleLabel(r))), + ], + onChanged: _saving ? null : (role) { + if (role != null) _patch(AccountPatch(role: role)); + }, + ), + ), + const SizedBox(width: 12), + Column( + children: [ + const Text('В капитал', style: TextStyle(fontSize: 11)), + Switch( + value: a.includeInNetWorth, + onChanged: _saving + ? null + : (v) => _patch(AccountPatch(includeInNetWorth: v)), + ), + ], + ), + ], + ), + ], + ), + ), + ); + } +} diff --git a/app/lib/features/accounts/providers.dart b/app/lib/features/accounts/providers.dart new file mode 100644 index 0000000..1f2e25f --- /dev/null +++ b/app/lib/features/accounts/providers.dart @@ -0,0 +1,16 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; + +/// Every account, archived included — screens decide what to show. +final accountsProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getAccountsApi().accountsList(); + return r.data ?? const []; +}); + +/// `account_id -> name`, for screens that only carry the id (transactions, rules). +final accountNamesProvider = Provider.autoDispose>((ref) { + final accounts = ref.watch(accountsProvider).valueOrNull ?? const []; + return {for (final a in accounts) a.id: a.name}; +}); diff --git a/app/lib/features/cashflow/cashflow_page.dart b/app/lib/features/cashflow/cashflow_page.dart new file mode 100644 index 0000000..472c9a3 --- /dev/null +++ b/app/lib/features/cashflow/cashflow_page.dart @@ -0,0 +1,209 @@ +import 'package:decimal/decimal.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:go_router/go_router.dart'; + +import '../../core/theme/chart_colors.dart'; +import '../../core/utils/ru_date.dart'; +import '../../core/widgets/async_value_view.dart'; +import '../../core/widgets/empty_state.dart'; +import '../../core/widgets/money_text.dart'; +import 'providers.dart'; + +const _incomeColor = ChartColors.income; +const _expenseColor = ChartColors.expense; + +double _d(String s) => Decimal.parse(s).toDouble(); + +/// Потоки: 24 months of cashflow, a grouped bar chart on top and the full +/// breakdown as a scrollable table below. Tapping a row opens Категории for +/// that month. +class CashflowPage extends ConsumerWidget { + const CashflowPage({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final monthly = ref.watch(cashflowMonthly24Provider); + + return Scaffold( + appBar: AppBar(title: const Text('Потоки')), + body: RefreshIndicator( + onRefresh: () async => ref.invalidate(cashflowMonthly24Provider), + child: AsyncValueView( + value: monthly, + onRetry: () => ref.invalidate(cashflowMonthly24Provider), + data: (rows) { + if (rows.isEmpty) { + return ListView( + children: const [ + EmptyState( + icon: Icons.swap_horiz_outlined, + message: 'Данных о потоках ещё нет — нужна синхронизация.', + ), + ], + ); + } + return ListView( + padding: const EdgeInsets.all(16), + children: [ + const _Legend(), + const SizedBox(height: 8), + SizedBox( + height: 240, + child: SingleChildScrollView( + scrollDirection: Axis.horizontal, + reverse: true, + child: SizedBox( + width: (rows.length * 56).toDouble().clamp(320, double.infinity), + child: _CashflowChart(rows: rows), + ), + ), + ), + const SizedBox(height: 24), + _Table(rows: rows), + ], + ); + }, + ), + ), + ); + } +} + +class _Legend extends StatelessWidget { + const _Legend(); + + @override + Widget build(BuildContext context) { + return Row( + children: const [ + _LegendDot(color: _incomeColor, label: 'Доход'), + SizedBox(width: 16), + _LegendDot(color: _expenseColor, label: 'Расход'), + ], + ); + } +} + +class _LegendDot extends StatelessWidget { + const _LegendDot({required this.color, required this.label}); + final Color color; + final String label; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisSize: MainAxisSize.min, + children: [ + Container(width: 10, height: 10, decoration: BoxDecoration(color: color, shape: BoxShape.circle)), + const SizedBox(width: 6), + Text(label, style: Theme.of(context).textTheme.bodySmall), + ], + ); + } +} + +class _CashflowChart extends StatelessWidget { + const _CashflowChart({required this.rows}); + + final List rows; + + @override + Widget build(BuildContext context) { + final maxY = rows.fold( + 0, + (m, r) => [m, _d(r.incomeRub), _d(r.expenseRub)].reduce((a, b) => a > b ? a : b), + ); + return BarChart( + BarChartData( + maxY: maxY * 1.1, + gridData: const FlGridData(drawVerticalLine: false), + borderData: FlBorderData(show: false), + titlesData: FlTitlesData( + topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + leftTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + bottomTitles: AxisTitles( + sideTitles: SideTitles( + showTitles: true, + getTitlesWidget: (value, meta) { + final i = value.toInt(); + if (i < 0 || i >= rows.length) return const SizedBox.shrink(); + return Padding( + padding: const EdgeInsets.only(top: 6), + child: Text(ruMonthYearShort(rows[i].month), style: const TextStyle(fontSize: 10)), + ); + }, + ), + ), + ), + barTouchData: BarTouchData( + touchTooltipData: BarTouchTooltipData( + getTooltipItem: (group, groupIndex, rod, rodIndex) { + final label = rodIndex == 0 ? 'Доход' : 'Расход'; + return BarTooltipItem( + '$label\n${MoneyText.format(rod.toY.toStringAsFixed(2), 'RUB')}', + const TextStyle(color: Colors.white, fontSize: 12), + ); + }, + ), + ), + barGroups: [ + for (var i = 0; i < rows.length; i++) + BarChartGroupData( + x: i, + barRods: [ + BarChartRodData(toY: _d(rows[i].incomeRub), color: _incomeColor, width: 8), + BarChartRodData(toY: _d(rows[i].expenseRub), color: _expenseColor, width: 8), + ], + barsSpace: 2, + ), + ], + ), + ); + } +} + +class _Table extends StatelessWidget { + const _Table({required this.rows}); + + final List rows; + + @override + Widget build(BuildContext context) { + final headerStyle = Theme.of(context).textTheme.labelMedium; + return SingleChildScrollView( + scrollDirection: Axis.horizontal, + child: DataTable( + columns: [ + DataColumn(label: Text('Месяц', style: headerStyle)), + DataColumn(label: Text('Доход', style: headerStyle), numeric: true), + DataColumn(label: Text('Расход', style: headerStyle), numeric: true), + DataColumn(label: Text('Базовые', style: headerStyle), numeric: true), + DataColumn(label: Text('Разовые', style: headerStyle), numeric: true), + DataColumn(label: Text('В сбережения', style: headerStyle), numeric: true), + DataColumn(label: Text('Норма сбер., %', style: headerStyle), numeric: true), + ], + rows: [ + for (final r in rows.reversed) + DataRow( + onSelectChanged: (_) => context.go('/categories?month=${monthKey(r.month)}'), + cells: [ + DataCell(Text(ruMonthYearShort(r.month))), + DataCell(MoneyText(r.incomeRub, currency: 'RUB')), + DataCell(MoneyText(r.expenseRub, currency: 'RUB')), + DataCell(MoneyText(r.baselineRub, currency: 'RUB')), + DataCell(MoneyText(r.oneOffRub, currency: 'RUB')), + DataCell(MoneyText(r.savingsTransferRub, currency: 'RUB')), + DataCell(Text(r.savingsRate == null + ? '—' + : '${(_d(r.savingsRate!) * 100).toStringAsFixed(1)}%')), + ], + ), + ], + ), + ); + } +} diff --git a/app/lib/features/cashflow/providers.dart b/app/lib/features/cashflow/providers.dart new file mode 100644 index 0000000..4d8a068 --- /dev/null +++ b/app/lib/features/cashflow/providers.dart @@ -0,0 +1,10 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; + +/// The last 24 months, oldest first (as the API returns them). +final cashflowMonthly24Provider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getCashflowApi().cashflowMonthly(months: 24); + return r.data ?? const []; +}); diff --git a/app/lib/features/categories/categories_page.dart b/app/lib/features/categories/categories_page.dart new file mode 100644 index 0000000..6cf057a --- /dev/null +++ b/app/lib/features/categories/categories_page.dart @@ -0,0 +1,248 @@ +import 'package:decimal/decimal.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/theme/chart_colors.dart'; +import '../../core/utils/ru_date.dart'; +import '../../core/widgets/async_value_view.dart'; +import '../../core/widgets/empty_state.dart'; +import '../../core/widgets/money_text.dart'; +import 'providers.dart'; + +class _Group { + _Group(this.rootId, this.rootName); + final int? rootId; + final String rootName; + final List rows = []; + + Decimal get total => rows.fold(Decimal.zero, (a, r) => a + Decimal.parse(r.amountRub)); +} + +List<_Group> _group(List rows) { + final byRoot = {}; + for (final r in rows) { + final key = r.categoryId == null ? null : (r.rootCategoryId ?? r.categoryId); + final group = byRoot.putIfAbsent( + key, + () => _Group(key, key == null ? 'Без категории' : (r.rootCategoryName ?? r.categoryName ?? '—')), + ); + group.rows.add(r); + } + final groups = byRoot.values.toList()..sort((a, b) => b.total.compareTo(a.total)); + return groups; +} + +/// Категории: expenses of one month, root-grouped, largest first. +class CategoriesPage extends ConsumerStatefulWidget { + const CategoriesPage({this.initialMonth, super.key}); + + final String? initialMonth; + + @override + ConsumerState createState() => _CategoriesPageState(); +} + +class _CategoriesPageState extends ConsumerState { + @override + void initState() { + super.initState(); + final initial = widget.initialMonth; + if (initial != null) { + Future.microtask(() => ref.read(selectedSpendingMonthProvider.notifier).state = initial); + } + } + + Future _pickMonth() async { + final current = parseMonthKey(ref.read(selectedSpendingMonthProvider)); + final picked = await showDatePicker( + context: context, + initialDate: current, + firstDate: DateTime.utc(2015), + lastDate: DateTime.now(), + helpText: 'Выберите месяц', + initialDatePickerMode: DatePickerMode.year, + ); + if (picked != null) { + ref.read(selectedSpendingMonthProvider.notifier).state = + monthKey(DateTime(picked.year, picked.month)); + } + } + + void _shiftMonth(int delta) { + final current = parseMonthKey(ref.read(selectedSpendingMonthProvider)); + final next = DateTime.utc(current.year, current.month + delta); + ref.read(selectedSpendingMonthProvider.notifier).state = monthKey(next); + } + + @override + Widget build(BuildContext context) { + final month = ref.watch(selectedSpendingMonthProvider); + final spending = ref.watch(spendingProvider(month)); + + return Scaffold( + appBar: AppBar(title: const Text('Категории')), + body: RefreshIndicator( + onRefresh: () async => ref.invalidate(spendingProvider(month)), + child: ListView( + padding: const EdgeInsets.all(16), + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + IconButton( + icon: const Icon(Icons.chevron_left), + onPressed: () => _shiftMonth(-1), + ), + TextButton( + onPressed: _pickMonth, + child: Text( + ruMonthYear(parseMonthKey(month)), + style: Theme.of(context).textTheme.titleMedium, + ), + ), + IconButton( + icon: const Icon(Icons.chevron_right), + onPressed: () => _shiftMonth(1), + ), + ], + ), + const SizedBox(height: 8), + AsyncValueView( + value: spending, + onRetry: () => ref.invalidate(spendingProvider(month)), + data: (rows) { + if (rows.isEmpty) { + return const EmptyState( + icon: Icons.donut_small_outlined, + message: 'Данных за этот месяц нет — нужна синхронизация.', + ); + } + final groups = _group(rows); + final total = groups.fold(Decimal.zero, (a, g) => a + g.total); + final maxTotal = groups.first.total; + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.symmetric(vertical: 8), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Text('Всего расходов', style: Theme.of(context).textTheme.bodyLarge), + MoneyText( + total.toString(), + currency: 'RUB', + style: Theme.of(context).textTheme.headlineSmall, + ), + ], + ), + ), + const Divider(), + for (final g in groups) _GroupTile(group: g, maxTotal: maxTotal), + ], + ); + }, + ), + ], + ), + ), + ); + } +} + +class _GroupTile extends StatelessWidget { + const _GroupTile({required this.group, required this.maxTotal}); + + final _Group group; + final Decimal maxTotal; + + bool get _flat => + group.rows.length == 1 && (group.rootId == null || group.rows.first.categoryId == group.rootId); + + @override + Widget build(BuildContext context) { + if (_flat) { + return _CategoryBar( + name: group.rootName, + amount: group.total, + maxAmount: maxTotal, + bold: true, + ); + } + final children = [...group.rows] + ..sort((a, b) => Decimal.parse(b.amountRub).compareTo(Decimal.parse(a.amountRub))); + return ExpansionTile( + tilePadding: EdgeInsets.zero, + title: _CategoryBar(name: group.rootName, amount: group.total, maxAmount: maxTotal, bold: true), + children: [ + for (final r in children) + Padding( + padding: const EdgeInsets.only(left: 16), + child: _CategoryBar( + name: r.categoryId == group.rootId ? 'Без подкатегории' : (r.categoryName ?? '—'), + amount: Decimal.parse(r.amountRub), + maxAmount: group.total, + bold: false, + ), + ), + ], + ); + } +} + +class _CategoryBar extends StatelessWidget { + const _CategoryBar({ + required this.name, + required this.amount, + required this.maxAmount, + required this.bold, + }); + + final String name; + final Decimal amount; + final Decimal maxAmount; + final bool bold; + + @override + Widget build(BuildContext context) { + final ratio = maxAmount == Decimal.zero + ? 0.0 + : (amount / maxAmount).toDouble().clamp(0.0, 1.0); + final scheme = Theme.of(context).colorScheme; + final style = bold + ? Theme.of(context).textTheme.bodyLarge + : Theme.of(context).textTheme.bodyMedium; + return Padding( + padding: const EdgeInsets.symmetric(vertical: 6), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded(child: Text(name, style: style)), + MoneyText(amount.toString(), currency: 'RUB', style: style), + ], + ), + const SizedBox(height: 4), + LayoutBuilder( + builder: (context, constraints) => ClipRRect( + borderRadius: BorderRadius.circular(4), + child: Stack( + children: [ + Container(height: 6, color: scheme.surfaceContainerHighest), + Container( + height: 6, + width: constraints.maxWidth * ratio, + color: bold ? ChartColors.expense : ChartColors.expense.withValues(alpha: 0.6), + ), + ], + ), + ), + ), + ], + ), + ); + } +} diff --git a/app/lib/features/categories/providers.dart b/app/lib/features/categories/providers.dart new file mode 100644 index 0000000..1730378 --- /dev/null +++ b/app/lib/features/categories/providers.dart @@ -0,0 +1,29 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; +import '../../core/utils/ru_date.dart'; + +/// Flat ZenMoney tag tree — the client nests it by `parent_id` where needed. +final categoriesListProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getCategoriesApi().categoriesList(); + return r.data ?? const []; +}); + +/// `category_id -> name`, for screens that only carry the id. +final categoryNamesProvider = Provider.autoDispose>((ref) { + final categories = ref.watch(categoriesListProvider).valueOrNull ?? const []; + return {for (final c in categories) c.id: c.name}; +}); + +/// Spending by category for one month (`YYYY-MM`); null means "the latest month". +final spendingProvider = + FutureProvider.autoDispose.family, String?>((ref, month) async { + final r = await ref.watch(apiProvider).getCashflowApi().cashflowSpending(month: month); + return r.data ?? const []; +}); + +/// The month currently selected on the Категории screen, `YYYY-MM`. +final selectedSpendingMonthProvider = StateProvider.autoDispose( + (ref) => monthKey(DateTime.now()), +); diff --git a/app/lib/features/home/home_page.dart b/app/lib/features/home/home_page.dart new file mode 100644 index 0000000..5b0d119 --- /dev/null +++ b/app/lib/features/home/home_page.dart @@ -0,0 +1,478 @@ +import 'package:dio/dio.dart'; +import 'package:decimal/decimal.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:fl_chart/fl_chart.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:go_router/go_router.dart'; + +import '../../core/auth/auth_controller.dart'; +import '../../core/theme/chart_colors.dart'; +import '../../core/utils/ru_date.dart'; +import '../../core/widgets/async_value_view.dart'; +import '../../core/widgets/empty_state.dart'; +import '../../core/widgets/money_text.dart'; +import '../../core/api/api_client.dart'; +import 'providers.dart'; + +double _d(String s) => Decimal.parse(s).toDouble(); + +Color _severityColor(String severity) { + final s = severity.toLowerCase(); + if (s.contains('crit') || s.contains('err')) return const Color(0xFFD03B3B); + if (s.contains('warn')) return const Color(0xFFFAB219); + if (s.contains('info') || s.contains('low')) return const Color(0xFF0CA30C); + return const Color(0xFFEC835A); +} + +/// Обзор: the dashboard landing page — net worth, this month's cashflow, +/// runway, a net worth line chart, a 12-month income/expense bar chart, and +/// a data-quality summary linking to the findings. +class HomePage extends ConsumerStatefulWidget { + const HomePage({super.key}); + + @override + ConsumerState createState() => _HomePageState(); +} + +class _HomePageState extends ConsumerState { + bool _refreshing = false; + + Future _refresh() async { + setState(() => _refreshing = true); + try { + await ref.read(apiProvider).getMetricsApi().metricsRefresh(); + } on DioException catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } finally { + if (mounted) setState(() => _refreshing = false); + invalidateHomeProviders(ref); + } + } + + void _showDataQuality(List rows) { + showModalBottomSheet( + context: context, + isScrollControlled: true, + builder: (context) => SafeArea( + child: Padding( + padding: const EdgeInsets.all(20), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('Качество данных', style: Theme.of(context).textTheme.titleLarge), + const SizedBox(height: 12), + if (rows.isEmpty) const Text('Проблем не найдено.'), + for (final row in rows) + Padding( + padding: const EdgeInsets.symmetric(vertical: 6), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + margin: const EdgeInsets.only(top: 4, right: 8), + width: 10, + height: 10, + decoration: + BoxDecoration(color: _severityColor(row.severity), shape: BoxShape.circle), + ), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('${row.checkName} (${row.count})', + style: Theme.of(context).textTheme.titleSmall), + Text(row.detail), + ], + ), + ), + ], + ), + ), + ], + ), + ), + ), + ); + } + + @override + Widget build(BuildContext context) { + final breakdown = ref.watch(netWorthBreakdownProvider); + final series = ref.watch(netWorthSeriesProvider); + final thisMonth = ref.watch(cashflowThisMonthProvider); + final last12 = ref.watch(cashflowLast12Provider); + final runway = ref.watch(runwayProvider); + final status = ref.watch(metricsStatusProvider); + final dataQuality = ref.watch(dataQualityProvider); + + return Scaffold( + appBar: AppBar( + title: const Text('Обзор'), + actions: [ + IconButton( + tooltip: 'Пересчитать метрики', + icon: _refreshing + ? const SizedBox( + width: 20, height: 20, child: CircularProgressIndicator(strokeWidth: 2)) + : const Icon(Icons.refresh), + onPressed: _refreshing ? null : _refresh, + ), + ], + ), + body: RefreshIndicator( + onRefresh: () async => invalidateHomeProviders(ref), + child: ListView( + padding: const EdgeInsets.all(16), + children: [ + Row( + children: [ + Expanded( + child: AsyncValueView( + value: status, + onRetry: () => ref.invalidate(metricsStatusProvider), + data: (log) { + final at = log?.finishedAt ?? log?.startedAt; + final text = at == null + ? 'Данные ещё не пересчитывались' + : 'Данные на ${ruDate(at.toLocal())} ${at.toLocal().hour.toString().padLeft(2, '0')}:${at.toLocal().minute.toString().padLeft(2, '0')}'; + return Text(text, style: Theme.of(context).textTheme.bodySmall); + }, + ), + ), + AsyncValueView( + value: dataQuality, + data: (rows) => ActionChip( + avatar: Icon( + rows.isEmpty ? Icons.check_circle_outline : Icons.warning_amber_outlined, + size: 18, + color: rows.isEmpty ? Colors.green : _severityColor(rows.first.severity), + ), + label: Text(rows.isEmpty ? 'ок' : '${rows.length} замечаний'), + onPressed: rows.isEmpty ? null : () => _showDataQuality(rows), + ), + ), + ], + ), + const SizedBox(height: 16), + AsyncValueView( + value: breakdown, + onRetry: () => ref.invalidate(netWorthBreakdownProvider), + data: (b) => _NetWorthTiles(breakdown: b), + ), + const SizedBox(height: 12), + Row( + children: [ + Expanded( + child: AsyncValueView( + value: thisMonth, + onRetry: () => ref.invalidate(cashflowThisMonthProvider), + data: (m) => _MonthTiles(month: m), + ), + ), + ], + ), + const SizedBox(height: 12), + AsyncValueView( + value: runway, + onRetry: () => ref.invalidate(runwayProvider), + data: (r) => _RunwayTile(runway: r), + ), + const SizedBox(height: 24), + LayoutBuilder( + builder: (context, constraints) { + final wide = constraints.maxWidth >= 900; + final netWorthChart = _ChartCard( + title: 'Капитал за 365 дней', + child: AsyncValueView( + value: series, + onRetry: () => ref.invalidate(netWorthSeriesProvider), + data: (rows) => rows.isEmpty + ? const EmptyState(icon: Icons.show_chart, message: 'Пока нет данных.') + : _NetWorthChart(rows: rows), + ), + ); + final cashflowChart = _ChartCard( + title: 'Доход и расход, 12 месяцев', + child: AsyncValueView( + value: last12, + onRetry: () => ref.invalidate(cashflowLast12Provider), + data: (rows) => rows.isEmpty + ? const EmptyState(icon: Icons.bar_chart, message: 'Пока нет данных.') + : _IncomeExpenseChart(rows: rows), + ), + ); + if (wide) { + return Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Expanded(child: netWorthChart), + const SizedBox(width: 16), + Expanded(child: cashflowChart), + ], + ); + } + return Column( + children: [netWorthChart, const SizedBox(height: 16), cashflowChart], + ); + }, + ), + const SizedBox(height: 8), + Align( + alignment: Alignment.centerRight, + child: TextButton.icon( + onPressed: () => context.go('/sync'), + icon: const Icon(Icons.sync, size: 16), + label: const Text('Синхронизация'), + ), + ), + ], + ), + ), + ); + } +} + +class _StatTile extends StatelessWidget { + const _StatTile({required this.label, required this.value}); + final String label; + final Widget value; + + @override + Widget build(BuildContext context) { + return SizedBox( + width: 168, + child: Card( + child: Padding( + padding: const EdgeInsets.all(12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(label, style: Theme.of(context).textTheme.bodySmall), + const SizedBox(height: 4), + DefaultTextStyle(style: Theme.of(context).textTheme.titleMedium!, child: value), + ], + ), + ), + ), + ); + } +} + +class _NetWorthTiles extends StatelessWidget { + const _NetWorthTiles({required this.breakdown}); + final NetWorthBreakdown breakdown; + + @override + Widget build(BuildContext context) { + return Wrap( + spacing: 12, + runSpacing: 12, + children: [ + _StatTile(label: 'Капитал сегодня', value: MoneyText(breakdown.totalRub, currency: 'RUB')), + _StatTile(label: 'Ликвидные', value: MoneyText(breakdown.liquidRub, currency: 'RUB')), + _StatTile(label: 'Сбережения', value: MoneyText(breakdown.savingsRub, currency: 'RUB')), + _StatTile(label: 'Инвестиции', value: MoneyText(breakdown.investmentRub, currency: 'RUB')), + _StatTile(label: 'Долги', value: MoneyText(breakdown.debtRub, currency: 'RUB')), + ], + ); + } +} + +class _MonthTiles extends StatelessWidget { + const _MonthTiles({required this.month}); + final CashFlowMonth? month; + + @override + Widget build(BuildContext context) { + if (month == null) { + return const EmptyState(icon: Icons.event_note_outlined, message: 'Данных за этот месяц нет.'); + } + final rateText = month!.savingsRate == null ? '—' : '${(_d(month!.savingsRate!) * 100).toStringAsFixed(1)}%'; + return Wrap( + spacing: 12, + runSpacing: 12, + children: [ + _StatTile(label: 'Доход в этом месяце', value: MoneyText(month!.incomeRub, currency: 'RUB')), + _StatTile(label: 'Расход в этом месяце', value: MoneyText(month!.expenseRub, currency: 'RUB')), + _StatTile(label: 'Норма сбережений', value: Text(rateText)), + ], + ); + } +} + +class _RunwayTile extends StatelessWidget { + const _RunwayTile({required this.runway}); + final RunwayOut runway; + + @override + Widget build(BuildContext context) { + final text = runway.runwayMonths == null + ? '—' + : '${_d(runway.runwayMonths!).toStringAsFixed(1)} мес.'; + return _StatTile(label: 'Запас хода (runway)', value: Text(text)); + } +} + +class _ChartCard extends StatelessWidget { + const _ChartCard({required this.title, required this.child}); + final String title; + final Widget child; + + @override + Widget build(BuildContext context) { + return Card( + child: Padding( + padding: const EdgeInsets.all(16), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text(title, style: Theme.of(context).textTheme.titleSmall), + const SizedBox(height: 12), + SizedBox(height: 200, child: child), + ], + ), + ), + ); + } +} + +class _NetWorthChart extends StatelessWidget { + const _NetWorthChart({required this.rows}); + final List rows; + + @override + Widget build(BuildContext context) { + final spots = [ + for (var i = 0; i < rows.length; i++) FlSpot(i.toDouble(), _d(rows[i].totalRub)), + ]; + return LineChart( + LineChartData( + gridData: const FlGridData(drawVerticalLine: false), + borderData: FlBorderData(show: false), + titlesData: const FlTitlesData( + topTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)), + bottomTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)), + leftTitles: AxisTitles(sideTitles: SideTitles(showTitles: false)), + ), + lineTouchData: LineTouchData( + touchTooltipData: LineTouchTooltipData( + getTooltipItems: (spots) => [ + for (final s in spots) + LineTooltipItem( + MoneyText.format(s.y.toStringAsFixed(2), 'RUB'), + const TextStyle(color: Colors.white, fontSize: 12), + ), + ], + ), + ), + lineBarsData: [ + LineChartBarData( + spots: spots, + isCurved: false, + barWidth: 2, + color: ChartColors.slot1Blue, + dotData: const FlDotData(show: false), + ), + ], + ), + ); + } +} + +class _IncomeExpenseChart extends StatelessWidget { + const _IncomeExpenseChart({required this.rows}); + final List rows; + + @override + Widget build(BuildContext context) { + final maxY = rows.fold( + 0, + (m, r) => [m, _d(r.incomeRub), _d(r.expenseRub)].reduce((a, b) => a > b ? a : b), + ); + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: const [ + _LegendDot(color: ChartColors.income, label: 'Доход'), + SizedBox(width: 16), + _LegendDot(color: ChartColors.expense, label: 'Расход'), + ], + ), + const SizedBox(height: 8), + Expanded( + child: BarChart( + BarChartData( + maxY: maxY * 1.1, + gridData: const FlGridData(drawVerticalLine: false), + borderData: FlBorderData(show: false), + titlesData: FlTitlesData( + topTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + rightTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + leftTitles: const AxisTitles(sideTitles: SideTitles(showTitles: false)), + bottomTitles: AxisTitles( + sideTitles: SideTitles( + showTitles: true, + getTitlesWidget: (value, meta) { + final i = value.toInt(); + if (i < 0 || i >= rows.length) return const SizedBox.shrink(); + return Padding( + padding: const EdgeInsets.only(top: 6), + child: + Text(ruMonthYearShort(rows[i].month), style: const TextStyle(fontSize: 9)), + ); + }, + ), + ), + ), + barTouchData: BarTouchData( + touchTooltipData: BarTouchTooltipData( + getTooltipItem: (group, groupIndex, rod, rodIndex) { + final label = rodIndex == 0 ? 'Доход' : 'Расход'; + return BarTooltipItem( + '$label\n${MoneyText.format(rod.toY.toStringAsFixed(2), 'RUB')}', + const TextStyle(color: Colors.white, fontSize: 12), + ); + }, + ), + ), + barGroups: [ + for (var i = 0; i < rows.length; i++) + BarChartGroupData( + x: i, + barRods: [ + BarChartRodData(toY: _d(rows[i].incomeRub), color: ChartColors.income, width: 6), + BarChartRodData(toY: _d(rows[i].expenseRub), color: ChartColors.expense, width: 6), + ], + barsSpace: 2, + ), + ], + ), + ), + ), + ], + ); + } +} + +class _LegendDot extends StatelessWidget { + const _LegendDot({required this.color, required this.label}); + final Color color; + final String label; + + @override + Widget build(BuildContext context) { + return Row( + mainAxisSize: MainAxisSize.min, + children: [ + Container(width: 10, height: 10, decoration: BoxDecoration(color: color, shape: BoxShape.circle)), + const SizedBox(width: 6), + Text(label, style: Theme.of(context).textTheme.bodySmall), + ], + ); + } +} diff --git a/app/lib/features/home/providers.dart b/app/lib/features/home/providers.dart new file mode 100644 index 0000000..7ea58ed --- /dev/null +++ b/app/lib/features/home/providers.dart @@ -0,0 +1,66 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; + +final netWorthBreakdownProvider = FutureProvider.autoDispose((ref) async { + final r = await ref.watch(apiProvider).getNetworthApi().networthBreakdown(); + return r.data!; +}); + +/// Daily net worth for the last 365 days. +final netWorthSeriesProvider = FutureProvider.autoDispose>((ref) async { + final now = DateTime.now(); + final r = await ref.watch(apiProvider).getNetworthApi().networthSeries( + from: now.subtract(const Duration(days: 365)), + to: now, + ); + return r.data ?? const []; +}); + +/// The current (partial) month's cashflow, or null before any data exists. +final cashflowThisMonthProvider = FutureProvider.autoDispose((ref) async { + final r = await ref.watch(apiProvider).getCashflowApi().cashflowMonthly(months: 1); + final rows = r.data ?? const []; + return rows.isEmpty ? null : rows.last; +}); + +/// The last 12 months, for the income-vs-expense bar chart. +final cashflowLast12Provider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getCashflowApi().cashflowMonthly(months: 12); + return r.data ?? const []; +}); + +final runwayProvider = FutureProvider.autoDispose((ref) async { + final r = await ref.watch(apiProvider).getCashflowApi().cashflowRunway(); + return r.data!; +}); + +/// When the metric tables were last rebuilt; null before the first refresh. +final metricsStatusProvider = FutureProvider.autoDispose((ref) async { + try { + final r = await ref.watch(apiProvider).getMetricsApi().metricsStatus(); + return r.data; + } on DioException catch (e) { + if (e.response?.statusCode == 404) return null; + rethrow; + } +}); + +final dataQualityProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getMetricsApi().metricsDataQuality(); + return r.data ?? const []; +}); + +/// Every dashboard provider, refreshed together after a manual +/// `POST /metrics/refresh` or a pull-to-refresh. +void invalidateHomeProviders(WidgetRef ref) { + ref.invalidate(netWorthBreakdownProvider); + ref.invalidate(netWorthSeriesProvider); + ref.invalidate(cashflowThisMonthProvider); + ref.invalidate(cashflowLast12Provider); + ref.invalidate(runwayProvider); + ref.invalidate(metricsStatusProvider); + ref.invalidate(dataQualityProvider); +} diff --git a/app/lib/features/login/login_page.dart b/app/lib/features/login/login_page.dart new file mode 100644 index 0000000..7496d80 --- /dev/null +++ b/app/lib/features/login/login_page.dart @@ -0,0 +1,96 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/auth/auth_controller.dart'; +import '../../core/config.dart'; + +class LoginPage extends ConsumerStatefulWidget { + const LoginPage({super.key}); + + @override + ConsumerState createState() => _LoginPageState(); +} + +class _LoginPageState extends ConsumerState { + final _email = TextEditingController(); + final _password = TextEditingController(); + String? _error; + bool _busy = false; + + @override + void dispose() { + _email.dispose(); + _password.dispose(); + super.dispose(); + } + + Future _submit() async { + setState(() { + _busy = true; + _error = null; + }); + final error = await ref + .read(authControllerProvider.notifier) + .login(_email.text.trim(), _password.text); + if (!mounted) return; + setState(() { + _busy = false; + _error = error; + }); + } + + @override + Widget build(BuildContext context) { + final status = ref.watch(authControllerProvider).status; + return Scaffold( + body: Center( + child: ConstrainedBox( + constraints: const BoxConstraints(maxWidth: 360), + child: Padding( + padding: const EdgeInsets.all(24), + child: status == AuthStatus.unknown + ? const CircularProgressIndicator() + : AutofillGroup( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text('fin-tracker', style: Theme.of(context).textTheme.headlineMedium), + const SizedBox(height: 4), + Text(apiBaseUrl(), style: Theme.of(context).textTheme.bodySmall), + const SizedBox(height: 24), + TextField( + controller: _email, + autofillHints: const [AutofillHints.username], + keyboardType: TextInputType.emailAddress, + decoration: const InputDecoration(labelText: 'Email'), + ), + const SizedBox(height: 12), + TextField( + controller: _password, + autofillHints: const [AutofillHints.password], + obscureText: true, + onSubmitted: (_) => _busy ? null : _submit(), + decoration: const InputDecoration(labelText: 'Пароль'), + ), + if (_error != null) ...[ + const SizedBox(height: 12), + Text(_error!, style: TextStyle(color: Theme.of(context).colorScheme.error)), + ], + const SizedBox(height: 24), + FilledButton( + onPressed: _busy ? null : _submit, + child: _busy + ? const SizedBox.square( + dimension: 18, child: CircularProgressIndicator(strokeWidth: 2)) + : const Text('Войти'), + ), + ], + ), + ), + ), + ), + ), + ); + } +} diff --git a/app/lib/features/rules/providers.dart b/app/lib/features/rules/providers.dart new file mode 100644 index 0000000..688f6cb --- /dev/null +++ b/app/lib/features/rules/providers.dart @@ -0,0 +1,20 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; + +final rulesListProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getRulesApi().rulesList(); + return r.data ?? const []; +}); + +/// Enabled rules that matched nothing in the latest refresh. +final rulesStaleProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getRulesApi().rulesStale(); + return r.data ?? const []; +}); + +final staleRuleIdsProvider = Provider.autoDispose>((ref) { + final stale = ref.watch(rulesStaleProvider).valueOrNull ?? const []; + return {for (final r in stale) r.id}; +}); diff --git a/app/lib/features/rules/rules_page.dart b/app/lib/features/rules/rules_page.dart new file mode 100644 index 0000000..9bc39ea --- /dev/null +++ b/app/lib/features/rules/rules_page.dart @@ -0,0 +1,377 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; +import '../../core/auth/auth_controller.dart'; +import '../../core/utils/ru_date.dart'; +import '../../core/widgets/async_value_view.dart'; +import '../../core/widgets/empty_state.dart'; +import 'providers.dart'; + +String ruleKindLabel(RuleKind k) => switch (k) { + RuleKind.savings => 'Сбережения', + RuleKind.oneOff => 'Разовая трата', + RuleKind.category => 'Категория', + RuleKind.payee => 'Плательщик', + RuleKind.brokerTarget => 'Целевой брокер', + RuleKind.ignore => 'Игнорировать', + RuleKind.unknownDefaultOpenApi => 'Неизвестно', + }; + +String ruleMatchTypeLabel(RuleMatchType t) => switch (t) { + RuleMatchType.id => 'ID транзакции', + RuleMatchType.payee => 'Плательщик', + RuleMatchType.comment => 'Комментарий', + RuleMatchType.category => 'Категория', + RuleMatchType.mcc => 'MCC', + RuleMatchType.account => 'Счёт', + RuleMatchType.unknownDefaultOpenApi => 'Неизвестно', + }; + +const _kinds = [ + RuleKind.savings, + RuleKind.oneOff, + RuleKind.category, + RuleKind.payee, + RuleKind.brokerTarget, + RuleKind.ignore, +]; + +const _matchTypes = [ + RuleMatchType.id, + RuleMatchType.payee, + RuleMatchType.comment, + RuleMatchType.category, + RuleMatchType.mcc, + RuleMatchType.account, +]; + +void _invalidateAll(WidgetRef ref) { + ref.invalidate(rulesListProvider); + ref.invalidate(rulesStaleProvider); +} + +/// Правила: list of categorisation rules, an add/edit dialog, and a manual +/// "apply" trigger that re-runs the whole metric refresh. +class RulesPage extends ConsumerWidget { + const RulesPage({super.key}); + + Future _apply(BuildContext context, WidgetRef ref) async { + final messenger = ScaffoldMessenger.of(context); + try { + final r = await ref.read(apiProvider).getRulesApi().rulesApply(); + final ok = r.data?.error == null; + messenger.showSnackBar(SnackBar( + content: Text(ok ? 'Правила применены' : 'Ошибка применения: ${r.data?.error}'), + )); + } on DioException catch (e) { + messenger.showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } finally { + _invalidateAll(ref); + } + } + + @override + Widget build(BuildContext context, WidgetRef ref) { + final rules = ref.watch(rulesListProvider); + final staleIds = ref.watch(staleRuleIdsProvider); + + return Scaffold( + appBar: AppBar( + title: const Text('Правила'), + actions: [ + IconButton( + tooltip: 'Применить правила', + icon: const Icon(Icons.play_circle_outline), + onPressed: () => _apply(context, ref), + ), + ], + ), + floatingActionButton: FloatingActionButton( + onPressed: () => showDialog( + context: context, + builder: (_) => _RuleDialog(onSaved: () => _invalidateAll(ref)), + ), + child: const Icon(Icons.add), + ), + body: RefreshIndicator( + onRefresh: () async => _invalidateAll(ref), + child: AsyncValueView( + value: rules, + onRetry: () => ref.invalidate(rulesListProvider), + data: (rows) { + if (rows.isEmpty) { + return ListView( + children: const [ + EmptyState(icon: Icons.rule_folder_outlined, message: 'Правил ещё нет.'), + ], + ); + } + final sorted = [...rows]..sort((a, b) => a.priority.compareTo(b.priority)); + return ListView( + padding: const EdgeInsets.all(16), + children: [ + for (final rule in sorted) + _RuleTile( + rule: rule, + stale: staleIds.contains(rule.id), + onChanged: () => _invalidateAll(ref), + ), + ], + ); + }, + ), + ), + ); + } +} + +class _RuleTile extends ConsumerStatefulWidget { + const _RuleTile({required this.rule, required this.stale, required this.onChanged}); + + final RuleOut rule; + final bool stale; + final VoidCallback onChanged; + + @override + ConsumerState<_RuleTile> createState() => _RuleTileState(); +} + +class _RuleTileState extends ConsumerState<_RuleTile> { + bool _busy = false; + + Future _toggle(bool enabled) async { + setState(() => _busy = true); + try { + await ref.read(apiProvider).getRulesApi().rulesPatch( + ruleId: widget.rule.id, + rulePatch: RulePatch(enabled: enabled), + ); + widget.onChanged(); + } on DioException catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } finally { + if (mounted) setState(() => _busy = false); + } + } + + Future _delete() async { + final confirmed = await showDialog( + context: context, + builder: (context) => AlertDialog( + title: const Text('Удалить правило?'), + content: Text('«${widget.rule.pattern}» — действие необратимо.'), + actions: [ + TextButton(onPressed: () => Navigator.pop(context, false), child: const Text('Отмена')), + FilledButton(onPressed: () => Navigator.pop(context, true), child: const Text('Удалить')), + ], + ), + ); + if (confirmed != true) return; + try { + await ref.read(apiProvider).getRulesApi().rulesDelete(ruleId: widget.rule.id); + widget.onChanged(); + } on DioException catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } + } + + @override + Widget build(BuildContext context) { + final rule = widget.rule; + return Card( + child: ListTile( + onTap: () => showDialog( + context: context, + builder: (_) => _RuleDialog(existing: rule, onSaved: widget.onChanged), + ), + title: Row( + children: [ + Text(ruleKindLabel(rule.kind)), + const SizedBox(width: 8), + Chip( + visualDensity: VisualDensity.compact, + label: Text(ruleMatchTypeLabel(rule.matchType)), + ), + if (widget.stale) ...[ + const SizedBox(width: 8), + Chip( + visualDensity: VisualDensity.compact, + label: const Text('устарело'), + backgroundColor: Colors.amber.withValues(alpha: 0.2), + ), + ], + ], + ), + subtitle: Padding( + padding: const EdgeInsets.only(top: 4), + child: Text( + [ + '${rule.pattern} → ${rule.value ?? '—'}', + 'совпадений: ${rule.matchCount}', + if (rule.lastMatchedAt != null) 'последнее: ${ruDate(rule.lastMatchedAt!.toLocal())}', + ].join(' · '), + ), + ), + trailing: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Switch(value: rule.enabled, onChanged: _busy ? null : _toggle), + IconButton(icon: const Icon(Icons.delete_outline), onPressed: _delete), + ], + ), + ), + ); + } +} + +class _RuleDialog extends ConsumerStatefulWidget { + const _RuleDialog({this.existing, required this.onSaved}); + + final RuleOut? existing; + final VoidCallback onSaved; + + @override + ConsumerState<_RuleDialog> createState() => _RuleDialogState(); +} + +class _RuleDialogState extends ConsumerState<_RuleDialog> { + final _formKey = GlobalKey(); + late RuleKind _kind; + late RuleMatchType _matchType; + late final TextEditingController _pattern; + late final TextEditingController _value; + late final TextEditingController _note; + late final TextEditingController _priority; + late bool _enabled; + bool _saving = false; + + @override + void initState() { + super.initState(); + final e = widget.existing; + _kind = e?.kind ?? RuleKind.category; + _matchType = e?.matchType ?? RuleMatchType.payee; + _pattern = TextEditingController(text: e?.pattern ?? ''); + _value = TextEditingController(text: e?.value ?? ''); + _note = TextEditingController(text: e?.note ?? ''); + _priority = TextEditingController(text: (e?.priority ?? 100).toString()); + _enabled = e?.enabled ?? true; + } + + @override + void dispose() { + _pattern.dispose(); + _value.dispose(); + _note.dispose(); + _priority.dispose(); + super.dispose(); + } + + Future _save() async { + if (!(_formKey.currentState?.validate() ?? false)) return; + setState(() => _saving = true); + final priority = int.tryParse(_priority.text.trim()) ?? 100; + try { + final api = ref.read(apiProvider).getRulesApi(); + if (widget.existing == null) { + await api.rulesCreate( + ruleCreate: RuleCreate( + kind: _kind, + matchType: _matchType, + pattern: _pattern.text.trim(), + value: _value.text.trim().isEmpty ? null : _value.text.trim(), + note: _note.text.trim().isEmpty ? null : _note.text.trim(), + priority: priority, + enabled: _enabled, + ), + ); + } else { + await api.rulesPatch( + ruleId: widget.existing!.id, + rulePatch: RulePatch( + kind: _kind, + matchType: _matchType, + pattern: _pattern.text.trim(), + value: _value.text.trim().isEmpty ? null : _value.text.trim(), + note: _note.text.trim().isEmpty ? null : _note.text.trim(), + priority: priority, + enabled: _enabled, + ), + ); + } + widget.onSaved(); + if (mounted) Navigator.pop(context); + } on DioException catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } finally { + if (mounted) setState(() => _saving = false); + } + } + + @override + Widget build(BuildContext context) { + return AlertDialog( + title: Text(widget.existing == null ? 'Новое правило' : 'Правило'), + content: Form( + key: _formKey, + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DropdownButtonFormField( + initialValue: _kind, + decoration: const InputDecoration(labelText: 'Тип правила'), + items: [for (final k in _kinds) DropdownMenuItem(value: k, child: Text(ruleKindLabel(k)))], + onChanged: (v) => setState(() => _kind = v!), + ), + DropdownButtonFormField( + initialValue: _matchType, + decoration: const InputDecoration(labelText: 'Совпадение по'), + items: [ + for (final t in _matchTypes) + DropdownMenuItem(value: t, child: Text(ruleMatchTypeLabel(t))), + ], + onChanged: (v) => setState(() => _matchType = v!), + ), + TextFormField( + controller: _pattern, + decoration: const InputDecoration(labelText: 'Шаблон (pattern)'), + validator: (v) => (v == null || v.trim().isEmpty) ? 'Обязательное поле' : null, + ), + TextFormField( + controller: _value, + decoration: const InputDecoration(labelText: 'Значение (value)'), + ), + TextFormField( + controller: _note, + decoration: const InputDecoration(labelText: 'Заметка'), + ), + TextFormField( + controller: _priority, + decoration: const InputDecoration(labelText: 'Приоритет'), + keyboardType: TextInputType.number, + ), + SwitchListTile( + contentPadding: EdgeInsets.zero, + title: const Text('Включено'), + value: _enabled, + onChanged: (v) => setState(() => _enabled = v), + ), + ], + ), + ), + ), + actions: [ + TextButton(onPressed: () => Navigator.pop(context), child: const Text('Отмена')), + FilledButton(onPressed: _saving ? null : _save, child: const Text('Сохранить')), + ], + ); + } +} diff --git a/app/lib/features/settings/settings_page.dart b/app/lib/features/settings/settings_page.dart new file mode 100644 index 0000000..4fbb35e --- /dev/null +++ b/app/lib/features/settings/settings_page.dart @@ -0,0 +1,89 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/common_providers.dart'; +import '../../core/app_info.dart'; +import '../../core/auth/auth_controller.dart'; +import '../../core/config.dart'; +import '../../core/theme/theme_controller.dart'; +import '../../core/widgets/async_value_view.dart'; + +/// Настройки: API endpoint, signed-in account, theme and logout. +class SettingsPage extends ConsumerWidget { + const SettingsPage({super.key}); + + @override + Widget build(BuildContext context, WidgetRef ref) { + final me = ref.watch(meProvider); + final themeMode = ref.watch(themeModeProvider); + + return Scaffold( + appBar: AppBar(title: const Text('Настройки')), + body: ListView( + padding: const EdgeInsets.symmetric(vertical: 8), + children: [ + const ListTile( + leading: Icon(Icons.dns_outlined), + title: Text('Адрес API'), + ), + ListTile( + contentPadding: const EdgeInsets.only(left: 56, right: 16), + title: SelectableText(apiBaseUrl()), + ), + const Divider(), + ListTile( + leading: const Icon(Icons.account_circle_outlined), + title: const Text('Аккаунт'), + subtitle: AsyncValueView( + value: me, + data: (u) => Text(u.email), + onRetry: () => ref.invalidate(meProvider), + ), + ), + const Divider(), + const ListTile( + leading: Icon(Icons.palette_outlined), + title: Text('Тема'), + ), + Padding( + padding: const EdgeInsets.symmetric(horizontal: 16), + child: SegmentedButton( + segments: const [ + ButtonSegment( + value: ThemeMode.system, + label: Text('Системная'), + icon: Icon(Icons.brightness_auto_outlined), + ), + ButtonSegment( + value: ThemeMode.light, + label: Text('Светлая'), + icon: Icon(Icons.light_mode_outlined), + ), + ButtonSegment( + value: ThemeMode.dark, + label: Text('Тёмная'), + icon: Icon(Icons.dark_mode_outlined), + ), + ], + selected: {themeMode}, + onSelectionChanged: (selection) => + ref.read(themeModeProvider.notifier).setMode(selection.first), + ), + ), + const Divider(), + const ListTile( + leading: Icon(Icons.info_outline), + title: Text('Версия приложения'), + subtitle: Text(appVersion), + ), + const Divider(), + ListTile( + leading: Icon(Icons.logout, color: Theme.of(context).colorScheme.error), + title: Text('Выйти', style: TextStyle(color: Theme.of(context).colorScheme.error)), + onTap: () => ref.read(authControllerProvider.notifier).logout(), + ), + ], + ), + ); + } +} diff --git a/app/lib/features/shell/app_shell.dart b/app/lib/features/shell/app_shell.dart new file mode 100644 index 0000000..1263471 --- /dev/null +++ b/app/lib/features/shell/app_shell.dart @@ -0,0 +1,94 @@ +import 'package:flutter/material.dart'; +import 'package:go_router/go_router.dart'; + +class _Destination { + const _Destination(this.path, this.icon, this.selectedIcon, this.label); + final String path; + final IconData icon; + final IconData selectedIcon; + final String label; +} + +const _destinations = [ + _Destination('/', Icons.dashboard_outlined, Icons.dashboard, 'Обзор'), + _Destination('/accounts', Icons.account_balance_outlined, Icons.account_balance, 'Счета'), + _Destination('/cashflow', Icons.swap_horiz_outlined, Icons.swap_horiz, 'Потоки'), + _Destination('/categories', Icons.category_outlined, Icons.category, 'Категории'), + _Destination( + '/transactions', Icons.receipt_long_outlined, Icons.receipt_long, 'Операции'), + _Destination('/rules', Icons.rule_folder_outlined, Icons.rule_folder, 'Правила'), + _Destination('/sync', Icons.sync_outlined, Icons.sync, 'Синк'), + _Destination('/settings', Icons.settings_outlined, Icons.settings, 'Настройки'), +]; + +/// Breakpoints per the plan: bottom bar under 600, collapsed rail 600–1200, +/// extended rail at 1200 and above. +const _narrowBreakpoint = 600.0; +const _wideBreakpoint = 1200.0; + +/// Adaptive navigation shell around the current route: a bottom +/// [NavigationBar] on narrow surfaces, a [NavigationRail] (collapsed or +/// extended) otherwise. +class AppShell extends StatelessWidget { + const AppShell({required this.location, required this.child, super.key}); + + final String location; + final Widget child; + + int get _selectedIndex { + final i = _destinations.indexWhere((d) => d.path == location); + return i == -1 ? 0 : i; + } + + void _onSelect(BuildContext context, int index) { + if (index != _selectedIndex) context.go(_destinations[index].path); + } + + @override + Widget build(BuildContext context) { + final width = MediaQuery.sizeOf(context).width; + + if (width < _narrowBreakpoint) { + return Scaffold( + body: SafeArea(child: child), + bottomNavigationBar: NavigationBar( + selectedIndex: _selectedIndex, + onDestinationSelected: (i) => _onSelect(context, i), + destinations: [ + for (final d in _destinations) + NavigationDestination( + icon: Icon(d.icon), + selectedIcon: Icon(d.selectedIcon), + label: d.label, + ), + ], + ), + ); + } + + final extended = width >= _wideBreakpoint; + return Scaffold( + body: Row( + children: [ + NavigationRail( + extended: extended, + minExtendedWidth: 220, + selectedIndex: _selectedIndex, + onDestinationSelected: (i) => _onSelect(context, i), + labelType: extended ? NavigationRailLabelType.none : NavigationRailLabelType.selected, + destinations: [ + for (final d in _destinations) + NavigationRailDestination( + icon: Icon(d.icon), + selectedIcon: Icon(d.selectedIcon), + label: Text(d.label), + ), + ], + ), + const VerticalDivider(width: 1), + Expanded(child: SafeArea(child: child)), + ], + ), + ); + } +} diff --git a/app/lib/features/sync/sync_page.dart b/app/lib/features/sync/sync_page.dart new file mode 100644 index 0000000..e5eca1e --- /dev/null +++ b/app/lib/features/sync/sync_page.dart @@ -0,0 +1,276 @@ +import 'dart:async'; + +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:intl/intl.dart'; + +import '../../core/api/api_client.dart'; +import '../../core/auth/auth_controller.dart'; +import '../../core/widgets/async_value_view.dart'; +import '../../core/widgets/empty_state.dart'; + +final _dateFmt = DateFormat('dd.MM.yyyy HH:mm'); + +final syncStatusProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getSyncApi().syncStatus(); + return r.data ?? const []; +}); + +final syncRunsProvider = FutureProvider.autoDispose>((ref) async { + final r = await ref.watch(apiProvider).getSyncApi().syncRuns(limit: 20); + return r.data ?? const []; +}); + +const _pollInterval = Duration(seconds: 10); + +/// Синк: source statuses with a manual trigger per source, and a log of the +/// last 20 runs. Polls `/sync/status` every 10 s while this page is mounted. +class SyncPage extends ConsumerStatefulWidget { + const SyncPage({super.key}); + + @override + ConsumerState createState() => _SyncPageState(); +} + +class _SyncPageState extends ConsumerState { + Timer? _timer; + + @override + void initState() { + super.initState(); + _timer = Timer.periodic(_pollInterval, (_) { + if (!mounted) return; + ref.invalidate(syncStatusProvider); + }); + } + + @override + void dispose() { + _timer?.cancel(); + super.dispose(); + } + + Future _refreshAll() async { + ref.invalidate(syncStatusProvider); + ref.invalidate(syncRunsProvider); + } + + Future _trigger(String source) async { + try { + await ref.read(apiProvider).getSyncApi().syncTrigger(source_: source); + } on DioException catch (e) { + if (!mounted) return; + ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(problemMessage(e)))); + } finally { + ref.invalidate(syncStatusProvider); + ref.invalidate(syncRunsProvider); + } + } + + @override + Widget build(BuildContext context) { + final status = ref.watch(syncStatusProvider); + final runs = ref.watch(syncRunsProvider); + + return Scaffold( + appBar: AppBar( + title: const Text('Синк'), + actions: [ + IconButton( + tooltip: 'Обновить', + icon: const Icon(Icons.refresh), + onPressed: _refreshAll, + ), + ], + ), + body: RefreshIndicator( + onRefresh: _refreshAll, + child: ListView( + padding: const EdgeInsets.all(16), + children: [ + Text('Источники', style: Theme.of(context).textTheme.titleMedium), + const SizedBox(height: 8), + AsyncValueView( + value: status, + onRetry: () => ref.invalidate(syncStatusProvider), + data: (rows) => rows.isEmpty + ? const EmptyState( + icon: Icons.cable_outlined, + message: 'Источники данных ещё не подключены (фаза 1: ZenMoney, ЦБ).', + ) + : Column( + children: [for (final s in rows) _SourceCard(source: s, onTrigger: _trigger)], + ), + ), + const SizedBox(height: 24), + Text('Последние запуски', style: Theme.of(context).textTheme.titleMedium), + const SizedBox(height: 8), + AsyncValueView( + value: runs, + onRetry: () => ref.invalidate(syncRunsProvider), + data: (rows) => rows.isEmpty + ? const EmptyState(icon: Icons.history, message: 'Запусков ещё не было.') + : Column(children: [for (final r in rows) _RunTile(run: r)]), + ), + ], + ), + ), + ); + } +} + +class _SourceCard extends StatelessWidget { + const _SourceCard({required this.source, required this.onTrigger}); + + final SourceStatus source; + final Future Function(String source) onTrigger; + + @override + Widget build(BuildContext context) { + return Card( + child: ListTile( + title: Row( + children: [ + Text(source.source_, style: Theme.of(context).textTheme.titleSmall), + const SizedBox(width: 8), + _statusChip(context, source.lastRunStatus), + if (source.queued) ...[ + const SizedBox(width: 8), + const Chip( + visualDensity: VisualDensity.compact, + label: Text('в очереди'), + ), + ], + ], + ), + subtitle: Padding( + padding: const EdgeInsets.only(top: 4), + child: Text([ + if (source.lastRunAt != null) 'запуск ${_dateFmt.format(source.lastRunAt!.toLocal())}', + if (source.cursor != null) 'курсор ${_shortCursor(source.cursor!)}', + ].join(' · ')), + ), + trailing: IconButton( + tooltip: 'Запустить синхронизацию', + icon: const Icon(Icons.sync), + onPressed: source.queued ? null : () => onTrigger(source.source_), + ), + ), + ); + } +} + +class _RunTile extends StatelessWidget { + const _RunTile({required this.run}); + + final SyncRunOut run; + + @override + Widget build(BuildContext context) { + final duration = run.finishedAt?.difference(run.startedAt); + final subtitle = [ + _dateFmt.format(run.startedAt.toLocal()), + duration != null ? _formatDuration(duration) : 'выполняется', + ].join(' · '); + + final counts = run.counts; + final content = Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (counts != null && counts.isNotEmpty) + Wrap( + spacing: 8, + runSpacing: 4, + children: [ + for (final e in counts.entries) + Chip( + visualDensity: VisualDensity.compact, + label: Text('${e.key}=${e.value}'), + ), + ], + ), + ], + ); + + if (run.error != null && run.error!.isNotEmpty) { + return Card( + child: ExpansionTile( + title: _runTitle(context), + subtitle: Text(subtitle), + children: [ + Padding( + padding: const EdgeInsets.fromLTRB(16, 0, 16, 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + content, + const SizedBox(height: 8), + Text(run.error!, style: TextStyle(color: Theme.of(context).colorScheme.error)), + ], + ), + ), + ], + ), + ); + } + + return Card( + child: Padding( + padding: const EdgeInsets.fromLTRB(16, 8, 16, 12), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _runTitle(context), + Padding( + padding: const EdgeInsets.only(top: 2, bottom: 6), + child: Text(subtitle, style: Theme.of(context).textTheme.bodySmall), + ), + content, + ], + ), + ), + ); + } + + Widget _runTitle(BuildContext context) { + return Row( + children: [ + Text(run.source_, style: Theme.of(context).textTheme.titleSmall), + const SizedBox(width: 8), + _statusChip(context, run.status), + ], + ); + } +} + +Widget _statusChip(BuildContext context, RunStatus? status) { + if (status == null) { + return const Chip(visualDensity: VisualDensity.compact, label: Text('нет данных')); + } + final scheme = Theme.of(context).colorScheme; + final (label, color) = switch (status) { + RunStatus.ok => ('ok', Colors.green), + RunStatus.error => ('error', scheme.error), + RunStatus.running => ('running', Colors.amber.shade700), + RunStatus.unknownDefaultOpenApi => ('неизвестно', scheme.outline), + }; + return Chip( + visualDensity: VisualDensity.compact, + label: Text(label), + backgroundColor: color.withValues(alpha: 0.15), + labelStyle: TextStyle(color: color), + side: BorderSide(color: color.withValues(alpha: 0.4)), + ); +} + +String _shortCursor(String cursor) { + if (cursor.length <= 20) return cursor; + return '${cursor.substring(0, 10)}…${cursor.substring(cursor.length - 6)}'; +} + +String _formatDuration(Duration d) { + if (d.inMinutes >= 1) return '${d.inMinutes} мин ${d.inSeconds % 60} с'; + return '${d.inSeconds} с'; +} diff --git a/app/lib/features/transactions/providers.dart b/app/lib/features/transactions/providers.dart new file mode 100644 index 0000000..344e5bb --- /dev/null +++ b/app/lib/features/transactions/providers.dart @@ -0,0 +1,160 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/api/api_client.dart'; + +class TransactionsFilter { + const TransactionsFilter({ + this.q, + this.from, + this.to, + this.accountId, + this.categoryId, + this.flowType, + }); + + final String? q; + final DateTime? from; + final DateTime? to; + final int? accountId; + final int? categoryId; + final FlowType? flowType; + + bool get isEmpty => + q == null && from == null && to == null && accountId == null && categoryId == null && flowType == null; + + TransactionsFilter copyWith({ + String? Function()? q, + DateTime? Function()? from, + DateTime? Function()? to, + int? Function()? accountId, + int? Function()? categoryId, + FlowType? Function()? flowType, + }) { + return TransactionsFilter( + q: q != null ? q() : this.q, + from: from != null ? from() : this.from, + to: to != null ? to() : this.to, + accountId: accountId != null ? accountId() : this.accountId, + categoryId: categoryId != null ? categoryId() : this.categoryId, + flowType: flowType != null ? flowType() : this.flowType, + ); + } +} + +class TransactionsState { + const TransactionsState({ + this.items = const [], + this.page = 1, + this.pageSize = 50, + this.total = 0, + this.loading = false, + this.loadingMore = false, + this.error, + }); + + final List items; + final int page; + final int pageSize; + final int total; + final bool loading; + final bool loadingMore; + final Object? error; + + bool get hasMore => items.length < total; + + TransactionsState copyWith({ + List? items, + int? page, + int? pageSize, + int? total, + bool? loading, + bool? loadingMore, + Object? error, + bool clearError = false, + }) { + return TransactionsState( + items: items ?? this.items, + page: page ?? this.page, + pageSize: pageSize ?? this.pageSize, + total: total ?? this.total, + loading: loading ?? this.loading, + loadingMore: loadingMore ?? this.loadingMore, + error: clearError ? null : (error ?? this.error), + ); + } +} + +/// Filters + paginated results for Операции. `refresh()` restarts from page 1 +/// (called on build and on every filter change); `loadMore()` appends the +/// next page for infinite scroll / the "ещё" button. +class TransactionsController extends Notifier { + TransactionsFilter filter = const TransactionsFilter(); + + @override + TransactionsState build() { + Future.microtask(refresh); + return const TransactionsState(loading: true); + } + + Future setFilter(TransactionsFilter Function(TransactionsFilter) update) { + filter = update(filter); + return refresh(); + } + + Future refresh() async { + state = state.copyWith(loading: true, clearError: true); + try { + final r = await ref.read(apiProvider).getTransactionsApi().transactionsList( + from: filter.from, + to: filter.to, + accountId: filter.accountId, + categoryId: filter.categoryId, + flowType: filter.flowType, + q: (filter.q == null || filter.q!.isEmpty) ? null : filter.q, + page: 1, + pageSize: state.pageSize, + ); + final page = r.data!; + state = TransactionsState( + items: page.items, + page: page.page, + pageSize: page.pageSize, + total: page.total, + ); + } on DioException catch (e) { + state = state.copyWith(loading: false, error: e); + } + } + + Future loadMore() async { + if (state.loading || state.loadingMore || !state.hasMore) return; + state = state.copyWith(loadingMore: true, clearError: true); + try { + final next = state.page + 1; + final r = await ref.read(apiProvider).getTransactionsApi().transactionsList( + from: filter.from, + to: filter.to, + accountId: filter.accountId, + categoryId: filter.categoryId, + flowType: filter.flowType, + q: (filter.q == null || filter.q!.isEmpty) ? null : filter.q, + page: next, + pageSize: state.pageSize, + ); + final page = r.data!; + state = state.copyWith( + items: [...state.items, ...page.items], + page: page.page, + total: page.total, + loadingMore: false, + ); + } on DioException catch (e) { + state = state.copyWith(loadingMore: false, error: e); + } + } +} + +final transactionsControllerProvider = + NotifierProvider(TransactionsController.new); diff --git a/app/lib/features/transactions/transaction_row.dart b/app/lib/features/transactions/transaction_row.dart new file mode 100644 index 0000000..048dd65 --- /dev/null +++ b/app/lib/features/transactions/transaction_row.dart @@ -0,0 +1,83 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter/material.dart'; + +import '../../core/utils/ru_date.dart'; +import '../../core/widgets/money_text.dart'; + +/// The amount/currency/RUB-equivalent a transaction is shown with, chosen by +/// its [FlowType]: the outgoing leg for expenses and transfers out, the +/// incoming leg for income. +({String amount, String currency, String? rub}) primaryAmount(TransactionOut t) { + switch (t.flowType) { + case FlowType.income: + return (amount: t.income, currency: t.incomeCurrency ?? 'RUB', rub: t.incomeRub); + case FlowType.expense: + return (amount: t.outcome, currency: t.outcomeCurrency ?? 'RUB', rub: t.outcomeRub); + case FlowType.internalTransfer: + case FlowType.savingsTransfer: + case FlowType.brokerExternalFlow: + case FlowType.other: + case FlowType.deleted: + case FlowType.unknownDefaultOpenApi: + if (t.outcome != '0' && t.outcomeCurrency != null) { + return (amount: t.outcome, currency: t.outcomeCurrency!, rub: t.outcomeRub); + } + return (amount: t.income, currency: t.incomeCurrency ?? 'RUB', rub: t.incomeRub); + } +} + +(IconData, Color) flowTypeIcon(FlowType type, ColorScheme scheme) => switch (type) { + FlowType.income => (Icons.arrow_circle_down_outlined, Colors.green), + FlowType.expense => (Icons.arrow_circle_up_outlined, scheme.error), + FlowType.internalTransfer => (Icons.swap_horiz, scheme.primary), + FlowType.savingsTransfer => (Icons.savings_outlined, Colors.amber.shade800), + FlowType.brokerExternalFlow => (Icons.trending_up, Colors.deepPurple), + FlowType.other || FlowType.deleted || FlowType.unknownDefaultOpenApi => ( + Icons.help_outline, + scheme.outline, + ), + }; + +/// One row of the Операции list: date, payee, category, native amount with +/// its RUB equivalent when the currency differs, and a flow-type icon. +class TransactionRow extends StatelessWidget { + const TransactionRow({ + required this.transaction, + required this.categoryName, + required this.onTap, + super.key, + }); + + final TransactionOut transaction; + final String? categoryName; + final VoidCallback onTap; + + @override + Widget build(BuildContext context) { + final t = transaction; + final scheme = Theme.of(context).colorScheme; + final (icon, color) = flowTypeIcon(t.flowType, scheme); + final amount = primaryAmount(t); + final showRub = amount.currency != 'RUB' && amount.rub != null; + final payee = t.payeeCanonical?.isNotEmpty == true ? t.payeeCanonical! : (t.payee ?? '—'); + + return ListTile( + onTap: onTap, + leading: Icon(icon, color: color), + title: Text(payee), + subtitle: Text([ruDate(t.date), ?categoryName].join(' · ')), + trailing: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + MoneyText(amount.amount, currency: amount.currency), + if (showRub) + Text( + MoneyText.format(amount.rub!, 'RUB'), + style: Theme.of(context).textTheme.bodySmall?.copyWith(color: scheme.outline), + ), + ], + ), + ); + } +} diff --git a/app/lib/features/transactions/transactions_page.dart b/app/lib/features/transactions/transactions_page.dart new file mode 100644 index 0000000..f2b952f --- /dev/null +++ b/app/lib/features/transactions/transactions_page.dart @@ -0,0 +1,347 @@ +import 'dart:async'; + +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import '../../core/utils/ru_date.dart'; +import '../../core/widgets/empty_state.dart'; +import '../../core/widgets/money_text.dart'; +import '../accounts/providers.dart'; +import '../categories/providers.dart'; +import 'providers.dart'; +import 'transaction_row.dart'; + +const _flowTypes = [ + FlowType.income, + FlowType.expense, + FlowType.internalTransfer, + FlowType.savingsTransfer, +]; + +String _flowTypeLabel(FlowType t) => switch (t) { + FlowType.income => 'Доход', + FlowType.expense => 'Расход', + FlowType.internalTransfer => 'Перевод', + FlowType.savingsTransfer => 'В сбережения', + FlowType.brokerExternalFlow => 'Брокер', + FlowType.other => 'Прочее', + FlowType.deleted => 'Удалено', + FlowType.unknownDefaultOpenApi => 'Неизвестно', + }; + +/// Операции: filtered, paginated transaction list with infinite scroll and a +/// detail bottom sheet per row. +class TransactionsPage extends ConsumerStatefulWidget { + const TransactionsPage({super.key}); + + @override + ConsumerState createState() => _TransactionsPageState(); +} + +class _TransactionsPageState extends ConsumerState { + final _searchController = TextEditingController(); + final _scrollController = ScrollController(); + Timer? _debounce; + + @override + void initState() { + super.initState(); + _scrollController.addListener(_onScroll); + } + + @override + void dispose() { + _debounce?.cancel(); + _searchController.dispose(); + _scrollController.removeListener(_onScroll); + _scrollController.dispose(); + super.dispose(); + } + + void _onScroll() { + if (_scrollController.position.pixels > _scrollController.position.maxScrollExtent - 200) { + ref.read(transactionsControllerProvider.notifier).loadMore(); + } + } + + void _onSearchChanged(String value) { + _debounce?.cancel(); + _debounce = Timer(const Duration(milliseconds: 400), () { + ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(q: () => value.trim().isEmpty ? null : value.trim()), + ); + }); + } + + Future _pickDateRange() async { + final filter = ref.read(transactionsControllerProvider.notifier).filter; + final now = DateTime.now(); + final picked = await showDateRangePicker( + context: context, + firstDate: DateTime.utc(2015), + lastDate: now, + initialDateRange: filter.from != null && filter.to != null + ? DateTimeRange(start: filter.from!, end: filter.to!) + : null, + helpText: 'Период', + ); + if (picked != null) { + ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(from: () => picked.start, to: () => picked.end), + ); + } + } + + void _clearDateRange() { + ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(from: () => null, to: () => null), + ); + } + + void _showDetail(TransactionOut t) { + final accountNames = ref.read(accountNamesProvider); + final categoryNames = ref.read(categoryNamesProvider); + showModalBottomSheet( + context: context, + isScrollControlled: true, + builder: (context) => _TransactionDetailSheet( + transaction: t, + accountNames: accountNames, + categoryNames: categoryNames, + ), + ); + } + + @override + Widget build(BuildContext context) { + final state = ref.watch(transactionsControllerProvider); + final controllerFilter = ref.watch(transactionsControllerProvider.notifier).filter; + final categoryNames = ref.watch(categoryNamesProvider); + final accounts = ref.watch(accountsProvider).valueOrNull ?? const []; + final categories = ref.watch(categoriesListProvider).valueOrNull ?? const []; + + return Scaffold( + appBar: AppBar(title: const Text('Операции')), + body: Column( + children: [ + Padding( + padding: const EdgeInsets.fromLTRB(16, 12, 16, 8), + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + TextField( + controller: _searchController, + decoration: const InputDecoration( + prefixIcon: Icon(Icons.search), + hintText: 'Поиск по плательщику или комментарию', + isDense: true, + border: OutlineInputBorder(), + ), + onChanged: _onSearchChanged, + ), + const SizedBox(height: 8), + Wrap( + spacing: 8, + runSpacing: 8, + crossAxisAlignment: WrapCrossAlignment.center, + children: [ + InputChip( + avatar: const Icon(Icons.date_range, size: 18), + label: Text( + controllerFilter.from != null && controllerFilter.to != null + ? '${ruDate(controllerFilter.from!)} – ${ruDate(controllerFilter.to!)}' + : 'Период', + ), + onPressed: _pickDateRange, + onDeleted: controllerFilter.from != null ? _clearDateRange : null, + ), + SizedBox( + width: 180, + child: DropdownButtonFormField( + initialValue: controllerFilter.accountId, + isDense: true, + decoration: const InputDecoration(labelText: 'Счёт', isDense: true), + items: [ + const DropdownMenuItem(value: null, child: Text('Все счета')), + for (final a in accounts) DropdownMenuItem(value: a.id, child: Text(a.name)), + ], + onChanged: (v) => ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(accountId: () => v), + ), + ), + ), + SizedBox( + width: 180, + child: DropdownButtonFormField( + initialValue: controllerFilter.categoryId, + isDense: true, + decoration: const InputDecoration(labelText: 'Категория', isDense: true), + items: [ + const DropdownMenuItem(value: null, child: Text('Все категории')), + for (final c in categories) DropdownMenuItem(value: c.id, child: Text(c.name)), + ], + onChanged: (v) => ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(categoryId: () => v), + ), + ), + ), + ], + ), + const SizedBox(height: 8), + Wrap( + spacing: 8, + children: [ + ChoiceChip( + label: const Text('Все типы'), + selected: controllerFilter.flowType == null, + onSelected: (_) => ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(flowType: () => null), + ), + ), + for (final ft in _flowTypes) + ChoiceChip( + label: Text(_flowTypeLabel(ft)), + selected: controllerFilter.flowType == ft, + onSelected: (_) => ref.read(transactionsControllerProvider.notifier).setFilter( + (f) => f.copyWith(flowType: () => ft), + ), + ), + ], + ), + ], + ), + ), + const Divider(height: 1), + Expanded(child: _buildList(state, categoryNames)), + ], + ), + ); + } + + Widget _buildList(TransactionsState state, Map categoryNames) { + if (state.loading && state.items.isEmpty) { + return const Center(child: CircularProgressIndicator()); + } + if (state.error != null && state.items.isEmpty) { + return Center( + child: Padding( + padding: const EdgeInsets.all(24), + child: Column( + mainAxisSize: MainAxisSize.min, + children: [ + Icon(Icons.error_outline, color: Theme.of(context).colorScheme.error, size: 32), + const SizedBox(height: 8), + Text('${state.error}', textAlign: TextAlign.center), + const SizedBox(height: 12), + FilledButton.tonal( + onPressed: () => ref.read(transactionsControllerProvider.notifier).refresh(), + child: const Text('Повторить'), + ), + ], + ), + ), + ); + } + if (state.items.isEmpty) { + return const EmptyState( + icon: Icons.receipt_long_outlined, + message: 'Операций не найдено — попробуйте изменить фильтры или выполните синхронизацию.', + ); + } + return RefreshIndicator( + onRefresh: () => ref.read(transactionsControllerProvider.notifier).refresh(), + child: ListView.builder( + controller: _scrollController, + itemCount: state.items.length + 1, + itemBuilder: (context, index) { + if (index == state.items.length) { + if (!state.hasMore) return const SizedBox(height: 24); + return Padding( + padding: const EdgeInsets.all(16), + child: Center( + child: state.loadingMore + ? const CircularProgressIndicator() + : TextButton( + onPressed: () => ref.read(transactionsControllerProvider.notifier).loadMore(), + child: const Text('Ещё'), + ), + ), + ); + } + final t = state.items[index]; + return TransactionRow( + transaction: t, + categoryName: t.categoryId != null ? categoryNames[t.categoryId] : null, + onTap: () => _showDetail(t), + ); + }, + ), + ); + } +} + +class _TransactionDetailSheet extends StatelessWidget { + const _TransactionDetailSheet({ + required this.transaction, + required this.accountNames, + required this.categoryNames, + }); + + final TransactionOut transaction; + final Map accountNames; + final Map categoryNames; + + @override + Widget build(BuildContext context) { + final t = transaction; + final rows = <(String, String)>[ + ('Дата', ruDate(t.date)), + ('Плательщик', t.payee ?? '—'), + if (t.payeeCanonical != null && t.payeeCanonical != t.payee) ('Канонический', t.payeeCanonical!), + ('Комментарий', t.comment ?? '—'), + ('Категория', t.categoryId != null ? (categoryNames[t.categoryId] ?? '#${t.categoryId}') : 'Без категории'), + ('Тип', _flowTypeLabel(t.flowType)), + if (t.outcome != '0') + ('Списание', '${MoneyText.format(t.outcome, t.outcomeCurrency ?? 'RUB')}' + '${t.outcomeRub != null ? ' (${MoneyText.format(t.outcomeRub!, 'RUB')})' : ''}'), + if (t.income != '0') + ('Зачисление', '${MoneyText.format(t.income, t.incomeCurrency ?? 'RUB')}' + '${t.incomeRub != null ? ' (${MoneyText.format(t.incomeRub!, 'RUB')})' : ''}'), + if (t.outcomeAccountId != null) + ('Счёт списания', accountNames[t.outcomeAccountId] ?? '#${t.outcomeAccountId}'), + if (t.incomeAccountId != null) + ('Счёт зачисления', accountNames[t.incomeAccountId] ?? '#${t.incomeAccountId}'), + if (t.mcc != null) ('MCC', '${t.mcc}'), + ('Удержание (hold)', t.hold ? 'да' : 'нет'), + ('Разовая трата', t.isOneOff ? 'да' : 'нет'), + if (t.tags.isNotEmpty) ('Теги', t.tags.map((id) => categoryNames[id] ?? '#$id').join(', ')), + if (t.tripId != null) ('Поездка', '#${t.tripId}'), + ('Источник (id)', t.sourceId), + ]; + return SafeArea( + child: Padding( + padding: const EdgeInsets.fromLTRB(20, 16, 20, 24), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text('Операция', style: Theme.of(context).textTheme.titleLarge), + const SizedBox(height: 12), + for (final (label, value) in rows) + Padding( + padding: const EdgeInsets.symmetric(vertical: 4), + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox(width: 140, child: Text(label, style: Theme.of(context).textTheme.bodySmall)), + Expanded(child: Text(value)), + ], + ), + ), + ], + ), + ), + ); + } +} diff --git a/app/lib/main.dart b/app/lib/main.dart new file mode 100644 index 0000000..51e6021 --- /dev/null +++ b/app/lib/main.dart @@ -0,0 +1,9 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +import 'app.dart'; + +void main() { + WidgetsFlutterBinding.ensureInitialized(); + runApp(const ProviderScope(child: FinTrackerApp())); +} diff --git a/app/lib/router.dart b/app/lib/router.dart new file mode 100644 index 0000000..da92808 --- /dev/null +++ b/app/lib/router.dart @@ -0,0 +1,55 @@ +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:go_router/go_router.dart'; + +import 'core/auth/auth_controller.dart'; +import 'features/accounts/accounts_page.dart'; +import 'features/cashflow/cashflow_page.dart'; +import 'features/categories/categories_page.dart'; +import 'features/home/home_page.dart'; +import 'features/login/login_page.dart'; +import 'features/rules/rules_page.dart'; +import 'features/settings/settings_page.dart'; +import 'features/shell/app_shell.dart'; +import 'features/sync/sync_page.dart'; +import 'features/transactions/transactions_page.dart'; + +final routerProvider = Provider((ref) { + final auth = ValueNotifier(ref.read(authControllerProvider)); + ref.listen(authControllerProvider, (_, next) => auth.value = next); + ref.onDispose(auth.dispose); + + return GoRouter( + initialLocation: '/', + refreshListenable: auth, + redirect: (context, state) { + final status = auth.value.status; + final atLogin = state.matchedLocation == '/login'; + return switch (status) { + AuthStatus.unknown => atLogin ? null : '/login', + AuthStatus.signedOut => atLogin ? null : '/login', + AuthStatus.signedIn => atLogin ? '/' : null, + }; + }, + routes: [ + GoRoute(path: '/login', builder: (_, _) => const LoginPage()), + ShellRoute( + builder: (context, state, child) => + AppShell(location: state.matchedLocation, child: child), + routes: [ + GoRoute(path: '/', builder: (_, _) => const HomePage()), + GoRoute(path: '/accounts', builder: (_, _) => const AccountsPage()), + GoRoute(path: '/cashflow', builder: (_, _) => const CashflowPage()), + GoRoute( + path: '/categories', + builder: (_, state) => CategoriesPage(initialMonth: state.uri.queryParameters['month']), + ), + GoRoute(path: '/transactions', builder: (_, _) => const TransactionsPage()), + GoRoute(path: '/rules', builder: (_, _) => const RulesPage()), + GoRoute(path: '/sync', builder: (_, _) => const SyncPage()), + GoRoute(path: '/settings', builder: (_, _) => const SettingsPage()), + ], + ), + ], + ); +}); diff --git a/app/linux/.gitignore b/app/linux/.gitignore new file mode 100644 index 0000000..d3896c9 --- /dev/null +++ b/app/linux/.gitignore @@ -0,0 +1 @@ +flutter/ephemeral diff --git a/app/linux/CMakeLists.txt b/app/linux/CMakeLists.txt new file mode 100644 index 0000000..fdc509d --- /dev/null +++ b/app/linux/CMakeLists.txt @@ -0,0 +1,128 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "fintracker_app") +# The unique GTK application identifier for this application. See: +# https://wiki.gnome.org/HowDoI/ChooseApplicationID +set(APPLICATION_ID "ru.fintracker.fintracker_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(SET CMP0063 NEW) + +# Load bundled libraries from the lib/ directory relative to the binary. +set(CMAKE_INSTALL_RPATH "$ORIGIN/lib") + +# Root filesystem for cross-building. +if(FLUTTER_TARGET_PLATFORM_SYSROOT) + set(CMAKE_SYSROOT ${FLUTTER_TARGET_PLATFORM_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT}) + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) + set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) +endif() + +# Define build configuration options. +if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") +endif() + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_14) + target_compile_options(${TARGET} PRIVATE -Wall -Werror) + target_compile_options(${TARGET} PRIVATE "$<$>:-O3>") + target_compile_definitions(${TARGET} PRIVATE "$<$>:NDEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) + +# Only the install-generated bundle's copy of the executable will launch +# correctly, since the resources must in the right relative locations. To avoid +# people trying to run the unbundled copy, put it in a subdirectory instead of +# the default top-level location. +set_target_properties(${BINARY_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/intermediates_do_not_run" +) + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# By default, "installing" just makes a relocatable bundle in the build +# directory. +set(BUILD_BUNDLE_DIR "${PROJECT_BINARY_DIR}/bundle") +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +# Start with a clean build bundle directory every time. +install(CODE " + file(REMOVE_RECURSE \"${BUILD_BUNDLE_DIR}/\") + " COMPONENT Runtime) + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +foreach(bundled_library ${PLUGIN_BUNDLED_LIBRARIES}) + install(FILES "${bundled_library}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endforeach(bundled_library) + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/linux/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +if(NOT CMAKE_BUILD_TYPE MATCHES "Debug") + install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() diff --git a/app/linux/flutter/CMakeLists.txt b/app/linux/flutter/CMakeLists.txt new file mode 100644 index 0000000..d5bd016 --- /dev/null +++ b/app/linux/flutter/CMakeLists.txt @@ -0,0 +1,88 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.10) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. + +# Serves the same purpose as list(TRANSFORM ... PREPEND ...), +# which isn't available in 3.10. +function(list_prepend LIST_NAME PREFIX) + set(NEW_LIST "") + foreach(element ${${LIST_NAME}}) + list(APPEND NEW_LIST "${PREFIX}${element}") + endforeach(element) + set(${LIST_NAME} "${NEW_LIST}" PARENT_SCOPE) +endfunction() + +# === Flutter Library === +# System-level dependencies. +find_package(PkgConfig REQUIRED) +pkg_check_modules(GTK REQUIRED IMPORTED_TARGET gtk+-3.0) +pkg_check_modules(GLIB REQUIRED IMPORTED_TARGET glib-2.0) +pkg_check_modules(GIO REQUIRED IMPORTED_TARGET gio-2.0) + +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/libflutter_linux_gtk.so") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/lib/libapp.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "fl_basic_message_channel.h" + "fl_binary_codec.h" + "fl_binary_messenger.h" + "fl_dart_project.h" + "fl_engine.h" + "fl_json_message_codec.h" + "fl_json_method_codec.h" + "fl_message_codec.h" + "fl_method_call.h" + "fl_method_channel.h" + "fl_method_codec.h" + "fl_method_response.h" + "fl_plugin_registrar.h" + "fl_plugin_registry.h" + "fl_standard_message_codec.h" + "fl_standard_method_codec.h" + "fl_string_codec.h" + "fl_value.h" + "fl_view.h" + "flutter_linux.h" +) +list_prepend(FLUTTER_LIBRARY_HEADERS "${EPHEMERAL_DIR}/flutter_linux/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}") +target_link_libraries(flutter INTERFACE + PkgConfig::GTK + PkgConfig::GLIB + PkgConfig::GIO +) +add_dependencies(flutter flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CMAKE_CURRENT_BINARY_DIR}/_phony_ + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.sh" + ${FLUTTER_TARGET_PLATFORM} ${CMAKE_BUILD_TYPE} + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} +) diff --git a/app/linux/flutter/generated_plugin_registrant.cc b/app/linux/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..d0e7f79 --- /dev/null +++ b/app/linux/flutter/generated_plugin_registrant.cc @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void fl_register_plugins(FlPluginRegistry* registry) { + g_autoptr(FlPluginRegistrar) flutter_secure_storage_linux_registrar = + fl_plugin_registry_get_registrar_for_plugin(registry, "FlutterSecureStorageLinuxPlugin"); + flutter_secure_storage_linux_plugin_register_with_registrar(flutter_secure_storage_linux_registrar); +} diff --git a/app/linux/flutter/generated_plugin_registrant.h b/app/linux/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..e0f0a47 --- /dev/null +++ b/app/linux/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void fl_register_plugins(FlPluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/app/linux/flutter/generated_plugins.cmake b/app/linux/flutter/generated_plugins.cmake new file mode 100644 index 0000000..ce58916 --- /dev/null +++ b/app/linux/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_secure_storage_linux +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/linux plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/linux plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/app/linux/runner/CMakeLists.txt b/app/linux/runner/CMakeLists.txt new file mode 100644 index 0000000..e97dabc --- /dev/null +++ b/app/linux/runner/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.13) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} + "main.cc" + "my_application.cc" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the application ID. +add_definitions(-DAPPLICATION_ID="${APPLICATION_ID}") + +# Add dependency libraries. Add any application-specific dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter) +target_link_libraries(${BINARY_NAME} PRIVATE PkgConfig::GTK) + +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") diff --git a/app/linux/runner/main.cc b/app/linux/runner/main.cc new file mode 100644 index 0000000..e7c5c54 --- /dev/null +++ b/app/linux/runner/main.cc @@ -0,0 +1,6 @@ +#include "my_application.h" + +int main(int argc, char** argv) { + g_autoptr(MyApplication) app = my_application_new(); + return g_application_run(G_APPLICATION(app), argc, argv); +} diff --git a/app/linux/runner/my_application.cc b/app/linux/runner/my_application.cc new file mode 100644 index 0000000..9b6efdb --- /dev/null +++ b/app/linux/runner/my_application.cc @@ -0,0 +1,148 @@ +#include "my_application.h" + +#include +#ifdef GDK_WINDOWING_X11 +#include +#endif + +#include "flutter/generated_plugin_registrant.h" + +struct _MyApplication { + GtkApplication parent_instance; + char** dart_entrypoint_arguments; +}; + +G_DEFINE_TYPE(MyApplication, my_application, GTK_TYPE_APPLICATION) + +// Called when first Flutter frame received. +static void first_frame_cb(MyApplication* self, FlView* view) { + gtk_widget_show(gtk_widget_get_toplevel(GTK_WIDGET(view))); +} + +// Implements GApplication::activate. +static void my_application_activate(GApplication* application) { + MyApplication* self = MY_APPLICATION(application); + GtkWindow* window = + GTK_WINDOW(gtk_application_window_new(GTK_APPLICATION(application))); + + // Use a header bar when running in GNOME as this is the common style used + // by applications and is the setup most users will be using (e.g. Ubuntu + // desktop). + // If running on X and not using GNOME then just use a traditional title bar + // in case the window manager does more exotic layout, e.g. tiling. + // If running on Wayland assume the header bar will work (may need changing + // if future cases occur). + gboolean use_header_bar = TRUE; +#ifdef GDK_WINDOWING_X11 + GdkScreen* screen = gtk_window_get_screen(window); + if (GDK_IS_X11_SCREEN(screen)) { + const gchar* wm_name = gdk_x11_screen_get_window_manager_name(screen); + if (g_strcmp0(wm_name, "GNOME Shell") != 0) { + use_header_bar = FALSE; + } + } +#endif + if (use_header_bar) { + GtkHeaderBar* header_bar = GTK_HEADER_BAR(gtk_header_bar_new()); + gtk_widget_show(GTK_WIDGET(header_bar)); + gtk_header_bar_set_title(header_bar, "fintracker_app"); + gtk_header_bar_set_show_close_button(header_bar, TRUE); + gtk_window_set_titlebar(window, GTK_WIDGET(header_bar)); + } else { + gtk_window_set_title(window, "fintracker_app"); + } + + gtk_window_set_default_size(window, 1280, 720); + + g_autoptr(FlDartProject) project = fl_dart_project_new(); + fl_dart_project_set_dart_entrypoint_arguments( + project, self->dart_entrypoint_arguments); + + FlView* view = fl_view_new(project); + GdkRGBA background_color; + // Background defaults to black, override it here if necessary, e.g. #00000000 + // for transparent. + gdk_rgba_parse(&background_color, "#000000"); + fl_view_set_background_color(view, &background_color); + gtk_widget_show(GTK_WIDGET(view)); + gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view)); + + // Show the window when Flutter renders. + // Requires the view to be realized so we can start rendering. + g_signal_connect_swapped(view, "first-frame", G_CALLBACK(first_frame_cb), + self); + gtk_widget_realize(GTK_WIDGET(view)); + + fl_register_plugins(FL_PLUGIN_REGISTRY(view)); + + gtk_widget_grab_focus(GTK_WIDGET(view)); +} + +// Implements GApplication::local_command_line. +static gboolean my_application_local_command_line(GApplication* application, + gchar*** arguments, + int* exit_status) { + MyApplication* self = MY_APPLICATION(application); + // Strip out the first argument as it is the binary name. + self->dart_entrypoint_arguments = g_strdupv(*arguments + 1); + + g_autoptr(GError) error = nullptr; + if (!g_application_register(application, nullptr, &error)) { + g_warning("Failed to register: %s", error->message); + *exit_status = 1; + return TRUE; + } + + g_application_activate(application); + *exit_status = 0; + + return TRUE; +} + +// Implements GApplication::startup. +static void my_application_startup(GApplication* application) { + // MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application startup. + + G_APPLICATION_CLASS(my_application_parent_class)->startup(application); +} + +// Implements GApplication::shutdown. +static void my_application_shutdown(GApplication* application) { + // MyApplication* self = MY_APPLICATION(object); + + // Perform any actions required at application shutdown. + + G_APPLICATION_CLASS(my_application_parent_class)->shutdown(application); +} + +// Implements GObject::dispose. +static void my_application_dispose(GObject* object) { + MyApplication* self = MY_APPLICATION(object); + g_clear_pointer(&self->dart_entrypoint_arguments, g_strfreev); + G_OBJECT_CLASS(my_application_parent_class)->dispose(object); +} + +static void my_application_class_init(MyApplicationClass* klass) { + G_APPLICATION_CLASS(klass)->activate = my_application_activate; + G_APPLICATION_CLASS(klass)->local_command_line = + my_application_local_command_line; + G_APPLICATION_CLASS(klass)->startup = my_application_startup; + G_APPLICATION_CLASS(klass)->shutdown = my_application_shutdown; + G_OBJECT_CLASS(klass)->dispose = my_application_dispose; +} + +static void my_application_init(MyApplication* self) {} + +MyApplication* my_application_new() { + // Set the program name to the application ID, which helps various systems + // like GTK and desktop environments map this running application to its + // corresponding .desktop file. This ensures better integration by allowing + // the application to be recognized beyond its binary name. + g_set_prgname(APPLICATION_ID); + + return MY_APPLICATION(g_object_new(my_application_get_type(), + "application-id", APPLICATION_ID, "flags", + G_APPLICATION_NON_UNIQUE, nullptr)); +} diff --git a/app/linux/runner/my_application.h b/app/linux/runner/my_application.h new file mode 100644 index 0000000..db16367 --- /dev/null +++ b/app/linux/runner/my_application.h @@ -0,0 +1,21 @@ +#ifndef FLUTTER_MY_APPLICATION_H_ +#define FLUTTER_MY_APPLICATION_H_ + +#include + +G_DECLARE_FINAL_TYPE(MyApplication, + my_application, + MY, + APPLICATION, + GtkApplication) + +/** + * my_application_new: + * + * Creates a new Flutter-based application. + * + * Returns: a new #MyApplication. + */ +MyApplication* my_application_new(); + +#endif // FLUTTER_MY_APPLICATION_H_ diff --git a/app/pubspec.lock b/app/pubspec.lock new file mode 100644 index 0000000..561022b --- /dev/null +++ b/app/pubspec.lock @@ -0,0 +1,670 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" + async: + dependency: transitive + description: + name: async + sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37 + url: "https://pub.dev" + source: hosted + version: "2.13.1" + boolean_selector: + dependency: transitive + description: + name: boolean_selector + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" + source: hosted + version: "2.1.2" + characters: + dependency: transitive + description: + name: characters + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + url: "https://pub.dev" + source: hosted + version: "1.4.1" + clock: + dependency: transitive + description: + name: clock + sha256: e51d50bca3217c9a9fa2b41a30e4a38971133f5f9ec7a3d57bae095007f1d28e + url: "https://pub.dev" + source: hosted + version: "1.1.3" + code_assets: + dependency: transitive + description: + name: code_assets + sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + collection: + dependency: transitive + description: + name: collection + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" + source: hosted + version: "1.19.1" + copy_with_extension: + dependency: transitive + description: + name: copy_with_extension + sha256: "28b8a99384df46f5287ed87e249869fddedd299752ea83603800448e0523f00b" + url: "https://pub.dev" + source: hosted + version: "7.1.0" + crypto: + dependency: transitive + description: + name: crypto + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" + source: hosted + version: "3.0.7" + decimal: + dependency: "direct main" + description: + name: decimal + sha256: "2c3c8b74f2948066d3f42585477aec9cfc48fefd7a723a4d4274a6c71a5c0df7" + url: "https://pub.dev" + source: hosted + version: "3.2.6" + dio: + dependency: "direct main" + description: + name: dio + sha256: "852ec3b48cc431ac04fff978413c541502b67ffc3e26921e74e3d994694192c1" + url: "https://pub.dev" + source: hosted + version: "5.11.1" + dio_web_adapter: + dependency: transitive + description: + name: dio_web_adapter + sha256: "3a1b2cd7be71086f38504956e3ebcd2837288d231ff454bafa78021244102bfc" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + equatable: + dependency: transitive + description: + name: equatable + sha256: "3bce007a596ff8b3119c45d68aaef631272537c03d30e5d4534dd24bf4c5eaa2" + url: "https://pub.dev" + source: hosted + version: "2.1.0" + fake_async: + dependency: transitive + description: + name: fake_async + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" + source: hosted + version: "1.3.3" + ffi: + dependency: transitive + description: + name: ffi + sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45" + url: "https://pub.dev" + source: hosted + version: "2.2.0" + file: + dependency: transitive + description: + name: file + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" + source: hosted + version: "7.0.1" + fintracker_api: + dependency: "direct main" + description: + path: "packages/api_client" + relative: true + source: path + version: "0.1.0" + fl_chart: + dependency: "direct main" + description: + name: fl_chart + sha256: "74959b99b92b9eebeed1a4049426fd67c4abc3c5a0f4d12e2877097d6a11ae08" + url: "https://pub.dev" + source: hosted + version: "0.69.2" + flutter: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_lints: + dependency: "direct dev" + description: + name: flutter_lints + sha256: "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1" + url: "https://pub.dev" + source: hosted + version: "6.0.0" + flutter_localizations: + dependency: "direct main" + description: flutter + source: sdk + version: "0.0.0" + flutter_riverpod: + dependency: "direct main" + description: + name: flutter_riverpod + sha256: "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1" + url: "https://pub.dev" + source: hosted + version: "2.6.1" + flutter_secure_storage: + dependency: "direct main" + description: + name: flutter_secure_storage + sha256: "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea" + url: "https://pub.dev" + source: hosted + version: "9.2.4" + flutter_secure_storage_linux: + dependency: transitive + description: + name: flutter_secure_storage_linux + sha256: be76c1d24a97d0b98f8b54bce6b481a380a6590df992d0098f868ad54dc8f688 + url: "https://pub.dev" + source: hosted + version: "1.2.3" + flutter_secure_storage_macos: + dependency: transitive + description: + name: flutter_secure_storage_macos + sha256: "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247" + url: "https://pub.dev" + source: hosted + version: "3.1.3" + flutter_secure_storage_platform_interface: + dependency: transitive + description: + name: flutter_secure_storage_platform_interface + sha256: cf91ad32ce5adef6fba4d736a542baca9daf3beac4db2d04be350b87f69ac4a8 + url: "https://pub.dev" + source: hosted + version: "1.1.2" + flutter_secure_storage_web: + dependency: transitive + description: + name: flutter_secure_storage_web + sha256: f4ebff989b4f07b2656fb16b47852c0aab9fed9b4ec1c70103368337bc1886a9 + url: "https://pub.dev" + source: hosted + version: "1.2.1" + flutter_secure_storage_windows: + dependency: transitive + description: + name: flutter_secure_storage_windows + sha256: b20b07cb5ed4ed74fc567b78a72936203f587eba460af1df11281c9326cd3709 + url: "https://pub.dev" + source: hosted + version: "3.1.2" + flutter_test: + dependency: "direct dev" + description: flutter + source: sdk + version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + go_router: + dependency: "direct main" + description: + name: go_router + sha256: f02fd7d2a4dc512fec615529824fdd217fecb3a3d3de68360293a551f21634b3 + url: "https://pub.dev" + source: hosted + version: "14.8.1" + hooks: + dependency: transitive + description: + name: hooks + sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" + url: "https://pub.dev" + source: hosted + version: "2.0.2" + http_parser: + dependency: transitive + description: + name: http_parser + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" + source: hosted + version: "4.1.2" + intl: + dependency: "direct main" + description: + name: intl + sha256: "1ca20c894b1717686a2319b8548763d812bc0aabdac580420a44c5178c57a867" + url: "https://pub.dev" + source: hosted + version: "0.20.3" + jni: + dependency: transitive + description: + name: jni + sha256: f038e58b4dc2c9037f50e233175086337e0b305e356d28211bf55f21c504cbd3 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + jni_flutter: + dependency: transitive + description: + name: jni_flutter + sha256: b2310cdd4c18c65c081ab141a41efa94aa26c65431803703ece51996f174f351 + url: "https://pub.dev" + source: hosted + version: "1.0.3" + jni_util: + dependency: transitive + description: + name: jni_util + sha256: "1ba86da04a5f2bf18fde2edb235587e70c5b0fc5bd4ba955f46b00942c3fc35f" + url: "https://pub.dev" + source: hosted + version: "1.0.0" + js: + dependency: transitive + description: + name: js + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" + source: hosted + version: "0.6.7" + json_annotation: + dependency: transitive + description: + name: json_annotation + sha256: "2a743920d81b7910627f68ee2c9ac1fc0bfee32b9fc3403587d7c6791ca12f80" + url: "https://pub.dev" + source: hosted + version: "4.12.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" + source: hosted + version: "11.0.2" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" + source: hosted + version: "3.0.10" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" + source: hosted + version: "3.0.2" + lints: + dependency: transitive + description: + name: lints + sha256: "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df" + url: "https://pub.dev" + source: hosted + version: "6.1.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" + matcher: + dependency: transitive + description: + name: matcher + sha256: "31bd099b47c10cd1aeb55146a2d46ce0277630ecef3f7dae54ad7873f36696cd" + url: "https://pub.dev" + source: hosted + version: "0.12.20" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" + source: hosted + version: "0.13.0" + meta: + dependency: transitive + description: + name: meta + sha256: c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d + url: "https://pub.dev" + source: hosted + version: "1.18.3" + mime: + dependency: transitive + description: + name: mime + sha256: bd47de35f07e27267e69c8c8b22edf9473bfee170a60d60fcc93730c5144b7f6 + url: "https://pub.dev" + source: hosted + version: "2.1.0" + objective_c: + dependency: transitive + description: + name: objective_c + sha256: b7fb95a6d9a4f009edd63dc5ac69f07420b23a16161c6dd8660290b59c602e8e + url: "https://pub.dev" + source: hosted + version: "9.5.0" + package_config: + dependency: transitive + description: + name: package_config + sha256: ffcf4cf3d6c0b74ac43708d9f56625506e8a68aa935abe9d267a7330f320eb5d + url: "https://pub.dev" + source: hosted + version: "3.0.0" + path: + dependency: transitive + description: + name: path + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" + source: hosted + version: "1.9.1" + path_provider: + dependency: transitive + description: + name: path_provider + sha256: a7f4874f987173da295a61c181b8ee71dab59b332a486b391babf26a1b884825 + url: "https://pub.dev" + source: hosted + version: "2.1.6" + path_provider_android: + dependency: transitive + description: + name: path_provider_android + sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd" + url: "https://pub.dev" + source: hosted + version: "2.3.1" + path_provider_foundation: + dependency: transitive + description: + name: path_provider_foundation + sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" + url: "https://pub.dev" + source: hosted + version: "2.6.0" + path_provider_linux: + dependency: transitive + description: + name: path_provider_linux + sha256: "58c2005f147315b11e9b4a7bc889cd5203e250cba8e3f012dae259b4972b5c16" + url: "https://pub.dev" + source: hosted + version: "2.2.2" + path_provider_platform_interface: + dependency: transitive + description: + name: path_provider_platform_interface + sha256: "484838772624c3a4b94f1e44a3e19897fee738f2d5c4ce448443b0417f7c9dda" + url: "https://pub.dev" + source: hosted + version: "2.1.3" + path_provider_windows: + dependency: transitive + description: + name: path_provider_windows + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" + source: hosted + version: "2.3.0" + platform: + dependency: transitive + description: + name: platform + sha256: a36d119c13416516a7b5913fbe8af8531e11633d784c550b2125f76c758524ec + url: "https://pub.dev" + source: hosted + version: "3.2.0" + plugin_platform_interface: + dependency: transitive + description: + name: plugin_platform_interface + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" + source: hosted + version: "2.1.8" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "261236774e8b1d69cfc6b9eabbc96c40f25e7a2d6b171f3385d4f65d5734fb24" + url: "https://pub.dev" + source: hosted + version: "2.2.1" + rational: + dependency: transitive + description: + name: rational + sha256: cb808fb6f1a839e6fc5f7d8cb3b0a10e1db48b3be102de73938c627f0b636336 + url: "https://pub.dev" + source: hosted + version: "2.2.3" + record_use: + dependency: transitive + description: + name: record_use + sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed" + url: "https://pub.dev" + source: hosted + version: "0.6.0" + riverpod: + dependency: transitive + description: + name: riverpod + sha256: "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959" + url: "https://pub.dev" + source: hosted + version: "2.6.1" + shared_preferences: + dependency: "direct main" + description: + name: shared_preferences + sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf + url: "https://pub.dev" + source: hosted + version: "2.5.5" + shared_preferences_android: + dependency: transitive + description: + name: shared_preferences_android + sha256: "1e12aafe408aa50da80edfd679a2a6bf63ba7ab37c7fa98286da459a757b3399" + url: "https://pub.dev" + source: hosted + version: "2.4.28" + shared_preferences_foundation: + dependency: transitive + description: + name: shared_preferences_foundation + sha256: "2ec3934efa51e46117f23031cc141b8fc878e8525b94ec1ea4f7f586cf1b47ea" + url: "https://pub.dev" + source: hosted + version: "2.5.7" + shared_preferences_linux: + dependency: transitive + description: + name: shared_preferences_linux + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + shared_preferences_platform_interface: + dependency: transitive + description: + name: shared_preferences_platform_interface + sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9" + url: "https://pub.dev" + source: hosted + version: "2.4.2" + shared_preferences_web: + dependency: transitive + description: + name: shared_preferences_web + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" + source: hosted + version: "2.4.3" + shared_preferences_windows: + dependency: transitive + description: + name: shared_preferences_windows + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" + source: hosted + version: "2.4.1" + sky_engine: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + source_span: + dependency: transitive + description: + name: source_span + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" + url: "https://pub.dev" + source: hosted + version: "1.10.2" + stack_trace: + dependency: transitive + description: + name: stack_trace + sha256: "277654b3034d17ac6f9f1cb5595db011b1d5d41e8806866db28e0abaa101c490" + url: "https://pub.dev" + source: hosted + version: "1.12.2" + state_notifier: + dependency: transitive + description: + name: state_notifier + sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb + url: "https://pub.dev" + source: hosted + version: "1.0.0" + stream_channel: + dependency: transitive + description: + name: stream_channel + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" + source: hosted + version: "2.1.4" + string_scanner: + dependency: transitive + description: + name: string_scanner + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" + source: hosted + version: "1.4.1" + term_glyph: + dependency: transitive + description: + name: term_glyph + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" + source: hosted + version: "1.2.2" + test_api: + dependency: transitive + description: + name: test_api + sha256: "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11" + url: "https://pub.dev" + source: hosted + version: "0.7.12" + typed_data: + dependency: transitive + description: + name: typed_data + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" + source: hosted + version: "1.4.0" + vector_math: + dependency: transitive + description: + name: vector_math + sha256: "1d774bbdf6b72a0b12122fc1560c9c2d2a67db5a4a4cc2bd8a5c990ab20e3188" + url: "https://pub.dev" + source: hosted + version: "2.4.0" + vm_service: + dependency: transitive + description: + name: vm_service + sha256: "5f37239c4851efcef929cea7824e76df7f2f0970aef85d66bbc430afa40e72f0" + url: "https://pub.dev" + source: hosted + version: "15.3.0" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" + win32: + dependency: transitive + description: + name: win32 + sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e + url: "https://pub.dev" + source: hosted + version: "5.15.0" + xdg_directories: + dependency: transitive + description: + name: xdg_directories + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" + source: hosted + version: "1.1.0" + yaml: + dependency: transitive + description: + name: yaml + sha256: f67cdd8e07d3c6329146aaef1ba043542b3134c12489f553ca9a7435d1068aea + url: "https://pub.dev" + source: hosted + version: "3.1.4" +sdks: + dart: ">=3.13.3 <4.0.0" + flutter: ">=3.44.0" diff --git a/app/pubspec.yaml b/app/pubspec.yaml new file mode 100644 index 0000000..8930815 --- /dev/null +++ b/app/pubspec.yaml @@ -0,0 +1,31 @@ +name: fintracker_app +description: "fin-tracker client: personal finance + investment analytics." +publish_to: "none" +version: 0.1.0+1 + +environment: + sdk: ^3.13.3 + +dependencies: + flutter: + sdk: flutter + flutter_localizations: + sdk: flutter + fintracker_api: + path: packages/api_client + dio: ^5.7.0 + flutter_riverpod: ^2.6.1 + go_router: ^14.6.0 + flutter_secure_storage: ^9.2.2 + decimal: ^3.0.2 + intl: ^0.20.2 + fl_chart: ^0.69.0 + shared_preferences: ^2.3.4 + +dev_dependencies: + flutter_test: + sdk: flutter + flutter_lints: ^6.0.0 + +flutter: + uses-material-design: true diff --git a/app/test/app_shell_test.dart b/app/test/app_shell_test.dart new file mode 100644 index 0000000..9e66308 --- /dev/null +++ b/app/test/app_shell_test.dart @@ -0,0 +1,26 @@ +import 'package:fintracker_app/features/shell/app_shell.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + Widget wrap(double width) { + return MediaQuery( + data: MediaQueryData(size: Size(width, 800)), + child: MaterialApp( + home: AppShell(location: '/', child: Container()), + ), + ); + } + + testWidgets('shows a NavigationRail on a wide surface', (tester) async { + await tester.pumpWidget(wrap(1280)); + expect(find.byType(NavigationRail), findsOneWidget); + expect(find.byType(NavigationBar), findsNothing); + }); + + testWidgets('shows a bottom NavigationBar on a narrow surface', (tester) async { + await tester.pumpWidget(wrap(400)); + expect(find.byType(NavigationBar), findsOneWidget); + expect(find.byType(NavigationRail), findsNothing); + }); +} diff --git a/app/test/date_query_interceptor_test.dart b/app/test/date_query_interceptor_test.dart new file mode 100644 index 0000000..43e589b --- /dev/null +++ b/app/test/date_query_interceptor_test.dart @@ -0,0 +1,38 @@ +import 'package:dio/dio.dart'; +import 'package:fintracker_app/core/api/api_client.dart'; +import 'package:flutter_test/flutter_test.dart'; + +/// Captures whatever `onRequest` passes on, so the rewritten query can be inspected. +class _Capture extends RequestInterceptorHandler { + RequestOptions? seen; + + @override + void next(RequestOptions options) => seen = options; +} + +void main() { + RequestOptions run(Map query) { + final handler = _Capture(); + DateQueryInterceptor().onRequest( + RequestOptions(path: '/networth/series', queryParameters: query), + handler, + ); + return handler.seen!; + } + + test('a DateTime becomes a plain YYYY-MM-DD date', () { + // the value the generated client hands over: DateTime.now(), time and all + final out = run({'from': DateTime(2025, 9, 18, 10, 31, 29, 84)}); + expect(out.queryParameters['from'], '2025-09-18'); + }); + + test('single-digit months and days keep two digits', () { + final out = run({'from': DateTime(2026, 1, 5)}); + expect(out.queryParameters['from'], '2026-01-05'); + }); + + test('non-date parameters are passed through untouched', () { + final out = run({'page': 2, 'q': 'кофе', 'include_deleted': false}); + expect(out.queryParameters, {'page': 2, 'q': 'кофе', 'include_deleted': false}); + }); +} diff --git a/app/test/home_page_test.dart b/app/test/home_page_test.dart new file mode 100644 index 0000000..36342af --- /dev/null +++ b/app/test/home_page_test.dart @@ -0,0 +1,51 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:fintracker_app/core/widgets/money_text.dart'; +import 'package:fintracker_app/features/home/home_page.dart'; +import 'package:fintracker_app/features/home/providers.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + testWidgets('Обзор renders stat tiles from a net worth breakdown', (tester) async { + final breakdown = NetWorthBreakdown( + accounts: const [], + byCurrency: const {'RUB': '123456.78'}, + d: DateTime(2026, 9, 17), + debtRub: '1000', + investmentRub: '2000', + liquidRub: '3000', + missingFxCount: 0, + savingsRub: '4000', + totalRub: '123456.78', + ); + + await tester.pumpWidget( + ProviderScope( + overrides: [ + netWorthBreakdownProvider.overrideWith((ref) => breakdown), + netWorthSeriesProvider.overrideWith((ref) => const []), + cashflowThisMonthProvider.overrideWith((ref) => null), + cashflowLast12Provider.overrideWith((ref) => const []), + runwayProvider.overrideWith((ref) => RunwayOut( + asOf: DateTime(2026, 9, 17), + avgBaseline3mRub: '0', + liquidReserveRub: '0', + runwayMonths: null, + )), + metricsStatusProvider.overrideWith((ref) => null), + dataQualityProvider.overrideWith((ref) => const []), + ], + child: const MaterialApp(home: HomePage()), + ), + ); + await tester.pumpAndSettle(); + + expect(find.text('Капитал сегодня'), findsOneWidget); + expect(find.text(MoneyText.format('123456.78', 'RUB')), findsOneWidget); + expect(find.text('Ликвидные'), findsOneWidget); + expect(find.text(MoneyText.format('3000', 'RUB')), findsOneWidget); + expect(find.text('Долги'), findsOneWidget); + expect(find.text(MoneyText.format('1000', 'RUB')), findsOneWidget); + }); +} diff --git a/app/test/money_text_test.dart b/app/test/money_text_test.dart new file mode 100644 index 0000000..6e48543 --- /dev/null +++ b/app/test/money_text_test.dart @@ -0,0 +1,10 @@ +import 'package:fintracker_app/core/widgets/money_text.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + test('formats a decimal-string RUB amount with ru_RU grouping', () { + // intl's ru_RU locale data uses U+00A0 (NBSP) as both the group and + // currency separator, so the expected string is not plain ASCII spaces. + expect(MoneyText.format('1234.5', 'RUB'), '1 234,50 ₽'); + }); +} diff --git a/app/test/rules_page_test.dart b/app/test/rules_page_test.dart new file mode 100644 index 0000000..47038c8 --- /dev/null +++ b/app/test/rules_page_test.dart @@ -0,0 +1,31 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:fintracker_app/features/rules/providers.dart'; +import 'package:fintracker_app/features/rules/rules_page.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + testWidgets('the add-rule dialog requires a non-empty pattern', (tester) async { + await tester.pumpWidget( + ProviderScope( + overrides: [ + rulesListProvider.overrideWith((ref) => const []), + rulesStaleProvider.overrideWith((ref) => const []), + ], + child: const MaterialApp(home: RulesPage()), + ), + ); + await tester.pumpAndSettle(); + + await tester.tap(find.byIcon(Icons.add)); + await tester.pumpAndSettle(); + + expect(find.text('Новое правило'), findsOneWidget); + + await tester.tap(find.text('Сохранить')); + await tester.pumpAndSettle(); + + expect(find.text('Обязательное поле'), findsOneWidget); + }); +} diff --git a/app/test/transaction_row_test.dart b/app/test/transaction_row_test.dart new file mode 100644 index 0000000..2ff6df2 --- /dev/null +++ b/app/test/transaction_row_test.dart @@ -0,0 +1,51 @@ +import 'package:fintracker_api/fintracker_api.dart'; +import 'package:fintracker_app/core/widgets/money_text.dart'; +import 'package:fintracker_app/features/transactions/transaction_row.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_test/flutter_test.dart'; + +TransactionOut _usdExpense() => TransactionOut( + categoryId: 1, + comment: null, + date: DateTime(2026, 9, 10), + deleted: false, + flowType: FlowType.expense, + hold: false, + id: 1, + income: '0', + incomeAccountId: null, + incomeCurrency: null, + incomeRub: null, + isOneOff: false, + mcc: null, + outcome: '100', + outcomeAccountId: 7, + outcomeCurrency: 'USD', + outcomeRub: '9500.00', + payee: 'Amazon.com', + payeeCanonical: 'Amazon', + sourceId: 'src-1', + tags: const [], + tripId: null, + ts: DateTime(2026, 9, 10), + ); + +void main() { + testWidgets('shows a USD amount with its RUB equivalent as secondary text', (tester) async { + await tester.pumpWidget( + MaterialApp( + home: Scaffold( + body: TransactionRow( + transaction: _usdExpense(), + categoryName: 'Покупки', + onTap: () {}, + ), + ), + ), + ); + + expect(find.text('Amazon'), findsOneWidget); + expect(find.text(MoneyText.format('100', 'USD')), findsOneWidget); + expect(find.text(MoneyText.format('9500.00', 'RUB')), findsOneWidget); + }); +} diff --git a/app/test/widget_test.dart b/app/test/widget_test.dart new file mode 100644 index 0000000..2d0027d --- /dev/null +++ b/app/test/widget_test.dart @@ -0,0 +1,9 @@ +import 'package:fintracker_app/core/auth/auth_controller.dart'; +import 'package:flutter_test/flutter_test.dart'; + +void main() { + test('AuthState.signedIn reflects status', () { + expect(const AuthState(AuthStatus.signedIn, accessToken: 't').signedIn, isTrue); + expect(const AuthState(AuthStatus.signedOut).signedIn, isFalse); + }); +} diff --git a/app/web/favicon.png b/app/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/app/web/icons/Icon-192.png b/app/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/app/web/icons/Icon-512.png b/app/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/app/web/icons/Icon-maskable-192.png b/app/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/app/web/icons/Icon-maskable-512.png b/app/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/app/web/index.html b/app/web/index.html new file mode 100644 index 0000000..e2b961d --- /dev/null +++ b/app/web/index.html @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + fintracker_app + + + + + + + diff --git a/app/web/manifest.json b/app/web/manifest.json new file mode 100644 index 0000000..1bae3ef --- /dev/null +++ b/app/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "fintracker_app", + "short_name": "fintracker_app", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} diff --git a/app/windows/.gitignore b/app/windows/.gitignore new file mode 100644 index 0000000..d492d0d --- /dev/null +++ b/app/windows/.gitignore @@ -0,0 +1,17 @@ +flutter/ephemeral/ + +# Visual Studio user-specific files. +*.suo +*.user +*.userosscache +*.sln.docstates + +# Visual Studio build-related files. +x64/ +x86/ + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ diff --git a/app/windows/CMakeLists.txt b/app/windows/CMakeLists.txt new file mode 100644 index 0000000..82a89fa --- /dev/null +++ b/app/windows/CMakeLists.txt @@ -0,0 +1,108 @@ +# Project-level configuration. +cmake_minimum_required(VERSION 3.14) +project(fintracker_app LANGUAGES CXX) + +# The name of the executable created for the application. Change this to change +# the on-disk name of your application. +set(BINARY_NAME "fintracker_app") + +# Explicitly opt in to modern CMake behaviors to avoid warnings with recent +# versions of CMake. +cmake_policy(VERSION 3.14...3.25) + +# Define build configuration option. +get_property(IS_MULTICONFIG GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) +if(IS_MULTICONFIG) + set(CMAKE_CONFIGURATION_TYPES "Debug;Profile;Release" + CACHE STRING "" FORCE) +else() + if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) + set(CMAKE_BUILD_TYPE "Debug" CACHE + STRING "Flutter build mode" FORCE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS + "Debug" "Profile" "Release") + endif() +endif() +# Define settings for the Profile build mode. +set(CMAKE_EXE_LINKER_FLAGS_PROFILE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") +set(CMAKE_SHARED_LINKER_FLAGS_PROFILE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE}") +set(CMAKE_C_FLAGS_PROFILE "${CMAKE_C_FLAGS_RELEASE}") +set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE}") + +# Use Unicode for all projects. +add_definitions(-DUNICODE -D_UNICODE) + +# Compilation settings that should be applied to most targets. +# +# Be cautious about adding new options here, as plugins use this function by +# default. In most cases, you should add new options to specific targets instead +# of modifying this function. +function(APPLY_STANDARD_SETTINGS TARGET) + target_compile_features(${TARGET} PUBLIC cxx_std_17) + target_compile_options(${TARGET} PRIVATE /W4 /WX /wd"4100") + target_compile_options(${TARGET} PRIVATE /EHsc) + target_compile_definitions(${TARGET} PRIVATE "_HAS_EXCEPTIONS=0") + target_compile_definitions(${TARGET} PRIVATE "$<$:_DEBUG>") +endfunction() + +# Flutter library and tool build rules. +set(FLUTTER_MANAGED_DIR "${CMAKE_CURRENT_SOURCE_DIR}/flutter") +add_subdirectory(${FLUTTER_MANAGED_DIR}) + +# Application build; see runner/CMakeLists.txt. +add_subdirectory("runner") + + +# Generated plugin build rules, which manage building the plugins and adding +# them to the application. +include(flutter/generated_plugins.cmake) + + +# === Installation === +# Support files are copied into place next to the executable, so that it can +# run in place. This is done instead of making a separate bundle (as on Linux) +# so that building and running from within Visual Studio will work. +set(BUILD_BUNDLE_DIR "$") +# Make the "install" step default, as it's required to run. +set(CMAKE_VS_INCLUDE_INSTALL_TO_DEFAULT_BUILD 1) +if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + set(CMAKE_INSTALL_PREFIX "${BUILD_BUNDLE_DIR}" CACHE PATH "..." FORCE) +endif() + +set(INSTALL_BUNDLE_DATA_DIR "${CMAKE_INSTALL_PREFIX}/data") +set(INSTALL_BUNDLE_LIB_DIR "${CMAKE_INSTALL_PREFIX}") + +install(TARGETS ${BINARY_NAME} RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_ICU_DATA_FILE}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + COMPONENT Runtime) + +install(FILES "${FLUTTER_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +if(PLUGIN_BUNDLED_LIBRARIES) + install(FILES "${PLUGIN_BUNDLED_LIBRARIES}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) +endif() + +# Copy the native assets provided by the build.dart from all packages. +set(NATIVE_ASSETS_DIR "${PROJECT_BUILD_DIR}native_assets/windows/") +install(DIRECTORY "${NATIVE_ASSETS_DIR}" + DESTINATION "${INSTALL_BUNDLE_LIB_DIR}" + COMPONENT Runtime) + +# Fully re-copy the assets directory on each build to avoid having stale files +# from a previous install. +set(FLUTTER_ASSET_DIR_NAME "flutter_assets") +install(CODE " + file(REMOVE_RECURSE \"${INSTALL_BUNDLE_DATA_DIR}/${FLUTTER_ASSET_DIR_NAME}\") + " COMPONENT Runtime) +install(DIRECTORY "${PROJECT_BUILD_DIR}/${FLUTTER_ASSET_DIR_NAME}" + DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" COMPONENT Runtime) + +# Install the AOT library on non-Debug builds only. +install(FILES "${AOT_LIBRARY}" DESTINATION "${INSTALL_BUNDLE_DATA_DIR}" + CONFIGURATIONS Profile;Release + COMPONENT Runtime) diff --git a/app/windows/flutter/CMakeLists.txt b/app/windows/flutter/CMakeLists.txt new file mode 100644 index 0000000..903f489 --- /dev/null +++ b/app/windows/flutter/CMakeLists.txt @@ -0,0 +1,109 @@ +# This file controls Flutter-level build steps. It should not be edited. +cmake_minimum_required(VERSION 3.14) + +set(EPHEMERAL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ephemeral") + +# Configuration provided via flutter tool. +include(${EPHEMERAL_DIR}/generated_config.cmake) + +# TODO: Move the rest of this into files in ephemeral. See +# https://github.com/flutter/flutter/issues/57146. +set(WRAPPER_ROOT "${EPHEMERAL_DIR}/cpp_client_wrapper") + +# Set fallback configurations for older versions of the flutter tool. +if (NOT DEFINED FLUTTER_TARGET_PLATFORM) + set(FLUTTER_TARGET_PLATFORM "windows-x64") +endif() + +# === Flutter Library === +set(FLUTTER_LIBRARY "${EPHEMERAL_DIR}/flutter_windows.dll") + +# Published to parent scope for install step. +set(FLUTTER_LIBRARY ${FLUTTER_LIBRARY} PARENT_SCOPE) +set(FLUTTER_ICU_DATA_FILE "${EPHEMERAL_DIR}/icudtl.dat" PARENT_SCOPE) +set(PROJECT_BUILD_DIR "${PROJECT_DIR}/build/" PARENT_SCOPE) +set(AOT_LIBRARY "${PROJECT_DIR}/build/windows/app.so" PARENT_SCOPE) + +list(APPEND FLUTTER_LIBRARY_HEADERS + "flutter_export.h" + "flutter_windows.h" + "flutter_messenger.h" + "flutter_plugin_registrar.h" + "flutter_texture_registrar.h" +) +list(TRANSFORM FLUTTER_LIBRARY_HEADERS PREPEND "${EPHEMERAL_DIR}/") +add_library(flutter INTERFACE) +target_include_directories(flutter INTERFACE + "${EPHEMERAL_DIR}" +) +target_link_libraries(flutter INTERFACE "${FLUTTER_LIBRARY}.lib") +add_dependencies(flutter flutter_assemble) + +# === Wrapper === +list(APPEND CPP_WRAPPER_SOURCES_CORE + "core_implementations.cc" + "standard_codec.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_CORE PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_PLUGIN + "plugin_registrar.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_PLUGIN PREPEND "${WRAPPER_ROOT}/") +list(APPEND CPP_WRAPPER_SOURCES_APP + "flutter_engine.cc" + "flutter_view_controller.cc" +) +list(TRANSFORM CPP_WRAPPER_SOURCES_APP PREPEND "${WRAPPER_ROOT}/") + +# Wrapper sources needed for a plugin. +add_library(flutter_wrapper_plugin STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} +) +apply_standard_settings(flutter_wrapper_plugin) +set_target_properties(flutter_wrapper_plugin PROPERTIES + POSITION_INDEPENDENT_CODE ON) +set_target_properties(flutter_wrapper_plugin PROPERTIES + CXX_VISIBILITY_PRESET hidden) +target_link_libraries(flutter_wrapper_plugin PUBLIC flutter) +target_include_directories(flutter_wrapper_plugin PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_plugin flutter_assemble) + +# Wrapper sources needed for the runner. +add_library(flutter_wrapper_app STATIC + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_APP} +) +apply_standard_settings(flutter_wrapper_app) +target_link_libraries(flutter_wrapper_app PUBLIC flutter) +target_include_directories(flutter_wrapper_app PUBLIC + "${WRAPPER_ROOT}/include" +) +add_dependencies(flutter_wrapper_app flutter_assemble) + +# === Flutter tool backend === +# _phony_ is a non-existent file to force this command to run every time, +# since currently there's no way to get a full input/output list from the +# flutter tool. +set(PHONY_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/_phony_") +set_source_files_properties("${PHONY_OUTPUT}" PROPERTIES SYMBOLIC TRUE) +add_custom_command( + OUTPUT ${FLUTTER_LIBRARY} ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} + ${PHONY_OUTPUT} + COMMAND ${CMAKE_COMMAND} -E env + ${FLUTTER_TOOL_ENVIRONMENT} + "${FLUTTER_ROOT}/packages/flutter_tools/bin/tool_backend.bat" + ${FLUTTER_TARGET_PLATFORM} $ + VERBATIM +) +add_custom_target(flutter_assemble DEPENDS + "${FLUTTER_LIBRARY}" + ${FLUTTER_LIBRARY_HEADERS} + ${CPP_WRAPPER_SOURCES_CORE} + ${CPP_WRAPPER_SOURCES_PLUGIN} + ${CPP_WRAPPER_SOURCES_APP} +) diff --git a/app/windows/flutter/generated_plugin_registrant.cc b/app/windows/flutter/generated_plugin_registrant.cc new file mode 100644 index 0000000..0c50753 --- /dev/null +++ b/app/windows/flutter/generated_plugin_registrant.cc @@ -0,0 +1,14 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#include "generated_plugin_registrant.h" + +#include + +void RegisterPlugins(flutter::PluginRegistry* registry) { + FlutterSecureStorageWindowsPluginRegisterWithRegistrar( + registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin")); +} diff --git a/app/windows/flutter/generated_plugin_registrant.h b/app/windows/flutter/generated_plugin_registrant.h new file mode 100644 index 0000000..dc139d8 --- /dev/null +++ b/app/windows/flutter/generated_plugin_registrant.h @@ -0,0 +1,15 @@ +// +// Generated file. Do not edit. +// + +// clang-format off + +#ifndef GENERATED_PLUGIN_REGISTRANT_ +#define GENERATED_PLUGIN_REGISTRANT_ + +#include + +// Registers Flutter plugins. +void RegisterPlugins(flutter::PluginRegistry* registry); + +#endif // GENERATED_PLUGIN_REGISTRANT_ diff --git a/app/windows/flutter/generated_plugins.cmake b/app/windows/flutter/generated_plugins.cmake new file mode 100644 index 0000000..d0b33f8 --- /dev/null +++ b/app/windows/flutter/generated_plugins.cmake @@ -0,0 +1,25 @@ +# +# Generated file, do not edit. +# + +list(APPEND FLUTTER_PLUGIN_LIST + flutter_secure_storage_windows +) + +list(APPEND FLUTTER_FFI_PLUGIN_LIST + jni +) + +set(PLUGIN_BUNDLED_LIBRARIES) + +foreach(plugin ${FLUTTER_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${plugin}/windows plugins/${plugin}) + target_link_libraries(${BINARY_NAME} PRIVATE ${plugin}_plugin) + list(APPEND PLUGIN_BUNDLED_LIBRARIES $) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${plugin}_bundled_libraries}) +endforeach(plugin) + +foreach(ffi_plugin ${FLUTTER_FFI_PLUGIN_LIST}) + add_subdirectory(flutter/ephemeral/.plugin_symlinks/${ffi_plugin}/windows plugins/${ffi_plugin}) + list(APPEND PLUGIN_BUNDLED_LIBRARIES ${${ffi_plugin}_bundled_libraries}) +endforeach(ffi_plugin) diff --git a/app/windows/runner/CMakeLists.txt b/app/windows/runner/CMakeLists.txt new file mode 100644 index 0000000..394917c --- /dev/null +++ b/app/windows/runner/CMakeLists.txt @@ -0,0 +1,40 @@ +cmake_minimum_required(VERSION 3.14) +project(runner LANGUAGES CXX) + +# Define the application target. To change its name, change BINARY_NAME in the +# top-level CMakeLists.txt, not the value here, or `flutter run` will no longer +# work. +# +# Any new source files that you add to the application should be added here. +add_executable(${BINARY_NAME} WIN32 + "flutter_window.cpp" + "main.cpp" + "utils.cpp" + "win32_window.cpp" + "${FLUTTER_MANAGED_DIR}/generated_plugin_registrant.cc" + "Runner.rc" + "runner.exe.manifest" +) + +# Apply the standard set of build settings. This can be removed for applications +# that need different build settings. +apply_standard_settings(${BINARY_NAME}) + +# Add preprocessor definitions for the build version. +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION=\"${FLUTTER_VERSION}\"") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MAJOR=${FLUTTER_VERSION_MAJOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_MINOR=${FLUTTER_VERSION_MINOR}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_PATCH=${FLUTTER_VERSION_PATCH}") +target_compile_definitions(${BINARY_NAME} PRIVATE "FLUTTER_VERSION_BUILD=${FLUTTER_VERSION_BUILD}") + +# Disable Windows macros that collide with C++ standard library functions. +target_compile_definitions(${BINARY_NAME} PRIVATE "NOMINMAX") + +# Add dependency libraries and include directories. Add any application-specific +# dependencies here. +target_link_libraries(${BINARY_NAME} PRIVATE flutter flutter_wrapper_app) +target_link_libraries(${BINARY_NAME} PRIVATE "dwmapi.lib") +target_include_directories(${BINARY_NAME} PRIVATE "${CMAKE_SOURCE_DIR}") + +# Run the Flutter tool portions of the build. This must not be removed. +add_dependencies(${BINARY_NAME} flutter_assemble) diff --git a/app/windows/runner/Runner.rc b/app/windows/runner/Runner.rc new file mode 100644 index 0000000..6532cc8 --- /dev/null +++ b/app/windows/runner/Runner.rc @@ -0,0 +1,121 @@ +// Microsoft Visual C++ generated resource script. +// +#pragma code_page(65001) +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "winres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (United States) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""winres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_APP_ICON ICON "resources\\app_icon.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +#if defined(FLUTTER_VERSION_MAJOR) && defined(FLUTTER_VERSION_MINOR) && defined(FLUTTER_VERSION_PATCH) && defined(FLUTTER_VERSION_BUILD) +#define VERSION_AS_NUMBER FLUTTER_VERSION_MAJOR,FLUTTER_VERSION_MINOR,FLUTTER_VERSION_PATCH,FLUTTER_VERSION_BUILD +#else +#define VERSION_AS_NUMBER 1,0,0,0 +#endif + +#if defined(FLUTTER_VERSION) +#define VERSION_AS_STRING FLUTTER_VERSION +#else +#define VERSION_AS_STRING "1.0.0" +#endif + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_AS_NUMBER + PRODUCTVERSION VERSION_AS_NUMBER + FILEFLAGSMASK VS_FFI_FILEFLAGSMASK +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904e4" + BEGIN + VALUE "CompanyName", "ru.fintracker" "\0" + VALUE "FileDescription", "fintracker_app" "\0" + VALUE "FileVersion", VERSION_AS_STRING "\0" + VALUE "InternalName", "fintracker_app" "\0" + VALUE "LegalCopyright", "Copyright (C) 2026 ru.fintracker. All rights reserved." "\0" + VALUE "OriginalFilename", "fintracker_app.exe" "\0" + VALUE "ProductName", "fintracker_app" "\0" + VALUE "ProductVersion", VERSION_AS_STRING "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1252 + END +END + +#endif // English (United States) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED diff --git a/app/windows/runner/flutter_window.cpp b/app/windows/runner/flutter_window.cpp new file mode 100644 index 0000000..955ee30 --- /dev/null +++ b/app/windows/runner/flutter_window.cpp @@ -0,0 +1,71 @@ +#include "flutter_window.h" + +#include + +#include "flutter/generated_plugin_registrant.h" + +FlutterWindow::FlutterWindow(const flutter::DartProject& project) + : project_(project) {} + +FlutterWindow::~FlutterWindow() {} + +bool FlutterWindow::OnCreate() { + if (!Win32Window::OnCreate()) { + return false; + } + + RECT frame = GetClientArea(); + + // The size here must match the window dimensions to avoid unnecessary surface + // creation / destruction in the startup path. + flutter_controller_ = std::make_unique( + frame.right - frame.left, frame.bottom - frame.top, project_); + // Ensure that basic setup of the controller was successful. + if (!flutter_controller_->engine() || !flutter_controller_->view()) { + return false; + } + RegisterPlugins(flutter_controller_->engine()); + SetChildContent(flutter_controller_->view()->GetNativeWindow()); + + flutter_controller_->engine()->SetNextFrameCallback([&]() { + this->Show(); + }); + + // Flutter can complete the first frame before the "show window" callback is + // registered. The following call ensures a frame is pending to ensure the + // window is shown. It is a no-op if the first frame hasn't completed yet. + flutter_controller_->ForceRedraw(); + + return true; +} + +void FlutterWindow::OnDestroy() { + if (flutter_controller_) { + flutter_controller_ = nullptr; + } + + Win32Window::OnDestroy(); +} + +LRESULT +FlutterWindow::MessageHandler(HWND hwnd, UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + // Give Flutter, including plugins, an opportunity to handle window messages. + if (flutter_controller_) { + std::optional result = + flutter_controller_->HandleTopLevelWindowProc(hwnd, message, wparam, + lparam); + if (result) { + return *result; + } + } + + switch (message) { + case WM_FONTCHANGE: + flutter_controller_->engine()->ReloadSystemFonts(); + break; + } + + return Win32Window::MessageHandler(hwnd, message, wparam, lparam); +} diff --git a/app/windows/runner/flutter_window.h b/app/windows/runner/flutter_window.h new file mode 100644 index 0000000..6da0652 --- /dev/null +++ b/app/windows/runner/flutter_window.h @@ -0,0 +1,33 @@ +#ifndef RUNNER_FLUTTER_WINDOW_H_ +#define RUNNER_FLUTTER_WINDOW_H_ + +#include +#include + +#include + +#include "win32_window.h" + +// A window that does nothing but host a Flutter view. +class FlutterWindow : public Win32Window { + public: + // Creates a new FlutterWindow hosting a Flutter view running |project|. + explicit FlutterWindow(const flutter::DartProject& project); + virtual ~FlutterWindow(); + + protected: + // Win32Window: + bool OnCreate() override; + void OnDestroy() override; + LRESULT MessageHandler(HWND window, UINT const message, WPARAM const wparam, + LPARAM const lparam) noexcept override; + + private: + // The project to run. + flutter::DartProject project_; + + // The Flutter instance hosted by this window. + std::unique_ptr flutter_controller_; +}; + +#endif // RUNNER_FLUTTER_WINDOW_H_ diff --git a/app/windows/runner/main.cpp b/app/windows/runner/main.cpp new file mode 100644 index 0000000..ef89c4d --- /dev/null +++ b/app/windows/runner/main.cpp @@ -0,0 +1,43 @@ +#include +#include +#include + +#include "flutter_window.h" +#include "utils.h" + +int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, + _In_ wchar_t *command_line, _In_ int show_command) { + // Attach to console when present (e.g., 'flutter run') or create a + // new console when running with a debugger. + if (!::AttachConsole(ATTACH_PARENT_PROCESS) && ::IsDebuggerPresent()) { + CreateAndAttachConsole(); + } + + // Initialize COM, so that it is available for use in the library and/or + // plugins. + ::CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); + + flutter::DartProject project(L"data"); + + std::vector command_line_arguments = + GetCommandLineArguments(); + + project.set_dart_entrypoint_arguments(std::move(command_line_arguments)); + + FlutterWindow window(project); + Win32Window::Point origin(10, 10); + Win32Window::Size size(1280, 720); + if (!window.Create(L"fintracker_app", origin, size)) { + return EXIT_FAILURE; + } + window.SetQuitOnClose(true); + + ::MSG msg; + while (::GetMessage(&msg, nullptr, 0, 0)) { + ::TranslateMessage(&msg); + ::DispatchMessage(&msg); + } + + ::CoUninitialize(); + return EXIT_SUCCESS; +} diff --git a/app/windows/runner/resource.h b/app/windows/runner/resource.h new file mode 100644 index 0000000..66a65d1 --- /dev/null +++ b/app/windows/runner/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by Runner.rc +// +#define IDI_APP_ICON 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/app/windows/runner/resources/app_icon.ico b/app/windows/runner/resources/app_icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..c04e20caf6370ebb9253ad831cc31de4a9c965f6 GIT binary patch literal 33772 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 literal 0 HcmV?d00001 diff --git a/app/windows/runner/runner.exe.manifest b/app/windows/runner/runner.exe.manifest new file mode 100644 index 0000000..153653e --- /dev/null +++ b/app/windows/runner/runner.exe.manifest @@ -0,0 +1,14 @@ + + + + + PerMonitorV2 + + + + + + + + + diff --git a/app/windows/runner/utils.cpp b/app/windows/runner/utils.cpp new file mode 100644 index 0000000..3cb7146 --- /dev/null +++ b/app/windows/runner/utils.cpp @@ -0,0 +1,69 @@ +#include "utils.h" + +#include +#include +#include +#include + +#include + +void CreateAndAttachConsole() { + if (::AllocConsole()) { + FILE *unused; + if (freopen_s(&unused, "CONOUT$", "w", stdout)) { + _dup2(_fileno(stdout), 1); + } + if (freopen_s(&unused, "CONOUT$", "w", stderr)) { + _dup2(_fileno(stdout), 2); + } + std::ios::sync_with_stdio(); + FlutterDesktopResyncOutputStreams(); + } +} + +std::vector GetCommandLineArguments() { + // Convert the UTF-16 command line arguments to UTF-8 for the Engine to use. + int argc; + wchar_t** argv = ::CommandLineToArgvW(::GetCommandLineW(), &argc); + if (argv == nullptr) { + return std::vector(); + } + + std::vector command_line_arguments; + + // Skip the first argument as it's the binary name. + for (int i = 1; i < argc; i++) { + command_line_arguments.push_back(Utf8FromUtf16(argv[i])); + } + + ::LocalFree(argv); + + return command_line_arguments; +} + +std::string Utf8FromUtf16(const wchar_t* utf16_string) { + if (utf16_string == nullptr) { + return std::string(); + } + // First, find the length of the string with a safe upper bound (CWE-126). + // UNICODE_STRING_MAX_CHARS (32767) is the maximum length of a UNICODE_STRING. + int input_length = static_cast(wcsnlen(utf16_string, UNICODE_STRING_MAX_CHARS)); + // Now use that bounded length to determine the required buffer size. + // When an explicit length is passed, WideCharToMultiByte does not include + // the null terminator in its returned size. + int target_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, nullptr, 0, nullptr, nullptr); + std::string utf8_string; + if (target_length == 0 || static_cast(target_length) > utf8_string.max_size()) { + return utf8_string; + } + utf8_string.resize(target_length); + int converted_length = ::WideCharToMultiByte( + CP_UTF8, WC_ERR_INVALID_CHARS, utf16_string, + input_length, utf8_string.data(), target_length, nullptr, nullptr); + if (converted_length == 0) { + return std::string(); + } + return utf8_string; +} diff --git a/app/windows/runner/utils.h b/app/windows/runner/utils.h new file mode 100644 index 0000000..3879d54 --- /dev/null +++ b/app/windows/runner/utils.h @@ -0,0 +1,19 @@ +#ifndef RUNNER_UTILS_H_ +#define RUNNER_UTILS_H_ + +#include +#include + +// Creates a console for the process, and redirects stdout and stderr to +// it for both the runner and the Flutter library. +void CreateAndAttachConsole(); + +// Takes a null-terminated wchar_t* encoded in UTF-16 and returns a std::string +// encoded in UTF-8. Returns an empty std::string on failure. +std::string Utf8FromUtf16(const wchar_t* utf16_string); + +// Gets the command line arguments passed in as a std::vector, +// encoded in UTF-8. Returns an empty std::vector on failure. +std::vector GetCommandLineArguments(); + +#endif // RUNNER_UTILS_H_ diff --git a/app/windows/runner/win32_window.cpp b/app/windows/runner/win32_window.cpp new file mode 100644 index 0000000..60608d0 --- /dev/null +++ b/app/windows/runner/win32_window.cpp @@ -0,0 +1,288 @@ +#include "win32_window.h" + +#include +#include + +#include "resource.h" + +namespace { + +/// Window attribute that enables dark mode window decorations. +/// +/// Redefined in case the developer's machine has a Windows SDK older than +/// version 10.0.22000.0. +/// See: https://docs.microsoft.com/windows/win32/api/dwmapi/ne-dwmapi-dwmwindowattribute +#ifndef DWMWA_USE_IMMERSIVE_DARK_MODE +#define DWMWA_USE_IMMERSIVE_DARK_MODE 20 +#endif + +constexpr const wchar_t kWindowClassName[] = L"FLUTTER_RUNNER_WIN32_WINDOW"; + +/// Registry key for app theme preference. +/// +/// A value of 0 indicates apps should use dark mode. A non-zero or missing +/// value indicates apps should use light mode. +constexpr const wchar_t kGetPreferredBrightnessRegKey[] = + L"Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize"; +constexpr const wchar_t kGetPreferredBrightnessRegValue[] = L"AppsUseLightTheme"; + +// The number of Win32Window objects that currently exist. +static int g_active_window_count = 0; + +using EnableNonClientDpiScaling = BOOL __stdcall(HWND hwnd); + +// Scale helper to convert logical scaler values to physical using passed in +// scale factor +int Scale(int source, double scale_factor) { + return static_cast(source * scale_factor); +} + +// Dynamically loads the |EnableNonClientDpiScaling| from the User32 module. +// This API is only needed for PerMonitor V1 awareness mode. +void EnableFullDpiSupportIfAvailable(HWND hwnd) { + HMODULE user32_module = LoadLibraryA("User32.dll"); + if (!user32_module) { + return; + } + auto enable_non_client_dpi_scaling = + reinterpret_cast( + GetProcAddress(user32_module, "EnableNonClientDpiScaling")); + if (enable_non_client_dpi_scaling != nullptr) { + enable_non_client_dpi_scaling(hwnd); + } + FreeLibrary(user32_module); +} + +} // namespace + +// Manages the Win32Window's window class registration. +class WindowClassRegistrar { + public: + ~WindowClassRegistrar() = default; + + // Returns the singleton registrar instance. + static WindowClassRegistrar* GetInstance() { + if (!instance_) { + instance_ = new WindowClassRegistrar(); + } + return instance_; + } + + // Returns the name of the window class, registering the class if it hasn't + // previously been registered. + const wchar_t* GetWindowClass(); + + // Unregisters the window class. Should only be called if there are no + // instances of the window. + void UnregisterWindowClass(); + + private: + WindowClassRegistrar() = default; + + static WindowClassRegistrar* instance_; + + bool class_registered_ = false; +}; + +WindowClassRegistrar* WindowClassRegistrar::instance_ = nullptr; + +const wchar_t* WindowClassRegistrar::GetWindowClass() { + if (!class_registered_) { + WNDCLASS window_class{}; + window_class.hCursor = LoadCursor(nullptr, IDC_ARROW); + window_class.lpszClassName = kWindowClassName; + window_class.style = CS_HREDRAW | CS_VREDRAW; + window_class.cbClsExtra = 0; + window_class.cbWndExtra = 0; + window_class.hInstance = GetModuleHandle(nullptr); + window_class.hIcon = + LoadIcon(window_class.hInstance, MAKEINTRESOURCE(IDI_APP_ICON)); + window_class.hbrBackground = 0; + window_class.lpszMenuName = nullptr; + window_class.lpfnWndProc = Win32Window::WndProc; + RegisterClass(&window_class); + class_registered_ = true; + } + return kWindowClassName; +} + +void WindowClassRegistrar::UnregisterWindowClass() { + UnregisterClass(kWindowClassName, nullptr); + class_registered_ = false; +} + +Win32Window::Win32Window() { + ++g_active_window_count; +} + +Win32Window::~Win32Window() { + --g_active_window_count; + Destroy(); +} + +bool Win32Window::Create(const std::wstring& title, + const Point& origin, + const Size& size) { + Destroy(); + + const wchar_t* window_class = + WindowClassRegistrar::GetInstance()->GetWindowClass(); + + const POINT target_point = {static_cast(origin.x), + static_cast(origin.y)}; + HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); + UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); + double scale_factor = dpi / 96.0; + + HWND window = CreateWindow( + window_class, title.c_str(), WS_OVERLAPPEDWINDOW, + Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), + Scale(size.width, scale_factor), Scale(size.height, scale_factor), + nullptr, nullptr, GetModuleHandle(nullptr), this); + + if (!window) { + return false; + } + + UpdateTheme(window); + + return OnCreate(); +} + +bool Win32Window::Show() { + return ShowWindow(window_handle_, SW_SHOWNORMAL); +} + +// static +LRESULT CALLBACK Win32Window::WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + if (message == WM_NCCREATE) { + auto window_struct = reinterpret_cast(lparam); + SetWindowLongPtr(window, GWLP_USERDATA, + reinterpret_cast(window_struct->lpCreateParams)); + + auto that = static_cast(window_struct->lpCreateParams); + EnableFullDpiSupportIfAvailable(window); + that->window_handle_ = window; + } else if (Win32Window* that = GetThisFromHandle(window)) { + return that->MessageHandler(window, message, wparam, lparam); + } + + return DefWindowProc(window, message, wparam, lparam); +} + +LRESULT +Win32Window::MessageHandler(HWND hwnd, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept { + switch (message) { + case WM_DESTROY: + window_handle_ = nullptr; + Destroy(); + if (quit_on_close_) { + PostQuitMessage(0); + } + return 0; + + case WM_DPICHANGED: { + auto newRectSize = reinterpret_cast(lparam); + LONG newWidth = newRectSize->right - newRectSize->left; + LONG newHeight = newRectSize->bottom - newRectSize->top; + + SetWindowPos(hwnd, nullptr, newRectSize->left, newRectSize->top, newWidth, + newHeight, SWP_NOZORDER | SWP_NOACTIVATE); + + return 0; + } + case WM_SIZE: { + RECT rect = GetClientArea(); + if (child_content_ != nullptr) { + // Size and position the child window. + MoveWindow(child_content_, rect.left, rect.top, rect.right - rect.left, + rect.bottom - rect.top, TRUE); + } + return 0; + } + + case WM_ACTIVATE: + if (child_content_ != nullptr) { + SetFocus(child_content_); + } + return 0; + + case WM_DWMCOLORIZATIONCOLORCHANGED: + UpdateTheme(hwnd); + return 0; + } + + return DefWindowProc(window_handle_, message, wparam, lparam); +} + +void Win32Window::Destroy() { + OnDestroy(); + + if (window_handle_) { + DestroyWindow(window_handle_); + window_handle_ = nullptr; + } + if (g_active_window_count == 0) { + WindowClassRegistrar::GetInstance()->UnregisterWindowClass(); + } +} + +Win32Window* Win32Window::GetThisFromHandle(HWND const window) noexcept { + return reinterpret_cast( + GetWindowLongPtr(window, GWLP_USERDATA)); +} + +void Win32Window::SetChildContent(HWND content) { + child_content_ = content; + SetParent(content, window_handle_); + RECT frame = GetClientArea(); + + MoveWindow(content, frame.left, frame.top, frame.right - frame.left, + frame.bottom - frame.top, true); + + SetFocus(child_content_); +} + +RECT Win32Window::GetClientArea() { + RECT frame; + GetClientRect(window_handle_, &frame); + return frame; +} + +HWND Win32Window::GetHandle() { + return window_handle_; +} + +void Win32Window::SetQuitOnClose(bool quit_on_close) { + quit_on_close_ = quit_on_close; +} + +bool Win32Window::OnCreate() { + // No-op; provided for subclasses. + return true; +} + +void Win32Window::OnDestroy() { + // No-op; provided for subclasses. +} + +void Win32Window::UpdateTheme(HWND const window) { + DWORD light_mode; + DWORD light_mode_size = sizeof(light_mode); + LSTATUS result = RegGetValue(HKEY_CURRENT_USER, kGetPreferredBrightnessRegKey, + kGetPreferredBrightnessRegValue, + RRF_RT_REG_DWORD, nullptr, &light_mode, + &light_mode_size); + + if (result == ERROR_SUCCESS) { + BOOL enable_dark_mode = light_mode == 0; + DwmSetWindowAttribute(window, DWMWA_USE_IMMERSIVE_DARK_MODE, + &enable_dark_mode, sizeof(enable_dark_mode)); + } +} diff --git a/app/windows/runner/win32_window.h b/app/windows/runner/win32_window.h new file mode 100644 index 0000000..e901dde --- /dev/null +++ b/app/windows/runner/win32_window.h @@ -0,0 +1,102 @@ +#ifndef RUNNER_WIN32_WINDOW_H_ +#define RUNNER_WIN32_WINDOW_H_ + +#include + +#include +#include +#include + +// A class abstraction for a high DPI-aware Win32 Window. Intended to be +// inherited from by classes that wish to specialize with custom +// rendering and input handling +class Win32Window { + public: + struct Point { + unsigned int x; + unsigned int y; + Point(unsigned int x, unsigned int y) : x(x), y(y) {} + }; + + struct Size { + unsigned int width; + unsigned int height; + Size(unsigned int width, unsigned int height) + : width(width), height(height) {} + }; + + Win32Window(); + virtual ~Win32Window(); + + // Creates a win32 window with |title| that is positioned and sized using + // |origin| and |size|. New windows are created on the default monitor. Window + // sizes are specified to the OS in physical pixels, hence to ensure a + // consistent size this function will scale the inputted width and height as + // as appropriate for the default monitor. The window is invisible until + // |Show| is called. Returns true if the window was created successfully. + bool Create(const std::wstring& title, const Point& origin, const Size& size); + + // Show the current window. Returns true if the window was successfully shown. + bool Show(); + + // Release OS resources associated with window. + void Destroy(); + + // Inserts |content| into the window tree. + void SetChildContent(HWND content); + + // Returns the backing Window handle to enable clients to set icon and other + // window properties. Returns nullptr if the window has been destroyed. + HWND GetHandle(); + + // If true, closing this window will quit the application. + void SetQuitOnClose(bool quit_on_close); + + // Return a RECT representing the bounds of the current client area. + RECT GetClientArea(); + + protected: + // Processes and route salient window messages for mouse handling, + // size change and DPI. Delegates handling of these to member overloads that + // inheriting classes can handle. + virtual LRESULT MessageHandler(HWND window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Called when CreateAndShow is called, allowing subclass window-related + // setup. Subclasses should return false if setup fails. + virtual bool OnCreate(); + + // Called when Destroy is called. + virtual void OnDestroy(); + + private: + friend class WindowClassRegistrar; + + // OS callback called by message pump. Handles the WM_NCCREATE message which + // is passed when the non-client area is being created and enables automatic + // non-client DPI scaling so that the non-client area automatically + // responds to changes in DPI. All other messages are handled by + // MessageHandler. + static LRESULT CALLBACK WndProc(HWND const window, + UINT const message, + WPARAM const wparam, + LPARAM const lparam) noexcept; + + // Retrieves a class instance pointer for |window| + static Win32Window* GetThisFromHandle(HWND const window) noexcept; + + // Update the window frame's theme to match the system theme. + static void UpdateTheme(HWND const window); + + bool quit_on_close_ = false; + + // window handle for top level window. + HWND window_handle_ = nullptr; + + // window handle for hosted content. + HWND child_content_ = nullptr; +}; + +#endif // RUNNER_WIN32_WINDOW_H_