Skip to content

Commit 26ff273

Browse files
fix text to speech for every km
1 parent 98749ac commit 26ff273

2 files changed

Lines changed: 5 additions & 23 deletions

File tree

lib/presentation/common/metrics/view_model/metrics_view_model.dart

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,16 +70,8 @@ class MetricsViewModel extends StateNotifier<MetricsState> {
7070
String km = speedStr.split('.')[0];
7171
String meters = speedStr.split('.')[1];
7272

73-
if (meters.startsWith('0')) {
74-
textToSay
75-
.write("${l10nConf.distance}: $speedStr ${l10nConf.kilometers}.");
76-
} else {
77-
textToSay
78-
.write("${l10nConf.distance}: $km,$meters ${l10nConf.kilometers}.");
79-
}
80-
8173
textToSay.write(
82-
"${l10nConf.speed}: $km,$meters ${l10nConf.kilometers} ${l10nConf.per} ${l10nConf.hours}");
74+
"${l10nConf.speed}: $km,$meters ${l10nConf.kilometers} ${l10nConf.per} ${l10nConf.hours}.");
8375

8476
await textToSpeech.say(textToSay.toString());
8577
}

lib/presentation/common/timer/viewmodel/timer_view_model.dart

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,8 @@ class TimerViewModel extends StateNotifier<TimerState> {
7777
String kmStr = distanceStr.split('.')[0];
7878
String metersStr = distanceStr.split('.')[1];
7979

80-
if (metersStr.startsWith('0')) {
81-
textToSay
82-
.write("${l10nConf.distance}: $distanceStr ${l10nConf.kilometers}.");
83-
} else {
84-
textToSay.write(
85-
"${l10nConf.distance}: $kmStr,$metersStr ${l10nConf.kilometers}.");
86-
}
80+
textToSay.write(
81+
"${l10nConf.distance}: $kmStr,$metersStr ${l10nConf.kilometers}.");
8782

8883
var duration = StringBuffer();
8984
if (state.hours != 0) {
@@ -102,13 +97,8 @@ class TimerViewModel extends StateNotifier<TimerState> {
10297
String km = speedStr.split('.')[0];
10398
String meters = speedStr.split('.')[1];
10499

105-
if (meters.startsWith('0')) {
106-
textToSay.write(
107-
"${l10nConf.speed}: $speedStr ${l10nConf.kilometers} ${l10nConf.per} ${l10nConf.hours}");
108-
} else {
109-
textToSay.write(
110-
"${l10nConf.speed}: $km,$meters ${l10nConf.kilometers} ${l10nConf.per} ${l10nConf.hours}");
111-
}
100+
textToSay.write(
101+
"${l10nConf.speed}: $km,$meters ${l10nConf.kilometers} ${l10nConf.per} ${l10nConf.hours}");
112102

113103
await ref.read(textToSpeechService).say(textToSay.toString());
114104

0 commit comments

Comments
 (0)