diff --git a/lib/screen_voice.dart b/lib/screen_voice.dart index 850dab2..842fe57 100644 --- a/lib/screen_voice.dart +++ b/lib/screen_voice.dart @@ -8,7 +8,7 @@ import 'package:ollama_app/worker/setter.dart'; import 'package:speech_to_text/speech_to_text.dart' as stt; import 'package:ollama_dart/ollama_dart.dart' as llama; import 'package:datetime_loop/datetime_loop.dart'; -import 'package:volume_controller/volume_controller.dart'; +// import 'package:volume_controller/volume_controller.dart'; import 'main.dart'; import 'worker/sender.dart'; diff --git a/lib/settings/voice.dart b/lib/settings/voice.dart index 268382a..ad14dbf 100644 --- a/lib/settings/voice.dart +++ b/lib/settings/voice.dart @@ -277,26 +277,25 @@ class _ScreenSettingsVoiceState extends State { : (voiceLanguageOptionsAvailable.contains(languageOptionIds.elementAt(index))) ? const Icon(Icons.spatial_tracking_rounded) : null, - checkmarkColor: (usedIndex == - index) + checkmarkColor: (usedIndex == index && + !(prefs?.getBool("useDeviceTheme") ?? + false)) ? ((MediaQuery.of(context).platformBrightness == Brightness.light) ? (theme ?? ThemeData()).colorScheme.secondary : (themeDark ?? ThemeData.dark()).colorScheme.secondary) : null, - labelStyle: (usedIndex == - index) + labelStyle: (usedIndex == index && + !(prefs?.getBool("useDeviceTheme") ?? + false)) ? TextStyle( color: (MediaQuery.of(context).platformBrightness == Brightness.light) ? (theme ?? ThemeData()).colorScheme.secondary : (themeDark ?? ThemeData.dark()).colorScheme.secondary) : null, - selectedColor: (MediaQuery.of(context).platformBrightness == - Brightness - .light) - ? (theme ?? ThemeData()) - .colorScheme - .primary - : (themeDark ?? ThemeData.dark()) - .colorScheme - .primary, + selectedColor: (prefs?.getBool("useDeviceTheme") ?? + false) + ? null + : (MediaQuery.of(context).platformBrightness == Brightness.light) + ? (theme ?? ThemeData()).colorScheme.primary + : (themeDark ?? ThemeData.dark()).colorScheme.primary, onSelected: (bool selected) {