* 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>
254 lines
8.3 KiB
Dart
254 lines
8.3 KiB
Dart
import 'dart:math';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:collection/collection.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/config/setting_keys.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/construct_use_model.dart';
|
|
import 'package:fluffychat/pangea/analytics_misc/constructs_model.dart';
|
|
import 'package:fluffychat/pangea/constructs/construct_level_enum.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/widgets/matrix.dart';
|
|
|
|
class LemmaUseExampleMessages extends StatelessWidget {
|
|
final ConstructUses construct;
|
|
|
|
const LemmaUseExampleMessages({super.key, required this.construct});
|
|
|
|
Future<List<ExampleMessage>> _getExampleMessages() async {
|
|
final List<ExampleMessage> examples = [];
|
|
for (final OneConstructUse use in construct.cappedUses) {
|
|
if (use.metadata.eventId == null || use.form == null || use.xp <= 0) {
|
|
continue;
|
|
}
|
|
|
|
final exampleIndex = examples.indexWhere(
|
|
(example) => example.event.eventId == use.metadata.eventId!,
|
|
);
|
|
|
|
if (exampleIndex != -1) {
|
|
final example = examples[exampleIndex];
|
|
final token = example.tokens.firstWhereOrNull(
|
|
(token) => token.text.content == use.form,
|
|
);
|
|
if (token == null) continue;
|
|
if (example.isTokenAdded(token)) continue;
|
|
example.addToken(token);
|
|
examples[exampleIndex] = example;
|
|
continue;
|
|
}
|
|
|
|
if (use.metadata.roomId == null) continue;
|
|
final Room? room = MatrixState.pangeaController.matrixState.client
|
|
.getRoomById(use.metadata.roomId!);
|
|
if (room == null) continue;
|
|
|
|
Timeline? timeline = room.timeline;
|
|
if (room.timeline == null) {
|
|
timeline = await room.getTimeline();
|
|
}
|
|
|
|
final Event? event = exampleIndex != -1
|
|
? examples[exampleIndex].event
|
|
: await room.getEventById(use.metadata.eventId!);
|
|
|
|
if (event == null) continue;
|
|
final PangeaMessageEvent pangeaMessageEvent = PangeaMessageEvent(
|
|
event: event,
|
|
timeline: timeline!,
|
|
ownMessage:
|
|
event.senderId ==
|
|
MatrixState.pangeaController.matrixState.client.userID,
|
|
);
|
|
final tokens = pangeaMessageEvent.messageDisplayRepresentation?.tokens;
|
|
if (tokens == null || tokens.isEmpty) continue;
|
|
final token = tokens.firstWhereOrNull(
|
|
(token) => token.text.content == use.form,
|
|
);
|
|
if (token == null) continue;
|
|
|
|
final example = ExampleMessage(
|
|
event: event,
|
|
message: pangeaMessageEvent.messageDisplayText,
|
|
tokens: tokens,
|
|
);
|
|
|
|
if (example.isTokenAdded(token)) continue;
|
|
example.addToken(token);
|
|
examples.add(example);
|
|
if (examples.length > 4) break;
|
|
}
|
|
|
|
return examples.toList();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return FutureBuilder(
|
|
future: _getExampleMessages(),
|
|
builder: (context, snapshot) {
|
|
if (snapshot.hasData) {
|
|
return Align(
|
|
alignment: Alignment.topLeft,
|
|
child: Column(
|
|
crossAxisAlignment: CrossAxisAlignment.start,
|
|
mainAxisAlignment: MainAxisAlignment.start,
|
|
children: snapshot.data!.map((example) {
|
|
return Container(
|
|
decoration: BoxDecoration(
|
|
color: construct.lemmaCategory.color(context),
|
|
borderRadius: BorderRadius.circular(4),
|
|
),
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 16,
|
|
vertical: 8,
|
|
),
|
|
margin: const EdgeInsets.only(bottom: 8),
|
|
child: RichText(
|
|
text: TextSpan(
|
|
style: TextStyle(
|
|
color: Theme.of(context).colorScheme.onPrimaryFixed,
|
|
fontSize:
|
|
AppSettings.fontSizeFactor.value *
|
|
AppConfig.messageFontSize,
|
|
),
|
|
children: example.textSpans,
|
|
),
|
|
),
|
|
);
|
|
}).toList(),
|
|
),
|
|
);
|
|
} else {
|
|
return const Column(
|
|
children: [
|
|
SizedBox(height: 10),
|
|
CircularProgressIndicator.adaptive(strokeWidth: 2),
|
|
],
|
|
);
|
|
}
|
|
},
|
|
);
|
|
}
|
|
}
|
|
|
|
class ExampleMessage {
|
|
final Event event;
|
|
final String message;
|
|
final List<PangeaToken> tokens;
|
|
final List<PangeaToken> _boldedTokens;
|
|
|
|
ExampleMessage({
|
|
required this.event,
|
|
required this.message,
|
|
required this.tokens,
|
|
}) : _boldedTokens = [];
|
|
|
|
final int tokenWindowSize = 10;
|
|
|
|
void addToken(PangeaToken token) {
|
|
_boldedTokens.add(token);
|
|
}
|
|
|
|
bool isTokenAdded(PangeaToken token) => _boldedTokens.contains(token);
|
|
|
|
/// Get a list of text spans with styling to indicate the matching tokens.
|
|
/// Leaves a window of tokens around the highlighted tokens.
|
|
List<TextSpan> get textSpans {
|
|
// define the token windows
|
|
final List<TokenWindow> tokenWindows = [];
|
|
tokens.sort((a, b) => a.text.offset.compareTo(b.text.offset));
|
|
_boldedTokens.sort((a, b) => a.text.offset.compareTo(b.text.offset));
|
|
|
|
int globalTokenIndex = 0;
|
|
for (int i = 0; i < _boldedTokens.length; i++) {
|
|
// go through each of the bolded tokens and add the surrounding token windows
|
|
final boldedToken = _boldedTokens[i];
|
|
final tokenIndex = tokens.indexOf(boldedToken);
|
|
|
|
// globalTokenIndex is the index of the last token added to this list + 1.
|
|
if (globalTokenIndex < tokenIndex) {
|
|
final gapSize = tokenIndex - globalTokenIndex;
|
|
if (gapSize <= tokenWindowSize) {
|
|
// if the gap is less than the window size, add all the gap tokens
|
|
tokenWindows.add(TokenWindow(globalTokenIndex, tokenIndex, false));
|
|
} else {
|
|
// otherwise, add the window size tokens preceding the bolded token
|
|
tokenWindows.add(
|
|
TokenWindow(tokenIndex - tokenWindowSize, tokenIndex, false),
|
|
);
|
|
}
|
|
}
|
|
|
|
globalTokenIndex = tokenIndex;
|
|
|
|
tokenWindows.add(TokenWindow(tokenIndex, tokenIndex + 1, true));
|
|
|
|
globalTokenIndex = tokenIndex + 1;
|
|
|
|
if (i >= _boldedTokens.length - 1) {
|
|
// if this is the last bolded token, then add the
|
|
// remaining tokens (up to the max window size)
|
|
if (globalTokenIndex >= tokens.length) break;
|
|
final endIndex = min(tokens.length, globalTokenIndex + tokenWindowSize);
|
|
tokenWindows.add(TokenWindow(globalTokenIndex, endIndex, false));
|
|
break;
|
|
}
|
|
|
|
// add the window tokens after the bolded token
|
|
final nextToken = _boldedTokens[i + 1];
|
|
final nextTokenIndex = tokens.indexOf(nextToken);
|
|
final endIndex = min(nextTokenIndex, globalTokenIndex + tokenWindowSize);
|
|
tokenWindows.add(TokenWindow(globalTokenIndex, endIndex, false));
|
|
|
|
globalTokenIndex = endIndex;
|
|
}
|
|
|
|
final List<TextSpan> spans = [];
|
|
// use separate pointers to handle white space around bolded tokens
|
|
int characterPointer = 0;
|
|
int tokenPointer = 0;
|
|
|
|
for (final window in tokenWindows) {
|
|
if (tokenPointer < window.startTokenIndex) {
|
|
spans.add(const TextSpan(text: " ... "));
|
|
characterPointer = tokens[window.startTokenIndex].text.offset;
|
|
}
|
|
|
|
spans.add(
|
|
TextSpan(
|
|
text: message.substring(
|
|
characterPointer,
|
|
tokens[window.endTokenIndex - 1].text.offset +
|
|
tokens[window.endTokenIndex - 1].text.length,
|
|
),
|
|
style: window.isBold
|
|
? const TextStyle(fontWeight: FontWeight.bold)
|
|
: null,
|
|
),
|
|
);
|
|
|
|
tokenPointer = window.endTokenIndex;
|
|
characterPointer =
|
|
tokens[window.endTokenIndex - 1].text.offset +
|
|
tokens[window.endTokenIndex - 1].text.length;
|
|
}
|
|
|
|
if (tokenPointer < tokens.length) {
|
|
spans.add(const TextSpan(text: " ... "));
|
|
}
|
|
return spans;
|
|
}
|
|
}
|
|
|
|
class TokenWindow {
|
|
int startTokenIndex;
|
|
int endTokenIndex;
|
|
bool isBold;
|
|
|
|
TokenWindow(this.startTokenIndex, this.endTokenIndex, this.isBold);
|
|
}
|