ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3162 from pangeachat/3161-only-do-phonetic-transcription-for-l1-l2-pairs-with-different-scripts

Browse source 
3161-only-do-phonetic-transcription-for-l1-l2-pairs-with-different-scripts
This commit is contained in:
ggurdin 2025-06-20 10:10:13 -04:00 • committed by GitHub
commit e108d69c2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 30 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pangea/analytics_details_popup/vocab_analytics_details_view.dart
View file

@ -67,7 +67,7 @@ class VocabDetailsView extends StatelessWidget {
);
},
),
if (MatrixState.pangeaController.languageController.userL2 != null)
if (MatrixState.pangeaController.languageController.showTrancription)
Padding(
padding: const EdgeInsets.only(top: 4.0),
child: PhoneticTranscriptionWidget(

10
lib/pangea/learning_settings/controllers/language_controller.dart
View file

@ -112,4 +112,14 @@ class LanguageController {
// final model = activeL2 != null ? PangeaLanguage.byLangCode(activeL2) : null;
// return model;
}
bool get showTrancription =>
(_pangeaController.languageController.userL1 != null &&
_pangeaController.languageController.userL2 != null &&
_pangeaController.languageController.userL1?.script !=
_pangeaController.languageController.userL2?.script) ||
(_pangeaController.languageController.userL1?.script !=
LanguageKeys.unknownLanguage ||
_pangeaController.languageController.userL2?.script ==
LanguageKeys.unknownLanguage);
}

4
lib/pangea/learning_settings/models/language_model.dart
View file

@ -7,11 +7,13 @@ import 'package:fluffychat/pangea/learning_settings/enums/l2_support_enum.dart';
class LanguageModel {
final String langCode;
final String displayName;
final String script;
final L2SupportEnum l2Support;
LanguageModel({
required this.langCode,
required this.displayName,
this.script = LanguageKeys.unknownLanguage,
this.l2Support = L2SupportEnum.na,
});
@ -28,12 +30,14 @@ class LanguageModel {
l2Support: json['l2_support'] != null
? L2SupportEnum.na.fromStorageString(json['l2_support'])
: L2SupportEnum.na,
script: json['script'] ?? LanguageKeys.unknownLanguage,
);
}
toJson() => {
'language_code': langCode,
'language_name': displayName,
'script': script,
'l2_support': l2Support.storageString,
};

28
lib/pangea/toolbar/widgets/overlay_message.dart
View file

@ -187,20 +187,22 @@ class OverlayMessage extends StatelessWidget {
fontStyle: FontStyle.italic,
),
),
PhoneticTranscriptionWidget(
text: overlayController
.transcription!.transcript.text,
textLanguage: PLanguageStore.byLangCode(
pangeaMessageEvent!
.messageDisplayLangCode,
) ??
LanguageModel.unknown,
style: AppConfig.messageTextStyle(
event,
textColor,
if (MatrixState.pangeaController
.languageController.showTrancription)
PhoneticTranscriptionWidget(
text: overlayController
.transcription!.transcript.text,
textLanguage: PLanguageStore.byLangCode(
pangeaMessageEvent!
.messageDisplayLangCode,
) ??
LanguageModel.unknown,
style: AppConfig.messageTextStyle(
event,
textColor,
),
iconColor: textColor,
),
iconColor: textColor,
),
],
),
)