* 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>
211 lines
7 KiB
Dart
211 lines
7 KiB
Dart
import 'dart:async';
|
|
import 'dart:io';
|
|
|
|
import 'package:flutter/foundation.dart';
|
|
|
|
import 'package:matrix/matrix.dart';
|
|
import 'package:path_provider/path_provider.dart';
|
|
|
|
import 'package:fluffychat/pangea/analytics_misc/lemma_emoji_setter_mixin.dart';
|
|
import 'package:fluffychat/pangea/common/utils/async_state.dart';
|
|
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
|
|
import 'package:fluffychat/pangea/events/models/pangea_token_text_model.dart';
|
|
import 'package:fluffychat/pangea/speech_to_text/speech_to_text_response_model.dart';
|
|
import 'package:fluffychat/pangea/toolbar/message_practice/message_audio_card.dart';
|
|
import 'package:fluffychat/pangea/toolbar/reading_assistance/select_mode_buttons.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class _TranscriptionLoader extends AsyncLoader<SpeechToTextResponseModel> {
|
|
final PangeaMessageEvent messageEvent;
|
|
_TranscriptionLoader(this.messageEvent) : super();
|
|
|
|
@override
|
|
Future<SpeechToTextResponseModel> fetch() => messageEvent.requestSpeechToText(
|
|
MatrixState.pangeaController.userController.userL1!.langCodeShort,
|
|
MatrixState.pangeaController.userController.userL2!.langCodeShort,
|
|
);
|
|
}
|
|
|
|
class _STTTranslationLoader extends AsyncLoader<String> {
|
|
final PangeaMessageEvent messageEvent;
|
|
_STTTranslationLoader(this.messageEvent) : super();
|
|
|
|
@override
|
|
Future<String> fetch() => messageEvent.requestSttTranslation(
|
|
langCode: MatrixState.pangeaController.userController.userL1!.langCodeShort,
|
|
l1Code: MatrixState.pangeaController.userController.userL1!.langCodeShort,
|
|
l2Code: MatrixState.pangeaController.userController.userL2!.langCodeShort,
|
|
);
|
|
}
|
|
|
|
class _TranslationLoader extends AsyncLoader<String> {
|
|
final PangeaMessageEvent messageEvent;
|
|
_TranslationLoader(this.messageEvent) : super();
|
|
|
|
@override
|
|
Future<String> fetch() => messageEvent.requestRespresentationByL1();
|
|
}
|
|
|
|
class _AudioLoader extends AsyncLoader<(PangeaAudioFile, File?)> {
|
|
final PangeaMessageEvent messageEvent;
|
|
_AudioLoader(this.messageEvent) : super();
|
|
|
|
@override
|
|
Future<(PangeaAudioFile, File?)> fetch() async {
|
|
final audioBytes = await messageEvent.requestTextToSpeech(
|
|
messageEvent.messageDisplayLangCode,
|
|
MatrixState.pangeaController.userController.voice,
|
|
);
|
|
|
|
File? audioFile;
|
|
if (!kIsWeb) {
|
|
final tempDir = await getTemporaryDirectory();
|
|
|
|
File? file;
|
|
file = File('${tempDir.path}/${audioBytes.name}');
|
|
await file.writeAsBytes(audioBytes.bytes);
|
|
audioFile = file;
|
|
}
|
|
|
|
return (audioBytes, audioFile);
|
|
}
|
|
}
|
|
|
|
class SelectModeController with LemmaEmojiSetter {
|
|
final PangeaMessageEvent messageEvent;
|
|
final _TranscriptionLoader _transcriptLoader;
|
|
final _TranslationLoader _translationLoader;
|
|
final _AudioLoader _audioLoader;
|
|
final _STTTranslationLoader _sttTranslationLoader;
|
|
|
|
SelectModeController(this.messageEvent)
|
|
: _transcriptLoader = _TranscriptionLoader(messageEvent),
|
|
_translationLoader = _TranslationLoader(messageEvent),
|
|
_audioLoader = _AudioLoader(messageEvent),
|
|
_sttTranslationLoader = _STTTranslationLoader(messageEvent);
|
|
|
|
ValueNotifier<SelectMode?> selectedMode = ValueNotifier<SelectMode?>(null);
|
|
|
|
// Sometimes the same token is clicked twice. Setting it to the same value
|
|
// won't trigger the notifier, so use the bool for force it to trigger.
|
|
ValueNotifier<(PangeaTokenText?, bool)> playTokenNotifier =
|
|
ValueNotifier<(PangeaTokenText?, bool)>((null, false));
|
|
|
|
void dispose() {
|
|
selectedMode.dispose();
|
|
playTokenNotifier.dispose();
|
|
_transcriptLoader.dispose();
|
|
_translationLoader.dispose();
|
|
_sttTranslationLoader.dispose();
|
|
_audioLoader.dispose();
|
|
}
|
|
|
|
static List<SelectMode> get _textModes => [
|
|
SelectMode.audio,
|
|
SelectMode.translate,
|
|
SelectMode.practice,
|
|
SelectMode.emoji,
|
|
];
|
|
|
|
static List<SelectMode> get _audioModes => [SelectMode.speechTranslation];
|
|
|
|
ValueNotifier<AsyncState<String>> get translationState =>
|
|
_translationLoader.state;
|
|
|
|
ValueNotifier<AsyncState<SpeechToTextResponseModel>> get transcriptionState =>
|
|
_transcriptLoader.state;
|
|
|
|
ValueNotifier<AsyncState<String>> get speechTranslationState =>
|
|
_sttTranslationLoader.state;
|
|
|
|
(PangeaAudioFile, File?)? get audioFile => _audioLoader.value;
|
|
|
|
List<SelectMode> allModes({bool enableRefresh = false}) {
|
|
final validTypes = {MessageTypes.Text, MessageTypes.Audio};
|
|
if (!messageEvent.event.status.isSent ||
|
|
messageEvent.event.type != EventTypes.Message ||
|
|
!validTypes.contains(messageEvent.event.messageType)) {
|
|
return [];
|
|
}
|
|
|
|
final types = messageEvent.event.messageType == MessageTypes.Text
|
|
? _textModes
|
|
: _audioModes;
|
|
|
|
if (enableRefresh) {
|
|
return [...types, SelectMode.requestRegenerate];
|
|
}
|
|
|
|
return types;
|
|
}
|
|
|
|
List<SelectMode> readingAssistanceModes({bool enableRefresh = false}) {
|
|
final validTypes = {MessageTypes.Text, MessageTypes.Audio};
|
|
if (!messageEvent.event.status.isSent ||
|
|
messageEvent.event.type != EventTypes.Message ||
|
|
!validTypes.contains(messageEvent.event.messageType)) {
|
|
return [];
|
|
}
|
|
|
|
List<SelectMode> modes = [];
|
|
final lang = messageEvent.messageDisplayLangCode.split("-").first;
|
|
|
|
final matchesL1 =
|
|
lang ==
|
|
MatrixState.pangeaController.userController.userL1!.langCodeShort;
|
|
|
|
if (messageEvent.event.messageType == MessageTypes.Text) {
|
|
final matchesL2 =
|
|
lang ==
|
|
MatrixState.pangeaController.userController.userL2!.langCodeShort;
|
|
|
|
modes = matchesL2
|
|
? _textModes
|
|
: matchesL1
|
|
? []
|
|
: [SelectMode.translate];
|
|
} else {
|
|
modes = matchesL1 ? [] : _audioModes;
|
|
}
|
|
|
|
if (enableRefresh) {
|
|
modes = [...modes, SelectMode.requestRegenerate];
|
|
}
|
|
|
|
return modes;
|
|
}
|
|
|
|
bool get isLoading => currentModeStateNotifier?.value is AsyncLoading;
|
|
|
|
bool get isShowingExtraContent =>
|
|
(selectedMode.value == SelectMode.translate &&
|
|
_translationLoader.isLoaded) ||
|
|
(selectedMode.value == SelectMode.speechTranslation &&
|
|
_sttTranslationLoader.isLoaded) ||
|
|
_transcriptLoader.isLoaded ||
|
|
_transcriptLoader.isError;
|
|
|
|
ValueNotifier<AsyncState>? get currentModeStateNotifier =>
|
|
modeStateNotifier(selectedMode.value);
|
|
|
|
ValueNotifier<AsyncState>? modeStateNotifier(SelectMode? mode) =>
|
|
switch (mode) {
|
|
SelectMode.audio => _audioLoader.state,
|
|
SelectMode.translate => _translationLoader.state,
|
|
SelectMode.speechTranslation => _sttTranslationLoader.state,
|
|
_ => null,
|
|
};
|
|
|
|
void setSelectMode(SelectMode? mode) {
|
|
if (selectedMode.value == mode) return;
|
|
selectedMode.value = mode;
|
|
}
|
|
|
|
void setPlayingToken(PangeaTokenText? token) =>
|
|
playTokenNotifier.value = (token, !playTokenNotifier.value.$2);
|
|
|
|
Future<void> fetchAudio() => _audioLoader.load();
|
|
Future<void> fetchTranslation() => _translationLoader.load();
|
|
Future<void> fetchTranscription() => _transcriptLoader.load();
|
|
Future<void> fetchSpeechTranslation() => _sttTranslationLoader.load();
|
|
}
|