refactor: fix a bit bug

2024-12-12 09:33:15 +07:00 · 2024-12-12 09:33:15 +07:00 · 6d6440732d
commit 6d6440732d
parent ad15e58f33
9 changed files with 87 additions and 84 deletions
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
--- a/agrilink_vocpro/android/app/build.gradle
+++ b/agrilink_vocpro/android/app/build.gradle
@ -11,7 +11,7 @@ plugins {
 android {
    namespace = "com.pis.agrilink_vocpro"
    compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "27.0.12077973"

    compileOptions {
        sourceCompatibility = JavaVersion.VERSION_1_8
--- a/agrilink_vocpro/android/settings.gradle
+++ b/agrilink_vocpro/android/settings.gradle
@ -18,11 +18,11 @@ pluginManagement {

 plugins {
    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
+    id "com.android.application" version "8.7.0" apply false
    // START: FlutterFire Configuration
    id "com.google.gms.google-services" version "4.3.15" apply false
    // END: FlutterFire Configuration
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "org.jetbrains.kotlin.android" version "2.0.20" apply false
 }

 include ":app"
--- a/agrilink_vocpro/lib/features/home/detail_pages/nitrogen/view/nitrogen_screen.dart
+++ b/agrilink_vocpro/lib/features/home/detail_pages/nitrogen/view/nitrogen_screen.dart
@ -84,7 +84,7 @@ class NitrogenScreen extends StatelessWidget {
            size: 64.r,
            color: Colors.blue,
          ),
-          Text('$value ppm', style: AppTheme.headline1),
+          Text('$value mg/L', style: AppTheme.headline1),
        ],
      ),
    );
--- a/agrilink_vocpro/lib/features/home/detail_pages/phosphorus/view/phosphorus_screen.dart
+++ b/agrilink_vocpro/lib/features/home/detail_pages/phosphorus/view/phosphorus_screen.dart
@ -84,7 +84,7 @@ class PhosphorusScreen extends StatelessWidget {
            size: 64.r,
            color: Colors.blue,
          ),
-          Text('$value ppm', style: AppTheme.headline1),
+          Text('$value mg/L', style: AppTheme.headline1),
        ],
      ),
    );
--- a/agrilink_vocpro/lib/features/home/detail_pages/potassium/view/potassium_screen.dart
+++ b/agrilink_vocpro/lib/features/home/detail_pages/potassium/view/potassium_screen.dart
@ -84,7 +84,7 @@ class PotassiumScreen extends StatelessWidget {
            size: 64.r,
            color: Colors.red,
          ),
-          Text('$value ppm', style: AppTheme.headline1),
+          Text('$value mg/L', style: AppTheme.headline1),
        ],
      ),
    );
