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

Merge pull request #4887 from pangeachat/4878-focus-on-word-meanings-in-reaction-choices

Browse source 
chore: Focus on word meanings in reaction choices
This commit is contained in:
ggurdin 2025-12-18 11:51:13 -05:00 • committed by GitHub
commit 6c50521aa9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 72 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

145
lib/pangea/toolbar/layout/message_selection_positioner.dart
View file

@ -3,13 +3,11 @@ import 'dart:math';
import 'package:flutter/material.dart';
import 'package:emoji_picker_flutter/emoji_picker_flutter.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/app_config.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat/chat.dart';
import 'package:fluffychat/pangea/common/utils/error_handler.dart';
import 'package:fluffychat/pangea/events/event_wrappers/pangea_message_event.dart';
@ -21,7 +19,6 @@ import 'package:fluffychat/pangea/toolbar/layout/reading_assistance_mode_enum.da
import 'package:fluffychat/pangea/toolbar/message_practice/reading_assistance_input_bar.dart';
import 'package:fluffychat/pangea/toolbar/message_selection_overlay.dart';
import 'package:fluffychat/pangea/toolbar/word_card/word_card_switcher.dart';
import 'package:fluffychat/utils/adaptive_bottom_sheet.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart';
@ -555,77 +552,77 @@ class MessageReactionPicker extends StatelessWidget {
),
),
),
IconButton(
icon: const Icon(
Icons.add_reaction_outlined,
),
tooltip: L10n.of(context).customReaction,
onPressed: () async {
final emoji = await showAdaptiveBottomSheet<String>(
context: context,
builder: (context) => Scaffold(
appBar: AppBar(
title: Text(
L10n.of(context).customReaction,
),
leading: CloseButton(
onPressed: () => Navigator.of(
context,
).pop(
null,
),
),
),
body: SizedBox(
height: double.infinity,
child: EmojiPicker(
onEmojiSelected: (
_,
emoji,
) =>
Navigator.of(
context,
).pop(
emoji.emoji,
),
config: Config(
emojiViewConfig: const EmojiViewConfig(
backgroundColor: Colors.transparent,
),
bottomActionBarConfig: const BottomActionBarConfig(
enabled: false,
),
categoryViewConfig: CategoryViewConfig(
initCategory: Category.SMILEYS,
backspaceColor: theme.colorScheme.primary,
iconColor: theme.colorScheme.primary.withAlpha(
128,
),
iconColorSelected: theme.colorScheme.primary,
indicatorColor: theme.colorScheme.primary,
backgroundColor: theme.colorScheme.surface,
),
skinToneConfig: SkinToneConfig(
dialogBackgroundColor: Color.lerp(
theme.colorScheme.surface,
theme.colorScheme.primaryContainer,
0.75,
)!,
indicatorColor: theme.colorScheme.onSurface,
),
),
),
),
),
);
if (emoji == null) return;
if (sentReactions.contains(emoji)) return;
await event?.room.sendReaction(
event.eventId,
emoji,
);
},
),
// IconButton(
// icon: const Icon(
// Icons.add_reaction_outlined,
// ),
// tooltip: L10n.of(context).customReaction,
// onPressed: () async {
// final emoji = await showAdaptiveBottomSheet<String>(
// context: context,
// builder: (context) => Scaffold(
// appBar: AppBar(
// title: Text(
// L10n.of(context).customReaction,
// ),
// leading: CloseButton(
// onPressed: () => Navigator.of(
// context,
// ).pop(
// null,
// ),
// ),
// ),
// body: SizedBox(
// height: double.infinity,
// child: EmojiPicker(
// onEmojiSelected: (
// _,
// emoji,
// ) =>
// Navigator.of(
// context,
// ).pop(
// emoji.emoji,
// ),
// config: Config(
// emojiViewConfig: const EmojiViewConfig(
// backgroundColor: Colors.transparent,
// ),
// bottomActionBarConfig: const BottomActionBarConfig(
// enabled: false,
// ),
// categoryViewConfig: CategoryViewConfig(
// initCategory: Category.SMILEYS,
// backspaceColor: theme.colorScheme.primary,
// iconColor: theme.colorScheme.primary.withAlpha(
// 128,
// ),
// iconColorSelected: theme.colorScheme.primary,
// indicatorColor: theme.colorScheme.primary,
// backgroundColor: theme.colorScheme.surface,
// ),
// skinToneConfig: SkinToneConfig(
// dialogBackgroundColor: Color.lerp(
// theme.colorScheme.surface,
// theme.colorScheme.primaryContainer,
// 0.75,
// )!,
// indicatorColor: theme.colorScheme.onSurface,
// ),
// ),
// ),
// ),
// ),
// );
// if (emoji == null) return;
// if (sentReactions.contains(emoji)) return;
// await event?.room.sendReaction(
// event.eventId,
// emoji,
// );
// },
// ),
],
),
),

2
lib/pangea/toolbar/reading_assistance/select_mode_buttons.dart
View file

@ -27,7 +27,7 @@ enum SelectMode {
audio(Icons.volume_up),
translate(Icons.translate),
practice(Symbols.fitness_center),
emoji(Icons.visibility_outlined),
emoji(Icons.add_reaction_outlined),
speechTranslation(Icons.translate);
final IconData icon;