From dc18c9c04b39865fc757d0e11ac8f08e7b66c43d Mon Sep 17 00:00:00 2001 From: Igor Kulikov Date: Tue, 16 Nov 2021 09:39:44 +0200 Subject: [PATCH] Fix compile errors --- android/app/build.gradle | 4 ++-- lib/core/auth/login/login_page.dart | 1 + lib/core/auth/login/reset_password_request_page.dart | 1 + lib/modules/profile/change_password_page.dart | 1 + lib/modules/profile/profile_page.dart | 1 + lib/utils/services/widget_action_handler.dart | 4 ++-- pubspec.lock | 12 ++++++++++++ pubspec.yaml | 1 + 8 files changed, 21 insertions(+), 4 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index 41894d0..fe68591 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 30 + compileSdkVersion 31 sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -36,7 +36,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "org.thingsboard.app" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 31 versionCode flutterVersionCode.toInteger() versionName flutterVersionName } diff --git a/lib/core/auth/login/login_page.dart b/lib/core/auth/login/login_page.dart index 7fd413b..7ea39da 100644 --- a/lib/core/auth/login/login_page.dart +++ b/lib/core/auth/login/login_page.dart @@ -4,6 +4,7 @@ import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:flutter_svg/flutter_svg.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; import 'package:thingsboard_app/constants/assets_path.dart'; diff --git a/lib/core/auth/login/reset_password_request_page.dart b/lib/core/auth/login/reset_password_request_page.dart index b9f830a..218935e 100644 --- a/lib/core/auth/login/reset_password_request_page.dart +++ b/lib/core/auth/login/reset_password_request_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:thingsboard_app/core/auth/login/login_page_background.dart'; import 'package:thingsboard_app/core/context/tb_context.dart'; import 'package:thingsboard_app/core/context/tb_context_widget.dart'; diff --git a/lib/modules/profile/change_password_page.dart b/lib/modules/profile/change_password_page.dart index 82bf396..2bfc55d 100644 --- a/lib/modules/profile/change_password_page.dart +++ b/lib/modules/profile/change_password_page.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:thingsboard_app/core/context/tb_context.dart'; import 'package:thingsboard_app/core/context/tb_context_widget.dart'; import 'package:thingsboard_app/widgets/tb_app_bar.dart'; diff --git a/lib/modules/profile/profile_page.dart b/lib/modules/profile/profile_page.dart index 7973dde..ec83d66 100644 --- a/lib/modules/profile/profile_page.dart +++ b/lib/modules/profile/profile_page.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_form_builder/flutter_form_builder.dart'; +import 'package:form_builder_validators/form_builder_validators.dart'; import 'package:thingsboard_app/modules/profile/change_password_page.dart'; import 'package:thingsboard_app/widgets/tb_app_bar.dart'; diff --git a/lib/utils/services/widget_action_handler.dart b/lib/utils/services/widget_action_handler.dart index 40d2af2..2d73b39 100644 --- a/lib/utils/services/widget_action_handler.dart +++ b/lib/utils/services/widget_action_handler.dart @@ -214,8 +214,8 @@ class WidgetActionHandler with HasTbContext { Future _scanQrCode() async { try { Barcode? barcode = await tbContext.navigateTo('/qrCodeScan', transition: TransitionType.nativeModal); - if (barcode != null) { - return WidgetMobileActionResult.successResult(MobileActionResult.qrCode(barcode.code, describeEnum(barcode.format))); + if (barcode != null && barcode.code != null) { + return WidgetMobileActionResult.successResult(MobileActionResult.qrCode(barcode.code!, describeEnum(barcode.format))); } else { return WidgetMobileActionResult.emptyResult(); } diff --git a/pubspec.lock b/pubspec.lock index 60ba0af..a8ea8f8 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -167,6 +167,11 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.9.2" + flutter_localizations: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -240,6 +245,13 @@ packages: description: flutter source: sdk version: "0.0.0" + form_builder_validators: + dependency: "direct main" + description: + name: form_builder_validators + url: "https://pub.dartlang.org" + source: hosted + version: "7.2.0" geolocator: dependency: "direct main" description: diff --git a/pubspec.yaml b/pubspec.yaml index a62714d..465117a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -38,6 +38,7 @@ dependencies: dart_jsonwebtoken: ^2.2.0 crypto: ^3.0.1 flutter_form_builder: ^7.0.0 + form_builder_validators: ^7.2.0 universal_platform: ^1.0.0+1 preload_page_view: ^0.1.6