Skip to content

Changed the FlatButtons to Elevated ones, because flutter no longer s… #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Changed the FlatButtons to Elevated ones, because flutter no longer s… #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions lib/components/ButtonDouble.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class _ButtonState extends State<ButtonDoubleComponent> {
return (Container(
height: 60,
width: 90,
child: FlatButton(
child: ElevatedButton(
onPressed: () {
_sendMessage(buttonClicado ? widget.comandOn! : widget.comandOff!);
_changeButtonColor();
Expand All @@ -53,10 +53,15 @@ class _ButtonState extends State<ButtonDoubleComponent> {
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)),
)),
)));
}

Expand Down
8 changes: 5 additions & 3 deletions lib/components/ButtonSingle.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,18 @@ class _ButtonState extends State<ButtonSingleComponent> {
return (Container(
height: 60,
width: 80,
child: FlatButton(
child: ElevatedButton(
onPressed: () {
_sendMessage(widget.comandOn!);
},
child: Text(
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)))),
)));
}

Expand Down
7 changes: 4 additions & 3 deletions lib/components/CustomAppBar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}),
Expand Down
61 changes: 32 additions & 29 deletions lib/components/VoiceButtonPage.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,7 +17,7 @@ class VoiceButtonComponent extends StatefulWidget {
this.languageSelected,
required this.clientID,
}) : super(key: key);
_VoiceButtonState createState() => _VoiceButtonState();
_VoiceButtonState createState() => _VoiceButtonState();
}

class Language {
Expand All @@ -41,12 +40,11 @@ class _Message {
_Message(this.whom, this.text);
}


class _VoiceButtonState extends State<VoiceButtonComponent> {
bool buttonClicado = false;
final TextEditingController textEditingController = TextEditingController();
List<_Message> messages = <_Message>[];

late SpeechRecognition _speech;
bool _speechRecognitionAvailable = false;
bool _isListening = false;
Expand All @@ -65,7 +63,15 @@ class _VoiceButtonState extends State<VoiceButtonComponent> {
_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);
});
}
Expand All @@ -89,9 +95,15 @@ class _VoiceButtonState extends State<VoiceButtonComponent> {
}
}


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(() {
Expand All @@ -110,7 +122,6 @@ class _VoiceButtonState extends State<VoiceButtonComponent> {
void onSpeechAvailability(bool result) =>
setState(() => _speechRecognitionAvailable = result);


void onRecognitionStarted() {
setState(() => _isListening = true);
}
Expand All @@ -128,24 +139,16 @@ class _VoiceButtonState extends State<VoiceButtonComponent> {
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),
));
}



}
}
Loading