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

resolve merge conflict

Browse source
This commit is contained in:
ggurdin 2025-06-16 16:35:32 -04:00
commit 620508a838
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
8 changed files with 73 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/l10n/intl_en.arb
View file

@ -5017,5 +5017,5 @@
"newDirectMessage": "New direct message",
"speakingExercisesTooltip": "Speaking practice",
"noChatsFoundHereYet": "No chats found here yet",
"phoneticTranscriptionError": "Phonetic transcription failed"
"transcriptionFailed": "Failed to transcribe audio"
}

16
lib/pangea/learning_settings/pages/settings_learning_view.dart
View file

@ -192,13 +192,15 @@ class SettingsLearningView extends StatelessWidget {
.colorScheme
.error,
),
Text(
L10n.of(context)
.noIdenticalLanguages,
style: TextStyle(
color: Theme.of(context)
.colorScheme
.error,
Flexible(
child: Text(
L10n.of(context)
.noIdenticalLanguages,
style: TextStyle(
color: Theme.of(context)
.colorScheme
.error,
),
),
),
],

18
lib/pangea/learning_settings/widgets/p_language_dropdown.dart
View file

@ -239,15 +239,17 @@ class LanguageDropDownEntry extends StatelessWidget {
Expanded(
child: Row(
children: [
Text(
languageModel.getDisplayName(context) ?? "",
style: const TextStyle().copyWith(
color: enabled
? Theme.of(context).textTheme.bodyLarge!.color
: Theme.of(context).disabledColor,
fontSize: 14,
Flexible(
child: Text(
languageModel.getDisplayName(context) ?? "",
style: const TextStyle().copyWith(
color: enabled
? Theme.of(context).textTheme.bodyLarge!.color
: Theme.of(context).disabledColor,
fontSize: 14,
),
overflow: TextOverflow.ellipsis,
),
overflow: TextOverflow.ellipsis,
),
const SizedBox(width: 10),
if (isL2List && languageModel.l2Support != L2SupportEnum.full)

32
lib/pangea/lemmas/lemma_reaction_picker.dart
View file

@ -28,17 +28,35 @@ class LemmaReactionPickerState extends State<LemmaReactionPicker> {
@override
void initState() {
super.initState();
widget.cId.getLemmaInfo().then((info) {
loading = false;
setState(() => displayEmoji = info.emoji);
}).catchError((e, s) {
ErrorHandler.logError(data: widget.cId.toJson(), e: e, s: s);
setState(() => loading = false);
});
_refresh();
}
@override
void didUpdateWidget(LemmaReactionPicker oldWidget) {
super.didUpdateWidget(oldWidget);
if (oldWidget.cId != widget.cId) {
_refresh();
}
}
void setEmoji(String emoji) => widget.controller.sendEmojiAction(emoji);
Future<void> _refresh() async {
setState(() {
loading = true;
displayEmoji = [];
});
try {
final info = await widget.cId.getLemmaInfo();
displayEmoji = info.emoji;
} catch (e, s) {
ErrorHandler.logError(data: widget.cId.toJson(), e: e, s: s);
} finally {
setState(() => loading = false);
}
}
@override
Widget build(BuildContext context) {
return Container(

5
lib/pangea/onboarding/onboarding_complete.dart
View file

@ -19,7 +19,10 @@ class OnboardingComplete extends StatelessWidget {
children: [
Container(
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.onSurface.withAlpha(20),
color: Theme.of(context)
.colorScheme
.surfaceContainerHigh
.withAlpha(170),
borderRadius: BorderRadius.circular(
10.0,
),

12
lib/pangea/public_spaces/public_room_bottom_sheet.dart
View file

@ -200,12 +200,14 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
Row(
spacing: 16.0,
children: [
(chunk?.avatarUrl != null)
(chunk?.avatarUrl != null || chunk?.roomType != 'm.space')
? Avatar(
mxContent: chunk?.avatarUrl,
name: chunk?.name,
size: 160.0,
borderRadius: BorderRadius.circular(24.0),
borderRadius: BorderRadius.circular(
chunk?.roomType != 'm.space' ? 80 : 24.0,
),
)
: ClipRRect(
borderRadius: BorderRadius.circular(24.0),
@ -242,7 +244,11 @@ class PublicRoomBottomSheetState extends State<PublicRoomBottomSheet> {
child: SingleChildScrollView(
child: Text(
chunk?.topic ??
L10n.of(context).noSpaceDescriptionYet,
(chunk?.roomType != 'm.space'
? L10n.of(context)
.noChatDescriptionYet
: L10n.of(context)
.noSpaceDescriptionYet),
softWrap: true,
textAlign: TextAlign.start,
maxLines: null,

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

@ -160,7 +160,7 @@ class OverlayMessage extends StatelessWidget {
),
const SizedBox(width: 8),
Text(
L10n.of(context).oopsSomethingWentWrong,
L10n.of(context).transcriptionFailed,
style: AppConfig.messageTextStyle(
event,
textColor,

27
lib/widgets/member_actions_popup_menu_button.dart
View file

@ -90,20 +90,21 @@ void showMemberActionsPopupMenu({
),
const PopupMenuDivider(),
// #Pangea
PopupMenuItem(
value: _MemberActions.chat,
child: Row(
children: [
const Icon(Icons.forum_outlined),
const SizedBox(width: 18),
Text(
dmRoomId == null
? L10n.of(context).startConversation
: L10n.of(context).sendAMessage,
),
],
if (user.room.client.userID != user.id)
PopupMenuItem(
value: _MemberActions.chat,
child: Row(
children: [
const Icon(Icons.forum_outlined),
const SizedBox(width: 18),
Text(
dmRoomId == null
? L10n.of(context).startConversation
: L10n.of(context).sendAMessage,
),
],
),
),
),
// Pangea#
if (onMention != null)
PopupMenuItem(