diff --git a/agrilink_vocpro/android/app/build.gradle b/agrilink_vocpro/android/app/build.gradle index 5641eb6..e40fede 100644 --- a/agrilink_vocpro/android/app/build.gradle +++ b/agrilink_vocpro/android/app/build.gradle @@ -33,11 +33,19 @@ android { versionName = flutter.versionName } + signingConfigs { + release { + keyAlias 'agrilink-upload' + keyPassword '100403' + storeFile file('D:/Code/real_project/flutter/mobile-smartfarming/upload-keystore.jks') + storePassword '100403' + } + } 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.debug + signingConfig signingConfigs.release + minifyEnabled true // You can set to true for release builds + shrinkResources true // Set to true if minify is true } } } diff --git a/agrilink_vocpro/android/app/src/main/AndroidManifest.xml b/agrilink_vocpro/android/app/src/main/AndroidManifest.xml index c15afda..a4c27a4 100644 --- a/agrilink_vocpro/android/app/src/main/AndroidManifest.xml +++ b/agrilink_vocpro/android/app/src/main/AndroidManifest.xml @@ -3,7 +3,7 @@ diff --git a/agrilink_vocpro/lib/features/home/detail_pages/conductivity/view/conductivity_screen.dart b/agrilink_vocpro/lib/features/home/detail_pages/conductivity/view/conductivity_screen.dart index 3317507..e971b82 100644 --- a/agrilink_vocpro/lib/features/home/detail_pages/conductivity/view/conductivity_screen.dart +++ b/agrilink_vocpro/lib/features/home/detail_pages/conductivity/view/conductivity_screen.dart @@ -144,7 +144,6 @@ class ConductivityScreen extends StatelessWidget { ? provider.dataFetchedNpk1[index].soilconductivity ?? 0 : provider.dataFetchedNpk2[index].soilconductivity ?? 0, ), - maxValue: 1, ); case ResultState.error: return const ErrorDataStateWidget(); diff --git a/agrilink_vocpro/lib/features/home/detail_pages/luminosity/view/light_screen.dart b/agrilink_vocpro/lib/features/home/detail_pages/luminosity/view/light_screen.dart index c0ea612..2d84fe9 100644 --- a/agrilink_vocpro/lib/features/home/detail_pages/luminosity/view/light_screen.dart +++ b/agrilink_vocpro/lib/features/home/detail_pages/luminosity/view/light_screen.dart @@ -137,6 +137,7 @@ class LightScreen extends StatelessWidget { provider.dataFetched[index].vicihumidity ?.toDouble() ?? 0), + maxValue: 500, ); case ResultState.error: return Center( diff --git 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 index 1e651bf..b803bca 100644 --- 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 @@ -144,7 +144,7 @@ class NitrogenScreen extends StatelessWidget { ? provider.dataFetchedNpk1[index].soilnitrogen ?? 0 : provider.dataFetchedNpk2[index].soilnitrogen ?? 0, ), - maxValue: 1, + maxValue: 10, ); case ResultState.error: return const ErrorDataStateWidget(); diff --git 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 index 73d6975..1c4e31a 100644 --- 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 @@ -144,7 +144,7 @@ class PhosphorusScreen extends StatelessWidget { ? provider.dataFetchedNpk1[index].soilphosphorus ?? 0 : provider.dataFetchedNpk2[index].soilphosphorus ?? 0, ), - maxValue: 10, + maxValue: 100, ); case ResultState.error: return const ErrorDataStateWidget(); diff --git 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 index baa8eac..85d8e3c 100644 --- 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 @@ -144,7 +144,7 @@ class PotassiumScreen extends StatelessWidget { ? provider.dataFetchedNpk1[index].soilpotassium ?? 0 : provider.dataFetchedNpk2[index].soilpotassium ?? 0, ), - maxValue: 1, + maxValue: 100, ); case ResultState.error: return const ErrorDataStateWidget(); diff --git a/agrilink_vocpro/lib/features/home/detail_pages/soil_moisture/view/soil_moisture_screen.dart b/agrilink_vocpro/lib/features/home/detail_pages/soil_moisture/view/soil_moisture_screen.dart index 6caebd3..d450c99 100644 --- a/agrilink_vocpro/lib/features/home/detail_pages/soil_moisture/view/soil_moisture_screen.dart +++ b/agrilink_vocpro/lib/features/home/detail_pages/soil_moisture/view/soil_moisture_screen.dart @@ -173,7 +173,6 @@ class SoilMoistureScreen extends StatelessWidget { ? provider.dataFetchedNpk1[index].soilhumidity ?? 0 : provider.dataFetchedNpk2[index].soilhumidity ?? 0, ), - maxValue: 1, ); case ResultState.error: return const ErrorDataStateWidget(); diff --git a/agrilink_vocpro/lib/features/home/detail_pages/temperature/view/temperature_screen.dart b/agrilink_vocpro/lib/features/home/detail_pages/temperature/view/temperature_screen.dart index 53cbe1a..0a9131a 100644 --- a/agrilink_vocpro/lib/features/home/detail_pages/temperature/view/temperature_screen.dart +++ b/agrilink_vocpro/lib/features/home/detail_pages/temperature/view/temperature_screen.dart @@ -228,6 +228,7 @@ class TemperatureScreen extends StatelessWidget { provider.dataFetched[index].vicitemperature ?.toDouble() ?? 0), + maxValue: 60, ); case ResultState.error: return ErrorDataStateWidget(); diff --git a/upload-keystore.jks b/upload-keystore.jks new file mode 100644 index 0000000..3c8fb7a Binary files /dev/null and b/upload-keystore.jks differ