--- a/agrilink_vocpro/lib/features/home/widgets/list_data_from_censor_npk1.dart
+++ b/agrilink_vocpro/lib/features/home/widgets/list_data_from_censor_npk1.dart
@ -58,7 +58,7 @@ class ListDataFromCensorNpk1 extends StatelessWidget {
                censorIdentifier: censorIdentifier,
                onTap: () async {
                  await context.push(
-                      '${AppRoute.nitrogen}/${provider.npk2SoilNitrogen}/${provider.npk1SoilNitrogen}');
+                      '${AppRoute.nitrogen}/${provider.npk1SoilNitrogen}/${provider.npk2SoilNitrogen}');
                },
              ),
              DataDisplayerWidget(
--- a/agrilink_vocpro/lib/features/home/widgets/list_data_from_censor_npk2.dart
+++ b/agrilink_vocpro/lib/features/home/widgets/list_data_from_censor_npk2.dart
@ -58,7 +58,7 @@ class ListDataFromCensorNpk2 extends StatelessWidget {
                iconColor: Colors.white,
                onTap: () async {
                  await context.push(
-                      '${AppRoute.nitrogen}/${provider.npk2SoilNitrogen}/${provider.npk1SoilNitrogen}');
+                      '${AppRoute.nitrogen}/${provider.npk1SoilNitrogen}/${provider.npk2SoilNitrogen}');
                },
              ),
              DataDisplayerWidget(
--- a/agrilink_vocpro/pubspec.lock
+++ b/agrilink_vocpro/pubspec.lock
@ -5,10 +5,10 @@ packages:
    dependency: transitive
    description:
      name: _flutterfire_internals
-      sha256: "5534e701a2c505fed1f0799e652dd6ae23bd4d2c4cf797220e5ced5764a7c1c2"
+      sha256: eae3133cbb06de9205899b822e3897fc6a8bc278ad4c944b4ce612689369694b
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.44"
+    version: "1.3.47"
  animated_segmented_tab_control:
    dependency: "direct main"
    description:
@ -29,18 +29,18 @@ packages:
    dependency: transitive
    description:
      name: async
-      sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
+      sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63
      url: "https://pub.dev"
    source: hosted
-    version: "2.11.0"
+    version: "2.12.0"
  boolean_selector:
    dependency: transitive
    description:
      name: boolean_selector
-      sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
+      sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
  bootstrap_icons:
    dependency: "direct main"
    description:
@ -61,42 +61,42 @@ packages:
    dependency: transitive
    description:
      name: charcode
-      sha256: fb98c0f6d12c920a02ee2d998da788bca066ca5f148492b7085ee23372b12306
+      sha256: fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.1"
+    version: "1.4.0"
  clock:
    dependency: transitive
    description:
      name: clock
-      sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
+      sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
      url: "https://pub.dev"
    source: hosted
-    version: "1.1.1"
+    version: "1.1.2"
  collection:
    dependency: transitive
    description:
      name: collection
-      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      sha256: a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf
      url: "https://pub.dev"
    source: hosted
-    version: "1.18.0"
+    version: "1.19.0"
  crypto:
    dependency: transitive
    description:
      name: crypto
-      sha256: ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27
+      sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855"
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.6"
  csslib:
    dependency: transitive
    description:
      name: csslib
-      sha256: "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb"
+      sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e"
      url: "https://pub.dev"
    source: hosted
-    version: "1.0.0"
+    version: "1.0.2"
  cupertino_icons:
    dependency: "direct main"
    description:
@ -125,10 +125,10 @@ packages:
    dependency: transitive
    description:
      name: equatable
-      sha256: c2b87cb7756efdf69892005af546c56c0b5037f54d2a88269b4f347a505e3ca2
+      sha256: "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7"
      url: "https://pub.dev"
    source: hosted
-    version: "2.0.5"
+    version: "2.0.7"
  event_bus:
    dependency: transitive
    description:
@ -141,10 +141,10 @@ packages:
    dependency: transitive
    description:
      name: fake_async
-      sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
+      sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc"
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.1"
+    version: "1.3.2"
  ffi:
    dependency: transitive
    description:
@ -165,58 +165,58 @@ packages:
    dependency: "direct main"
    description:
      name: firebase_core
-      sha256: "51dfe2fbf3a984787a2e7b8592f2f05c986bfedd6fdacea3f9e0a7beb334de96"
+      sha256: fef81a53ba1ca618def1f8bef4361df07968434e62cb204c1fb90bb880a03da2
      url: "https://pub.dev"
    source: hosted
-    version: "3.6.0"
+    version: "3.8.1"
  firebase_core_platform_interface:
    dependency: transitive
    description:
      name: firebase_core_platform_interface
-      sha256: e30da58198a6d4b49d5bce4e852f985c32cb10db329ebef9473db2b9f09ce810
+      sha256: b94b217e3ad745e784960603d33d99471621ecca151c99c670869b76e50ad2a6
      url: "https://pub.dev"
    source: hosted
-    version: "5.3.0"
+    version: "5.3.1"
  firebase_core_web:
    dependency: transitive
    description:
      name: firebase_core_web
-      sha256: f967a7138f5d2ffb1ce15950e2a382924239eaa521150a8f144af34e68b3b3e5
+      sha256: "9e69806bb3d905aeec3c1242e0e1475de6ea6d48f456af29d598fb229a2b4e5e"
      url: "https://pub.dev"
    source: hosted
-    version: "2.18.1"
+    version: "2.18.2"
  firebase_messaging:
    dependency: "direct main"
    description:
      name: firebase_messaging
-      sha256: eb6e28a3a35deda61fe8634967c84215efc19133ba58d8e0fc6c9a2af2cba05e
+      sha256: "151a3ee68736abf293aab66d1317ade53c88abe1db09c75a0460aebf7767bbdf"
      url: "https://pub.dev"
    source: hosted
-    version: "15.1.3"
+    version: "15.1.6"
  firebase_messaging_platform_interface:
    dependency: transitive
    description:
      name: firebase_messaging_platform_interface
-      sha256: b316c4ee10d93d32c033644207afc282d9b2b4372f3cf9c6022f3558b3873d2d
+      sha256: f331ee51e40c243f90cc7bc059222dfec4e5df53125b08d31fb28961b00d2a9d
      url: "https://pub.dev"
    source: hosted
-    version: "4.5.46"
+    version: "4.5.49"
  firebase_messaging_web:
    dependency: transitive
    description:
      name: firebase_messaging_web
-      sha256: d7f0147a1a9fe4313168e20154a01fd5cf332898de1527d3930ff77b8c7f5387
+      sha256: efaf3fdc54cd77e0eedb8e75f7f01c808828c64d052ddbf94d3009974e47d30f
      url: "https://pub.dev"
    source: hosted
-    version: "3.9.2"
+    version: "3.9.5"
  fl_chart:
    dependency: "direct main"
    description:
      name: fl_chart
-      sha256: "94307bef3a324a0d329d3ab77b2f0c6e5ed739185ffc029ed28c0f9b019ea7ef"
+      sha256: "74959b99b92b9eebeed1a4049426fd67c4abc3c5a0f4d12e2877097d6a11ae08"
      url: "https://pub.dev"
    source: hosted
-    version: "0.69.0"
+    version: "0.69.2"
  flutter:
    dependency: "direct main"
    description: flutter
@ -260,10 +260,10 @@ packages:
    dependency: "direct main"
    description:
      name: go_router
-      sha256: "6f1b756f6e863259a99135ff3c95026c3cdca17d10ebef2bba2261a25ddc8bbc"
+      sha256: "2fd11229f59e23e967b0775df8d5948a519cd7e1e8b6e849729e010587b46539"
      url: "https://pub.dev"
    source: hosted
-    version: "14.3.0"
+    version: "14.6.2"
  google_fonts:
    dependency: "direct main"
    description:
@ -276,10 +276,10 @@ packages:
    dependency: transitive
    description:
      name: google_identity_services_web
-      sha256: "5be191523702ba8d7a01ca97c17fca096822ccf246b0a9f11923a6ded06199b6"
+      sha256: "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9"
      url: "https://pub.dev"
    source: hosted
-    version: "0.3.1+4"
+    version: "0.3.3"
  googleapis_auth:
    dependency: "direct main"
    description:
@ -292,10 +292,10 @@ packages:
    dependency: transitive
    description:
      name: html
-      sha256: "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a"
+      sha256: "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec"
      url: "https://pub.dev"
    source: hosted
-    version: "0.15.4"
+    version: "0.15.5"
  http:
    dependency: "direct main"
    description:
@ -308,10 +308,10 @@ packages:
    dependency: transitive
    description:
      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      sha256: "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360"
      url: "https://pub.dev"
    source: hosted
-    version: "4.0.2"
+    version: "4.1.1"
  intl:
    dependency: "direct main"
    description:
@ -332,18 +332,18 @@ packages:
    dependency: transitive
    description:
      name: leak_tracker
-      sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05"
+      sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec
      url: "https://pub.dev"
    source: hosted
-    version: "10.0.5"
+    version: "10.0.8"
  leak_tracker_flutter_testing:
    dependency: transitive
    description:
      name: leak_tracker_flutter_testing
-      sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806"
+      sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
      url: "https://pub.dev"
    source: hosted
-    version: "3.0.5"
+    version: "3.0.9"
  leak_tracker_testing:
    dependency: transitive
    description:
@ -356,18 +356,18 @@ packages:
    dependency: transitive
    description:
      name: lints
-      sha256: "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413"
+      sha256: "4a16b3f03741e1252fda5de3ce712666d010ba2122f8e912c94f9f7b90e1a4c3"
      url: "https://pub.dev"
    source: hosted
-    version: "5.0.0"
+    version: "5.1.0"
  logging:
    dependency: transitive
    description:
      name: logging
-      sha256: "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340"
+      sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.3.0"
  matcher:
    dependency: transitive
    description:
@ -412,34 +412,34 @@ packages:
    dependency: transitive
    description:
      name: path
-      sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
+      sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
      url: "https://pub.dev"
    source: hosted
-    version: "1.9.0"
+    version: "1.9.1"
  path_provider:
    dependency: transitive
    description:
      name: path_provider
-      sha256: fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
      url: "https://pub.dev"
    source: hosted
-    version: "2.1.4"
+    version: "2.1.5"
  path_provider_android:
    dependency: transitive
    description:
      name: path_provider_android
-      sha256: c464428172cb986b758c6d1724c603097febb8fb855aa265aeecc9280c294d4a
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
      url: "https://pub.dev"
    source: hosted
-    version: "2.2.12"
+    version: "2.2.15"
  path_provider_foundation:
    dependency: transitive
    description:
      name: path_provider_foundation
-      sha256: f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
      url: "https://pub.dev"
    source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
  path_provider_linux:
    dependency: transitive
    description:
@ -468,10 +468,10 @@ packages:
    dependency: transitive
    description:
      name: platform
-      sha256: "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65"
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
      url: "https://pub.dev"
    source: hosted
-    version: "3.1.5"
+    version: "3.1.6"
  plugin_platform_interface:
    dependency: transitive
    description:
@ -492,18 +492,18 @@ packages:
    dependency: "direct main"
    description:
      name: shared_preferences
-      sha256: "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051"
+      sha256: "95f9997ca1fb9799d494d0cb2a780fd7be075818d59f00c43832ed112b158a82"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.2"
+    version: "2.3.3"
  shared_preferences_android:
    dependency: transitive
    description:
      name: shared_preferences_android
-      sha256: "3b9febd815c9ca29c9e3520d50ec32f49157711e143b7a4ca039eb87e8ade5ab"
+      sha256: "7f172d1b06de5da47b6264c2692ee2ead20bbbc246690427cdb4fc301cd0c549"
      url: "https://pub.dev"
    source: hosted
-    version: "2.3.3"
+    version: "2.3.4"
  shared_preferences_foundation:
    dependency: transitive
    description:
@ -556,7 +556,7 @@ packages:
    dependency: transitive
    description: flutter
    source: sdk
-    version: "0.0.99"
+    version: "0.0.0"
  source_span:
    dependency: transitive
    description:
@ -569,10 +569,10 @@ packages:
    dependency: transitive
    description:
      name: stack_trace
-      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
+      sha256: "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377"
      url: "https://pub.dev"
    source: hosted
-    version: "1.11.1"
+    version: "1.12.0"
  stream_channel:
    dependency: transitive
    description:
@ -585,10 +585,10 @@ packages:
    dependency: transitive
    description:
      name: string_scanner
-      sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
+      sha256: "0bd04f5bb74fcd6ff0606a888a30e917af9bd52820b178eaa464beb11dca84b6"
      url: "https://pub.dev"
    source: hosted
-    version: "1.2.0"
+    version: "1.4.0"
  term_glyph:
    dependency: transitive
    description:
@ -601,18 +601,18 @@ packages:
    dependency: transitive
    description:
      name: test_api
-      sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb"
+      sha256: "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c"
      url: "https://pub.dev"
    source: hosted
-    version: "0.7.2"
+    version: "0.7.3"
  typed_data:
    dependency: transitive
    description:
      name: typed_data
-      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006
      url: "https://pub.dev"
    source: hosted
-    version: "1.3.2"
+    version: "1.4.0"
  universal_html:
    dependency: transitive
    description:
@ -641,10 +641,10 @@ packages:
    dependency: transitive
    description:
      name: vm_service
-      sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d"
+      sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14"
      url: "https://pub.dev"
    source: hosted
-    version: "14.2.5"
+    version: "14.3.1"
  web:
    dependency: transitive
    description:
@ -662,5 +662,5 @@ packages:
    source: hosted
    version: "1.1.0"
 sdks:
-  dart: ">=3.5.1 <4.0.0"
+  dart: ">=3.6.0-0 <4.0.0"
  flutter: ">=3.24.0"