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

reduce complexity of choice array widget

Browse source
This commit is contained in:
ggurdin 2025-11-04 14:57:20 -05:00
parent 4bbb81e20c
commit 9f30e26a2a
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
4 changed files with 84 additions and 162 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

241
lib/pangea/choreographer/widgets/choice_array.dart
View file

@ -1,6 +1,3 @@
import 'dart:developer';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:collection/collection.dart';
@ -13,10 +10,9 @@ import 'package:fluffychat/widgets/matrix.dart';
import '../../bot/utils/bot_style.dart';
import 'it_shimmer.dart';
// CTODO refactor
typedef ChoiceCallback = void Function(String value, int index);
class ChoicesArray extends StatefulWidget {
class ChoicesArray extends StatelessWidget {
final bool isLoading;
final List<Choice>? choices;
final ChoiceCallback onPressed;
@ -32,15 +28,8 @@ class ChoicesArray extends StatefulWidget {
/// choices could have identical text, like in back-to-back practice activities
final String? id;
/// some uses of this widget want to disable clicking of the choices
final bool enabled;
final String Function(String)? getDisplayCopy;
/// activity has multiple correct answers, so user can still
/// select choices once the correct choice has been selected
final bool enableMultiSelect;
const ChoicesArray({
super.key,
required this.isLoading,
@ -49,79 +38,39 @@ class ChoicesArray extends StatefulWidget {
required this.selectedChoiceIndex,
this.enableAudio = true,
this.langCode,
this.enabled = true,
this.onLongPress,
this.getDisplayCopy,
this.id,
this.enableMultiSelect = false,
});
@override
ChoicesArrayState createState() => ChoicesArrayState();
}
class ChoicesArrayState extends State<ChoicesArray> {
bool interactionDisabled = false;
void disableInteraction() {
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) setState(() => interactionDisabled = true);
});
}
void enableInteractions() {
if (_hasSelectedCorrectChoice && !widget.enableMultiSelect) return;
WidgetsBinding.instance.addPostFrameCallback((_) {
if (mounted) setState(() => interactionDisabled = false);
});
}
bool get _hasSelectedCorrectChoice =>
widget.choices?.any((choice) => choice.isGold && choice.color != null) ??
false;
@override
Widget build(BuildContext context) {
final ThemeData theme = Theme.of(context);
final choices = widget.choices!
.mapIndexed(
(index, entry) => ChoiceItem(
theme: theme,
onLongPress: widget.enabled ? widget.onLongPress : null,
onPressed: widget.enabled
? (String value, int index) {
widget.onPressed(value, index);
// TODO - what to pass here as eventID?
if (widget.enableAudio && widget.langCode != null) {
TtsController.tryToSpeak(
value,
targetID: null,
langCode: widget.langCode!,
);
}
}
: (String value, int index) {
debugger(when: kDebugMode);
},
entry: MapEntry(index, entry),
interactionDisabled: interactionDisabled,
enableInteraction: enableInteractions,
disableInteraction: disableInteraction,
isSelected: widget.selectedChoiceIndex == index,
id: widget.id,
getDisplayCopy: widget.getDisplayCopy,
),
)
.toList();
return widget.isLoading &&
(widget.choices == null || widget.choices!.length <= 1)
return isLoading && (choices == null || choices!.length <= 1)
? const ItShimmer()
: Wrap(
alignment: WrapAlignment.center,
spacing: 4.0,
children: choices,
children: [
...choices!.mapIndexed(
(index, entry) => ChoiceItem(
onLongPress: onLongPress,
onPressed: (String value, int index) {
onPressed(value, index);
if (enableAudio && langCode != null) {
TtsController.tryToSpeak(
value,
targetID: null,
langCode: langCode!,
);
}
},
entry: MapEntry(index, entry),
isSelected: selectedChoiceIndex == index,
id: id,
getDisplayCopy: getDisplayCopy,
),
),
],
);
}
}
@ -139,110 +88,88 @@ class Choice {
}
class ChoiceItem extends StatelessWidget {
final MapEntry<int, Choice> entry;
final ChoiceCallback? onLongPress;
final ChoiceCallback onPressed;
final bool isSelected;
final String? id;
final String Function(String)? getDisplayCopy;
final double? fontSize;
const ChoiceItem({
super.key,
required this.theme,
required this.onLongPress,
required this.onPressed,
required this.entry,
required this.isSelected,
required this.interactionDisabled,
required this.enableInteraction,
required this.disableInteraction,
required this.id,
this.getDisplayCopy,
this.fontSize,
});
final MapEntry<int, Choice> entry;
final ThemeData theme;
final ChoiceCallback? onLongPress;
final ChoiceCallback onPressed;
final bool isSelected;
final bool interactionDisabled;
final VoidCallback enableInteraction;
final VoidCallback disableInteraction;
final String? id;
final String Function(String)? getDisplayCopy;
final double? fontSize;
@override
Widget build(BuildContext context) {
try {
return Tooltip(
message: onLongPress != null ? L10n.of(context).holdForInfo : "",
waitDuration: onLongPress != null
? const Duration(milliseconds: 500)
: const Duration(days: 1),
child: CompositedTransformTarget(
link: MatrixState.pAnyState
final theme = Theme.of(context);
return Tooltip(
message: onLongPress != null ? L10n.of(context).holdForInfo : "",
waitDuration: onLongPress != null
? const Duration(milliseconds: 500)
: const Duration(days: 1),
child: CompositedTransformTarget(
link: MatrixState.pAnyState
.layerLinkAndKey("${entry.value.text}$id")
.link,
child: ChoiceAnimationWidget(
isSelected: isSelected,
isCorrect: entry.value.isGold,
key: MatrixState.pAnyState
.layerLinkAndKey("${entry.value.text}$id")
.link,
child: ChoiceAnimationWidget(
isSelected: isSelected,
isCorrect: entry.value.isGold,
key: MatrixState.pAnyState
.layerLinkAndKey("${entry.value.text}$id")
.key,
child: Container(
margin: const EdgeInsets.all(2),
padding: EdgeInsets.zero,
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(
Radius.circular(AppConfig.borderRadius),
.key,
child: Container(
margin: const EdgeInsets.all(2),
padding: EdgeInsets.zero,
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(
Radius.circular(AppConfig.borderRadius),
),
border: Border.all(
color: isSelected
? entry.value.color ?? theme.colorScheme.primary
: Colors.transparent,
style: BorderStyle.solid,
width: 2.0,
),
),
child: TextButton(
style: TextButton.styleFrom(
padding: const EdgeInsets.symmetric(
horizontal: 8,
vertical: 4,
),
border: Border.all(
color: isSelected
? entry.value.color ?? theme.colorScheme.primary
: Colors.transparent,
style: BorderStyle.solid,
width: 2.0,
backgroundColor: isSelected
? (entry.value.color?.withAlpha(50) ??
theme.colorScheme.primary.withAlpha(10))
: null,
textStyle: BotStyle.text(context),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
),
),
child: TextButton(
style: ButtonStyle(
padding: WidgetStateProperty.all(
const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
),
//if index is selected, then give the background a slight primary color
backgroundColor: WidgetStateProperty.all<Color>(
entry.value.color?.withAlpha(50) ??
theme.colorScheme.primary.withAlpha(10),
),
textStyle: WidgetStateProperty.all(
BotStyle.text(context),
),
shape: WidgetStateProperty.all(
RoundedRectangleBorder(
borderRadius:
BorderRadius.circular(AppConfig.borderRadius),
),
),
),
onLongPress: onLongPress != null && !interactionDisabled
? () => onLongPress!(entry.value.text, entry.key)
: null,
onPressed: interactionDisabled
? null
: () => onPressed(entry.value.text, entry.key),
child: Text(
getDisplayCopy != null
? getDisplayCopy!(entry.value.text)
: entry.value.text,
style: BotStyle.text(context).copyWith(
fontSize: fontSize,
),
textAlign: TextAlign.center,
onLongPress: () => onLongPress!(entry.value.text, entry.key),
onPressed: () => onPressed(entry.value.text, entry.key),
child: Text(
getDisplayCopy != null
? getDisplayCopy!(entry.value.text)
: entry.value.text,
style: BotStyle.text(context).copyWith(
fontSize: fontSize,
),
textAlign: TextAlign.center,
),
),
),
),
);
} catch (e) {
debugger(when: kDebugMode);
return Container();
}
),
);
}
}

1
lib/pangea/choreographer/widgets/igc/message_analytics_feedback.dart
View file

@ -122,7 +122,6 @@ class MessageAnalyticsFeedbackState extends State<MessageAnalyticsFeedback>
if (widget.newVocabConstructs <= 0 && widget.newGrammarConstructs <= 0) {
return const SizedBox.shrink();
}
// CTODO check if working
return Material(
type: MaterialType.transparency,

1
lib/pangea/choreographer/widgets/it_bar.dart
View file

@ -149,7 +149,6 @@ class ITBarState extends State<ITBar> with SingleTickerProviderStateMixin {
}
if (continuance.level == 1) {
// CTODO doesn't always go to next continuance
_onCorrectSelection(index);
} else {
_showFeedbackCard(

3
lib/pangea/toolbar/widgets/practice_activity/multiple_choice_activity.dart
View file

@ -237,14 +237,11 @@ class MultipleChoiceActivityState extends State<MultipleChoiceActivity> {
onPressed: updateChoice,
selectedChoiceIndex: selectedChoiceIndex,
choices: choices(context),
enabled: true,
id: currentRecordModel?.hashCode.toString(),
enableAudio: practiceActivity.activityType.includeTTSOnClick,
langCode:
MatrixState.pangeaController.languageController.activeL2Code(),
getDisplayCopy: _getDisplayCopy,
enableMultiSelect:
widget.currentActivity.activityType == ActivityTypeEnum.emoji,
),
],
);