* 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>
239 lines
6.7 KiB
Dart
239 lines
6.7 KiB
Dart
import 'dart:async';
|
|
import 'dart:collection';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
|
|
import 'package:async/async.dart';
|
|
|
|
import 'package:fluffychat/pangea/choreographer/it/gold_route_tracker_model.dart';
|
|
import 'package:fluffychat/pangea/choreographer/it/it_repo.dart';
|
|
import 'package:fluffychat/pangea/choreographer/it/it_response_model.dart';
|
|
import 'package:fluffychat/pangea/choreographer/it/it_step_model.dart';
|
|
import 'package:fluffychat/widgets/future_loading_dialog.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
import 'completed_it_step_model.dart';
|
|
import 'it_request_model.dart';
|
|
|
|
class ITController {
|
|
final Function(Object) onError;
|
|
|
|
final Queue<Completer<ITStepModel>> _queue = Queue();
|
|
GoldRouteTrackerModel? _goldRouteTracker;
|
|
|
|
final ValueNotifier<String?> _sourceText = ValueNotifier(null);
|
|
final ValueNotifier<ITStepModel?> _currentITStep = ValueNotifier(null);
|
|
final ValueNotifier<bool> _open = ValueNotifier(false);
|
|
final ValueNotifier<bool> _editing = ValueNotifier(false);
|
|
final ValueNotifier<double> _progress = ValueNotifier(0.0);
|
|
|
|
ITController(this.onError);
|
|
|
|
ValueNotifier<bool> get open => _open;
|
|
ValueNotifier<bool> get editing => _editing;
|
|
ValueNotifier<double> get progress => _progress;
|
|
|
|
ValueNotifier<ITStepModel?> get currentITStep => _currentITStep;
|
|
ValueNotifier<String?> get sourceText => _sourceText;
|
|
StreamController<CompletedITStepModel> acceptedContinuanceStream =
|
|
StreamController.broadcast();
|
|
|
|
bool _continuing = false;
|
|
bool dismissed = false;
|
|
|
|
ITRequestModel _request(String textInput) {
|
|
assert(_sourceText.value != null);
|
|
return ITRequestModel(
|
|
text: _sourceText.value!,
|
|
customInput: textInput,
|
|
sourceLangCode: MatrixState.pangeaController.userController.userL1Code!,
|
|
targetLangCode: MatrixState.pangeaController.userController.userL2Code!,
|
|
goldTranslation: _goldRouteTracker?.fullTranslation,
|
|
goldContinuances: _goldRouteTracker?.continuances,
|
|
);
|
|
}
|
|
|
|
Future<Result<ITResponseModel>> _safeRequest(String text) {
|
|
return ITRepo.get(_request(text)).timeout(
|
|
const Duration(seconds: 10),
|
|
onTimeout: () => Result.error(
|
|
TimeoutException("ITRepo.get timed out after 10 seconds"),
|
|
),
|
|
);
|
|
}
|
|
|
|
void clearSourceText() {
|
|
_sourceText.value = null;
|
|
}
|
|
|
|
void clearSession() {
|
|
dismissed = false;
|
|
_progress.value = 0.0;
|
|
}
|
|
|
|
void dispose() {
|
|
acceptedContinuanceStream.close();
|
|
_open.dispose();
|
|
_editing.dispose();
|
|
_currentITStep.dispose();
|
|
_sourceText.dispose();
|
|
}
|
|
|
|
void openIT(String text) {
|
|
_sourceText.value = text;
|
|
_open.value = true;
|
|
_continueIT();
|
|
}
|
|
|
|
void closeIT({bool dismiss = false}) {
|
|
MatrixState.pAnyState.closeOverlay("it_feedback_card");
|
|
|
|
setEditingSourceText(false);
|
|
if (dismiss) {
|
|
dismissed = true;
|
|
}
|
|
|
|
_open.value = false;
|
|
_queue.clear();
|
|
_currentITStep.value = null;
|
|
_goldRouteTracker = null;
|
|
}
|
|
|
|
void setEditingSourceText(bool value) {
|
|
_editing.value = value;
|
|
}
|
|
|
|
void submitSourceTextEdits(String text) {
|
|
_queue.clear();
|
|
_currentITStep.value = null;
|
|
_goldRouteTracker = null;
|
|
_progress.value = 0.0;
|
|
_sourceText.value = text;
|
|
setEditingSourceText(false);
|
|
_continueIT();
|
|
}
|
|
|
|
ContinuanceModel selectContinuance(int index) {
|
|
if (_currentITStep.value == null) {
|
|
throw "onSelectContinuance called when _currentITStep is null";
|
|
}
|
|
|
|
if (index < 0 || index >= _currentITStep.value!.continuances.length) {
|
|
throw "onSelectContinuance called with invalid index $index";
|
|
}
|
|
|
|
final currentStep = _currentITStep.value!;
|
|
currentStep.continuances[index] = currentStep.continuances[index].copyWith(
|
|
wasClicked: true,
|
|
);
|
|
_currentITStep.value = _currentITStep.value!.copyWith(
|
|
continuances: currentStep.continuances,
|
|
);
|
|
return _currentITStep.value!.continuances[index];
|
|
}
|
|
|
|
void acceptContinuance(int chosenIndex) {
|
|
if (_currentITStep.value == null) {
|
|
throw "onAcceptContinuance called when _currentITStep is null";
|
|
}
|
|
|
|
if (chosenIndex < 0 ||
|
|
chosenIndex >= _currentITStep.value!.continuances.length) {
|
|
throw "onAcceptContinuance called with invalid index $chosenIndex";
|
|
}
|
|
|
|
acceptedContinuanceStream.add(
|
|
CompletedITStepModel(
|
|
_currentITStep.value!.continuances,
|
|
chosen: chosenIndex,
|
|
),
|
|
);
|
|
final progress =
|
|
(_goldRouteTracker!.continuances.indexWhere(
|
|
(c) =>
|
|
c.text ==
|
|
_currentITStep.value!.continuances[chosenIndex].text,
|
|
) +
|
|
1) /
|
|
_goldRouteTracker!.continuances.length;
|
|
_progress.value = progress;
|
|
_continueIT();
|
|
}
|
|
|
|
Future<void> _continueIT() async {
|
|
if (_continuing) return;
|
|
_continuing = true;
|
|
|
|
try {
|
|
if (_currentITStep.value == null) {
|
|
await _initTranslationData();
|
|
} else if (_queue.isEmpty) {
|
|
closeIT();
|
|
} else {
|
|
final nextStepCompleter = _queue.removeFirst();
|
|
_currentITStep.value = await nextStepCompleter.future;
|
|
}
|
|
} catch (e) {
|
|
onError(e);
|
|
} finally {
|
|
_continuing = false;
|
|
}
|
|
}
|
|
|
|
Future<void> _initTranslationData() async {
|
|
final res = await _safeRequest("");
|
|
if (_sourceText.value == null || !_open.value) return;
|
|
if (res.isError || res.result?.goldContinuances == null) {
|
|
onError(res.asError!);
|
|
return;
|
|
}
|
|
|
|
final result = res.result!;
|
|
_goldRouteTracker = GoldRouteTrackerModel(
|
|
result.goldContinuances!,
|
|
_sourceText.value!,
|
|
);
|
|
|
|
_currentITStep.value = ITStepModel.fromResponse(
|
|
sourceText: _sourceText.value!,
|
|
currentText: "",
|
|
responseModel: res.result!,
|
|
storedGoldContinuances: _goldRouteTracker!.continuances,
|
|
);
|
|
|
|
_fillITStepQueue();
|
|
}
|
|
|
|
Future<void> _fillITStepQueue() async {
|
|
if (_sourceText.value == null ||
|
|
_goldRouteTracker!.continuances.length < 2) {
|
|
return;
|
|
}
|
|
|
|
final sourceText = _sourceText.value!;
|
|
final goldContinuances = _goldRouteTracker!.continuances;
|
|
String currentText = goldContinuances[0].text;
|
|
for (int i = 1; i < goldContinuances.length; i++) {
|
|
if (_sourceText.value == null || !_open.value) {
|
|
return;
|
|
}
|
|
|
|
final completer = Completer<ITStepModel>();
|
|
_queue.add(completer);
|
|
final resp = await _safeRequest(currentText);
|
|
if (resp.isError) {
|
|
completer.completeError(resp.asError!);
|
|
break;
|
|
} else {
|
|
final step = ITStepModel.fromResponse(
|
|
sourceText: sourceText,
|
|
currentText: currentText,
|
|
responseModel: resp.result!,
|
|
storedGoldContinuances: goldContinuances,
|
|
);
|
|
completer.complete(step);
|
|
}
|
|
|
|
currentText += goldContinuances[i].text;
|
|
}
|
|
}
|
|
}
|