From 6af1b2d21e209fb77efa4abdf5e404b3b28d7083 Mon Sep 17 00:00:00 2001 From: alboom4ick Date: Fri, 25 Oct 2024 10:27:35 +0500 Subject: [PATCH] Changed the FlatButtons to Elevated ones, because flutter no longer supports them. --- lib/components/ButtonDouble.dart | 15 ++- lib/components/ButtonSingle.dart | 8 +- lib/components/CustomAppBar.dart | 7 +- lib/components/VoiceButtonPage.dart | 61 ++++++----- pubspec.lock | 160 ++++++++++++++++++---------- 5 files changed, 156 insertions(+), 95 deletions(-) diff --git a/lib/components/ButtonDouble.dart b/lib/components/ButtonDouble.dart index cf391d7..46ee9bc 100644 --- a/lib/components/ButtonDouble.dart +++ b/lib/components/ButtonDouble.dart @@ -44,7 +44,7 @@ class _ButtonState extends State { return (Container( height: 60, width: 90, - child: FlatButton( + child: ElevatedButton( onPressed: () { _sendMessage(buttonClicado ? widget.comandOn! : widget.comandOff!); _changeButtonColor(); @@ -53,10 +53,15 @@ class _ButtonState extends State { widget.buttonName!, style: TextStyle(color: Colors.white), ), - color: buttonClicado - ? Color.fromRGBO(237, 46, 39, 1) - : Color.fromRGBO(0, 0, 0, 1), - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), + style: ButtonStyle( + backgroundColor: WidgetStatePropertyAll( + buttonClicado + ? Color.fromRGBO(237, 46, 39, 1) + : Color.fromRGBO(0, 0, 0, 1), + ), + shape: WidgetStatePropertyAll( + RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), + )), ))); } diff --git a/lib/components/ButtonSingle.dart b/lib/components/ButtonSingle.dart index 20bee86..8f28ea1 100644 --- a/lib/components/ButtonSingle.dart +++ b/lib/components/ButtonSingle.dart @@ -39,7 +39,7 @@ class _ButtonState extends State { return (Container( height: 60, width: 80, - child: FlatButton( + child: ElevatedButton( onPressed: () { _sendMessage(widget.comandOn!); }, @@ -47,8 +47,10 @@ class _ButtonState extends State { widget.buttonName!, style: TextStyle(color: Colors.white, fontSize: 25), ), - color: widget.colorButton!, - shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(5)), + style: ButtonStyle( + backgroundColor: WidgetStatePropertyAll(widget.colorButton!), + shape: WidgetStatePropertyAll(RoundedRectangleBorder( + borderRadius: BorderRadius.circular(5)))), ))); } diff --git a/lib/components/CustomAppBar.dart b/lib/components/CustomAppBar.dart index ad0379b..cae5122 100644 --- a/lib/components/CustomAppBar.dart +++ b/lib/components/CustomAppBar.dart @@ -65,9 +65,10 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget { : Icons.bluetooth_disabled), style: ElevatedButton.styleFrom( shape: CircleBorder(), - primary: StatusConnectionProvider.device != null - ? Color.fromRGBO(15, 171, 118, 1) - : Colors.black), + backgroundColor: + StatusConnectionProvider.device != null + ? Color.fromRGBO(15, 171, 118, 1) + : Colors.black), ) : SizedBox.shrink()); }), diff --git a/lib/components/VoiceButtonPage.dart b/lib/components/VoiceButtonPage.dart index aa46aab..5211e8c 100644 --- a/lib/components/VoiceButtonPage.dart +++ b/lib/components/VoiceButtonPage.dart @@ -7,7 +7,6 @@ import 'dart:typed_data'; import 'package:flutter_bluetooth_serial/flutter_bluetooth_serial.dart'; import 'package:flutter_speech/flutter_speech.dart'; - class VoiceButtonComponent extends StatefulWidget { final BluetoothConnection? connection; final int clientID; @@ -18,7 +17,7 @@ class VoiceButtonComponent extends StatefulWidget { this.languageSelected, required this.clientID, }) : super(key: key); - _VoiceButtonState createState() => _VoiceButtonState(); + _VoiceButtonState createState() => _VoiceButtonState(); } class Language { @@ -41,12 +40,11 @@ class _Message { _Message(this.whom, this.text); } - class _VoiceButtonState extends State { bool buttonClicado = false; final TextEditingController textEditingController = TextEditingController(); List<_Message> messages = <_Message>[]; - + late SpeechRecognition _speech; bool _speechRecognitionAvailable = false; bool _isListening = false; @@ -65,7 +63,15 @@ class _VoiceButtonState extends State { _speech.setRecognitionResultHandler(onRecognitionResult); _speech.setRecognitionCompleteHandler(onRecognitionComplete); _speech.setErrorHandler(errorHandler); - _speech.activate(languages.firstWhere((l) => l.code == (widget.languageSelected == null ? 'pt_BR' : widget.languageSelected!)).code).then((res) { + _speech + .activate(languages + .firstWhere((l) => + l.code == + (widget.languageSelected == null + ? 'pt_BR' + : widget.languageSelected!)) + .code) + .then((res) { setState(() => _speechRecognitionAvailable = res); }); } @@ -89,9 +95,15 @@ class _VoiceButtonState extends State { } } - - void start() => _speech.activate( - languages.firstWhere((l) => l.code == (widget.languageSelected == null ? 'pt_BR' : widget.languageSelected!)).code).then((_) { + void start() => _speech + .activate(languages + .firstWhere((l) => + l.code == + (widget.languageSelected == null + ? 'pt_BR' + : widget.languageSelected!)) + .code) + .then((_) { return _speech.listen().then((result) { print('_MyAppState.start => result $result'); setState(() { @@ -110,7 +122,6 @@ class _VoiceButtonState extends State { void onSpeechAvailability(bool result) => setState(() => _speechRecognitionAvailable = result); - void onRecognitionStarted() { setState(() => _isListening = true); } @@ -128,24 +139,16 @@ class _VoiceButtonState extends State { void errorHandler() => activateSpeechRecognizer(); Widget build(BuildContext context) { - return (ElevatedButton( - onPressed: _speechRecognitionAvailable && !_isListening - ? () => start() - : null, - child: Icon( - _isListening - ? Icons.settings_voice - : Icons.settings_voice_outlined, - ), - style: ElevatedButton.styleFrom( - shape: CircleBorder(), - primary: _isListening - ? Color.fromRGBO(255, 255, 0, 1) - : Colors.black), - - )); + return (ElevatedButton( + onPressed: + _speechRecognitionAvailable && !_isListening ? () => start() : null, + child: Icon( + _isListening ? Icons.settings_voice : Icons.settings_voice_outlined, + ), + style: ElevatedButton.styleFrom( + shape: CircleBorder(), + backgroundColor: + _isListening ? Color.fromRGBO(255, 255, 0, 1) : Colors.black), + )); } - - - -} \ No newline at end of file +} diff --git a/pubspec.lock b/pubspec.lock index 35e0fe3..42a3331 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,58 +5,58 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org/" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev/" source: hosted - version: "2.8.1" + version: "2.11.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org/" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev/" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org/" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev/" source: hosted - version: "1.1.0" - charcode: - dependency: transitive - description: - name: charcode - url: "https://pub.dartlang.org/" - source: hosted - version: "1.3.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org/" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev/" source: hosted - version: "1.1.0" + version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org/" + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a + url: "https://pub.dev/" source: hosted - version: "1.15.0" + version: "1.18.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org/" + sha256: "1989d917fbe8e6b39806207df5a3fdd3d816cbd090fac2ce26fb45e9a71476e5" + url: "https://pub.dev/" source: hosted version: "1.0.4" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org/" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev/" source: hosted - version: "1.2.0" + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -66,21 +66,24 @@ packages: dependency: "direct main" description: name: flutter_bluetooth_serial - url: "https://pub.dartlang.org/" + sha256: "248608f777e92e867b642c88327c030fd5eacafb9841d4aa3e34d04ae314de20" + url: "https://pub.dev/" source: hosted version: "0.3.2" flutter_lints: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org/" + sha256: b543301ad291598523947dc534aaddc5aaad597b709d2426d3a0e0d44c5cb493 + url: "https://pub.dev/" source: hosted version: "1.0.4" flutter_speech: dependency: "direct main" description: name: flutter_speech - url: "https://pub.dartlang.org/" + sha256: d818e653b72516fd93bdb19731c98f3daf46d7990c77c4a84920a44830460a20 + url: "https://pub.dev/" source: hosted version: "2.0.0" flutter_test: @@ -88,53 +91,92 @@ packages: description: flutter source: sdk version: "0.0.0" + leak_tracker: + dependency: transitive + description: + name: leak_tracker + sha256: "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05" + url: "https://pub.dev/" + source: hosted + version: "10.0.5" + leak_tracker_flutter_testing: + dependency: transitive + description: + name: leak_tracker_flutter_testing + sha256: "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806" + url: "https://pub.dev/" + source: hosted + version: "3.0.5" + leak_tracker_testing: + dependency: transitive + description: + name: leak_tracker_testing + sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" + url: "https://pub.dev/" + source: hosted + version: "3.0.1" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org/" + sha256: a2c3d198cb5ea2e179926622d433331d8b58374ab8f29cdda6e863bd62fd369c + url: "https://pub.dev/" source: hosted version: "1.0.1" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org/" + sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb + url: "https://pub.dev/" + source: hosted + version: "0.12.16+1" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec + url: "https://pub.dev/" source: hosted - version: "0.12.10" + version: "0.11.1" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org/" + sha256: bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7 + url: "https://pub.dev/" source: hosted - version: "1.7.0" + version: "1.15.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org/" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev/" source: hosted version: "1.0.0" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org/" + sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af" + url: "https://pub.dev/" source: hosted - version: "1.8.0" + version: "1.9.0" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org/" + sha256: dc18c7bddb94a1eb3c3154587d16175a657356c80566712e6cd8ca4825eae112 + url: "https://pub.dev/" source: hosted version: "6.0.1" scoped_model: dependency: "direct main" description: name: scoped_model - url: "https://pub.dartlang.org/" + sha256: "2d39f91b92f4c0f214a529a0b93baa85b83a141d60ddb5bb45a5d9c543a0fdfe" + url: "https://pub.dev/" source: hosted version: "2.0.0-nullsafety.0" sky_engine: @@ -146,58 +188,66 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org/" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev/" source: hosted - version: "1.8.1" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org/" + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" + url: "https://pub.dev/" source: hosted - version: "1.10.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org/" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 + url: "https://pub.dev/" source: hosted - version: "2.1.0" + version: "2.1.2" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org/" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev/" source: hosted - version: "1.1.0" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org/" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev/" source: hosted - version: "1.2.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org/" + sha256: "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb" + url: "https://pub.dev/" source: hosted - version: "0.4.2" - typed_data: + version: "0.7.2" + vector_math: dependency: transitive description: - name: typed_data - url: "https://pub.dartlang.org/" + name: vector_math + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev/" source: hosted - version: "1.3.0" - vector_math: + version: "2.1.4" + vm_service: dependency: transitive description: - name: vector_math - url: "https://pub.dartlang.org/" + name: vm_service + sha256: "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d" + url: "https://pub.dev/" source: hosted - version: "2.1.0" + version: "14.2.5" sdks: - dart: ">=2.12.0 <3.0.0" - flutter: ">=1.24.0-1.0.pre" + dart: ">=3.3.0 <4.0.0" + flutter: ">=3.18.0-18.0.pre.54"