* 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>
215 lines
6.5 KiB
Dart
215 lines
6.5 KiB
Dart
import 'package:flutter/material.dart';
|
|
|
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
|
|
|
import 'package:fluffychat/config/app_config.dart';
|
|
import 'package:fluffychat/pangea/choreographer/choreo_constants.dart';
|
|
import 'package:fluffychat/pangea/choreographer/igc/autocorrect_span.dart';
|
|
import 'package:fluffychat/pangea/choreographer/igc/pangea_match_model.dart';
|
|
import 'package:fluffychat/pangea/choreographer/igc/pangea_match_state_model.dart';
|
|
import 'package:fluffychat/pangea/choreographer/igc/pangea_match_status_enum.dart';
|
|
import 'package:fluffychat/pangea/choreographer/igc/replacement_type_enum.dart';
|
|
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
|
|
import 'package:fluffychat/pangea/subscription/controllers/subscription_controller.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
import '../choreographer.dart';
|
|
import 'edit_type_enum.dart';
|
|
|
|
class PangeaTextController extends TextEditingController {
|
|
final Choreographer choreographer;
|
|
EditTypeEnum editType = EditTypeEnum.keyboard;
|
|
String _currentText = '';
|
|
|
|
PangeaTextController({required this.choreographer}) {
|
|
addListener(_onTextChanged);
|
|
}
|
|
|
|
bool get exceededMaxLength => text.length >= ChoreoConstants.maxLength;
|
|
|
|
TextStyle _underlineStyle(Color color) => TextStyle(
|
|
decoration: TextDecoration.underline,
|
|
decorationColor: color,
|
|
decorationThickness: 5,
|
|
);
|
|
|
|
Color _underlineColor(PangeaMatch match) {
|
|
// Automatic corrections use primary color
|
|
if (match.status == PangeaMatchStatusEnum.automatic) {
|
|
return AppConfig.primaryColor.withAlpha(180);
|
|
}
|
|
|
|
// Use type-based coloring
|
|
return match.match.type.underlineColor();
|
|
}
|
|
|
|
TextStyle _textStyle(
|
|
PangeaMatch match,
|
|
TextStyle? existingStyle,
|
|
bool isOpenMatch,
|
|
) {
|
|
double opacityFactor = 1.0;
|
|
if (!isOpenMatch) {
|
|
opacityFactor = 0.2;
|
|
}
|
|
|
|
final alpha = (255 * opacityFactor).round();
|
|
final style = _underlineStyle(_underlineColor(match).withAlpha(alpha));
|
|
return existingStyle?.merge(style) ?? style;
|
|
}
|
|
|
|
void setSystemText(String newText, EditTypeEnum type) {
|
|
editType = type;
|
|
text = newText;
|
|
}
|
|
|
|
void _onTextChanged() {
|
|
final diff = text.characters.length - _currentText.characters.length;
|
|
if (diff > 1 && editType == EditTypeEnum.keyboard) {
|
|
final pastedText = text.characters
|
|
.skip(_currentText.characters.length)
|
|
.take(diff)
|
|
.join();
|
|
choreographer.onPaste(pastedText);
|
|
}
|
|
_currentText = text;
|
|
}
|
|
|
|
void _onUndo(PangeaMatchState match) {
|
|
try {
|
|
choreographer.igcController.updateMatch(
|
|
match,
|
|
PangeaMatchStatusEnum.undo,
|
|
);
|
|
} catch (e, s) {
|
|
ErrorHandler.logError(
|
|
e: e,
|
|
s: s,
|
|
level: SentryLevel.warning,
|
|
data: {"match": match.toJson()},
|
|
);
|
|
MatrixState.pAnyState.closeOverlay();
|
|
choreographer.clearMatches(e);
|
|
}
|
|
}
|
|
|
|
@override
|
|
TextSpan buildTextSpan({
|
|
required BuildContext context,
|
|
TextStyle? style,
|
|
required bool withComposing,
|
|
}) {
|
|
final subscription =
|
|
MatrixState.pangeaController.subscriptionController.subscriptionStatus;
|
|
|
|
if (subscription == SubscriptionStatus.shouldShowPaywall) {
|
|
return _buildPaywallSpan(style);
|
|
}
|
|
|
|
if (choreographer.igcController.currentText == null) {
|
|
return TextSpan(text: text, style: style);
|
|
}
|
|
|
|
final parts = text.split(choreographer.igcController.currentText!);
|
|
if (parts.length != 2) {
|
|
return TextSpan(text: text, style: style);
|
|
}
|
|
|
|
return TextSpan(
|
|
style: style,
|
|
children: [
|
|
..._buildTokenSpan(defaultStyle: style),
|
|
TextSpan(text: parts[1], style: style),
|
|
],
|
|
);
|
|
}
|
|
|
|
TextSpan _buildPaywallSpan(TextStyle? style) => TextSpan(
|
|
text: text,
|
|
style: style?.merge(
|
|
_underlineStyle(const Color.fromARGB(187, 132, 96, 224)),
|
|
),
|
|
);
|
|
|
|
InlineSpan _buildMatchSpan(PangeaMatchState match, TextStyle style) {
|
|
final span = choreographer.igcController.currentText!.characters
|
|
.getRange(
|
|
match.updatedMatch.match.offset,
|
|
match.updatedMatch.match.offset + match.updatedMatch.match.length,
|
|
)
|
|
.toString();
|
|
|
|
if (match.updatedMatch.status == PangeaMatchStatusEnum.automatic) {
|
|
final originalText = match.originalMatch.match.fullText.characters
|
|
.getRange(
|
|
match.originalMatch.match.offset,
|
|
match.originalMatch.match.offset + match.originalMatch.match.length,
|
|
)
|
|
.toString();
|
|
|
|
return AutocorrectSpan(
|
|
transformTargetId:
|
|
"autocorrection_${match.updatedMatch.match.offset}_${match.updatedMatch.match.length}",
|
|
currentText: span,
|
|
originalText: originalText,
|
|
onUndo: () => _onUndo(match),
|
|
style: style,
|
|
);
|
|
} else {
|
|
return TextSpan(text: span, style: style);
|
|
}
|
|
}
|
|
|
|
/// Returns a list of [TextSpan]s used to display the text in the input field
|
|
/// with the appropriate styling for each error match.
|
|
List<InlineSpan> _buildTokenSpan({TextStyle? defaultStyle}) {
|
|
final textSpanMatches =
|
|
[
|
|
...choreographer.igcController.openMatches,
|
|
...choreographer.igcController.recentAutomaticCorrections,
|
|
]..sort(
|
|
(a, b) => a.updatedMatch.match.offset.compareTo(
|
|
b.updatedMatch.match.offset,
|
|
),
|
|
);
|
|
|
|
final currentText = choreographer.igcController.currentText!;
|
|
final spans = <InlineSpan>[];
|
|
int cursor = 0;
|
|
|
|
for (final match in textSpanMatches) {
|
|
if (cursor < match.updatedMatch.match.offset) {
|
|
final text = currentText.characters
|
|
.getRange(cursor, match.updatedMatch.match.offset)
|
|
.toString();
|
|
spans.add(TextSpan(text: text, style: defaultStyle));
|
|
}
|
|
|
|
final openMatch =
|
|
choreographer.igcController.currentlyOpenMatch?.updatedMatch.match;
|
|
final style = _textStyle(
|
|
match.updatedMatch,
|
|
defaultStyle,
|
|
openMatch != null &&
|
|
openMatch.offset == match.updatedMatch.match.offset &&
|
|
openMatch.length == match.updatedMatch.match.length,
|
|
);
|
|
|
|
spans.add(_buildMatchSpan(match, style));
|
|
cursor =
|
|
match.updatedMatch.match.offset + match.updatedMatch.match.length;
|
|
}
|
|
|
|
if (cursor < currentText.characters.length) {
|
|
spans.add(
|
|
TextSpan(
|
|
text: currentText.characters
|
|
.getRange(cursor, currentText.characters.length)
|
|
.toString(),
|
|
style: defaultStyle,
|
|
),
|
|
);
|
|
}
|
|
|
|
return spans;
|
|
}
|
|
}
|