From e1b6f7c2cb286e1c0fd0b1b20b100f5e71b6afa1 Mon Sep 17 00:00:00 2001 From: Rustem Date: Wed, 10 Jun 2026 13:21:12 +0500 Subject: [PATCH] flutter upgrade --- android/app/build.gradle | 48 +- android/build.gradle | 53 +- android/gradle.properties | 5 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- android/settings.gradle | 30 +- lib/core/services/ApiService.dart | 2 +- lib/core/services/blue_print_service.dart | 167 +--- lib/main.dart | 3 +- lib/redux/actions/setting_actions.dart | 2 +- lib/redux/state/setting_state.dart | 2 +- lib/views/bank_setting/bank_setting_view.dart | 9 +- .../bank_setting/forte_setting_view.dart | 9 +- lib/views/bank_view/bank_view.dart | 24 +- lib/views/check/image_show_container.dart | 11 +- lib/views/history/history_view.dart | 2 +- lib/views/home/home_view_m.dart | 1 - lib/views/home/tabs/CalculatorTab.dart | 10 +- lib/views/home/tabs/KassaTab.dart | 20 +- .../tabs/kassaView/CatalogBottomSheet.dart | 4 +- .../tabs/kassaView/ProductAddBottomSheet.dart | 2 +- lib/views/payment/payment_view.dart | 1 - lib/views/payment_nfc/payment_nfc_view.dart | 1 - lib/views/qr_view/qr_view.dart | 2 +- .../settings/printer/views/PrinterSelect.dart | 2 +- lib/views/settings/settings_view.dart | 9 +- lib/widgets/components/ProductListItem.dart | 8 +- .../calculator/calculator-button.dart | 18 +- lib/widgets/dialog_manager.dart | 12 +- pubspec.lock | 822 ++++++++++++------ pubspec.yaml | 27 +- 30 files changed, 716 insertions(+), 592 deletions(-) diff --git a/android/app/build.gradle b/android/app/build.gradle index cb1eb9d..4f0d77d 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,3 +1,9 @@ +plugins { + id "com.android.application" + id "kotlin-android" + id "dev.flutter.flutter-gradle-plugin" +} + def localProperties = new Properties() def localPropertiesFile = rootProject.file('local.properties') if (localPropertiesFile.exists()) { @@ -6,11 +12,6 @@ if (localPropertiesFile.exists()) { } } -def flutterRoot = localProperties.getProperty('flutter.sdk') -if (flutterRoot == null) { - throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") -} - def flutterVersionCode = localProperties.getProperty('flutter.versionCode') if (flutterVersionCode == null) { flutterVersionCode = '4' @@ -21,20 +22,16 @@ if (flutterVersionName == null) { flutterVersionName = '1.0.4' } -apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' -apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" - def keystoreProperties = new Properties() def keystorePropertiesFile = rootProject.file('key.properties') if (keystorePropertiesFile.exists()) { keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) } - - android { - compileSdkVersion 31 + namespace "kz.com.aman.kassa" + compileSdkVersion 36 + ndkVersion "28.2.13676358" sourceSets { main.java.srcDirs += 'src/main/kotlin' @@ -46,7 +43,7 @@ android { defaultConfig { applicationId "kz.com.aman.kassa" - minSdkVersion 21 + minSdkVersion flutter.minSdkVersion targetSdkVersion 35 versionCode flutterVersionCode.toInteger() versionName flutterVersionName @@ -62,29 +59,24 @@ android { storePassword keystoreProperties['storePassword'] } } + buildTypes { debug { shrinkResources false minifyEnabled false - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - defaultConfig { - minSdkVersion 24 - } } release { shrinkResources false minifyEnabled false - useProguard false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release } } compileOptions { - //coreLibraryDesugaringEnabled true - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } packagingOptions { @@ -93,9 +85,8 @@ android { } kotlinOptions { - jvmTarget = JavaVersion.VERSION_1_8.toString() + jvmTarget = JavaVersion.VERSION_17.toString() } - } flutter { @@ -103,7 +94,6 @@ flutter { } dependencies { - //coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9' implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' @@ -111,15 +101,5 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - - // https://mvnrepository.com/artifact/com.google.code.gson/gson implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.6' - - - //implementation 'com.android.support:multidex:2.0.1' - //m4bank dependencies - } - - - diff --git a/android/build.gradle b/android/build.gradle index b9631ec..e1ca41e 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,24 +1,18 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '2.2.20' repositories { google() - jcenter() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' - classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' // add plugin - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + classpath 'org.greenrobot:greendao-gradle-plugin:3.2.2' } - - } allprojects { repositories { google() - jcenter() mavenCentral() } @@ -37,13 +31,42 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { - delete rootProject.buildDir -} - -tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all { - kotlinOptions { - jvmTarget = "1.8" +gradle.beforeProject { proj -> + proj.afterEvaluate { + if (proj.plugins.hasPlugin("com.android.library")) { + try { + if (!proj.android.namespace) { + def manifestFile = proj.file("src/main/AndroidManifest.xml") + if (manifestFile.exists()) { + def manifest = new groovy.xml.XmlSlurper().parse(manifestFile) + def packageName = manifest.'@package'?.toString() + if (packageName) { + proj.android.namespace = packageName + } + } + } + } catch (Exception ignored) {} + } + // Force Java 17 for all Android subprojects to match global Kotlin JVM target 17 + if (proj.plugins.hasPlugin("com.android.library") || proj.plugins.hasPlugin("com.android.application")) { + try { + proj.android.compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + } catch (Exception ignored) {} + } } } +tasks.register("clean", Delete) { + delete rootProject.layout.buildDirectory +} + +allprojects { + tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { + kotlinOptions { + jvmTarget = "17" + } + } +} diff --git a/android/gradle.properties b/android/gradle.properties index 38c8d45..f9d971f 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -2,3 +2,8 @@ org.gradle.jvmargs=-Xmx1536M android.enableR8=true android.useAndroidX=true android.enableJetifier=true +# This builtInKotlin flag was added automatically by Flutter migrator +android.builtInKotlin=false +# This newDsl flag was added automatically by Flutter migrator +android.newDsl=false +android.defaults.buildfeatures.buildconfig=true diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 493072b..065230d 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.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-all.zip diff --git a/android/settings.gradle b/android/settings.gradle index 5a2f14f..ff03f22 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,15 +1,25 @@ -include ':app' +pluginManagement { + def flutterSdkPath = { + def properties = new Properties() + file("local.properties").withInputStream { properties.load(it) } + def flutterSdkPath = properties.getProperty("flutter.sdk") + assert flutterSdkPath != null, "flutter.sdk not set in local.properties" + return flutterSdkPath + }() -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() + includeBuild("$flutterSdkPath/packages/flutter_tools/gradle") -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } + repositories { + google() + mavenCentral() + gradlePluginPortal() + } } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory +plugins { + id "dev.flutter.flutter-plugin-loader" version "1.0.0" + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } + +include ":app" diff --git a/lib/core/services/ApiService.dart b/lib/core/services/ApiService.dart index b560dd7..338d7b1 100644 --- a/lib/core/services/ApiService.dart +++ b/lib/core/services/ApiService.dart @@ -8,7 +8,7 @@ import 'package:aman_kassa_flutter/redux/state/user_state.dart'; import 'package:aman_kassa_flutter/redux/store.dart'; import 'package:aman_kassa_flutter/views/login/login_view.dart'; import 'package:crypto/crypto.dart'; -import 'package:device_info/device_info.dart'; +import 'package:device_info_plus/device_info_plus.dart'; import 'package:aman_kassa_flutter/core/models/message.dart'; import 'package:aman_kassa_flutter/core/models/response.dart'; import 'package:aman_kassa_flutter/core/models/smena.dart'; diff --git a/lib/core/services/blue_print_service.dart b/lib/core/services/blue_print_service.dart index 74936aa..9f3aa14 100644 --- a/lib/core/services/blue_print_service.dart +++ b/lib/core/services/blue_print_service.dart @@ -1,173 +1,30 @@ -import 'dart:io'; +import 'dart:async'; import 'dart:typed_data'; import 'package:aman_kassa_flutter/core/base/base_service.dart'; -import 'package:bluetooth_print/bluetooth_print.dart'; -import 'package:bluetooth_print/bluetooth_print_model.dart'; -import 'package:flutter_blue/flutter_blue.dart' as flutter_blue; -import 'package:flutter_blue/gen/flutterblue.pb.dart' as proto; +import 'package:aman_kassa_flutter/core/models/bluetooth_device.dart'; +// Stub implementation — bluetooth print disabled class BluePrintService extends BaseService { - final BluetoothPrint _bluetoothAndr = BluetoothPrint.instance; - flutter_blue.BluetoothDevice? _bluetoothDeviceIOS; - final flutter_blue.FlutterBlue _bluetoothIOS = - flutter_blue.FlutterBlue.instance; - - final bool isAndroid = Platform.isAndroid; - final bool isIos = Platform.isIOS; - // final bool isAndroid = false; - // final bool isIos = true; - BluetoothDevice? _device; - Future scan() async { - if (isAndroid) { - await _bluetoothAndr.startScan(timeout: Duration(seconds: 4)); - } else if (isIos) { - await _bluetoothIOS.startScan(timeout: const Duration(seconds: 5)); - } - } + Future scan() async {} - Future stopScan() async { - if (isAndroid) { - await _bluetoothAndr.stopScan(); - } else if (isIos) { - await _bluetoothIOS.stopScan(); - } - } + Future stopScan() async {} - Stream> get scanResult { - if (isAndroid) - return _bluetoothAndr.scanResults; - else - return _bluetoothIOS.scanResults.asyncMap>( - (event) => - Future.wait(event.toList().map((e) async => BluetoothDevice() - ..name = e.device.name - ..type = e.device.type.index - ..address = e.device.id.id))); - } + Stream> get scanResult => + Stream>.value([]); - Stream get isScanning => - isAndroid ? _bluetoothAndr.isScanning : _bluetoothIOS.isScanning; + Stream get isScanning => Stream.value(false); - Stream get state => isAndroid - ? _bluetoothAndr.state - : _bluetoothIOS.state.asyncMap((event) => event.index); + Stream get state => Stream.value(0); set device(BluetoothDevice device) => _device = device; - Future connect() async { - bool response = false; - if (_device == null) { - response = false; - } else { - // try { - // await _bluetoothAndr.connect(_device!); - // await Future.delayed(Duration(seconds: 5)); - // response = true; - // } catch (e) { - // print('Error connect $e'); - // response = false; - // } + Future connect() async => false; - try { - if (isAndroid) { - await _bluetoothAndr.connect(_device!); - } else if (isIos) { - _bluetoothDeviceIOS = flutter_blue.BluetoothDevice.fromProto( - proto.BluetoothDevice( - name: _device?.name ?? '', - remoteId: _device?.address ?? '', - type: proto.BluetoothDevice_Type.valueOf(_device?.type ?? 0), - ), - ); - final List connectedDevices = - await _bluetoothIOS.connectedDevices; - final int deviceConnectedIndex = connectedDevices - .indexWhere((flutter_blue.BluetoothDevice bluetoothDevice) { - return bluetoothDevice.id == _bluetoothDeviceIOS?.id; - }); - if (deviceConnectedIndex < 0) { - await _bluetoothDeviceIOS?.connect(); - } - } - - response = true; - _device?.connected = true; - return Future.value(response); - } on Exception catch (error) { - print('$runtimeType - Error $error'); - response = false; - _device?.connected = false; - return Future.value(response); - } - } - return response; - } - - Future disconnect() async { - bool response = false; - try { - if (isAndroid) { - await _bluetoothAndr.disconnect(); - } else if (isIos) { - await _bluetoothDeviceIOS?.disconnect(); - } - - print('disconnected'); - response = true; - } catch (e) { - print('Error $e'); - response = false; - } - return response; - } + Future disconnect() async => true; Future printBytes(Uint8List bytes, - {int chunkSizeBytes = 20, int queueSleepTimeMs = 20}) async { - Map config = Map(); - final len = bytes.length; - List> chunks = []; - for (var i = 0; i < len; i += chunkSizeBytes) { - var end = (i + chunkSizeBytes < len) ? i + chunkSizeBytes : len; - chunks.add(bytes.sublist(i, end)); - } - - for (var i = 0; i < chunks.length; i += 1) { - if (isAndroid) { - await _printAndroid(chunks[i], config); - } else if (isIos) { - await _printIos(Uint8List.fromList(chunks[i]), config); - } - - await Future.delayed(Duration(milliseconds: queueSleepTimeMs)); - } - - - - return true; - } - - Future _printIos(Uint8List bytes,Map config) async { - final List bluetoothServices = - await _bluetoothDeviceIOS?.discoverServices() ?? - []; - final flutter_blue.BluetoothService bluetoothService = - bluetoothServices.firstWhere( - (flutter_blue.BluetoothService service) => service.isPrimary, - ); - final flutter_blue.BluetoothCharacteristic characteristic = - bluetoothService.characteristics.firstWhere( - (flutter_blue.BluetoothCharacteristic bluetoothCharacteristic) => - bluetoothCharacteristic.properties.write, - ); - await characteristic.write(bytes, withoutResponse: true); - } - - Future _printAndroid(List chunk ,Map config) async { - - - await _bluetoothAndr.rawBytes(config, chunk); - } + {int chunkSizeBytes = 20, int queueSleepTimeMs = 20}) async => false; } diff --git a/lib/main.dart b/lib/main.dart index a17864a..6cc08ed 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -106,9 +106,8 @@ class MainApplication extends StatelessWidget { ), builder: (context, child) => MaterialApp( theme: ThemeData( - backgroundColor: backgroundColor, + colorScheme: ColorScheme.fromSeed(seedColor: primaryColor).copyWith(surface: backgroundColor), primaryColor: primaryColor, - accentColor: yellowColor, scaffoldBackgroundColor: Colors.white, // textTheme: GoogleFonts.latoTextTheme( // Theme.of(context).textTheme, diff --git a/lib/redux/actions/setting_actions.dart b/lib/redux/actions/setting_actions.dart index 3cef5b2..ff705fa 100644 --- a/lib/redux/actions/setting_actions.dart +++ b/lib/redux/actions/setting_actions.dart @@ -1,6 +1,6 @@ +import 'package:aman_kassa_flutter/core/models/bluetooth_device.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; import 'package:aman_kassa_flutter/redux/state/setting_state.dart'; -import 'package:bluetooth_print/bluetooth_print_model.dart'; import 'package:meta/meta.dart'; import 'package:redux/redux.dart'; import 'package:redux_thunk/redux_thunk.dart'; diff --git a/lib/redux/state/setting_state.dart b/lib/redux/state/setting_state.dart index 6072258..ffb264d 100644 --- a/lib/redux/state/setting_state.dart +++ b/lib/redux/state/setting_state.dart @@ -1,5 +1,5 @@ +import 'package:aman_kassa_flutter/core/models/bluetooth_device.dart'; import 'package:aman_kassa_flutter/redux/constants/setting_const.dart'; -import 'package:bluetooth_print/bluetooth_print_model.dart'; import 'package:meta/meta.dart'; @immutable diff --git a/lib/views/bank_setting/bank_setting_view.dart b/lib/views/bank_setting/bank_setting_view.dart index d5ef6c0..f50dc18 100644 --- a/lib/views/bank_setting/bank_setting_view.dart +++ b/lib/views/bank_setting/bank_setting_view.dart @@ -120,15 +120,16 @@ class _BankSettingViewState extends State { labelText: 'Пароль', hintText: "Введите пароль"), ), verticalSpaceMedium, - RaisedButton( + ElevatedButton( onPressed: () => this._saveData(context), child: Text( 'Cохранить', style: TextStyle(color: whiteColor, fontSize: 25.0), ), - color: primaryColor, - padding: - const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0), + style: ElevatedButton.styleFrom( + backgroundColor: primaryColor, + padding: const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0), + ), ), ], diff --git a/lib/views/bank_setting/forte_setting_view.dart b/lib/views/bank_setting/forte_setting_view.dart index 98332d3..7bfb388 100644 --- a/lib/views/bank_setting/forte_setting_view.dart +++ b/lib/views/bank_setting/forte_setting_view.dart @@ -122,15 +122,16 @@ class _ForteSettingViewState extends State { labelText: 'Пароль', hintText: "Введите пароль"), ), verticalSpaceMedium, - RaisedButton( + ElevatedButton( onPressed: () => this._saveData(context), child: Text( 'Cохранить', style: TextStyle(color: whiteColor, fontSize: 25.0), ), - color: primaryColor, - padding: - const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0), + style: ElevatedButton.styleFrom( + backgroundColor: primaryColor, + padding: const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0), + ), ), ], diff --git a/lib/views/bank_view/bank_view.dart b/lib/views/bank_view/bank_view.dart index 4f624d6..f7bfcb4 100644 --- a/lib/views/bank_view/bank_view.dart +++ b/lib/views/bank_view/bank_view.dart @@ -171,13 +171,13 @@ class _BankViewState extends State { child: Column( mainAxisAlignment: MainAxisAlignment.center, children: [ - RaisedButton( + ElevatedButton( child: Text('Activity m4Bank'), onPressed: activity), Column( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('version: $versionValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Version'), onPressed: version), ], ), @@ -185,7 +185,7 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('init: $initValue' , overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Init'), onPressed: initialize), ], ), @@ -193,7 +193,7 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('connection: $connectionValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Connect'), onPressed: connect), ], ), @@ -201,21 +201,21 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('auth: $authValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton(child: Text('Auth'), onPressed: auth), + ElevatedButton(child: Text('Auth'), onPressed: auth), ], ), Column( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('cancel: $cancelValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton(child: Text('Cancel'), onPressed: cancel), + ElevatedButton(child: Text('Cancel'), onPressed: cancel), ], ), Column( mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('shutdown: $shutdownValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Shutdown'), onPressed: shutdown), ], ), @@ -223,7 +223,7 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('transaction: $transactionValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Transaction'), onPressed: transaction), ], ), @@ -231,7 +231,7 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('get: $getValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Get'), onPressed: get), ], ), @@ -239,7 +239,7 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('error: $errorValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('Error'), onPressed: error), ], ), @@ -247,12 +247,12 @@ class _BankViewState extends State { mainAxisAlignment: MainAxisAlignment.spaceAround, children: [ Text('error: $closeDayValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton( + ElevatedButton( child: Text('CloseDay'), onPressed: closeDay), ], ), Text('pay: $payValue', overflow: TextOverflow.clip, maxLines: 2, softWrap: false), - RaisedButton(child: Text('Payment'), onPressed: pay), + ElevatedButton(child: Text('Payment'), onPressed: pay), ], ), ), diff --git a/lib/views/check/image_show_container.dart b/lib/views/check/image_show_container.dart index dae344d..9950ac4 100644 --- a/lib/views/check/image_show_container.dart +++ b/lib/views/check/image_show_container.dart @@ -26,12 +26,13 @@ import 'package:aman_kassa_flutter/views/settings/printer/PrinterTest.dart'; import 'package:aman_kassa_flutter/views/payment/halyk_pos_service.dart'; import 'package:aman_kassa_flutter/widgets/fields/busy_button_icon.dart'; import 'package:aman_kassa_flutter/widgets/loader/Dialogs.dart'; -import 'package:bluetooth_print/bluetooth_print_model.dart'; +import 'package:aman_kassa_flutter/core/models/bluetooth_device.dart'; import 'package:esc_pos_utils/esc_pos_utils.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:material_design_icons_flutter/material_design_icons_flutter.dart'; -import 'package:vocsy_esys_flutter_share/vocsy_esys_flutter_share.dart'; +import 'package:share_plus/share_plus.dart'; +import 'package:path_provider/path_provider.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../core/models/aman_dao.dart'; @@ -401,7 +402,11 @@ class _MyFloatingActionButtonState extends State { void shareFile() async { try { - await Share.file('Aman Kassa', 'aman_kassa_check.png', base64Decode(widget.data.data!.base64Data!), 'image/png'); + final bytes = base64Decode(widget.data.data!.base64Data!); + final tempDir = await getTemporaryDirectory(); + final file = File('${tempDir.path}/aman_kassa_check.png'); + await file.writeAsBytes(bytes); + await Share.shareXFiles([XFile(file.path, mimeType: 'image/png')], subject: 'Aman Kassa'); } catch (e) { print('error: $e'); } diff --git a/lib/views/history/history_view.dart b/lib/views/history/history_view.dart index fdd8ed4..e242210 100644 --- a/lib/views/history/history_view.dart +++ b/lib/views/history/history_view.dart @@ -47,7 +47,7 @@ class _HistoryViewState extends State { appBar: AppBar( title: Text('История чеков'), actions: [ - FlatButton( + TextButton( child: Text( 'Очистить', style: TextStyle( diff --git a/lib/views/home/home_view_m.dart b/lib/views/home/home_view_m.dart index 016b975..69ce7d3 100644 --- a/lib/views/home/home_view_m.dart +++ b/lib/views/home/home_view_m.dart @@ -168,7 +168,6 @@ class _HomeViewState extends State with WidgetsBindingObserver { return Scaffold( appBar: AppBar( titleSpacing: 5.0, - brightness: Brightness.light, title: HeaderTitle(), actions: [ PopupMenu( diff --git a/lib/views/home/tabs/CalculatorTab.dart b/lib/views/home/tabs/CalculatorTab.dart index 5e56042..ab820c8 100644 --- a/lib/views/home/tabs/CalculatorTab.dart +++ b/lib/views/home/tabs/CalculatorTab.dart @@ -37,9 +37,8 @@ class CalculatorTab extends StatelessWidget { Row( children: [ Expanded( - child: RaisedButton( - padding: EdgeInsets.all(16.0), - color: redColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: redColor, padding: EdgeInsets.all(16.0)), child: Text( "возврат", style: buttonBigTitleTextStyle, @@ -52,9 +51,8 @@ class CalculatorTab extends StatelessWidget { }), ), Expanded( - child: RaisedButton( - padding: EdgeInsets.all(16.0), - color: greenColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: greenColor, padding: EdgeInsets.all(16.0)), child: Text( "оплата", style: buttonBigTitleTextStyle, diff --git a/lib/views/home/tabs/KassaTab.dart b/lib/views/home/tabs/KassaTab.dart index db2b787..b86d446 100644 --- a/lib/views/home/tabs/KassaTab.dart +++ b/lib/views/home/tabs/KassaTab.dart @@ -72,9 +72,8 @@ class KassaTab extends StatelessWidget { Expanded( child: Padding( padding: const EdgeInsets.all(4.0), - child: RaisedButton( - padding: const EdgeInsets.all(8), - color: primaryColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: primaryColor, padding: const EdgeInsets.all(8)), child: Text( "Добавить", style: buttonBigTitleTextStyle, @@ -88,9 +87,8 @@ class KassaTab extends StatelessWidget { Expanded( child: Padding( padding: const EdgeInsets.all(4.0), - child: RaisedButton( - padding: EdgeInsets.all(8), - color: greenColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: greenColor, padding: EdgeInsets.all(8)), child: Text( "Каталог", style: buttonBigTitleTextStyle, @@ -135,9 +133,8 @@ class KassaTab extends StatelessWidget { Expanded( child: Padding( padding: const EdgeInsets.all(4.0), - child: RaisedButton( - padding: const EdgeInsets.all(8), - color: redColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: redColor, padding: const EdgeInsets.all(8)), child: Text( "возврат", style: buttonBigTitleTextStyle, @@ -153,9 +150,8 @@ class KassaTab extends StatelessWidget { Expanded( child: Padding( padding: const EdgeInsets.all(4.0), - child: RaisedButton( - padding: const EdgeInsets.all(8), - color: greenColor, + child: ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: greenColor, padding: const EdgeInsets.all(8)), child: Text( "оплата", style: buttonBigTitleTextStyle, diff --git a/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart b/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart index 98d3f18..e4da6a1 100644 --- a/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart +++ b/lib/views/home/tabs/kassaView/CatalogBottomSheet.dart @@ -115,12 +115,12 @@ class CatalogBottomSheet extends StatelessWidget { }, ), ), - RaisedButton( + ElevatedButton( child: Text( 'Отмена', style: buttonBigTitleTextStyle, ), - color: redColor, + style: ElevatedButton.styleFrom(backgroundColor: redColor), onPressed: () { Navigator.pop(context); }), diff --git a/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart b/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart index 496cde8..76624a3 100644 --- a/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart +++ b/lib/views/home/tabs/kassaView/ProductAddBottomSheet.dart @@ -90,7 +90,7 @@ class _ProductAddBottomSheetState extends State { child: ElevatedButton( onPressed: _isSearching ? null : _searchByNtin, style: ElevatedButton.styleFrom( - primary: primaryColor, + backgroundColor: primaryColor, padding: EdgeInsets.symmetric(horizontal: 12), ), child: _isSearching diff --git a/lib/views/payment/payment_view.dart b/lib/views/payment/payment_view.dart index 938654a..84bd83f 100644 --- a/lib/views/payment/payment_view.dart +++ b/lib/views/payment/payment_view.dart @@ -108,7 +108,6 @@ class _PaymentViewState extends State { }, child: Scaffold( appBar: AppBar( - brightness: Brightness.light, backgroundColor: whiteColor, elevation: 0, leading: IconButton( diff --git a/lib/views/payment_nfc/payment_nfc_view.dart b/lib/views/payment_nfc/payment_nfc_view.dart index 74b82aa..ad0818f 100644 --- a/lib/views/payment_nfc/payment_nfc_view.dart +++ b/lib/views/payment_nfc/payment_nfc_view.dart @@ -343,7 +343,6 @@ class _PaymentNfcViewState extends State { }, child: Scaffold( appBar: AppBar( - brightness: Brightness.light, backgroundColor: purpleColor, elevation: 0, leading: IconButton( diff --git a/lib/views/qr_view/qr_view.dart b/lib/views/qr_view/qr_view.dart index f414a4e..b11a953 100644 --- a/lib/views/qr_view/qr_view.dart +++ b/lib/views/qr_view/qr_view.dart @@ -26,7 +26,7 @@ class _QrViewState extends State { ), body: Container( child: Center( - child: QrImage( + child: QrImageView( data: widget.data.url!, version: QrVersions.auto, size: 220.0, diff --git a/lib/views/settings/printer/views/PrinterSelect.dart b/lib/views/settings/printer/views/PrinterSelect.dart index ff12a7b..f0be17a 100644 --- a/lib/views/settings/printer/views/PrinterSelect.dart +++ b/lib/views/settings/printer/views/PrinterSelect.dart @@ -3,7 +3,7 @@ import 'package:aman_kassa_flutter/core/logger.dart'; import 'package:aman_kassa_flutter/core/services/blue_print_service.dart'; import 'package:aman_kassa_flutter/redux/actions/setting_actions.dart'; import 'package:aman_kassa_flutter/redux/store.dart'; -import 'package:bluetooth_print/bluetooth_print_model.dart'; +import 'package:aman_kassa_flutter/core/models/bluetooth_device.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart' hide Image; diff --git a/lib/views/settings/settings_view.dart b/lib/views/settings/settings_view.dart index e8bc364..d876297 100644 --- a/lib/views/settings/settings_view.dart +++ b/lib/views/settings/settings_view.dart @@ -76,15 +76,16 @@ class _SettingViewState extends State { keyboardType: TextInputType.number, ), verticalSpaceMedium, - RaisedButton( + ElevatedButton( onPressed: () => this._setPinCode(context), child: Text( 'Cохранить настройки', style: TextStyle(color: whiteColor, fontSize: 20.0), ), - color: primaryColor, - padding: - const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0), + style: ElevatedButton.styleFrom( + backgroundColor: primaryColor, + padding: const EdgeInsets.symmetric(vertical: 5.0, horizontal: 20.0), + ), ), ], diff --git a/lib/widgets/components/ProductListItem.dart b/lib/widgets/components/ProductListItem.dart index cd65f30..5483681 100644 --- a/lib/widgets/components/ProductListItem.dart +++ b/lib/widgets/components/ProductListItem.dart @@ -153,8 +153,8 @@ class ProductListItem extends StatelessWidget { actions: [ Row( children: [ - RaisedButton( - color: redColor, + ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: redColor), child: Text( 'Отмена', style: TextStyle(fontSize: 18), @@ -166,8 +166,8 @@ class ProductListItem extends StatelessWidget { SizedBox( width: 5, ), - RaisedButton( - color: primaryColor, + ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: primaryColor), child: Text( 'Сохранить', style: TextStyle(fontSize: 18), diff --git a/lib/widgets/components/calculator/calculator-button.dart b/lib/widgets/components/calculator/calculator-button.dart index ef6e9c4..21ab1be 100644 --- a/lib/widgets/components/calculator/calculator-button.dart +++ b/lib/widgets/components/calculator/calculator-button.dart @@ -23,20 +23,20 @@ class CalculatorButton extends StatelessWidget { // width: 1.2, // ), // ), - child: FlatButton( + child: TextButton( onPressed: () => onTap(buttonText: text), + style: TextButton.styleFrom( + padding: const EdgeInsets.all(20), + backgroundColor: buildMainColor(), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(0), + side: BorderSide(color: Colors.black), + ), + ), child: Text( text, style: TextStyle(fontSize: 25, fontWeight: FontWeight.w700, color: buildTextColor()), ), - padding: const EdgeInsets.all(20), - highlightColor: Colors.blueGrey[100], - splashColor: Colors.blueAccent[100], - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(0), - side: BorderSide(color: Colors.black) - ), - color: buildMainColor(), ))); } diff --git a/lib/widgets/dialog_manager.dart b/lib/widgets/dialog_manager.dart index cd3e340..b8e298d 100644 --- a/lib/widgets/dialog_manager.dart +++ b/lib/widgets/dialog_manager.dart @@ -58,14 +58,14 @@ class _DialogManagerState extends State { content: Text(request.description), actions: [ if (isConfirmationDialog) - FlatButton( + TextButton( child: Text(request.cancelTitle!), onPressed: () { _dialogService .dialogComplete(DialogResponse(confirmed: false)); }, ), - FlatButton( + TextButton( child: Text(request.buttonTitle), onPressed: () { _dialogService @@ -129,8 +129,8 @@ class _DialogManagerState extends State { ), actions: [ if (isConfirmationDialog) - RaisedButton( - color: redColor, + ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: redColor), child: Text( request.cancelTitle!, style: TextStyle(fontSize: 18), @@ -143,8 +143,8 @@ class _DialogManagerState extends State { SizedBox( width: 5, ), - RaisedButton( - color: primaryColor, + ElevatedButton( + style: ElevatedButton.styleFrom(backgroundColor: primaryColor), child: Text( request.buttonTitle, style: TextStyle(fontSize: 18), diff --git a/pubspec.lock b/pubspec.lock index c0479f7..d89d3b2 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,249 +1,290 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: + _flutterfire_internals: dependency: transitive description: - name: archive - url: "https://pub.dartlang.org" + name: _flutterfire_internals + sha256: "2f428053492f92303e42c9afa8e3a78ad1886760e7b594e2b5a6b6ee47376360" + url: "https://pub.dev" source: hosted - version: "3.1.9" + version: "1.0.2" + archive: + dependency: "direct overridden" + description: + name: archive + sha256: a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff + url: "https://pub.dev" + source: hosted + version: "4.0.9" + args: + dependency: transitive + description: + name: args + sha256: d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04 + url: "https://pub.dev" + source: hosted + version: "2.7.0" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37 + url: "https://pub.dev" source: hosted - version: "2.8.2" + version: "2.13.1" auto_size_text: dependency: "direct main" description: name: auto_size_text - url: "https://pub.dartlang.org" + sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599" + url: "https://pub.dev" source: hosted version: "3.0.0" barcode_scan2: dependency: "direct main" description: name: barcode_scan2 - url: "https://pub.dartlang.org" + sha256: "9b539b0ce419005c451de66374c79f39801986f1fd7a213e63d948f21487cd69" + url: "https://pub.dev" source: hosted - version: "4.2.4" - bluetooth_print: - dependency: "direct main" - description: - path: "../bluetooth_print" - relative: true - source: path - version: "3.0.1" + version: "4.7.2" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.2" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b + url: "https://pub.dev" source: hosted - version: "1.2.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org" - source: hosted - version: "1.3.1" + version: "1.4.1" charset_converter: dependency: "direct main" description: name: charset_converter - url: "https://pub.dartlang.org" + sha256: af00b5b73b367101c661b8dfaa52abf3e533de7b3e247e3f65c535ebc4df820a + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.4.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.1.2" + cloud_firestore_platform_interface: + dependency: transitive + description: + name: cloud_firestore_platform_interface + sha256: d023142c18c28b2610c23c196e829c96976569cc2aa2f8e45328ae8a64c428d1 + url: "https://pub.dev" + source: hosted + version: "5.7.7" + cloud_firestore_web: + dependency: transitive + description: + name: cloud_firestore_web + sha256: "3d7d4fa8c1dc5a1f7cb33985ae0ab9924d33d76d4959fe26aed84b7d282887e3" + url: "https://pub.dev" + source: hosted + version: "2.8.10" + code_assets: + dependency: transitive + description: + name: code_assets + sha256: bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8 + url: "https://pub.dev" + source: hosted + version: "1.2.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76" + url: "https://pub.dev" source: hosted - version: "1.16.0" - convert: + version: "1.19.1" + cross_file: dependency: transitive description: - name: convert - url: "https://pub.dartlang.org" + name: cross_file + sha256: "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937" + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "0.3.5+2" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf + url: "https://pub.dev" source: hosted - version: "3.0.1" + version: "3.0.7" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e" + url: "https://pub.dev" source: hosted - version: "0.17.1" + version: "1.0.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: "41e005c33bd814be4d3096aff55b1908d419fde52ca656c8c47719ec745873cd" + url: "https://pub.dev" source: hosted - version: "1.0.5" - device_info: + version: "1.0.9" + device_info_plus: dependency: "direct main" description: - name: device_info - url: "https://pub.dartlang.org" + name: device_info_plus + sha256: "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a" + url: "https://pub.dev" source: hosted - version: "2.0.3" - device_info_platform_interface: + version: "11.5.0" + device_info_plus_platform_interface: dependency: transitive description: - name: device_info_platform_interface - url: "https://pub.dartlang.org" + name: device_info_plus_platform_interface + sha256: e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "7.0.3" equatable: dependency: "direct main" description: name: equatable - url: "https://pub.dartlang.org" + sha256: "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.8" esc_pos_utils: dependency: "direct main" description: name: esc_pos_utils - url: "https://pub.dartlang.org" + sha256: "8ec0013d7a7f1e790ced6b09b95ce3bf2c6f9468a3e2bc49ece000761d86c6f8" + url: "https://pub.dev" source: hosted version: "1.1.0" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44" + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.3.3" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45" + url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "2.2.0" file: - dependency: transitive + dependency: "direct overridden" description: name: file - url: "https://pub.dartlang.org" + sha256: a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4 + url: "https://pub.dev" source: hosted - version: "6.1.2" + version: "7.0.1" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "4f1d7c13a909e82ff026679c9b8493cdeb35a9c76bc46c42bf9e2240c9e57e80" + url: "https://pub.dev" source: hosted - version: "1.20.1" + version: "1.24.0" firebase_core_platform_interface: - dependency: transitive + dependency: "direct overridden" description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: a78327f0f2f5e36073427300633c9036c4499f047f178498d08b0345ae7ad5b4 + url: "https://pub.dev" source: hosted version: "4.5.0" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "839f1b48032a61962792cea1225fae030d4f27163867f181d6d2072dd40acbee" + url: "https://pub.dev" source: hosted - version: "1.7.1" + version: "1.7.3" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - url: "https://pub.dartlang.org" + sha256: "3a2e5c067a52868afbcefcdffa06ef2aa84a6e7bf5c8bc5eeed9d8dd0c7671bc" + url: "https://pub.dev" source: hosted - version: "12.0.2" + version: "12.0.3" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - url: "https://pub.dartlang.org" + sha256: "71f120e8b405a172cb0088a2cd62fd8b77be0f0c942a5bda411b80268c1702f8" + url: "https://pub.dev" source: hosted - version: "4.1.1" + version: "4.2.0" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - url: "https://pub.dartlang.org" + sha256: b7c5e019c4ecf3a512c4a0f00a4a9c1f260eb11872380a91f35983387488ce94 + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.2.0" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be + url: "https://pub.dev" source: hosted - version: "1.0.0" + version: "1.1.1" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_blue: - dependency: "direct main" - description: - name: flutter_blue - url: "https://pub.dartlang.org" - source: hosted - version: "0.8.0" flutter_lock_screen: dependency: "direct main" description: - name: flutter_lock_screen - url: "https://pub.dartlang.org" - source: hosted + path: "local_packages/flutter_lock_screen" + relative: true + source: path version: "2.0.1" - flutter_plugin_android_lifecycle: - dependency: transitive - description: - name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" flutter_redux: dependency: "direct main" description: name: flutter_redux - url: "https://pub.dartlang.org" + sha256: "3b20be9e08d0038e1452fbfa1fdb1ea0a7c3738c997734530b3c6d0bb5fcdbdc" + url: "https://pub.dev" source: hosted version: "0.10.0" flutter_screenutil: dependency: "direct main" description: name: flutter_screenutil - url: "https://pub.dartlang.org" + sha256: "8239210dd68bee6b0577aa4a090890342d04a136ce1c81f98ee513fc0ce891de" + url: "https://pub.dev" source: hosted - version: "5.5.3+2" + version: "5.9.3" flutter_test: dependency: "direct dev" description: flutter @@ -258,553 +299,758 @@ packages: dependency: transitive description: name: gbk_codec - url: "https://pub.dartlang.org" + sha256: "3af5311fc9393115e3650ae6023862adf998051a804a08fb804f042724999f61" + url: "https://pub.dev" source: hosted version: "0.4.0" get_it: dependency: "direct main" description: name: get_it - url: "https://pub.dartlang.org" + sha256: d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1 + url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "7.7.0" google_fonts: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: "8f099045e2f2a30e4d4d0a35f40c6bc941a8f2ca0e10ad9d214ee9edd3f37483" + url: "https://pub.dev" source: hosted version: "3.0.1" hex: dependency: transitive description: name: hex - url: "https://pub.dartlang.org" + sha256: "4e7cd54e4b59ba026432a6be2dd9d96e4c5205725194997193bf871703b82c4a" + url: "https://pub.dev" source: hosted version: "0.2.0" + hooks: + dependency: transitive + description: + name: hooks + sha256: "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba" + url: "https://pub.dev" + source: hosted + version: "2.0.2" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602" + url: "https://pub.dev" source: hosted - version: "0.15.0" + version: "0.15.6" http: dependency: "direct main" description: name: http - url: "https://pub.dartlang.org" + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "0.13.6" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "8e9d133755c3e84c73288363e6343157c383a0c6c56fc51afcc5d4d7180306d6" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.3.0" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" + jni: + dependency: transitive + description: + name: jni + sha256: c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f + url: "https://pub.dev" + source: hosted + version: "1.0.0" + jni_flutter: + dependency: transitive + description: + name: jni_flutter + sha256: "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6" + url: "https://pub.dev" + source: hosted + version: "1.0.1" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" - json_annotation: + version: "0.6.7" + leak_tracker: dependency: transitive description: - name: json_annotation - url: "https://pub.dartlang.org" + name: leak_tracker + sha256: "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de" + url: "https://pub.dev" source: hosted - version: "4.4.0" - local_auth: - dependency: "direct main" - description: - name: local_auth - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.2" - local_auth_android: + version: "11.0.2" + leak_tracker_flutter_testing: dependency: transitive description: - name: local_auth_android - url: "https://pub.dartlang.org" + name: leak_tracker_flutter_testing + sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1" + url: "https://pub.dev" source: hosted - version: "1.0.11" - local_auth_ios: + version: "3.0.10" + leak_tracker_testing: dependency: transitive description: - name: local_auth_ios - url: "https://pub.dartlang.org" + name: leak_tracker_testing + sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1" + url: "https://pub.dev" source: hosted - version: "1.0.9" - local_auth_platform_interface: - dependency: transitive - description: - name: local_auth_platform_interface - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.4" - local_auth_windows: - dependency: transitive - description: - name: local_auth_windows - url: "https://pub.dartlang.org" - source: hosted - version: "1.0.3" + version: "3.0.2" logger: dependency: "direct main" description: name: logger - url: "https://pub.dartlang.org" + sha256: "7ad7215c15420a102ec687bb320a7312afd449bac63bfb1c60d9787c27b9767f" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.0" + logging: + dependency: transitive + description: + name: logging + sha256: c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61 + url: "https://pub.dev" + source: hosted + version: "1.3.0" mask_text_input_formatter: dependency: "direct main" description: name: mask_text_input_formatter - url: "https://pub.dartlang.org" + sha256: "978c58ec721c25621ceb468e633f4eef64b64d45424ac4540e0565d4f7c800cd" + url: "https://pub.dev" source: hosted - version: "2.4.0" + version: "2.9.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861 + url: "https://pub.dev" source: hosted - version: "0.12.11" + version: "0.12.19" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b" + url: "https://pub.dev" source: hosted - version: "0.1.4" + version: "0.13.0" material_design_icons_flutter: dependency: "direct main" description: - name: material_design_icons_flutter - url: "https://pub.dartlang.org" - source: hosted + path: "local_packages/material_design_icons_flutter" + relative: true + source: path version: "5.0.6996" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349" + url: "https://pub.dev" source: hosted - version: "1.7.0" + version: "1.18.0" + mime: + dependency: transitive + description: + name: mime + sha256: "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6" + url: "https://pub.dev" + source: hosted + version: "2.0.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" + objective_c: + dependency: transitive + description: + name: objective_c + sha256: "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed" + url: "https://pub.dev" + source: hosted + version: "9.4.1" + package_config: + dependency: transitive + description: + name: package_config + sha256: f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc + url: "https://pub.dev" + source: hosted + version: "2.2.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5" + url: "https://pub.dev" source: hosted - version: "1.8.1" + version: "1.9.1" path_provider: dependency: "direct main" description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd" + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.1.5" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd" + url: "https://pub.dev" source: hosted - version: "2.0.11" - path_provider_ios: + version: "2.3.1" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699" + url: "https://pub.dev" source: hosted - version: "2.0.7" + version: "2.6.0" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" source: hosted - version: "2.1.5" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.1.2" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7 + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.3.0" permission_handler: dependency: "direct main" description: name: permission_handler - url: "https://pub.dartlang.org" + sha256: fe54465bcc62a4564c6e4db337bbaded6c0c0fa6e10487414436d163114784f6 + url: "https://pub.dev" source: hosted - version: "8.3.0" + version: "12.0.3" + permission_handler_android: + dependency: transitive + description: + name: permission_handler_android + sha256: "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6" + url: "https://pub.dev" + source: hosted + version: "13.0.1" + permission_handler_apple: + dependency: transitive + description: + name: permission_handler_apple + sha256: e20daf680eef1ca62ffe8c8c526b778cc386d50137c77ac71c8ec9c88c13fb9d + url: "https://pub.dev" + source: hosted + version: "9.4.9" + permission_handler_html: + dependency: transitive + description: + name: permission_handler_html + sha256: "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24" + url: "https://pub.dev" + source: hosted + version: "0.1.3+5" permission_handler_platform_interface: dependency: transitive description: name: permission_handler_platform_interface - url: "https://pub.dartlang.org" + sha256: eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878 + url: "https://pub.dev" source: hosted - version: "3.7.0" + version: "4.3.0" + permission_handler_windows: + dependency: transitive + description: + name: permission_handler_windows + sha256: "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e" + url: "https://pub.dev" + source: hosted + version: "0.2.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675" + url: "https://pub.dev" source: hosted - version: "4.4.0" + version: "7.0.2" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984" + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.6" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" + url: "https://pub.dev" source: hosted - version: "2.1.2" - process: + version: "2.1.8" + posix: dependency: transitive description: - name: process - url: "https://pub.dartlang.org" + name: posix + sha256: "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07" + url: "https://pub.dev" source: hosted - version: "4.2.4" + version: "6.5.0" protobuf: dependency: transitive description: name: protobuf - url: "https://pub.dartlang.org" + sha256: "75ec242d22e950bdcc79ee38dd520ce4ee0bc491d7fadc4ea47694604d22bf06" + url: "https://pub.dev" source: hosted - version: "2.0.1" + version: "6.0.0" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272" + url: "https://pub.dev" source: hosted - version: "6.0.3" + version: "6.1.5+1" + pub_semver: + dependency: transitive + description: + name: pub_semver + sha256: "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585" + url: "https://pub.dev" + source: hosted + version: "2.2.0" qr: dependency: transitive description: name: qr - url: "https://pub.dartlang.org" + sha256: "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "3.0.2" qr_flutter: dependency: "direct main" description: name: qr_flutter - url: "https://pub.dartlang.org" + sha256: "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097" + url: "https://pub.dev" source: hosted - version: "4.0.0" + version: "4.1.0" + record_use: + dependency: transitive + description: + name: record_use + sha256: "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed" + url: "https://pub.dev" + source: hosted + version: "0.6.0" redux: dependency: "direct main" description: name: redux - url: "https://pub.dartlang.org" + sha256: "1e86ed5b1a9a717922d0a0ca41f9bf49c1a587d50050e9426fc65b14e85ec4d7" + url: "https://pub.dev" source: hosted version: "5.0.0" redux_persist: dependency: "direct main" description: name: redux_persist - url: "https://pub.dartlang.org" + sha256: d482ec27983c746321255ae61ab05964e812f316dd6c049adf2d4944c11a4458 + url: "https://pub.dev" source: hosted version: "0.9.0" redux_persist_flutter: dependency: "direct main" description: name: redux_persist_flutter - url: "https://pub.dartlang.org" + sha256: d12ada7bda3f31902bbd4be2503c66c9cf9b9142819a2f2f20a730c2e9206765 + url: "https://pub.dev" source: hosted version: "0.9.0" redux_thunk: dependency: "direct main" description: name: redux_thunk - url: "https://pub.dartlang.org" + sha256: ae7c41b1401f59440d6709741979a06b6e29cf7a2b00ec239149727340a35403 + url: "https://pub.dev" source: hosted version: "0.4.0" responsive_builder: dependency: "direct main" description: name: responsive_builder - url: "https://pub.dartlang.org" + sha256: f01bc341c73b6db7bd6319e22d2c160f28f924399ae46e6699ecc8160ba2765c + url: "https://pub.dev" source: hosted - version: "0.4.2" - rxdart: + version: "0.4.3" + share_plus: + dependency: "direct main" + description: + name: share_plus + sha256: fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da + url: "https://pub.dev" + source: hosted + version: "10.1.4" + share_plus_platform_interface: dependency: transitive description: - name: rxdart - url: "https://pub.dartlang.org" + name: share_plus_platform_interface + sha256: cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b + url: "https://pub.dev" source: hosted - version: "0.26.0" + version: "5.0.2" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf + url: "https://pub.dev" source: hosted - version: "2.0.15" + version: "2.5.5" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: a2c49fc1fed7140cadd892d765bd47edbe4ac0b9c7e7e3c493dcb58126f99cf0 + url: "https://pub.dev" source: hosted - version: "2.0.10" - shared_preferences_ios: + version: "2.4.25" + shared_preferences_foundation: dependency: transitive description: - name: shared_preferences_ios - url: "https://pub.dartlang.org" + name: shared_preferences_foundation + sha256: "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f" + url: "https://pub.dev" source: hosted - version: "2.0.9" + version: "2.5.6" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f" + url: "https://pub.dev" source: hosted - version: "2.0.4" - shared_preferences_macos: - dependency: transitive - description: - name: shared_preferences_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.2" + version: "2.4.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9" + url: "https://pub.dev" source: hosted - version: "2.0.0" + version: "2.4.2" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019 + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.4.3" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1" + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.4.1" sky_engine: dependency: transitive description: flutter source: sdk - version: "0.0.99" + version: "0.0.0" source_span: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.10.2" sqflite: dependency: "direct main" description: name: sqflite - url: "https://pub.dartlang.org" + sha256: "58a799e6ac17dd32fbab93813d39ed835a75ccc0f8f85b8955fe318c6712b082" + url: "https://pub.dev" source: hosted - version: "2.0.3+1" + version: "2.4.3" + sqflite_android: + dependency: transitive + description: + name: sqflite_android + sha256: d0548f9d7422a2dae99ec6f8b0a3074463b132d216fa5ba0d230eeefc901983b + url: "https://pub.dev" + source: hosted + version: "2.4.3" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: cce558075afe2a83f3fd7fc123acd6b090683e4f23910d44fbb31ecd7800b014 + url: "https://pub.dev" source: hosted - version: "2.2.1+1" + version: "2.5.9" + sqflite_darwin: + dependency: transitive + description: + name: sqflite_darwin + sha256: "164a5d73ab87a134566057219988bafde837029a64264e61f1f04376ef3cfcd2" + url: "https://pub.dev" + source: hosted + version: "2.4.3" + sqflite_platform_interface: + dependency: transitive + description: + name: sqflite_platform_interface + sha256: f84939f84350d92d04416f8bc4dc52d3896aec7716cc9e80cf0146342139dc50 + url: "https://pub.dev" + source: hosted + version: "2.4.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1" + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.12.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.4" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43" + url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.4.1" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "93b153dcb6a26dcddee6ca087dd634b53e38c10b5aa163e8e49501a776456153" + url: "https://pub.dev" source: hosted - version: "3.0.0" + version: "3.4.1" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e" + url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "1.2.2" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e" + url: "https://pub.dev" source: hosted - version: "0.4.9" + version: "0.7.11" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006 + url: "https://pub.dev" source: hosted - version: "1.3.0" + version: "1.4.0" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8 + url: "https://pub.dev" source: hosted - version: "6.1.5" + version: "6.3.2" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: b413d49b73867ac08dd2f9890efd3cc11f2a0e577618d50843440a1fb3776c32 + url: "https://pub.dev" source: hosted - version: "6.0.14" + version: "6.3.32" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0" + url: "https://pub.dev" source: hosted - version: "6.0.14" + version: "6.4.1" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.2.2" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18" + url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "3.2.5" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.2" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34" + url: "https://pub.dev" source: hosted - version: "2.0.6" + version: "2.4.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f" + url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "3.1.5" + uuid: + dependency: transitive + description: + name: uuid + sha256: "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489" + url: "https://pub.dev" + source: hosted + version: "4.5.3" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b + url: "https://pub.dev" source: hosted - version: "2.1.2" - vocsy_esys_flutter_share: - dependency: "direct main" + version: "2.2.0" + vm_service: + dependency: transitive description: - name: vocsy_esys_flutter_share - url: "https://pub.dartlang.org" + name: vm_service + sha256: "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360" + url: "https://pub.dev" source: hosted - version: "1.0.1" + version: "15.2.0" + web: + dependency: transitive + description: + name: web + sha256: "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a" + url: "https://pub.dev" + source: hosted + version: "1.1.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e + url: "https://pub.dev" source: hosted - version: "2.3.8" + version: "5.15.0" + win32_registry: + dependency: transitive + description: + name: win32_registry + sha256: "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae" + url: "https://pub.dev" + source: hosted + version: "2.1.0" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15" + url: "https://pub.dev" source: hosted - version: "0.2.0" + version: "1.1.0" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025" + url: "https://pub.dev" source: hosted - version: "5.3.1" + version: "6.6.1" + yaml: + dependency: transitive + description: + name: yaml + sha256: b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce + url: "https://pub.dev" + source: hosted + version: "3.1.3" sdks: - dart: ">=2.17.0-0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=3.12.0 <4.0.0" + flutter: ">=3.44.0" diff --git a/pubspec.yaml b/pubspec.yaml index 4a7eca7..d465a9e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -23,26 +23,31 @@ dependencies: google_fonts: ^3.0.1 material_design_icons_flutter: ^5.0.6996 intl: ^0.17.0 - barcode_scan2: ^4.2.1 - device_info: ^2.0.3 - vocsy_esys_flutter_share: ^1.0.1 + barcode_scan2: ^4.7.2 + device_info_plus: ^11.0.0 + share_plus: ^10.0.0 auto_size_text: ^3.0.0 url_launcher: ^6.1.5 qr_flutter: ^4.0.0 mask_text_input_formatter: ^2.4.0 - flutter_screenutil: ^5.5.3+2 + flutter_screenutil: ^5.9.3 shared_preferences: ^2.0.15 - flutter_lock_screen: ^2.0.1 - local_auth: ^2.1.2 + flutter_lock_screen: + path: local_packages/flutter_lock_screen + #local_auth: ^2.3.0 #esc_pos_bluetooth: ^0.4.1 esc_pos_utils: ^1.1.0 - charset_converter: ^2.1.0 - permission_handler: ^8.3.0 - bluetooth_print: - path: ../bluetooth_print - flutter_blue: ^0.8.0 + charset_converter: ^2.4.0 + permission_handler: ^12.0.0 firebase_messaging: ^12.0.2 firebase_core: ^1.20.1 +dependency_overrides: + archive: ^4.0.0 + file: ^7.0.0 + material_design_icons_flutter: + path: local_packages/material_design_icons_flutter + firebase_core_platform_interface: 4.5.0 + dev_dependencies: flutter_test: sdk: flutter