Minor improvements

This commit is contained in:
Igor Kulikov
2022-09-01 17:09:07 +03:00
parent 104c683838
commit 964ae675d5
7 changed files with 30 additions and 30 deletions

View File

@@ -1,12 +1,12 @@
buildscript { buildscript {
ext.kotlin_version = '1.5.10' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { 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" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }
} }

View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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

View File

@@ -286,7 +286,7 @@ class TbContext {
oauth2ClientInfos = await tbClient.getOAuth2Service().getOAuth2Clients( oauth2ClientInfos = await tbClient.getOAuth2Service().getOAuth2Clients(
pkgName: packageName, platform: _oauth2PlatformType); pkgName: packageName, platform: _oauth2PlatformType);
} }
_isAuthenticated.value = tbClient.isAuthenticated(); _isAuthenticated.value = tbClient.isAuthenticated() && !tbClient.isPreVerificationToken();
await updateRouteState(); await updateRouteState();
} catch (e, s) { } catch (e, s) {
log.error('Error: $e', e, s); log.error('Error: $e', e, s);
@@ -318,7 +318,7 @@ class TbContext {
Listenable get isAuthenticatedListenable => _isAuthenticated; Listenable get isAuthenticatedListenable => _isAuthenticated;
bool get isAuthenticated => bool get isAuthenticated =>
_isAuthenticated.value && !tbClient.isPreVerificationToken(); _isAuthenticated.value;
bool get hasOAuthClients => bool get hasOAuthClients =>
oauth2ClientInfos != null && oauth2ClientInfos!.isNotEmpty; oauth2ClientInfos != null && oauth2ClientInfos!.isNotEmpty;

View File

@@ -47,7 +47,7 @@ class MessageLookup extends MessageLookupByLibrary {
"alarmClearTitle": MessageLookupByLibrary.simpleMessage("Clear Alarm"), "alarmClearTitle": MessageLookupByLibrary.simpleMessage("Clear Alarm"),
"alarms": MessageLookupByLibrary.simpleMessage("Alarms"), "alarms": MessageLookupByLibrary.simpleMessage("Alarms"),
"allDevices": MessageLookupByLibrary.simpleMessage("All devices"), "allDevices": MessageLookupByLibrary.simpleMessage("All devices"),
"appTitle": MessageLookupByLibrary.simpleMessage("Thingsboard"), "appTitle": MessageLookupByLibrary.simpleMessage("ThingsBoard"),
"assetName": MessageLookupByLibrary.simpleMessage("Asset name"), "assetName": MessageLookupByLibrary.simpleMessage("Asset name"),
"assets": MessageLookupByLibrary.simpleMessage("Assets"), "assets": MessageLookupByLibrary.simpleMessage("Assets"),
"assignedToCustomer": "assignedToCustomer":
@@ -98,7 +98,7 @@ class MessageLookup extends MessageLookupByLibrary {
"loginNotification": "loginNotification":
MessageLookupByLibrary.simpleMessage("Login to your account"), MessageLookupByLibrary.simpleMessage("Login to your account"),
"logoDefaultValue": "logoDefaultValue":
MessageLookupByLibrary.simpleMessage("Thingsboard Logo"), MessageLookupByLibrary.simpleMessage("ThingsBoard Logo"),
"logout": MessageLookupByLibrary.simpleMessage("Log Out"), "logout": MessageLookupByLibrary.simpleMessage("Log Out"),
"mfaProviderBackupCode": "mfaProviderBackupCode":
MessageLookupByLibrary.simpleMessage("Backup code"), MessageLookupByLibrary.simpleMessage("Backup code"),

View File

@@ -50,10 +50,10 @@ class S {
return Localizations.of<S>(context, S); return Localizations.of<S>(context, S);
} }
/// `Thingsboard` /// `ThingsBoard`
String get appTitle { String get appTitle {
return Intl.message( return Intl.message(
'Thingsboard', 'ThingsBoard',
name: 'appTitle', name: 'appTitle',
desc: '', desc: '',
args: [], args: [],
@@ -150,10 +150,10 @@ class S {
); );
} }
/// `Thingsboard Logo` /// `ThingsBoard Logo`
String get logoDefaultValue { String get logoDefaultValue {
return Intl.message( return Intl.message(
'Thingsboard Logo', 'ThingsBoard Logo',
name: 'logoDefaultValue', name: 'logoDefaultValue',
desc: '', desc: '',
args: [], args: [],

View File

@@ -1,5 +1,5 @@
{ {
"appTitle": "Thingsboard", "appTitle": "ThingsBoard",
"home": "Home", "home": "Home",
"alarms": "Alarms", "alarms": "Alarms",
@@ -12,7 +12,7 @@
"logout": "Log Out", "logout": "Log Out",
"login": "Log In", "login": "Log In",
"logoDefaultValue": "Thingsboard Logo", "logoDefaultValue": "ThingsBoard Logo",
"loginNotification": "Login to your account", "loginNotification": "Login to your account",
"email": "Email", "email": "Email",
"emailRequireText": "Email is required.", "emailRequireText": "Email is required.",

View File

@@ -28,7 +28,7 @@ packages:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.8.2" version: "2.9.0"
auto_size_text: auto_size_text:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -49,7 +49,7 @@ packages:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
@@ -77,7 +77,7 @@ packages:
name: clock name: clock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
collection: collection:
dependency: transitive dependency: transitive
description: description:
@@ -161,7 +161,7 @@ packages:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.3.1"
fluro: fluro:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -180,7 +180,7 @@ packages:
name: flutter_form_builder name: flutter_form_builder
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "7.5.0" version: "7.6.0"
flutter_inappwebview: flutter_inappwebview:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -264,7 +264,7 @@ packages:
name: flutter_svg name: flutter_svg
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.3" version: "1.1.4"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -295,7 +295,7 @@ packages:
name: geolocator_android name: geolocator_android
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.0.2" version: "4.1.0"
geolocator_apple: geolocator_apple:
dependency: transitive dependency: transitive
description: description:
@@ -379,7 +379,7 @@ packages:
name: image_picker_ios name: image_picker_ios
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.8.5+6" version: "0.8.6"
image_picker_platform_interface: image_picker_platform_interface:
dependency: transitive dependency: transitive
description: description:
@@ -435,14 +435,14 @@ packages:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.11" version: "0.12.12"
material_color_utilities: material_color_utilities:
dependency: transitive dependency: transitive
description: description:
name: material_color_utilities name: material_color_utilities
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.1.5"
material_design_icons_flutter: material_design_icons_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -456,7 +456,7 @@ packages:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.0" version: "1.8.0"
mime: mime:
dependency: "direct main" dependency: "direct main"
description: description:
@@ -477,7 +477,7 @@ packages:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.1" version: "1.8.2"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
@@ -526,7 +526,7 @@ packages:
name: qr_code_scanner name: qr_code_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.0" version: "1.0.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@@ -545,7 +545,7 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.2" version: "1.9.0"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
@@ -573,21 +573,21 @@ packages:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0" version: "1.1.1"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "1.2.1"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.9" version: "0.4.12"
thingsboard_client: thingsboard_client:
dependency: "direct main" dependency: "direct main"
description: description: