diff --git a/android/build.gradle b/android/build.gradle index b3afb28..bef5f7b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.7.10' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.0' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..8bd70f3 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -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-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip diff --git a/lib/core/context/tb_context.dart b/lib/core/context/tb_context.dart index 459580f..fbf120f 100644 --- a/lib/core/context/tb_context.dart +++ b/lib/core/context/tb_context.dart @@ -286,7 +286,7 @@ class TbContext { oauth2ClientInfos = await tbClient.getOAuth2Service().getOAuth2Clients( pkgName: packageName, platform: _oauth2PlatformType); } - _isAuthenticated.value = tbClient.isAuthenticated(); + _isAuthenticated.value = tbClient.isAuthenticated() && !tbClient.isPreVerificationToken(); await updateRouteState(); } catch (e, s) { log.error('Error: $e', e, s); @@ -318,7 +318,7 @@ class TbContext { Listenable get isAuthenticatedListenable => _isAuthenticated; bool get isAuthenticated => - _isAuthenticated.value && !tbClient.isPreVerificationToken(); + _isAuthenticated.value; bool get hasOAuthClients => oauth2ClientInfos != null && oauth2ClientInfos!.isNotEmpty; diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index 346751a..62ba866 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -47,7 +47,7 @@ class MessageLookup extends MessageLookupByLibrary { "alarmClearTitle": MessageLookupByLibrary.simpleMessage("Clear Alarm"), "alarms": MessageLookupByLibrary.simpleMessage("Alarms"), "allDevices": MessageLookupByLibrary.simpleMessage("All devices"), - "appTitle": MessageLookupByLibrary.simpleMessage("Thingsboard"), + "appTitle": MessageLookupByLibrary.simpleMessage("ThingsBoard"), "assetName": MessageLookupByLibrary.simpleMessage("Asset name"), "assets": MessageLookupByLibrary.simpleMessage("Assets"), "assignedToCustomer": @@ -98,7 +98,7 @@ class MessageLookup extends MessageLookupByLibrary { "loginNotification": MessageLookupByLibrary.simpleMessage("Login to your account"), "logoDefaultValue": - MessageLookupByLibrary.simpleMessage("Thingsboard Logo"), + MessageLookupByLibrary.simpleMessage("ThingsBoard Logo"), "logout": MessageLookupByLibrary.simpleMessage("Log Out"), "mfaProviderBackupCode": MessageLookupByLibrary.simpleMessage("Backup code"), diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 5fb26b6..7965265 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -50,10 +50,10 @@ class S { return Localizations.of(context, S); } - /// `Thingsboard` + /// `ThingsBoard` String get appTitle { return Intl.message( - 'Thingsboard', + 'ThingsBoard', name: 'appTitle', desc: '', args: [], @@ -150,10 +150,10 @@ class S { ); } - /// `Thingsboard Logo` + /// `ThingsBoard Logo` String get logoDefaultValue { return Intl.message( - 'Thingsboard Logo', + 'ThingsBoard Logo', name: 'logoDefaultValue', desc: '', args: [], diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index a77ba01..feb5604 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -1,5 +1,5 @@ { - "appTitle": "Thingsboard", + "appTitle": "ThingsBoard", "home": "Home", "alarms": "Alarms", @@ -12,7 +12,7 @@ "logout": "Log Out", "login": "Log In", - "logoDefaultValue": "Thingsboard Logo", + "logoDefaultValue": "ThingsBoard Logo", "loginNotification": "Login to your account", "email": "Email", "emailRequireText": "Email is required.", diff --git a/pubspec.lock b/pubspec.lock index b033d71..1d6a48d 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -28,7 +28,7 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.0" auto_size_text: dependency: "direct main" description: @@ -49,7 +49,7 @@ packages: name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" charcode: dependency: transitive description: @@ -77,7 +77,7 @@ packages: name: clock url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: @@ -161,7 +161,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" fluro: dependency: "direct main" description: @@ -180,7 +180,7 @@ packages: name: flutter_form_builder url: "https://pub.dartlang.org" source: hosted - version: "7.5.0" + version: "7.6.0" flutter_inappwebview: dependency: "direct main" description: @@ -264,7 +264,7 @@ packages: name: flutter_svg url: "https://pub.dartlang.org" source: hosted - version: "1.1.3" + version: "1.1.4" flutter_test: dependency: "direct dev" description: flutter @@ -295,7 +295,7 @@ packages: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "4.0.2" + version: "4.1.0" geolocator_apple: dependency: transitive description: @@ -379,7 +379,7 @@ packages: name: image_picker_ios url: "https://pub.dartlang.org" source: hosted - version: "0.8.5+6" + version: "0.8.6" image_picker_platform_interface: dependency: transitive description: @@ -435,14 +435,14 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.11" + version: "0.12.12" material_color_utilities: dependency: transitive description: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.5" material_design_icons_flutter: dependency: "direct main" description: @@ -456,7 +456,7 @@ packages: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.7.0" + version: "1.8.0" mime: dependency: "direct main" description: @@ -477,7 +477,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" path_drawing: dependency: transitive description: @@ -526,7 +526,7 @@ packages: name: qr_code_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.0" + version: "1.0.1" sky_engine: dependency: transitive description: flutter @@ -545,7 +545,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.9.0" stack_trace: dependency: transitive description: @@ -573,21 +573,21 @@ packages: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.1.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.12" thingsboard_client: dependency: "direct main" description: