* 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>
236 lines
6.5 KiB
Dart
236 lines
6.5 KiB
Dart
import 'dart:developer';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_use_type_enum.dart';
|
|
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
|
|
import 'package:fluffychat/pangea/constructs/construct_identifier.dart';
|
|
import 'package:fluffychat/pangea/morphs/default_morph_mapping.dart';
|
|
import 'package:fluffychat/pangea/morphs/morph_features_enum.dart';
|
|
import 'package:fluffychat/pangea/morphs/morph_models.dart';
|
|
import 'construct_type_enum.dart';
|
|
|
|
class ConstructAnalyticsModel {
|
|
List<OneConstructUse> uses;
|
|
|
|
ConstructAnalyticsModel({this.uses = const []});
|
|
|
|
static const _usesKey = "uses";
|
|
|
|
factory ConstructAnalyticsModel.fromJson(Map<String, dynamic> json) {
|
|
final List<OneConstructUse> uses = [];
|
|
|
|
if (json[_usesKey] is List) {
|
|
// This is the new format
|
|
for (final useJson in json[_usesKey]) {
|
|
// grammar construct uses are deprecated so but some are saved
|
|
// here we're filtering from data
|
|
if (["grammar", "g"].contains(useJson['constructType'])) {
|
|
continue;
|
|
} else {
|
|
try {
|
|
uses.add(OneConstructUse.fromJson(useJson));
|
|
} catch (err, s) {
|
|
ErrorHandler.logError(e: err, s: s, data: {"useJson": useJson});
|
|
continue;
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
debugger(when: kDebugMode);
|
|
ErrorHandler.logError(
|
|
m: "Analytics room with non-list uses",
|
|
data: {"usesKey": _usesKey},
|
|
);
|
|
}
|
|
|
|
return ConstructAnalyticsModel(uses: uses);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() {
|
|
return {_usesKey: uses.map((use) => use.toJson()).toList()};
|
|
}
|
|
}
|
|
|
|
class OneConstructUse {
|
|
String lemma;
|
|
|
|
// practice activities do not currently include form in the target_construct info
|
|
// for that, this is nullable
|
|
String? form;
|
|
|
|
/// For vocab constructs, this is the POS. For morph
|
|
/// constructs, this is the morphological category.
|
|
late String _category;
|
|
|
|
ConstructTypeEnum constructType;
|
|
ConstructUseTypeEnum useType;
|
|
|
|
/// Used to unqiuely identify the construct use. Useful in the case
|
|
/// that a users makes the same type of mistake multiple times in a
|
|
/// message, and those uses need to be disinguished.
|
|
String? id;
|
|
ConstructUseMetaData metadata;
|
|
|
|
int xp;
|
|
|
|
OneConstructUse({
|
|
required this.useType,
|
|
required this.lemma,
|
|
required this.constructType,
|
|
required this.metadata,
|
|
required category,
|
|
required this.form,
|
|
required this.xp,
|
|
this.id,
|
|
}) {
|
|
if (category is MorphFeaturesEnum) {
|
|
_category = category.name;
|
|
} else {
|
|
_category = category ?? "other";
|
|
}
|
|
}
|
|
|
|
String? get chatId => metadata.roomId;
|
|
String get msgId => metadata.eventId!;
|
|
DateTime get timeStamp => metadata.timeStamp;
|
|
|
|
factory OneConstructUse.fromJson(Map<String, dynamic> json) {
|
|
debugger(when: kDebugMode && json['constructType'] == null);
|
|
|
|
final ConstructTypeEnum constructType = json['constructType'] != null
|
|
? ConstructTypeEnum.fromString(json['constructType'])
|
|
: ConstructTypeEnum.vocab;
|
|
|
|
final useType = ConstructUseTypeUtil.fromString(json['useType']);
|
|
|
|
return OneConstructUse(
|
|
useType: useType,
|
|
lemma: json['lemma'],
|
|
form: json['form'],
|
|
category: getCategory(json, constructType),
|
|
constructType: constructType,
|
|
id: json['id'],
|
|
metadata: ConstructUseMetaData(
|
|
eventId: json['msgId'],
|
|
roomId: json['chatId'],
|
|
timeStamp: DateTime.parse(json['timeStamp']),
|
|
),
|
|
xp: json['xp'] ?? useType.pointValue,
|
|
);
|
|
}
|
|
|
|
Map<String, dynamic> toJson() => {
|
|
'useType': useType.string,
|
|
'chatId': metadata.roomId,
|
|
'timeStamp': metadata.timeStamp.toIso8601String(),
|
|
'form': form,
|
|
'msgId': metadata.eventId,
|
|
'lemma': lemma,
|
|
'constructType': constructType.string,
|
|
'categories': category,
|
|
'id': id,
|
|
'xp': xp,
|
|
};
|
|
|
|
OneConstructUse copyWith({
|
|
String? lemma,
|
|
String? form,
|
|
String? category,
|
|
ConstructTypeEnum? constructType,
|
|
ConstructUseTypeEnum? useType,
|
|
String? id,
|
|
ConstructUseMetaData? metadata,
|
|
int? xp,
|
|
}) {
|
|
return OneConstructUse(
|
|
lemma: lemma ?? this.lemma,
|
|
form: form ?? this.form,
|
|
category: category ?? this.category,
|
|
constructType: constructType ?? this.constructType,
|
|
useType: useType ?? this.useType,
|
|
id: id ?? this.id,
|
|
metadata: metadata ?? this.metadata,
|
|
xp: xp ?? this.xp,
|
|
);
|
|
}
|
|
|
|
String get category {
|
|
if (_category.isEmpty) return "other";
|
|
return _category.toLowerCase();
|
|
}
|
|
|
|
static String getCategory(
|
|
Map<String, dynamic> json,
|
|
ConstructTypeEnum constructType,
|
|
) {
|
|
final categoryEntry = json['cat'] ?? json['categories'];
|
|
|
|
if (constructType == ConstructTypeEnum.vocab) {
|
|
final String? category = categoryEntry is String
|
|
? categoryEntry
|
|
: categoryEntry is List && categoryEntry.isNotEmpty
|
|
? categoryEntry.first
|
|
: null;
|
|
return category ?? "Other";
|
|
}
|
|
|
|
final MorphFeaturesAndTags morphs = defaultMorphMapping;
|
|
|
|
if (categoryEntry == null) {
|
|
return morphs.guessMorphCategory(json["lemma"]);
|
|
}
|
|
|
|
if ((categoryEntry is List)) {
|
|
if (categoryEntry.isEmpty) {
|
|
return morphs.guessMorphCategory(json["lemma"]);
|
|
}
|
|
return categoryEntry.first;
|
|
} else if (categoryEntry is String) {
|
|
return categoryEntry;
|
|
}
|
|
|
|
debugPrint(
|
|
"Category entry is not a list or string -${json['cat'] ?? json['categories']}-",
|
|
);
|
|
return morphs.guessMorphCategory(json["lemma"]);
|
|
}
|
|
|
|
Room? getRoom(Client client) {
|
|
if (metadata.roomId == null) return null;
|
|
return client.getRoomById(metadata.roomId!);
|
|
}
|
|
|
|
Future<Event?> getEvent(Client client) async {
|
|
final Room? room = getRoom(client);
|
|
if (room == null || metadata.eventId == null) return null;
|
|
return room.getEventById(metadata.eventId!);
|
|
}
|
|
|
|
Color pointValueColor(BuildContext context) {
|
|
if (xp == 0) return Theme.of(context).colorScheme.primary;
|
|
return xp > 0 ? AppConfig.gold : Colors.red;
|
|
}
|
|
|
|
ConstructIdentifier get identifier => ConstructIdentifier(
|
|
lemma: lemma,
|
|
type: constructType,
|
|
category: category,
|
|
);
|
|
}
|
|
|
|
class ConstructUseMetaData {
|
|
String? eventId;
|
|
String? roomId;
|
|
DateTime timeStamp;
|
|
|
|
ConstructUseMetaData({
|
|
required this.roomId,
|
|
required this.timeStamp,
|
|
this.eventId,
|
|
});
|
|
}
|