From feab8d65a86c857d8db3eb0f250d5d60b0039fc4 Mon Sep 17 00:00:00 2001 From: JHubi1 Date: Tue, 25 Jun 2024 21:26:51 +0200 Subject: [PATCH] Smaller fixes --- lib/settings/voice.dart | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/settings/voice.dart b/lib/settings/voice.dart index 9e870a4..268382a 100644 --- a/lib/settings/voice.dart +++ b/lib/settings/voice.dart @@ -32,7 +32,7 @@ class _ScreenSettingsVoiceState extends State { bool dialogMustLoad = true; - void load() async { + Future load() async { var tmp = await speech.locales(); languageOptionIds = tmp.map((e) => e.localeId); languageOptions = tmp.map((e) => e.name); @@ -103,16 +103,7 @@ class _ScreenSettingsVoiceState extends State { .settingsVoiceNotSupported, Icons.info_rounded, () { if (permissionLoading) return; - if (!voiceLanguageOptions.contains( - (prefs!.getString("voiceLanguage") ?? - "en_US"))) { - selectionHaptic(); - ScaffoldMessenger.of(context).showSnackBar(SnackBar( - content: Text(AppLocalizations.of(context)! - .settingsVoiceTtsNotSupportedDescription), - showCloseIcon: true)); - } else if (!(permissionBluetooth && - permissionRecord)) { + if (!(permissionBluetooth && permissionRecord)) { void load() async { try { if (await Permission @@ -144,6 +135,14 @@ class _ScreenSettingsVoiceState extends State { } load(); + } else if (!voiceLanguageOptions.contains( + (prefs!.getString("voiceLanguage") ?? + "en_US"))) { + selectionHaptic(); + ScaffoldMessenger.of(context).showSnackBar(SnackBar( + content: Text(AppLocalizations.of(context)! + .settingsVoiceTtsNotSupportedDescription), + showCloseIcon: true)); } }), toggle( @@ -184,6 +183,7 @@ class _ScreenSettingsVoiceState extends State { setModalState = setLocalState; void loadSelected() async { + await load(); if ((prefs!.getString("voiceLanguage") ?? "") != "") { @@ -204,7 +204,6 @@ class _ScreenSettingsVoiceState extends State { } if (dialogMustLoad) { - load(); loadSelected(); dialogMustLoad = false; }