* 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>
316 lines
9.7 KiB
Dart
316 lines
9.7 KiB
Dart
import 'package:flutter/painting.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/analytics_practice/analytics_practice_constants.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/message_activity_request.dart';
|
|
import 'package:fluffychat/pangea/practice_activities/practice_target.dart';
|
|
|
|
class ExampleMessageInfo {
|
|
final List<InlineSpan> exampleMessage;
|
|
|
|
const ExampleMessageInfo({required this.exampleMessage});
|
|
|
|
Map<String, dynamic> toJson() {
|
|
final segments = <Map<String, dynamic>>[];
|
|
|
|
for (final span in exampleMessage) {
|
|
if (span is TextSpan) {
|
|
segments.add({
|
|
'text': span.text ?? '',
|
|
'isBold': span.style?.fontWeight == FontWeight.bold,
|
|
});
|
|
}
|
|
}
|
|
|
|
return {'segments': segments};
|
|
}
|
|
|
|
factory ExampleMessageInfo.fromJson(Map<String, dynamic> json) {
|
|
final segments = json['segments'] as List<dynamic>? ?? [];
|
|
|
|
final spans = <InlineSpan>[];
|
|
for (final segment in segments) {
|
|
final text = segment['text'] as String? ?? '';
|
|
final isBold = segment['isBold'] as bool? ?? false;
|
|
|
|
spans.add(
|
|
TextSpan(
|
|
text: text,
|
|
style: isBold ? const TextStyle(fontWeight: FontWeight.bold) : null,
|
|
),
|
|
);
|
|
}
|
|
|
|
return ExampleMessageInfo(exampleMessage: spans);
|
|
}
|
|
}
|
|
|
|
/// An extended example message that includes both formatted display spans and tokens to generate audio practice activities.
|
|
/// eventId/roomId are needed for audio playback.
|
|
class AudioExampleMessage {
|
|
final List<PangeaToken> tokens;
|
|
final String? eventId;
|
|
final String? roomId;
|
|
final ExampleMessageInfo exampleMessage;
|
|
|
|
const AudioExampleMessage({
|
|
required this.tokens,
|
|
this.eventId,
|
|
this.roomId,
|
|
required this.exampleMessage,
|
|
});
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {'eventId': eventId, 'roomId': roomId};
|
|
}
|
|
|
|
factory AudioExampleMessage.fromJson(Map<String, dynamic> json) {
|
|
return AudioExampleMessage(
|
|
tokens: const [],
|
|
eventId: json['eventId'] as String?,
|
|
roomId: json['roomId'] as String?,
|
|
exampleMessage: const ExampleMessageInfo(exampleMessage: []),
|
|
);
|
|
}
|
|
}
|
|
|
|
class AnalyticsActivityTarget {
|
|
final PracticeTarget target;
|
|
final GrammarErrorRequestInfo? grammarErrorInfo;
|
|
final ExampleMessageInfo? exampleMessage;
|
|
final AudioExampleMessage? audioExampleMessage;
|
|
|
|
AnalyticsActivityTarget({
|
|
required this.target,
|
|
this.grammarErrorInfo,
|
|
this.exampleMessage,
|
|
this.audioExampleMessage,
|
|
});
|
|
|
|
Map<String, dynamic> toJson() => {
|
|
'target': target.toJson(),
|
|
'grammarErrorInfo': grammarErrorInfo?.toJson(),
|
|
'exampleMessage': exampleMessage?.toJson(),
|
|
'audioExampleMessage': audioExampleMessage?.toJson(),
|
|
};
|
|
|
|
factory AnalyticsActivityTarget.fromJson(Map<String, dynamic> json) =>
|
|
AnalyticsActivityTarget(
|
|
target: PracticeTarget.fromJson(json['target']),
|
|
grammarErrorInfo: json['grammarErrorInfo'] != null
|
|
? GrammarErrorRequestInfo.fromJson(json['grammarErrorInfo'])
|
|
: null,
|
|
exampleMessage: json['exampleMessage'] != null
|
|
? ExampleMessageInfo.fromJson(json['exampleMessage'])
|
|
: null,
|
|
audioExampleMessage: json['audioExampleMessage'] != null
|
|
? AudioExampleMessage.fromJson(json['audioExampleMessage'])
|
|
: null,
|
|
);
|
|
}
|
|
|
|
class AnalyticsPracticeSessionModel {
|
|
final DateTime startedAt;
|
|
final List<AnalyticsActivityTarget> practiceTargets;
|
|
final String userL1;
|
|
final String userL2;
|
|
|
|
AnalyticsPracticeSessionState state;
|
|
|
|
AnalyticsPracticeSessionModel({
|
|
required this.startedAt,
|
|
required this.practiceTargets,
|
|
required this.userL1,
|
|
required this.userL2,
|
|
AnalyticsPracticeSessionState? state,
|
|
}) : state = state ?? const AnalyticsPracticeSessionState();
|
|
|
|
// Maximum activities to attempt (including skips)
|
|
int get _maxAttempts =>
|
|
(AnalyticsPracticeConstants.practiceGroupSize +
|
|
AnalyticsPracticeConstants.errorBufferSize)
|
|
.clamp(0, practiceTargets.length)
|
|
.toInt();
|
|
|
|
int get _completionGoal => AnalyticsPracticeConstants.practiceGroupSize.clamp(
|
|
0,
|
|
practiceTargets.length,
|
|
);
|
|
|
|
// Total attempted so far (completed + skipped)
|
|
int get _totalAttempted => state.currentIndex + state.skippedActivities;
|
|
|
|
bool get isComplete {
|
|
final complete =
|
|
state.finished ||
|
|
state.currentIndex >= _completionGoal ||
|
|
_totalAttempted >= _maxAttempts;
|
|
return complete;
|
|
}
|
|
|
|
double get progress {
|
|
final possibleCompletions =
|
|
(state.currentIndex + _maxAttempts - _totalAttempted).clamp(
|
|
0,
|
|
_completionGoal,
|
|
);
|
|
return possibleCompletions > 0
|
|
? (state.currentIndex / possibleCompletions).clamp(0.0, 1.0)
|
|
: 1.0;
|
|
}
|
|
|
|
List<MessageActivityRequest> get activityRequests {
|
|
return practiceTargets.map((target) {
|
|
return MessageActivityRequest(
|
|
userL1: userL1,
|
|
userL2: userL2,
|
|
activityQualityFeedback: null,
|
|
target: target.target,
|
|
grammarErrorInfo: target.grammarErrorInfo,
|
|
exampleMessage: target.exampleMessage,
|
|
audioExampleMessage: target.audioExampleMessage,
|
|
);
|
|
}).toList();
|
|
}
|
|
|
|
void setElapsedSeconds(int seconds) =>
|
|
state = state.copyWith(elapsedSeconds: seconds);
|
|
|
|
void finishSession() => state = state.copyWith(finished: true);
|
|
|
|
void completeActivity() =>
|
|
state = state.copyWith(currentIndex: state.currentIndex + 1);
|
|
|
|
void incrementSkippedActivities() =>
|
|
state = state.copyWith(skippedActivities: state.skippedActivities + 1);
|
|
|
|
void submitAnswer(OneConstructUse use) =>
|
|
state = state.copyWith(completedUses: [...state.completedUses, use]);
|
|
|
|
factory AnalyticsPracticeSessionModel.fromJson(Map<String, dynamic> json) {
|
|
return AnalyticsPracticeSessionModel(
|
|
startedAt: DateTime.parse(json['startedAt'] as String),
|
|
practiceTargets: (json['practiceTargets'] as List<dynamic>)
|
|
.map((e) => AnalyticsActivityTarget.fromJson(e))
|
|
.whereType<AnalyticsActivityTarget>()
|
|
.toList(),
|
|
userL1: json['userL1'] as String,
|
|
userL2: json['userL2'] as String,
|
|
state: AnalyticsPracticeSessionState.fromJson(json),
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {
|
|
'startedAt': startedAt.toIso8601String(),
|
|
'practiceTargets': practiceTargets.map((e) => e.toJson()).toList(),
|
|
'userL1': userL1,
|
|
'userL2': userL2,
|
|
...state.toJson(),
|
|
};
|
|
}
|
|
}
|
|
|
|
class AnalyticsPracticeSessionState {
|
|
final List<OneConstructUse> completedUses;
|
|
final int currentIndex;
|
|
final bool finished;
|
|
final int elapsedSeconds;
|
|
final int skippedActivities;
|
|
|
|
const AnalyticsPracticeSessionState({
|
|
this.completedUses = const [],
|
|
this.currentIndex = 0,
|
|
this.finished = false,
|
|
this.elapsedSeconds = 0,
|
|
this.skippedActivities = 0,
|
|
});
|
|
|
|
int get totalXpGained => completedUses.fold(0, (sum, use) => sum + use.xp);
|
|
|
|
double get accuracy {
|
|
if (completedUses.isEmpty) return 0.0;
|
|
final correct = completedUses.where((use) => use.xp > 0).length;
|
|
final result = correct / completedUses.length;
|
|
return (result * 100).truncateToDouble();
|
|
}
|
|
|
|
bool get _giveAccuracyBonus => accuracy >= 100.0;
|
|
|
|
bool get _giveTimeBonus =>
|
|
elapsedSeconds <= AnalyticsPracticeConstants.timeForBonus;
|
|
|
|
int get bonusXP => accuracyBonusXP + timeBonusXP;
|
|
|
|
int get accuracyBonusXP => _giveAccuracyBonus ? _bonusXP : 0;
|
|
|
|
int get timeBonusXP => _giveTimeBonus ? _bonusXP : 0;
|
|
|
|
int get _bonusXP => _bonusUses.fold(0, (sum, use) => sum + use.xp);
|
|
|
|
int get allXPGained => totalXpGained + bonusXP;
|
|
|
|
List<OneConstructUse> get _bonusUses =>
|
|
completedUses.where((use) => use.xp > 0).map(_bonusUse).toList();
|
|
|
|
List<OneConstructUse> get allBonusUses => [
|
|
if (_giveAccuracyBonus) ..._bonusUses,
|
|
if (_giveTimeBonus) ..._bonusUses,
|
|
];
|
|
|
|
OneConstructUse _bonusUse(OneConstructUse originalUse) => OneConstructUse(
|
|
useType: ConstructUseTypeEnum.bonus,
|
|
constructType: originalUse.constructType,
|
|
metadata: ConstructUseMetaData(
|
|
roomId: originalUse.metadata.roomId,
|
|
timeStamp: DateTime.now(),
|
|
),
|
|
category: originalUse.category,
|
|
lemma: originalUse.lemma,
|
|
form: originalUse.form,
|
|
xp: ConstructUseTypeEnum.bonus.pointValue,
|
|
);
|
|
|
|
AnalyticsPracticeSessionState copyWith({
|
|
List<OneConstructUse>? completedUses,
|
|
int? currentIndex,
|
|
bool? finished,
|
|
int? elapsedSeconds,
|
|
int? skippedActivities,
|
|
}) {
|
|
return AnalyticsPracticeSessionState(
|
|
completedUses: completedUses ?? this.completedUses,
|
|
currentIndex: currentIndex ?? this.currentIndex,
|
|
finished: finished ?? this.finished,
|
|
elapsedSeconds: elapsedSeconds ?? this.elapsedSeconds,
|
|
skippedActivities: skippedActivities ?? this.skippedActivities,
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {
|
|
'completedUses': completedUses.map((e) => e.toJson()).toList(),
|
|
'currentIndex': currentIndex,
|
|
'finished': finished,
|
|
'elapsedSeconds': elapsedSeconds,
|
|
'skippedActivities': skippedActivities,
|
|
};
|
|
}
|
|
|
|
factory AnalyticsPracticeSessionState.fromJson(Map<String, dynamic> json) {
|
|
return AnalyticsPracticeSessionState(
|
|
completedUses:
|
|
(json['completedUses'] as List<dynamic>?)
|
|
?.map((e) => OneConstructUse.fromJson(e))
|
|
.whereType<OneConstructUse>()
|
|
.toList() ??
|
|
[],
|
|
currentIndex: json['currentIndex'] as int? ?? 0,
|
|
finished: json['finished'] as bool? ?? false,
|
|
elapsedSeconds: json['elapsedSeconds'] as int? ?? 0,
|
|
skippedActivities: json['skippedActivities'] as int? ?? 0,
|
|
);
|
|
}
|
|
}
|