* fix: restrict height of dropdowns in user menu popup * chore: make sso button order consistent * fix: use latest edit to make representations * chore: show tooltip on full phonetic transcription widget * chore: shrink tooltip text size Also give it maxTimelineWidth in chat to match other widgets placement, and give slightly less padding between icons * feat: show audio message transcripts in vocab practice * moved some logic around * chore: check for button in showMessageShimmer * fix: show error message when not enough data for practice * fix: clear selected token in activity vocab display on word card dismissed * chore: throw expection while loading practice session is user is unsubscribed * fix: account for blocked and capped constructs in analytics download model * chore: save voice in TTS events and re-request if requested voice doesn't match saved voice * Fix grammar error null error and only reload current question upon encountering error * fix: filter RoomMemberChangeType.other events from timeline * chore: store font size settings per-user * fix: oops, don't return null from representationByLanguage (#5301) * feat: expose construct level up stream * 5259 bot settings language settings (#5305) * feat: add voice to user model * update bot settings on language / learning settings update * use room summary to determine member count * translations * chore: Remove sentence-level pronunciation (#5306) * fix: use sync stream to update analytics requests indicator (#5307) * fix: disable text scaling in learning progress indicators (#5313) * fix: don't auto-play bot audio message if another audio message is playing (#5315) * fix: restrict when analytics practice session loss popup is shown (#5316) * feat: rise and fade animation for construct levels * fix: hide info about course editing in join mode (#5317) * chore: update knock copy (#5318) * fix: switch back to flutter's built in dropdown for cerf level dropdown menu (#5322) * fix: fix public room sheet navigation (#5323) * fix: update some Russion translations (#5324) * feat: bring back old course pages (#5328) * fix: add more space between text and underline for highlighted tokens (#5332) * chore: close emoji picker on send message (#5336) * chore: add copy asking user to search for users in invite public tab (#5338) * chore: hide invite all in space button if everyone from space is already in room (#5340) * fix: enable language mismatch popup for activity langs that match l1 (#5341) * chore: remove set status button in settings (#5343) * chore: hide option to seperate chat types (#5345) * add translations for error questions and some spacing tweaks to improve layout and overflow issues * forgot to push file and formatting * feat: enable emoji search (#5350) * re-enable choice notifier * fix syntax * fix: reset audio player after auto-playing bot voice message (#5353) * fix: set explicit height for expanded nav rail item section (#5356) * fix: move onTap call up a level in widget tree (#5359) * chore: increase hitbox size of mini analytics navigation buttons * chore: clamp number of points shown in gain points animation * chore: reverse change to cefr level display in saved activities * chore: empty analytics usage dots display update * simplify growth animation remove stream, calculate manually with the analytics feedback for XP, new vocab and new morphs * chore: update disabled toolbar button color * cleanup * Limit activity role to 2 lines, use ellipses if needed * fetch translation on activity target generation * Disable l1 translation for audio messages * fix: use token offset and length to determine where to highlight in example messages * Hide view status toggle in style view * Hide status message when viewing profile * Add tooltip to course analytics button * feat: add progress bar to IT bar * chore: show loading indicator on recording dialog start up * fix: prevent out-of-date lemma loading futures from overriding new futures * chore: If IGC change is different by a whitespace, apply automatically * chore: prevent UI block on save activity * chore: Darken Screen further on Activity End Popup * chore: show shimmer on full activity role indicator * fix: use event stream for construct level animation * remove async function for analytics in chat and sort imports * chore: block notification permission request on app launch * fix: uncomment shouldShowActivityInstructions * feat: use image as activity background - add switch tile in settings to toggle - if set, remove image from activity summary widget * feat: add alert to notification settings to enable notifications * translations * add back bot settings widgets * chore: If link, treat as regular message * feat: highlight chat with support * fix: reset bypassExitConfirmation on session-level error * Add default images when activity doesn't have image * feat: Bring back language setting in bot avatar popup * chore: better match tooltip style * chore: update constant in level equation to make 6000 xp ~level 10 * chore: keep input focused after send * chore: if mobile keyboard open on show toolbar, close it and still show toolbar * fix: add padding to bottom of main chat list to make all items visible * chore: Expand role card if needed/available space * fix: account for smaller screens * fix: remove public course route between find a course and public course preview * fix: prevent avatar flickering on expand nav rail * fix: only allow one line of text in grammar match choices * chore: Default courses to public but restricted * chore: Keep cursor as hand when mousing over word-card emojis * fix: use unique storage key for morph info cache * fix: give morph definition a fixed height to prevent other element from jumping around * chore: Search for course filter not saved when open new course page * fix: Prevent Grammar Practice Blank Fill-Ins (#5464) * feat: filter out new constructs with category 'other' (#5454) * fix: always show scroll bars in activity user summary widgets (#5465) * fix: distinguish constuct level up animations by construct ID instead of count (#5468) * chore: Keep Tooltip until word enters Catagory (#5469) * feat: filter 'other' constructs from existing analytics data (#5473) * fix: don't include error span as choice in grammar error practice if the translation contains the error span (#5474) * chore: translation button style update translation appears in message bubble like in chat with a pressable button and sound effect * 5415 if invalid lemma definition breaks practice (#5466) * skip error causing lemmas in practice * update progress on skipping and play audio/update value after loading question, so a skipped questions isn't displayed * remove unnecessary line and comment * fix: don't label room as activity room if activityID is null (#5480) * chore: onboarding updates (#5485) * chore: update logic for which bot chats are targeted for bot options update on language update, add retry logic (#5488) * chore: ensure grammar category has example and multiple choices * chore: add subtitle to chat with support tile (#5494) * Use vocab symbol for newly collected words (#5489) * Show different course plan page if 500 error is detected (#5478) * Show different course plan page if 500 error is detected * translations --------- Co-authored-by: ggurdin <ggurdin@gmail.com> * chore: In user search, append needed decorators (#5495) * Move login/signup back buttons closer to center of screen (#5496) * fix: better message offset defaults (#5497) * chore: more onboarding tweaks (#5499) * chore: don't give normalization errors or single choices * chore: update room summary model (#5502) * fix: Don't shimmer disabled translation button (#5505) * chore: skip recently practiced grammar errors wip: only partially works due to analytics not being given to every question * feat: initial updates to public course preview page (#5453) * feat: initial updates to public course preview page * chore: account for join rules and power levels in RoomSummaryResponse * load room preview in course preview page * seperate public course preview page from selected course page * display course admins * Add avatar URL and display name to room summary. Get courseID from room summary * don't leave page on knock * fix: on IT closed, only replace source text if IT manually dismissed to prevent race condition with accepted continuance stream for single-span translation (#5510) * fix: reset IT progress on send and on edit (#5511) * chore: show close button on error snackbar (#5512) * fix: make analytics practice view scrollable, fix heights of top elements to prevent jumping around (#5513) * fix: save activities to analytics room for corresponding language (#5514) * chore: make login and signup views more consistent (#5518) * fix: return capped uses allows all grammar error targets to be searched for recent uses and filtered out, even maxed out ones * fix: prevent activity title from jumping on phonetic transcription load (#5519) * chore: fix inkwell border radius in activity summary (#5520) * fix: listen to scroll metrics to update scroll down button (#5522) * chore: update copy for auto-igc toggle (#5523) * chore: error on empty audio recording (#5524) * chore: show correct answer hint button and don't show answer description on selection of correct answer * make grammar icons larger and more spaced * chore: update bot target gender on user settings gender update (#5528) * fix: use correct stripe management URL in staging environment (#5530) * fix: update activity analytics stream on reinit analytics (#5532) * chore: add padding to extended activity description (#5534) * chore: don't add artificial profile to DM search results (#5535) * fix: update language chips materialTapTargetSize (#5538) * fix: add exampleMessage to AnalyticsActivityTarget and remove it from PracticeTarget * fix: only call getUses once in fetchErrors * feat: make deeplinks work for public course preview page (#5540) * fix: use stream to always update saved activity list on language update (#5541) * fix: use MorphInfoRepo to filter valid morph categories * feat: track end date on cancel subscription click and refresh page when end date changes (#5542) * initial work to add enable notifications to onboarding * notification page navigation * chore: add morphExampleInfo to activity model * fix: missing line * fix login redirect * move try-catch into request permission function * fix typos, dispose value notifier * fix: update UI on reply / edit event update * fix: update data type of user genders in bot options model * fix: move use activity image background setting into pangea user-specific style settings * fix: one click to close word card in activity vocab * fix: don't show error on cancel add recovery email * fix: filter edited events from search results * feat: add new parts of speech (idiom, phrasal verb, compound) and update localization (#5564) * fix: include stt for audio messages in level summary request * fix: don't pop from language selection page when not possible * fix: add new parts of speech to function for getting grammar copy (#5586) * chore: bump version to 4.1.17+7 --------- Co-authored-by: Ava Shilling <165050625+avashilling@users.noreply.github.com> Co-authored-by: Kelrap <kel.raphael3@outlook.com> Co-authored-by: Kelrap <99418823+Kelrap@users.noreply.github.com> Co-authored-by: wcjord <32568597+wcjord@users.noreply.github.com>
728 lines
23 KiB
Dart
728 lines
23 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/config/themes.dart';
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/pangea/analytics_details_popup/morph_meaning_widget.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/analytics_practice_page.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/analytics_practice_session_model.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/choice_cards/audio_choice_card.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/choice_cards/game_choice_card.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/choice_cards/grammar_choice_card.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/choice_cards/meaning_choice_card.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/completed_activity_session_view.dart';
|
|
import 'package:fluffychat/pangea/analytics_practice/practice_timer_widget.dart';
|
|
import 'package:fluffychat/pangea/analytics_summary/animated_progress_bar.dart';
|
|
import 'package:fluffychat/pangea/common/utils/async_state.dart';
|
|
import 'package:fluffychat/pangea/common/widgets/error_indicator.dart';
|
|
import 'package:fluffychat/pangea/common/widgets/pressable_button.dart';
|
|
import 'package:fluffychat/pangea/instructions/instructions_enum.dart';
|
|
import 'package:fluffychat/pangea/instructions/instructions_inline_tooltip.dart';
|
|
import 'package:fluffychat/pangea/phonetic_transcription/phonetic_transcription_widget.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
|
|
import 'package:fluffychat/utils/localized_exception_extension.dart';
|
|
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class AnalyticsPracticeView extends StatelessWidget {
|
|
final AnalyticsPracticeState controller;
|
|
|
|
const AnalyticsPracticeView(this.controller, {super.key});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
const loading = Center(
|
|
child: SizedBox(
|
|
width: 24,
|
|
height: 24,
|
|
child: CircularProgressIndicator.adaptive(),
|
|
),
|
|
);
|
|
return Scaffold(
|
|
appBar: AppBar(
|
|
title: Row(
|
|
spacing: 8.0,
|
|
children: [
|
|
Expanded(
|
|
child: ValueListenableBuilder(
|
|
valueListenable: controller.progressNotifier,
|
|
builder: (context, progress, __) {
|
|
return AnimatedProgressBar(
|
|
height: 20.0,
|
|
widthPercent: progress,
|
|
barColor: Theme.of(context).colorScheme.primary,
|
|
);
|
|
},
|
|
),
|
|
),
|
|
//keep track of state to update timer
|
|
ValueListenableBuilder(
|
|
valueListenable: controller.sessionState,
|
|
builder: (context, state, __) {
|
|
if (state is AsyncLoaded<AnalyticsPracticeSessionModel>) {
|
|
return PracticeTimerWidget(
|
|
key: ValueKey(state.value.startedAt),
|
|
initialSeconds: state.value.state.elapsedSeconds,
|
|
onTimeUpdate: controller.updateElapsedTime,
|
|
isRunning: !state.value.isComplete,
|
|
);
|
|
}
|
|
return const SizedBox.shrink();
|
|
},
|
|
),
|
|
],
|
|
),
|
|
),
|
|
body: Padding(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 8.0,
|
|
),
|
|
child: MaxWidthBody(
|
|
withScrolling: false,
|
|
showBorder: false,
|
|
child: ValueListenableBuilder(
|
|
valueListenable: controller.sessionState,
|
|
builder: (context, state, __) {
|
|
return switch (state) {
|
|
AsyncError<AnalyticsPracticeSessionModel>(:final error) =>
|
|
ErrorIndicator(
|
|
message: error.toLocalizedString(context),
|
|
),
|
|
AsyncLoaded<AnalyticsPracticeSessionModel>(:final value) =>
|
|
value.isComplete
|
|
? CompletedActivitySessionView(state.value, controller)
|
|
: _AnalyticsActivityView(controller),
|
|
_ => loading,
|
|
};
|
|
},
|
|
),
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _AnalyticsActivityView extends StatelessWidget {
|
|
final AnalyticsPracticeState controller;
|
|
|
|
const _AnalyticsActivityView(
|
|
this.controller,
|
|
);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final isColumnMode = FluffyThemes.isColumnMode(context);
|
|
TextStyle? titleStyle = isColumnMode
|
|
? Theme.of(context).textTheme.titleLarge
|
|
: Theme.of(context).textTheme.titleMedium;
|
|
titleStyle = titleStyle?.copyWith(fontWeight: FontWeight.bold);
|
|
|
|
return ListView(
|
|
children: [
|
|
//per-activity instructions, add switch statement once there are more types
|
|
const InstructionsInlineTooltip(
|
|
instructionsEnum: InstructionsEnum.selectMeaning,
|
|
padding: EdgeInsets.symmetric(
|
|
vertical: 8.0,
|
|
),
|
|
),
|
|
SizedBox(
|
|
height: 75.0,
|
|
child: ValueListenableBuilder(
|
|
valueListenable: controller.activityTarget,
|
|
builder: (context, target, __) => target != null
|
|
? Column(
|
|
children: [
|
|
Text(
|
|
target.promptText(context),
|
|
textAlign: TextAlign.center,
|
|
style: titleStyle,
|
|
maxLines: 2,
|
|
overflow: TextOverflow.ellipsis,
|
|
),
|
|
if (controller.widget.type == ConstructTypeEnum.vocab)
|
|
PhoneticTranscriptionWidget(
|
|
text:
|
|
target.target.tokens.first.vocabConstructID.lemma,
|
|
textLanguage: MatrixState
|
|
.pangeaController.userController.userL2!,
|
|
style: const TextStyle(fontSize: 14.0),
|
|
),
|
|
],
|
|
)
|
|
: const SizedBox.shrink(),
|
|
),
|
|
),
|
|
const SizedBox(height: 16.0),
|
|
Center(
|
|
child: _AnalyticsPracticeCenterContent(controller: controller),
|
|
),
|
|
const SizedBox(height: 16.0),
|
|
_ActivityChoicesWidget(controller),
|
|
const SizedBox(height: 16.0),
|
|
_WrongAnswerFeedback(controller: controller),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
class _AnalyticsPracticeCenterContent extends StatelessWidget {
|
|
final AnalyticsPracticeState controller;
|
|
|
|
const _AnalyticsPracticeCenterContent({
|
|
required this.controller,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ValueListenableBuilder(
|
|
valueListenable: controller.activityTarget,
|
|
builder: (context, target, __) => switch (target?.target.activityType) {
|
|
null => const SizedBox(),
|
|
ActivityTypeEnum.grammarError => SizedBox(
|
|
height: 160.0,
|
|
child: SingleChildScrollView(
|
|
child: ValueListenableBuilder(
|
|
valueListenable: controller.activityState,
|
|
builder: (context, state, __) => switch (state) {
|
|
AsyncLoaded(
|
|
value: final GrammarErrorPracticeActivityModel activity
|
|
) =>
|
|
Column(
|
|
mainAxisSize: MainAxisSize.min,
|
|
children: [
|
|
_ErrorBlankWidget(
|
|
key: ValueKey(
|
|
'${activity.eventID}_${activity.errorOffset}_${activity.errorLength}',
|
|
),
|
|
activity: activity,
|
|
),
|
|
const SizedBox(height: 12),
|
|
],
|
|
),
|
|
_ => const SizedBox(),
|
|
},
|
|
),
|
|
),
|
|
),
|
|
ActivityTypeEnum.grammarCategory => Center(
|
|
child: Column(
|
|
children: [
|
|
_CorrectAnswerHint(controller: controller),
|
|
_ExampleMessageWidget(
|
|
controller.getExampleMessage(target!),
|
|
),
|
|
const SizedBox(height: 12),
|
|
ValueListenableBuilder(
|
|
valueListenable: controller.hintPressedNotifier,
|
|
builder: (context, hintPressed, __) {
|
|
return HintButton(
|
|
depressed: hintPressed,
|
|
onPressed: controller.onHintPressed,
|
|
);
|
|
},
|
|
),
|
|
],
|
|
),
|
|
),
|
|
_ => SizedBox(
|
|
height: 100.0,
|
|
child: Center(
|
|
child: _ExampleMessageWidget(
|
|
controller.getExampleMessage(target!),
|
|
),
|
|
),
|
|
),
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ExampleMessageWidget extends StatelessWidget {
|
|
final Future<List<InlineSpan>?> future;
|
|
|
|
const _ExampleMessageWidget(this.future);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return FutureBuilder<List<InlineSpan>?>(
|
|
future: future,
|
|
builder: (context, snapshot) {
|
|
if (!snapshot.hasData || snapshot.data == null) {
|
|
return const SizedBox();
|
|
}
|
|
|
|
return Container(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 12,
|
|
vertical: 8,
|
|
),
|
|
decoration: BoxDecoration(
|
|
color: Color.alphaBlend(
|
|
Colors.white.withAlpha(180),
|
|
ThemeData.dark().colorScheme.primary,
|
|
),
|
|
borderRadius: BorderRadius.circular(16),
|
|
),
|
|
child: RichText(
|
|
text: TextSpan(
|
|
style: TextStyle(
|
|
color: Theme.of(context).colorScheme.onPrimaryFixed,
|
|
fontSize: AppConfig.fontSizeFactor * AppConfig.messageFontSize,
|
|
),
|
|
children: snapshot.data!,
|
|
),
|
|
),
|
|
);
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
class _CorrectAnswerHint extends StatelessWidget {
|
|
final AnalyticsPracticeState controller;
|
|
|
|
const _CorrectAnswerHint({
|
|
required this.controller,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ValueListenableBuilder(
|
|
valueListenable: controller.hintPressedNotifier,
|
|
builder: (context, hintPressed, __) {
|
|
if (!hintPressed) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
|
|
return ValueListenableBuilder(
|
|
valueListenable: controller.activityState,
|
|
builder: (context, state, __) {
|
|
if (state is! AsyncLoaded<MultipleChoicePracticeActivityModel>) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
|
|
final activity = state.value;
|
|
if (activity is! MorphPracticeActivityModel) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
|
|
final correctAnswerTag =
|
|
activity.multipleChoiceContent.answers.first;
|
|
|
|
return Padding(
|
|
padding: const EdgeInsets.only(bottom: 8.0),
|
|
child: MorphMeaningWidget(
|
|
feature: activity.morphFeature,
|
|
tag: correctAnswerTag,
|
|
),
|
|
);
|
|
},
|
|
);
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
class _WrongAnswerFeedback extends StatelessWidget {
|
|
final AnalyticsPracticeState controller;
|
|
|
|
const _WrongAnswerFeedback({
|
|
required this.controller,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ListenableBuilder(
|
|
listenable: Listenable.merge([
|
|
controller.activityState,
|
|
controller.selectedMorphChoice,
|
|
]),
|
|
builder: (context, _) {
|
|
final activityState = controller.activityState.value;
|
|
final selectedChoice = controller.selectedMorphChoice.value;
|
|
|
|
if (activityState
|
|
is! AsyncLoaded<MultipleChoicePracticeActivityModel> ||
|
|
selectedChoice == null) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
|
|
final activity = activityState.value;
|
|
final isWrongAnswer =
|
|
!activity.multipleChoiceContent.isCorrect(selectedChoice.tag);
|
|
|
|
if (!isWrongAnswer) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
|
|
return Padding(
|
|
padding: const EdgeInsets.only(bottom: 8.0),
|
|
child: MorphMeaningWidget(
|
|
feature: selectedChoice.feature,
|
|
tag: selectedChoice.tag,
|
|
blankErrorFeedback: true,
|
|
),
|
|
);
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ErrorBlankWidget extends StatefulWidget {
|
|
final GrammarErrorPracticeActivityModel activity;
|
|
|
|
const _ErrorBlankWidget({
|
|
super.key,
|
|
required this.activity,
|
|
});
|
|
|
|
@override
|
|
State<_ErrorBlankWidget> createState() => _ErrorBlankWidgetState();
|
|
}
|
|
|
|
class _ErrorBlankWidgetState extends State<_ErrorBlankWidget> {
|
|
late final String translation = widget.activity.translation;
|
|
bool _showTranslation = false;
|
|
|
|
void _toggleTranslation() {
|
|
setState(() {
|
|
_showTranslation = !_showTranslation;
|
|
});
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final text = widget.activity.text;
|
|
final errorOffset = widget.activity.errorOffset;
|
|
final errorLength = widget.activity.errorLength;
|
|
|
|
const maxContextChars = 50;
|
|
|
|
final chars = text.characters;
|
|
final totalLength = chars.length;
|
|
|
|
// ---------- BEFORE ----------
|
|
int beforeStart = 0;
|
|
bool trimmedBefore = false;
|
|
|
|
if (errorOffset > maxContextChars) {
|
|
int desiredStart = errorOffset - maxContextChars;
|
|
|
|
// Snap left to nearest whitespace to avoid cutting words
|
|
while (desiredStart > 0 && chars.elementAt(desiredStart) != ' ') {
|
|
desiredStart--;
|
|
}
|
|
|
|
beforeStart = desiredStart;
|
|
trimmedBefore = true;
|
|
}
|
|
|
|
final before =
|
|
chars.skip(beforeStart).take(errorOffset - beforeStart).toString();
|
|
|
|
// ---------- AFTER ----------
|
|
int afterEnd = totalLength;
|
|
bool trimmedAfter = false;
|
|
|
|
final errorEnd = errorOffset + errorLength;
|
|
final afterChars = totalLength - errorEnd;
|
|
|
|
if (afterChars > maxContextChars) {
|
|
int desiredEnd = errorEnd + maxContextChars;
|
|
|
|
// Snap right to nearest whitespace
|
|
while (desiredEnd < totalLength && chars.elementAt(desiredEnd) != ' ') {
|
|
desiredEnd++;
|
|
}
|
|
|
|
afterEnd = desiredEnd;
|
|
trimmedAfter = true;
|
|
}
|
|
|
|
final after = chars.skip(errorEnd).take(afterEnd - errorEnd).toString();
|
|
|
|
return Column(
|
|
children: [
|
|
Container(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 12,
|
|
vertical: 8,
|
|
),
|
|
decoration: BoxDecoration(
|
|
color: Color.alphaBlend(
|
|
Colors.white.withAlpha(180),
|
|
ThemeData.dark().colorScheme.primary,
|
|
),
|
|
borderRadius: BorderRadius.circular(16),
|
|
),
|
|
child: Column(
|
|
children: [
|
|
RichText(
|
|
text: TextSpan(
|
|
style: TextStyle(
|
|
color: Theme.of(context).colorScheme.onPrimaryFixed,
|
|
fontSize:
|
|
AppConfig.fontSizeFactor * AppConfig.messageFontSize,
|
|
),
|
|
children: [
|
|
if (trimmedBefore) const TextSpan(text: '…'),
|
|
if (before.isNotEmpty) TextSpan(text: before),
|
|
WidgetSpan(
|
|
child: Container(
|
|
height: 4.0,
|
|
width: (errorLength * 8).toDouble(),
|
|
padding: const EdgeInsets.only(bottom: 2.0),
|
|
decoration: BoxDecoration(
|
|
color: Theme.of(context).colorScheme.primary,
|
|
),
|
|
),
|
|
),
|
|
if (after.isNotEmpty) TextSpan(text: after),
|
|
if (trimmedAfter) const TextSpan(text: '…'),
|
|
],
|
|
),
|
|
),
|
|
const SizedBox(height: 8),
|
|
_showTranslation
|
|
? Text(
|
|
translation,
|
|
style: TextStyle(
|
|
color: Theme.of(context).colorScheme.onPrimaryFixed,
|
|
fontSize: AppConfig.fontSizeFactor *
|
|
AppConfig.messageFontSize,
|
|
fontStyle: FontStyle.italic,
|
|
),
|
|
textAlign: TextAlign.left,
|
|
)
|
|
: const SizedBox.shrink(),
|
|
],
|
|
),
|
|
),
|
|
const SizedBox(height: 8),
|
|
HintButton(depressed: _showTranslation, onPressed: _toggleTranslation),
|
|
],
|
|
);
|
|
}
|
|
}
|
|
|
|
class HintButton extends StatelessWidget {
|
|
final VoidCallback onPressed;
|
|
final bool depressed;
|
|
|
|
const HintButton({
|
|
required this.onPressed,
|
|
required this.depressed,
|
|
super.key,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return PressableButton(
|
|
borderRadius: BorderRadius.circular(20),
|
|
color: Theme.of(context).colorScheme.primaryContainer,
|
|
onPressed: onPressed,
|
|
depressed: depressed,
|
|
playSound: true,
|
|
colorFactor: 0.3,
|
|
builder: (context, depressed, shadowColor) => Stack(
|
|
alignment: Alignment.center,
|
|
children: [
|
|
Container(
|
|
height: 40.0,
|
|
width: 40.0,
|
|
decoration: BoxDecoration(
|
|
color: depressed
|
|
? shadowColor
|
|
: Theme.of(context).colorScheme.primaryContainer,
|
|
shape: BoxShape.circle,
|
|
),
|
|
),
|
|
const Icon(
|
|
Icons.lightbulb_outline,
|
|
size: 20,
|
|
),
|
|
],
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ActivityChoicesWidget extends StatelessWidget {
|
|
final AnalyticsPracticeState controller;
|
|
|
|
const _ActivityChoicesWidget(
|
|
this.controller,
|
|
);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return ValueListenableBuilder(
|
|
valueListenable: controller.activityState,
|
|
builder: (context, state, __) {
|
|
return switch (state) {
|
|
AsyncLoading<MultipleChoicePracticeActivityModel>() => const Center(
|
|
child: SizedBox(
|
|
width: 24,
|
|
height: 24,
|
|
child: CircularProgressIndicator.adaptive(),
|
|
),
|
|
),
|
|
AsyncError<MultipleChoicePracticeActivityModel>(:final error) =>
|
|
Column(
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: [
|
|
//allow try to reload activity in case of error
|
|
ErrorIndicator(message: error.toString()),
|
|
const SizedBox(height: 16),
|
|
TextButton.icon(
|
|
onPressed: controller.reloadCurrentActivity,
|
|
icon: const Icon(Icons.refresh),
|
|
label: Text(L10n.of(context).tryAgain),
|
|
),
|
|
],
|
|
),
|
|
AsyncLoaded<MultipleChoicePracticeActivityModel>(:final value) =>
|
|
ValueListenableBuilder(
|
|
valueListenable: controller.enableChoicesNotifier,
|
|
builder: (context, enabled, __) {
|
|
final choices = controller.filteredChoices(value);
|
|
return Column(
|
|
spacing: 8.0,
|
|
mainAxisAlignment: MainAxisAlignment.center,
|
|
children: choices
|
|
.map(
|
|
(choice) => _ChoiceCard(
|
|
activity: value,
|
|
targetId: controller.choiceTargetId(choice.choiceId),
|
|
choiceId: choice.choiceId,
|
|
onPressed: () => controller.onSelectChoice(
|
|
choice.choiceId,
|
|
),
|
|
cardHeight: 60.0,
|
|
choiceText: choice.choiceText,
|
|
choiceEmoji: choice.choiceEmoji,
|
|
enabled: enabled,
|
|
),
|
|
)
|
|
.toList(),
|
|
);
|
|
},
|
|
),
|
|
_ => Container(
|
|
constraints: const BoxConstraints(maxHeight: 400.0),
|
|
child: const Center(
|
|
child: CircularProgressIndicator.adaptive(),
|
|
),
|
|
),
|
|
};
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
class _ChoiceCard extends StatelessWidget {
|
|
final MultipleChoicePracticeActivityModel activity;
|
|
final String choiceId;
|
|
final String targetId;
|
|
final VoidCallback onPressed;
|
|
final double cardHeight;
|
|
|
|
final String choiceText;
|
|
final String? choiceEmoji;
|
|
final bool enabled;
|
|
|
|
const _ChoiceCard({
|
|
required this.activity,
|
|
required this.choiceId,
|
|
required this.targetId,
|
|
required this.onPressed,
|
|
required this.cardHeight,
|
|
required this.choiceText,
|
|
required this.choiceEmoji,
|
|
this.enabled = true,
|
|
});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final isCorrect = activity.multipleChoiceContent.isCorrect(choiceId);
|
|
final activityType = activity.activityType;
|
|
final constructId = activity.tokens.first.vocabConstructID;
|
|
|
|
switch (activity.activityType) {
|
|
case ActivityTypeEnum.lemmaMeaning:
|
|
return MeaningChoiceCard(
|
|
key: ValueKey(
|
|
'${constructId.string}_${activityType.name}_meaning_$choiceId',
|
|
),
|
|
choiceId: choiceId,
|
|
targetId: targetId,
|
|
displayText: choiceText,
|
|
emoji: choiceEmoji,
|
|
onPressed: onPressed,
|
|
isCorrect: isCorrect,
|
|
height: cardHeight,
|
|
isEnabled: enabled,
|
|
);
|
|
|
|
case ActivityTypeEnum.lemmaAudio:
|
|
return AudioChoiceCard(
|
|
key: ValueKey(
|
|
'${constructId.string}_${activityType.name}_audio_$choiceId',
|
|
),
|
|
text: choiceId,
|
|
targetId: targetId,
|
|
onPressed: onPressed,
|
|
isCorrect: isCorrect,
|
|
height: cardHeight,
|
|
isEnabled: enabled,
|
|
);
|
|
|
|
case ActivityTypeEnum.grammarCategory:
|
|
return GrammarChoiceCard(
|
|
key: ValueKey(
|
|
'${constructId.string}_${activityType.name}_grammar_$choiceId',
|
|
),
|
|
choiceId: choiceId,
|
|
targetId: targetId,
|
|
feature: (activity as MorphPracticeActivityModel).morphFeature,
|
|
tag: choiceText,
|
|
onPressed: onPressed,
|
|
isCorrect: isCorrect,
|
|
height: cardHeight,
|
|
enabled: enabled,
|
|
);
|
|
|
|
case ActivityTypeEnum.grammarError:
|
|
final activity = this.activity as GrammarErrorPracticeActivityModel;
|
|
return GameChoiceCard(
|
|
key: ValueKey(
|
|
'${activity.errorLength}_${activity.errorOffset}_${activity.eventID}_${activityType.name}_grammar_error_$choiceId',
|
|
),
|
|
shouldFlip: false,
|
|
targetId: targetId,
|
|
onPressed: onPressed,
|
|
isCorrect: isCorrect,
|
|
height: cardHeight,
|
|
isEnabled: enabled,
|
|
child: Text(choiceText),
|
|
);
|
|
|
|
default:
|
|
return GameChoiceCard(
|
|
key: ValueKey(
|
|
'${constructId.string}_${activityType.name}_basic_$choiceId',
|
|
),
|
|
shouldFlip: false,
|
|
targetId: targetId,
|
|
onPressed: onPressed,
|
|
isCorrect: isCorrect,
|
|
height: cardHeight,
|
|
isEnabled: enabled,
|
|
child: Text(choiceText),
|
|
);
|
|
}
|
|
}
|
|
}
|