2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Set usage of custom emojis and stickers

Browse source
This commit is contained in:
krille-chan 2025-11-20 18:55:19 +01:00
commit 18d69ae608
No known key found for this signature in database
3 changed files with 102 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/l10n/intl_en.arb
View file

@ -3454,5 +3454,7 @@
"thread": "Thread", "thread": "Thread",
"backToMainChat": "Back to main chat", "backToMainChat": "Back to main chat",
"saveChanges": "Save changes", "saveChanges": "Save changes",
"createSticker": "Create sticker or emoji" "createSticker": "Create sticker or emoji",
"useAsSticker": "Use as sticker",
"useAsEmoji": "Use as emoji"
} }

9
lib/pages/settings_emotes/settings_emotes.dart
View file

@ -124,6 +124,15 @@ class EmotesSettingsController extends State<EmotesSettings> {
showSave = true; showSave = true;
}); });
void toggleUsage(String imageCode, ImagePackUsage usage) {
setState(() {
final usages =
pack!.images[imageCode]!.usage ??= List.from(ImagePackUsage.values);
if (!usages.remove(usage)) usages.add(usage);
showSave = true;
});
}
void submitImageAction( void submitImageAction(
String oldImageCode, String oldImageCode,
String imageCode, String imageCode,

136
lib/pages/settings_emotes/settings_emotes_view.dart
View file

@ -1,6 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:matrix/matrix_api_lite/model/events/image_pack_content.dart';
import 'package:fluffychat/l10n/l10n.dart'; import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart';
@ -116,56 +118,102 @@ class EmotesSettingsView extends StatelessWidget {
final useShortCuts = final useShortCuts =
(PlatformInfos.isWeb || PlatformInfos.isDesktop); (PlatformInfos.isWeb || PlatformInfos.isDesktop);
return ListTile( return ListTile(
title: Shortcuts( title: Row(
shortcuts: !useShortCuts children: [
? {} Expanded(
: { child: Shortcuts(
LogicalKeySet(LogicalKeyboardKey.enter): shortcuts: !useShortCuts
SubmitLineIntent(), ? {}
}, : {
child: Actions( LogicalKeySet(LogicalKeyboardKey.enter):
actions: !useShortCuts SubmitLineIntent(),
? {}
: {
SubmitLineIntent: CallbackAction(
onInvoke: (i) {
controller.submitImageAction(
imageCode,
textEditingController.text,
image,
textEditingController,
);
return null;
}, },
child: Actions(
actions: !useShortCuts
? {}
: {
SubmitLineIntent: CallbackAction(
onInvoke: (i) {
controller.submitImageAction(
imageCode,
textEditingController.text,
image,
textEditingController,
);
return null;
},
),
},
child: TextField(
readOnly: controller.readonly,
controller: textEditingController,
autocorrect: false,
minLines: 1,
maxLines: 1,
maxLength: 128,
decoration: InputDecoration(
hintText: L10n.of(context).emoteShortcode,
prefixText: ': ',
suffixText: ':',
counter: const SizedBox.shrink(),
filled: false,
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors.transparent,
),
),
),
onSubmitted: (s) =>
controller.submitImageAction(
imageCode,
s,
image,
textEditingController,
), ),
},
child: TextField(
readOnly: controller.readonly,
controller: textEditingController,
autocorrect: false,
minLines: 1,
maxLines: 1,
maxLength: 128,
decoration: InputDecoration(
hintText: L10n.of(context).emoteShortcode,
prefixText: ': ',
suffixText: ':',
counter: const SizedBox.shrink(),
filled: false,
enabledBorder: const OutlineInputBorder(
borderSide: BorderSide(
color: Colors.transparent,
), ),
), ),
), ),
onSubmitted: (s) => controller.submitImageAction(
imageCode,
s,
image,
textEditingController,
),
), ),
), PopupMenuButton<ImagePackUsage>(
onSelected: (usage) => controller.toggleUsage(
imageCode,
usage,
),
itemBuilder: (context) => [
PopupMenuItem(
value: ImagePackUsage.sticker,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (image.usage?.contains(
ImagePackUsage.sticker,
) ??
true)
const Icon(Icons.check_outlined),
const SizedBox(width: 12),
Text(L10n.of(context).useAsSticker),
],
),
),
PopupMenuItem(
value: ImagePackUsage.emoticon,
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (image.usage?.contains(
ImagePackUsage.emoticon,
) ??
true)
const Icon(Icons.check_outlined),
const SizedBox(width: 12),
Text(L10n.of(context).useAsEmoji),
],
),
),
],
icon: const Icon(Icons.edit_outlined),
),
],
), ),
leading: _EmoteImage(image.url), leading: _EmoteImage(image.url),
trailing: controller.readonly trailing: controller.readonly