* build: Reenable shrink resources and minify in gradle * build: (deps): bump image from 4.6.0 to 4.7.1 Bumps [image](https://github.com/brendan-duncan/image) from 4.6.0 to 4.7.1. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * build: (deps): bump file_picker from 10.3.7 to 10.3.8 Bumps [file_picker](https://github.com/miguelpruivo/flutter_file_picker) from 10.3.7 to 10.3.8. - [Release notes](https://github.com/miguelpruivo/flutter_file_picker/releases) - [Changelog](https://github.com/miguelpruivo/flutter_file_picker/blob/master/CHANGELOG.md) - [Commits](https://github.com/miguelpruivo/flutter_file_picker/compare/v10.3.7...v10.3.8) --- updated-dependencies: - dependency-name: file_picker dependency-version: 10.3.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Improved search * build: Use matrix sdk vom pub.dev again * chore: Follow up better search * build: (deps): bump image from 4.7.1 to 4.7.2 Bumps [image](https://github.com/brendan-duncan/image) from 4.7.1 to 4.7.2. - [Changelog](https://github.com/brendan-duncan/image/blob/main/CHANGELOG.md) - [Commits](https://github.com/brendan-duncan/image/commits) --- updated-dependencies: - dependency-name: image dependency-version: 4.7.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore: Make cross signing self sign mandatory for bootstrap * chore: Update user device keys before creating bootstrap * fix: Better wait for secrets after verification bootstrap * refactor: Remove native imaging and enable web worker * refactor: Remove unused html onfocus streams * build: (deps): bump flutter_foreground_task from 9.1.0 to 9.2.0 Bumps [flutter_foreground_task](https://github.com/Dev-hwang/flutter_foreground_task) from 9.1.0 to 9.2.0. - [Changelog](https://github.com/Dev-hwang/flutter_foreground_task/blob/master/CHANGELOG.md) - [Commits](https://github.com/Dev-hwang/flutter_foreground_task/commits) --- updated-dependencies: - dependency-name: flutter_foreground_task dependency-version: 9.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Uzbek) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uz/ * chore(translations): Translated using Weblate (Russian) Currently translated at 99.8% (824 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 90.9% (750 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Galician) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * chore(translations): Translated using Weblate (Basque) Currently translated at 99.7% (823 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * chore(translations): Translated using Weblate (Ukrainian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * chore(translations): Translated using Weblate (Dutch) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 95.2% (788 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Spanish) Currently translated at 96.3% (797 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore(translations): Translated using Weblate (Russian) Currently translated at 100.0% (825 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * fix: Broken ruzzian plurals * chore(translations): Translated using Weblate (Norwegian Bokmål) Currently translated at 91.2% (753 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nb_NO/ * chore(translations): Translated using Weblate (Bengali) Currently translated at 4.5% (38 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/bn/ * chore(translations): Translated using Weblate (French) Currently translated at 82.3% (679 of 825 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * build: (deps): bump translations_cleaner from 0.0.5 to 0.1.0 Bumps [translations_cleaner](https://github.com/Chinmay-KB/translations_cleaner) from 0.0.5 to 0.1.0. - [Changelog](https://github.com/Chinmay-KB/translations_cleaner/blob/main/CHANGELOG.md) - [Commits](https://github.com/Chinmay-KB/translations_cleaner/commits) --- updated-dependencies: - dependency-name: translations_cleaner dependency-version: 0.1.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (German) Currently translated at 99.2% (821 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore(translations): Translated using Weblate (Estonian) Currently translated at 100.0% (827 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * build: Bump version to 2.4.0 * build: (deps): bump sqflite_common_ffi from 2.3.6 to 2.3.7+1 Bumps [sqflite_common_ffi](https://github.com/tekartik/sqflite) from 2.3.6 to 2.3.7+1. - [Commits](https://github.com/tekartik/sqflite/compare/sqflite_common_ffi_v2.3.6...sqflite_common_ffi/v2.3.7) --- updated-dependencies: - dependency-name: sqflite_common_ffi dependency-version: 2.3.7+1 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(translations): Translated using Weblate (Czech) Currently translated at 66.1% (547 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (Czech) Currently translated at 72.7% (602 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/cs/ * chore(translations): Translated using Weblate (German) Currently translated at 99.8% (826 of 827 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * chore: Add security.md file * fix: Locale unlocalized strings * build: (deps): bump matrix from 4.1.0 to 5.0.0 Bumps [matrix](https://github.com/famedly/matrix-dart-sdk) from 4.1.0 to 5.0.0. - [Release notes](https://github.com/famedly/matrix-dart-sdk/releases) - [Changelog](https://github.com/famedly/matrix-dart-sdk/blob/main/CHANGELOG.md) - [Commits](https://github.com/famedly/matrix-dart-sdk/compare/v4.1.0...v5.0.0) --- updated-dependencies: - dependency-name: matrix dependency-version: 5.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * fix: Notifications on web correctly managed when tab not focused * chore: Add changelog for android * chore: Remove duplicated localization * fix: Sign in label * chore: Versionize fcm shared isolate * build: Remove unused packag * build: (deps): bump package_info_plus from 8.3.1 to 9.0.0 Bumps [package_info_plus](https://github.com/fluttercommunity/plus_plugins/tree/main/packages/package_info_plus) from 8.3.1 to 9.0.0. - [Release notes](https://github.com/fluttercommunity/plus_plugins/releases) - [Commits](https://github.com/fluttercommunity/plus_plugins/commits/package_info_plus-v9.0.0/packages/package_info_plus) --- updated-dependencies: - dependency-name: package_info_plus dependency-version: 9.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com> * feat: Display particle animation on login page * chore: Use fixed version of fcm shared isolate * fix: apk crash on some platforms due new flutter version * chore: Correct kotlin format * fix iOS notifications * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * fluffychat merge * add missing type annotations * update matrix version * fluffychat merge * fluffychat merge * fix notification on click actions --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Christian Kußowski <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: BeMeritus <bemerituss@gmail.com> Co-authored-by: Frank Paul Silye <frankps@gmail.com> Co-authored-by: josé m. <correoxm@disroot.org> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: Priit Jõerüüt <jrthwlate@users.noreply.hosted.weblate.org> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Дмитрий Михирев <bizdelnick@gmail.com> Co-authored-by: Kimby <kimbyqs@gmail.com> Co-authored-by: Christian <christian-pauly@posteo.de> Co-authored-by: Kom nake <kominak310@svcache.com> Co-authored-by: hugues de keyzer <komputilisto@hugues.info> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Šebestová <ka.sebestova.cz@gmail.com>
234 lines
7.6 KiB
Dart
234 lines
7.6 KiB
Dart
import 'package:flutter/foundation.dart';
|
|
|
|
import 'package:async/async.dart';
|
|
import 'package:collection/collection.dart';
|
|
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_type_enum.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
|
|
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/activity_type_enum.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/message_activity_request.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_activity_model.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_choice.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_generation_repo.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_selection.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_selection_repo.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_target.dart';
|
|
import 'package:fluffychat/pangea/text_to_speech/tts_controller.dart';
|
|
import 'package:fluffychat/pangea/toolbar/message_practice/message_practice_mode_enum.dart';
|
|
import 'package:fluffychat/pangea/toolbar/message_practice/morph_selection.dart';
|
|
import 'package:fluffychat/pangea/toolbar/message_practice/practice_record_controller.dart';
|
|
import 'package:fluffychat/widgets/future_loading_dialog.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class PracticeController with ChangeNotifier {
|
|
final PangeaMessageEvent pangeaMessageEvent;
|
|
|
|
PracticeController(this.pangeaMessageEvent) {
|
|
_fetchPracticeSelection();
|
|
}
|
|
|
|
PracticeActivityModel? _activity;
|
|
|
|
MessagePracticeMode practiceMode = MessagePracticeMode.noneSelected;
|
|
|
|
MorphSelection? selectedMorph;
|
|
PracticeChoice? selectedChoice;
|
|
|
|
PracticeSelection? practiceSelection;
|
|
|
|
bool? wasCorrectMatch(PracticeChoice choice) {
|
|
if (_activity == null) return false;
|
|
return PracticeRecordController.wasCorrectMatch(
|
|
_activity!.practiceTarget,
|
|
choice,
|
|
);
|
|
}
|
|
|
|
bool? wasCorrectChoice(String choice) {
|
|
if (_activity == null) return false;
|
|
return PracticeRecordController.wasCorrectChoice(
|
|
_activity!.practiceTarget,
|
|
choice,
|
|
);
|
|
}
|
|
|
|
bool get isTotallyDone =>
|
|
isPracticeSessionDone(ActivityTypeEnum.emoji) &&
|
|
isPracticeSessionDone(ActivityTypeEnum.wordMeaning) &&
|
|
isPracticeSessionDone(ActivityTypeEnum.wordFocusListening) &&
|
|
isPracticeSessionDone(ActivityTypeEnum.morphId);
|
|
|
|
bool isPracticeSessionDone(ActivityTypeEnum activityType) =>
|
|
practiceSelection
|
|
?.activities(activityType)
|
|
.every((a) => PracticeRecordController.isCompleteByTarget(a)) ==
|
|
true;
|
|
|
|
bool isPracticeButtonEmpty(PangeaToken token) {
|
|
final target = practiceTargetForToken(token);
|
|
|
|
if (MessagePracticeMode.wordEmoji == practiceMode) {
|
|
if (token.vocabConstructID.userSetEmoji != null) {
|
|
return false;
|
|
}
|
|
// Keep open even when completed to show emoji
|
|
return target == null;
|
|
}
|
|
|
|
if (MessagePracticeMode.wordMorph == practiceMode) {
|
|
// Keep open even when completed to show morph icon
|
|
return target == null;
|
|
}
|
|
|
|
return target == null ||
|
|
PracticeRecordController.isCompleteByToken(target, token);
|
|
}
|
|
|
|
bool get showChoiceShimmer {
|
|
if (_activity == null) return false;
|
|
if (_activity is MorphMatchPracticeActivityModel) {
|
|
return selectedMorph != null &&
|
|
!PracticeRecordController.hasResponse(_activity!.practiceTarget);
|
|
}
|
|
|
|
return selectedChoice == null &&
|
|
!PracticeRecordController.hasAnyCorrectChoices(
|
|
_activity!.practiceTarget,
|
|
);
|
|
}
|
|
|
|
Future<void> _fetchPracticeSelection() async {
|
|
if (pangeaMessageEvent.messageDisplayRepresentation?.tokens == null) return;
|
|
practiceSelection = await PracticeSelectionRepo.get(
|
|
pangeaMessageEvent.eventId,
|
|
pangeaMessageEvent.messageDisplayLangCode,
|
|
pangeaMessageEvent.messageDisplayRepresentation!.tokens!,
|
|
);
|
|
}
|
|
|
|
Future<Result<PracticeActivityModel>> fetchActivityModel(
|
|
PracticeTarget target,
|
|
) async {
|
|
final req = MessageActivityRequest(
|
|
userL1: MatrixState.pangeaController.userController.userL1!.langCode,
|
|
userL2: MatrixState.pangeaController.userController.userL2!.langCode,
|
|
activityQualityFeedback: null,
|
|
target: target,
|
|
);
|
|
|
|
final result = await PracticeRepo.getPracticeActivity(
|
|
req,
|
|
messageInfo: pangeaMessageEvent.event.content,
|
|
);
|
|
if (result.isValue) {
|
|
_activity = result.result;
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
PracticeTarget? practiceTargetForToken(PangeaToken token) {
|
|
if (practiceMode.associatedActivityType == null) return null;
|
|
return practiceSelection
|
|
?.activities(practiceMode.associatedActivityType!)
|
|
.firstWhereOrNull((a) => a.tokens.contains(token));
|
|
}
|
|
|
|
void updateToolbarMode(MessagePracticeMode mode) {
|
|
selectedChoice = null;
|
|
practiceMode = mode;
|
|
if (practiceMode != MessagePracticeMode.wordMorph) {
|
|
selectedMorph = null;
|
|
}
|
|
notifyListeners();
|
|
}
|
|
|
|
void onChoiceSelect(PracticeChoice? choice, [bool force = false]) {
|
|
if (_activity == null) return;
|
|
if (selectedChoice == choice && !force) {
|
|
selectedChoice = null;
|
|
} else {
|
|
selectedChoice = choice;
|
|
}
|
|
notifyListeners();
|
|
}
|
|
|
|
void onSelectMorph(MorphSelection newMorph) {
|
|
practiceMode = MessagePracticeMode.wordMorph;
|
|
selectedMorph = newMorph;
|
|
notifyListeners();
|
|
}
|
|
|
|
void onMatch(PangeaToken token, PracticeChoice choice) {
|
|
if (_activity == null) return;
|
|
final isCorrect = PracticeRecordController.onSelectChoice(
|
|
choice.choiceContent,
|
|
token,
|
|
_activity!,
|
|
);
|
|
|
|
final targetId =
|
|
"message-token-${token.text.uniqueKey}-${pangeaMessageEvent.eventId}";
|
|
|
|
final updateService = MatrixState
|
|
.pangeaController
|
|
.matrixState
|
|
.analyticsDataService
|
|
.updateService;
|
|
|
|
// we don't take off points for incorrect emoji matches
|
|
if (_activity is! EmojiPracticeActivityModel || isCorrect) {
|
|
final constructUseType = PracticeRecordController.lastResponse(
|
|
_activity!.practiceTarget,
|
|
)!.useType(_activity!.activityType);
|
|
|
|
final constructs = [
|
|
OneConstructUse(
|
|
useType: constructUseType,
|
|
lemma: token.lemma.text,
|
|
constructType: ConstructTypeEnum.vocab,
|
|
metadata: ConstructUseMetaData(
|
|
roomId: pangeaMessageEvent.room.id,
|
|
timeStamp: DateTime.now(),
|
|
eventId: pangeaMessageEvent.eventId,
|
|
),
|
|
category: token.pos,
|
|
// in the case of a wrong answer, the cId doesn't match the token
|
|
form: token.text.content,
|
|
xp: constructUseType.pointValue,
|
|
),
|
|
];
|
|
|
|
updateService.addAnalytics(targetId, constructs);
|
|
}
|
|
|
|
if (isCorrect) {
|
|
if (_activity is EmojiPracticeActivityModel) {
|
|
updateService.setLemmaInfo(
|
|
choice.form.cId,
|
|
emoji: choice.choiceContent,
|
|
);
|
|
}
|
|
|
|
if (_activity is LemmaMeaningPracticeActivityModel) {
|
|
updateService.setLemmaInfo(
|
|
choice.form.cId,
|
|
meaning: choice.choiceContent,
|
|
);
|
|
}
|
|
}
|
|
|
|
if (_activity is LemmaMeaningPracticeActivityModel ||
|
|
_activity is EmojiPracticeActivityModel) {
|
|
TtsController.tryToSpeak(
|
|
token.text.content,
|
|
langCode: MatrixState.pangeaController.userController.userL2!.langCode,
|
|
);
|
|
}
|
|
|
|
notifyListeners();
|
|
}
|
|
}
|