ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: some fixes for alignment / audio buttons in word zoom card (#2625)

Browse source
This commit is contained in:
ggurdin 2025-05-02 12:48:18 -04:00 • committed by GitHub
parent 3a1bac6dc5
commit df38d752a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/pangea/lemmas/construct_xp_widget.dart
View file

@ -102,10 +102,6 @@ class ConstructXpWidgetState extends State<ConstructXpWidget>
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
if (constructLemmaCategory == null) {
return const SizedBox();
}
return SizedBox( return SizedBox(
width: widget.size, width: widget.size,
height: widget.size, height: widget.size,

35
lib/pangea/toolbar/widgets/word_zoom/lemma_widget.dart
View file

@ -9,7 +9,6 @@ import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
import 'package:fluffychat/pangea/events/models/tokens_event_content_model.dart'; import 'package:fluffychat/pangea/events/models/tokens_event_content_model.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart'; import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart'; import 'package:fluffychat/pangea/toolbar/controllers/tts_controller.dart';
import 'package:fluffychat/pangea/toolbar/enums/message_mode_enum.dart';
import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart'; import 'package:fluffychat/pangea/toolbar/widgets/message_selection_overlay.dart';
import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_audio_button.dart'; import 'package:fluffychat/pangea/toolbar/widgets/practice_activity/word_audio_button.dart';
import 'package:fluffychat/widgets/future_loading_dialog.dart'; import 'package:fluffychat/widgets/future_loading_dialog.dart';
@ -170,39 +169,17 @@ class LemmaWidgetState extends State<LemmaWidget> {
return Row( return Row(
children: [ children: [
// Tooltip(
// triggerMode: TooltipTriggerMode.tap,
// message: L10n.of(context).doubleClickToEdit,
// child: GestureDetector(
// onLongPress: () => _toggleEditMode(true),
// onDoubleTap: () => _toggleEditMode(true),
// child:
Text( Text(
widget.token.lemma.text, widget.token.lemma.text,
style: Theme.of(context).textTheme.headlineSmall, style: Theme.of(context).textTheme.headlineSmall,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
), ),
// ), WordAudioButton(
// ), text: widget.token.lemma.text,
if (widget.token.lemma.text.toLowerCase() == baseOpacity: 0.4,
widget.token.text.content.toLowerCase()) uniqueID: "lemma-content-${widget.token.text.content}",
WordAudioButton( langCode: widget.pangeaMessageEvent.messageDisplayLangCode,
text: widget.token.text.content, ),
isSelected:
MessageMode.listening == widget.overlayController?.toolbarMode,
baseOpacity: 0.4,
callbackOverride: widget.overlayController?.practiceSelection
?.hasActiveActivityByToken(
MessageMode.listening.associatedActivityType!,
widget.token,
) ==
true
? () => widget.overlayController
?.updateToolbarMode(MessageMode.listening)
: null,
uniqueID: "lemma-content-${widget.token.text.content}",
langCode: widget.pangeaMessageEvent.messageDisplayLangCode,
),
], ],
); );
} }

26
lib/pangea/toolbar/widgets/word_zoom/word_zoom_widget.dart
View file

@ -69,11 +69,14 @@ class WordZoomWidget extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
//@ggurdin - might need to play with size to properly center //@ggurdin - might need to play with size to properly center
IconButton( SizedBox(
onPressed: () => overlayController.updateSelectedSpan( width: 24.0,
token.text, child: IconButton(
onPressed: () => overlayController.updateSelectedSpan(
token.text,
),
icon: const Icon(Icons.close),
), ),
icon: const Icon(Icons.close),
), ),
LemmaWidget( LemmaWidget(
token: _selectedToken, token: _selectedToken,
@ -162,7 +165,7 @@ class WordZoomWidget extends StatelessWidget {
alignment: WrapAlignment.center, alignment: WrapAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center, crossAxisAlignment: WrapCrossAlignment.center,
children: [ children: [
if (!_selectedToken.doesLemmaTextMatchTokenText) ...[ ...[
Text( Text(
_selectedToken.text.content, _selectedToken.text.content,
style: Theme.of(context).textTheme.bodyLarge, style: Theme.of(context).textTheme.bodyLarge,
@ -170,20 +173,7 @@ class WordZoomWidget extends StatelessWidget {
), ),
WordAudioButton( WordAudioButton(
text: _selectedToken.text.content, text: _selectedToken.text.content,
isSelected:
MessageMode.listening == overlayController.toolbarMode,
baseOpacity: 0.4, baseOpacity: 0.4,
callbackOverride: overlayController.hideWordCardContent &&
overlayController.practiceSelection
?.hasActiveActivityByToken(
MessageMode.listening.associatedActivityType!,
_selectedToken,
) ==
true &&
overlayController.hideWordCardContent
? () => overlayController
.updateToolbarMode(MessageMode.listening)
: null,
uniqueID: "word-zoom-audio-${_selectedToken.text.content}", uniqueID: "word-zoom-audio-${_selectedToken.text.content}",
langCode: overlayController langCode: overlayController
.pangeaMessageEvent?.messageDisplayLangCode, .pangeaMessageEvent?.messageDisplayLangCode,