| @@ -6,7 +6,7 @@ buildscript { | |||
| } | |||
| dependencies { | |||
| classpath 'com.android.tools.build:gradle:3.5.0' | |||
| classpath 'com.android.tools.build:gradle:4.0.1' | |||
| classpath 'com.google.gms:google-services:4.3.3' | |||
| classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" | |||
| } | |||
| @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME | |||
| distributionPath=wrapper/dists | |||
| zipStoreBase=GRADLE_USER_HOME | |||
| zipStorePath=wrapper/dists | |||
| distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.2-all.zip | |||
| distributionUrl=https://services.gradle.org/distributions/gradle-6.1.1-all.zip | |||
| @@ -361,7 +361,7 @@ | |||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||
| CLANG_ENABLE_MODULES = YES; | |||
| CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | |||
| CURRENT_PROJECT_VERSION = 4; | |||
| CURRENT_PROJECT_VERSION = 5; | |||
| DEVELOPMENT_TEAM = C3DTD2JH94; | |||
| ENABLE_BITCODE = NO; | |||
| FRAMEWORK_SEARCH_PATHS = ( | |||
| @@ -377,7 +377,7 @@ | |||
| "$(inherited)", | |||
| "$(PROJECT_DIR)/Flutter", | |||
| ); | |||
| MARKETING_VERSION = 1.0.1; | |||
| MARKETING_VERSION = 1.0.2; | |||
| PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo; | |||
| PRODUCT_NAME = "$(TARGET_NAME)"; | |||
| SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; | |||
| @@ -500,7 +500,7 @@ | |||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||
| CLANG_ENABLE_MODULES = YES; | |||
| CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | |||
| CURRENT_PROJECT_VERSION = 4; | |||
| CURRENT_PROJECT_VERSION = 5; | |||
| DEVELOPMENT_TEAM = C3DTD2JH94; | |||
| ENABLE_BITCODE = NO; | |||
| FRAMEWORK_SEARCH_PATHS = ( | |||
| @@ -516,7 +516,7 @@ | |||
| "$(inherited)", | |||
| "$(PROJECT_DIR)/Flutter", | |||
| ); | |||
| MARKETING_VERSION = 1.0.1; | |||
| MARKETING_VERSION = 1.0.2; | |||
| PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo; | |||
| PRODUCT_NAME = "$(TARGET_NAME)"; | |||
| SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; | |||
| @@ -533,7 +533,7 @@ | |||
| ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; | |||
| CLANG_ENABLE_MODULES = YES; | |||
| CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements; | |||
| CURRENT_PROJECT_VERSION = 4; | |||
| CURRENT_PROJECT_VERSION = 5; | |||
| DEVELOPMENT_TEAM = C3DTD2JH94; | |||
| ENABLE_BITCODE = NO; | |||
| FRAMEWORK_SEARCH_PATHS = ( | |||
| @@ -549,7 +549,7 @@ | |||
| "$(inherited)", | |||
| "$(PROJECT_DIR)/Flutter", | |||
| ); | |||
| MARKETING_VERSION = 1.0.1; | |||
| MARKETING_VERSION = 1.0.2; | |||
| PRODUCT_BUNDLE_IDENTIFIER = vn.azteam.farmdemo; | |||
| PRODUCT_NAME = "$(TARGET_NAME)"; | |||
| SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; | |||
| @@ -55,7 +55,8 @@ abstract class RestClient { | |||
| Future<void> deleteFcmToken(@Body() String token); | |||
| //Plot | |||
| @GET("/api/tb-crops?page={page}&size={size}&sort=id,asc&query={query}") | |||
| @GET( | |||
| "/api/_search/tb-crops?page={page}&size={size}&sort=id,asc&query={query}") | |||
| Future<List<TbCropDTO>> getPlots( | |||
| {@Path() int page = 0, @Path() int size = 20, @Path() String query = ""}); | |||
| @@ -188,7 +188,7 @@ class _RestClient implements RestClient { | |||
| queryParameters.removeWhere((k, v) => v == null); | |||
| final _data = <String, dynamic>{}; | |||
| final _result = await _dio.request<List<dynamic>>( | |||
| '/api/tb-crops?page=$page&size=$size&sort=id,asc&query=$query', | |||
| '/api/_search/tb-crops?page=$page&size=$size&sort=id,asc&query=$query', | |||
| queryParameters: queryParameters, | |||
| options: RequestOptions( | |||
| method: 'GET', | |||
| @@ -75,6 +75,7 @@ class _PlotActionScreenState extends State<PlotActionScreen> | |||
| '${ConstCommon.baseImageUrl}${actionType.urlLogo}', | |||
| placeholder: (context, url) => Icon( | |||
| Icons.broken_image, | |||
| color: Colors.grey[300], | |||
| ), | |||
| errorWidget: (context, url, error) => Image.asset( | |||
| AppAssets.logo, | |||
| @@ -45,7 +45,7 @@ dependencies: | |||
| camera: ^0.5.8+5 | |||
| path_provider: ^1.6.14 | |||
| file_picker: ^2.0.7 | |||
| file_picker: ^2.1.5+1 | |||
| flutter_cache_manager: ^1.4.2 | |||
| mime: ^0.9.7 | |||