From 0ff8b047402d5db70758b18e88f0921031447f21 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 18 Jun 2025 14:58:12 -0400 Subject: [PATCH 1/2] Selects icon color for phonetic audio button based on background darkness --- .../phonetic_transcription_widget.dart | 18 +++++++++++++++--- .../toolbar/widgets/overlay_message.dart | 1 + 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart b/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart index 0e7c69f74..b1fe93f75 100644 --- a/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart +++ b/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart @@ -16,11 +16,13 @@ class PhoneticTranscriptionWidget extends StatefulWidget { final LanguageModel textLanguage; final TextStyle? style; final double? iconSize; + final bool? lightBackground; const PhoneticTranscriptionWidget({ super.key, required this.text, required this.textLanguage, + this.lightBackground, this.style, this.iconSize, }); @@ -143,9 +145,19 @@ class _PhoneticTranscriptionWidgetState : Icon( _isPlaying ? Icons.pause_outlined : Icons.volume_up, size: widget.iconSize ?? 24, - color: _isPlaying - ? Theme.of(context).colorScheme.primary - : Theme.of(context).iconTheme.color, + color: widget.lightBackground ?? + Theme.of(context).brightness == + Brightness.light + ? _isPlaying + ? Theme.of(context) + .colorScheme + .onPrimaryFixed + : Theme.of(context) + .colorScheme + .onTertiaryFixed + : _isPlaying + ? Theme.of(context).colorScheme.primary + : Theme.of(context).iconTheme.color, ), ), ], diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart index aa3300f3c..73a3e6f6b 100644 --- a/lib/pangea/toolbar/widgets/overlay_message.dart +++ b/lib/pangea/toolbar/widgets/overlay_message.dart @@ -199,6 +199,7 @@ class OverlayMessage extends StatelessWidget { event, textColor, ), + lightBackground: ownMessage ? true : null, ), ], ), From 241a8051cd7e539e1844c99b6a584f3771755856 Mon Sep 17 00:00:00 2001 From: ggurdin Date: Wed, 18 Jun 2025 15:57:11 -0400 Subject: [PATCH 2/2] simplify --- .../phonetic_transcription_widget.dart | 14 ++++---------- lib/pangea/toolbar/widgets/overlay_message.dart | 2 +- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart b/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart index eb5cc59f5..d343c5855 100644 --- a/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart +++ b/lib/pangea/phonetic_transcription/phonetic_transcription_widget.dart @@ -17,15 +17,15 @@ class PhoneticTranscriptionWidget extends StatefulWidget { final LanguageModel textLanguage; final TextStyle? style; final double? iconSize; - final bool? lightBackground; + final Color? iconColor; const PhoneticTranscriptionWidget({ super.key, required this.text, required this.textLanguage, - this.lightBackground, this.style, this.iconSize, + this.iconColor, }); @override @@ -168,14 +168,8 @@ class _PhoneticTranscriptionWidgetState child: Icon( _isPlaying ? Icons.pause_outlined : Icons.volume_up, size: widget.iconSize ?? 24, - color: widget.lightBackground ?? - Theme.of(context).brightness == Brightness.light - ? _isPlaying - ? Theme.of(context).colorScheme.onPrimaryFixed - : Theme.of(context).colorScheme.onTertiaryFixed - : _isPlaying - ? Theme.of(context).colorScheme.primary - : Theme.of(context).iconTheme.color, + color: + widget.iconColor ?? Theme.of(context).iconTheme.color, ), ), ], diff --git a/lib/pangea/toolbar/widgets/overlay_message.dart b/lib/pangea/toolbar/widgets/overlay_message.dart index 73a3e6f6b..71a7c573d 100644 --- a/lib/pangea/toolbar/widgets/overlay_message.dart +++ b/lib/pangea/toolbar/widgets/overlay_message.dart @@ -199,7 +199,7 @@ class OverlayMessage extends StatelessWidget { event, textColor, ), - lightBackground: ownMessage ? true : null, + iconColor: textColor, ), ], ),