* 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>
256 lines
7.6 KiB
Dart
256 lines
7.6 KiB
Dart
import 'dart:math';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/pangea/activity_planner/activity_plan_request.dart';
|
|
import 'package:fluffychat/pangea/common/config/environment.dart';
|
|
import 'package:fluffychat/pangea/common/constants/model_keys.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_model.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_text_model.dart';
|
|
import 'package:fluffychat/pangea/lemmas/lemma.dart';
|
|
|
|
class ActivityPlanModel {
|
|
final String activityId;
|
|
|
|
final ActivityPlanRequest req;
|
|
final String title;
|
|
final String description;
|
|
final String learningObjective;
|
|
final String instructions;
|
|
final List<Vocab> vocab;
|
|
final String? _imageURL;
|
|
final DateTime? endAt;
|
|
final Duration? duration;
|
|
final Map<String, ActivityRole>? _roles;
|
|
final bool isDeprecatedModel;
|
|
|
|
ActivityPlanModel({
|
|
required this.req,
|
|
required this.title,
|
|
// TODO: when we bring back user's being able to make their own activity,
|
|
// then this should be required
|
|
String? description,
|
|
required this.learningObjective,
|
|
required this.instructions,
|
|
required this.vocab,
|
|
required this.activityId,
|
|
Map<String, ActivityRole>? roles,
|
|
String? imageURL,
|
|
this.endAt,
|
|
this.duration,
|
|
this.isDeprecatedModel = false,
|
|
}) : description = (description == null || description.isEmpty)
|
|
? learningObjective
|
|
: description,
|
|
_roles = roles,
|
|
_imageURL = imageURL;
|
|
|
|
List<String> get placeholderImages => [
|
|
"${AppConfig.assetsBaseURL}/Space%20template%202.png",
|
|
"${AppConfig.assetsBaseURL}/Space%20template%203.png",
|
|
"${AppConfig.assetsBaseURL}/Space%20template%204.png",
|
|
];
|
|
|
|
String get randomPlaceholder =>
|
|
placeholderImages[Random(
|
|
title.hashCode,
|
|
).nextInt(placeholderImages.length)];
|
|
|
|
Uri? get imageURL => _imageURL != null
|
|
? Uri.tryParse("${Environment.cmsApi}$_imageURL")
|
|
: Uri.tryParse(randomPlaceholder);
|
|
|
|
Map<String, ActivityRole> get roles {
|
|
if (_roles != null) return _roles;
|
|
final defaultRoles = <String, ActivityRole>{};
|
|
for (int i = 0; i < req.numberOfParticipants; i++) {
|
|
defaultRoles['role_$i'] = ActivityRole(
|
|
id: 'role_$i',
|
|
name: 'Participant',
|
|
goal: learningObjective,
|
|
avatarUrl: null,
|
|
);
|
|
}
|
|
return defaultRoles;
|
|
}
|
|
|
|
factory ActivityPlanModel.fromJson(Map<String, dynamic> json) {
|
|
final req = ActivityPlanRequest.fromJson(
|
|
json[ModelKey.activityPlanRequest],
|
|
);
|
|
|
|
Map<String, ActivityRole>? roles;
|
|
final roleContent = json['roles'];
|
|
if (roleContent is Map<String, dynamic>) {
|
|
roles = Map<String, ActivityRole>.from(
|
|
json['roles'].map(
|
|
(key, value) => MapEntry(key, ActivityRole.fromJson(value)),
|
|
),
|
|
);
|
|
}
|
|
|
|
final activityId = json[ModelKey.activityId] ?? json["bookmark_id"];
|
|
return ActivityPlanModel(
|
|
imageURL: json[ModelKey.activityPlanImageURL],
|
|
instructions: json[ModelKey.activityPlanInstructions],
|
|
req: req,
|
|
title: json[ModelKey.activityPlanTitle],
|
|
description:
|
|
json[ModelKey.description] ??
|
|
json[ModelKey.activityPlanLearningObjective],
|
|
learningObjective: json[ModelKey.activityPlanLearningObjective],
|
|
vocab: List<Vocab>.from(
|
|
json[ModelKey.activityPlanVocab].map((vocab) => Vocab.fromJson(vocab)),
|
|
),
|
|
endAt: json[ModelKey.activityPlanEndAt] != null
|
|
? DateTime.parse(json[ModelKey.activityPlanEndAt])
|
|
: null,
|
|
duration: json[ModelKey.duration] != null
|
|
? Duration(
|
|
days: json[ModelKey.duration]['days'] ?? 0,
|
|
hours: json[ModelKey.duration]['hours'] ?? 0,
|
|
minutes: json[ModelKey.duration]['minutes'] ?? 0,
|
|
)
|
|
: null,
|
|
roles: roles,
|
|
activityId: activityId,
|
|
isDeprecatedModel: json["bookmark_id"] != null,
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {
|
|
ModelKey.activityId: activityId,
|
|
ModelKey.activityPlanImageURL: _imageURL,
|
|
ModelKey.activityPlanInstructions: instructions,
|
|
ModelKey.activityPlanRequest: req.toJson(),
|
|
ModelKey.activityPlanTitle: title,
|
|
ModelKey.description: description,
|
|
ModelKey.activityPlanLearningObjective: learningObjective,
|
|
ModelKey.activityPlanVocab: vocab.map((vocab) => vocab.toJson()).toList(),
|
|
ModelKey.activityPlanEndAt: endAt?.toIso8601String(),
|
|
ModelKey.duration: {
|
|
'days': duration?.inDays ?? 0,
|
|
'hours': duration?.inHours.remainder(24) ?? 0,
|
|
'minutes': duration?.inMinutes.remainder(60) ?? 0,
|
|
},
|
|
'roles': _roles?.map((key, value) => MapEntry(key, value.toJson())),
|
|
};
|
|
}
|
|
|
|
String get vocabString {
|
|
final List<String> vocabList = [];
|
|
String vocabString = "";
|
|
// cycle through vocab with index
|
|
for (var i = 0; i < vocab.length; i++) {
|
|
// if the lemma appears more than once in the vocab list, show the pos
|
|
// vocab is a wrapped list of string, separated by commas
|
|
final v = vocab[i];
|
|
final bool showPos =
|
|
vocab.where((vocab) => vocab.lemma == v.lemma).length > 1;
|
|
vocabString +=
|
|
'${v.lemma}${showPos ? ' (${v.pos})' : ''}${i + 1 < vocab.length ? ', ' : ''}';
|
|
vocabList.add("${v.lemma}${showPos ? ' (${v.pos})' : ''}");
|
|
}
|
|
return vocabString;
|
|
}
|
|
|
|
@override
|
|
bool operator ==(Object other) {
|
|
if (identical(this, other)) return true;
|
|
|
|
return other is ActivityPlanModel &&
|
|
other.req == req &&
|
|
other.title == title &&
|
|
other.learningObjective == learningObjective &&
|
|
other.instructions == instructions &&
|
|
other.description == description &&
|
|
listEquals(other.vocab, vocab) &&
|
|
other._imageURL == _imageURL;
|
|
}
|
|
|
|
@override
|
|
int get hashCode =>
|
|
req.hashCode ^
|
|
title.hashCode ^
|
|
learningObjective.hashCode ^
|
|
description.hashCode ^
|
|
instructions.hashCode ^
|
|
Object.hashAll(vocab) ^
|
|
_imageURL.hashCode;
|
|
}
|
|
|
|
class Vocab {
|
|
final String lemma;
|
|
final String pos;
|
|
|
|
Vocab({required this.lemma, required this.pos});
|
|
|
|
factory Vocab.fromJson(Map<String, dynamic> json) {
|
|
return Vocab(lemma: json[ModelKey.lemma], pos: json['pos']);
|
|
}
|
|
|
|
PangeaToken asToken() {
|
|
final text = PangeaTokenText(
|
|
content: lemma,
|
|
length: lemma.characters.length,
|
|
offset: 0,
|
|
);
|
|
|
|
return PangeaToken(
|
|
text: text,
|
|
lemma: Lemma(text: lemma, saveVocab: true, form: lemma),
|
|
pos: pos,
|
|
morph: {},
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {ModelKey.lemma: lemma, 'pos': pos};
|
|
}
|
|
|
|
@override
|
|
bool operator ==(Object other) {
|
|
if (identical(this, other)) return true;
|
|
|
|
return other is Vocab && other.lemma == lemma && other.pos == pos;
|
|
}
|
|
|
|
@override
|
|
int get hashCode => lemma.hashCode ^ pos.hashCode;
|
|
}
|
|
|
|
class ActivityRole {
|
|
final String id;
|
|
final String name;
|
|
final String? goal;
|
|
final String? avatarUrl;
|
|
|
|
ActivityRole({
|
|
required this.id,
|
|
required this.name,
|
|
required this.goal,
|
|
this.avatarUrl,
|
|
});
|
|
|
|
factory ActivityRole.fromJson(Map<String, dynamic> json) {
|
|
final urlContent = json['avatar_url'] as String?;
|
|
String? avatarUrl;
|
|
if (urlContent != null && urlContent.isNotEmpty) {
|
|
avatarUrl = urlContent;
|
|
}
|
|
|
|
return ActivityRole(
|
|
id: json['id'] as String,
|
|
name: json['name'] as String,
|
|
goal: json['goal'] as String?,
|
|
avatarUrl: avatarUrl,
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {'id': id, 'name': name, 'goal': goal, 'avatar_url': avatarUrl};
|
|
}
|
|
}
|