* 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>
377 lines
16 KiB
Dart
377 lines
16 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/utils/platform_infos.dart';
|
|
import 'package:fluffychat/utils/url_launcher.dart';
|
|
import 'package:fluffychat/widgets/layouts/max_width_body.dart';
|
|
import 'package:fluffychat/widgets/mxc_image.dart';
|
|
import 'package:fluffychat/widgets/mxc_image_viewer.dart';
|
|
import '../../widgets/matrix.dart';
|
|
import 'settings_emotes.dart';
|
|
|
|
enum PopupMenuEmojiActions { import, export }
|
|
|
|
class EmotesSettingsView extends StatelessWidget {
|
|
final EmotesSettingsController controller;
|
|
|
|
const EmotesSettingsView(this.controller, {super.key});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
if (controller.widget.roomId != null && controller.room == null) {
|
|
return Scaffold(
|
|
appBar: AppBar(title: Text(L10n.of(context).oopsSomethingWentWrong)),
|
|
body: Center(
|
|
child: Text(L10n.of(context).youAreNoLongerParticipatingInThisChat),
|
|
),
|
|
);
|
|
}
|
|
final theme = Theme.of(context);
|
|
|
|
final client = Matrix.of(context).client;
|
|
final imageKeys = controller.pack!.images.keys.toList();
|
|
final packKeys = controller.packKeys;
|
|
if (packKeys != null && packKeys.isEmpty) {
|
|
packKeys.add('');
|
|
}
|
|
final attributionUrl = Uri.tryParse(
|
|
controller.packAttributionController.text,
|
|
);
|
|
|
|
return Scaffold(
|
|
appBar: AppBar(
|
|
automaticallyImplyLeading: !controller.showSave,
|
|
title: controller.showSave
|
|
? TextButton(
|
|
onPressed: controller.resetAction,
|
|
child: Text(L10n.of(context).cancel),
|
|
)
|
|
: Text(L10n.of(context).customEmojisAndStickers),
|
|
actions: [
|
|
if (controller.showSave)
|
|
ElevatedButton(
|
|
onPressed: () => controller.save(context),
|
|
style: ElevatedButton.styleFrom(
|
|
backgroundColor: theme.colorScheme.primary,
|
|
foregroundColor: theme.colorScheme.onPrimary,
|
|
),
|
|
child: Text(L10n.of(context).saveChanges),
|
|
)
|
|
else
|
|
PopupMenuButton<PopupMenuEmojiActions>(
|
|
useRootNavigator: true,
|
|
onSelected: (value) {
|
|
switch (value) {
|
|
case PopupMenuEmojiActions.export:
|
|
controller.exportAsZip();
|
|
break;
|
|
case PopupMenuEmojiActions.import:
|
|
controller.importEmojiZip();
|
|
break;
|
|
}
|
|
},
|
|
itemBuilder: (context) => [
|
|
if (!controller.readonly)
|
|
PopupMenuItem(
|
|
value: PopupMenuEmojiActions.import,
|
|
child: Text(L10n.of(context).importFromZipFile),
|
|
),
|
|
if (imageKeys.isNotEmpty)
|
|
PopupMenuItem(
|
|
value: PopupMenuEmojiActions.export,
|
|
child: Text(L10n.of(context).exportEmotePack),
|
|
),
|
|
],
|
|
),
|
|
],
|
|
bottom: packKeys == null
|
|
? null
|
|
: PreferredSize(
|
|
preferredSize: const Size.fromHeight(48),
|
|
child: Padding(
|
|
padding: const EdgeInsets.all(4.0),
|
|
child: SizedBox(
|
|
height: 40,
|
|
child: ListView.builder(
|
|
scrollDirection: Axis.horizontal,
|
|
itemCount: packKeys.length + 1,
|
|
itemBuilder: (context, i) {
|
|
if (i == 0) {
|
|
if (controller.readonly) {
|
|
return const SizedBox.shrink();
|
|
}
|
|
return Padding(
|
|
padding: const EdgeInsets.symmetric(
|
|
horizontal: 4.0,
|
|
),
|
|
child: FilterChip(
|
|
label: const Icon(Icons.add_outlined, size: 20),
|
|
onSelected: controller.showSave
|
|
? null
|
|
: (_) => controller.createImagePack(),
|
|
),
|
|
);
|
|
}
|
|
i--;
|
|
final key = packKeys[i];
|
|
final event = controller.room?.getState(
|
|
'im.ponies.room_emotes',
|
|
packKeys[i],
|
|
);
|
|
|
|
final eventPack = event?.content
|
|
.tryGetMap<String, Object?>('pack');
|
|
final packName =
|
|
eventPack?.tryGet<String>('display_name') ??
|
|
eventPack?.tryGet<String>('name') ??
|
|
(key.isNotEmpty ? key : 'Default');
|
|
|
|
return Padding(
|
|
padding: const EdgeInsets.symmetric(horizontal: 4.0),
|
|
child: FilterChip(
|
|
label: Text(packName),
|
|
selected:
|
|
controller.stateKey == key ||
|
|
(controller.stateKey == null && key.isEmpty),
|
|
onSelected: controller.showSave
|
|
? null
|
|
: (_) => controller.setStateKey(key),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
body: MaxWidthBody(
|
|
child: Column(
|
|
mainAxisSize: .min,
|
|
crossAxisAlignment: .stretch,
|
|
children: <Widget>[
|
|
if (controller.room != null) ...[
|
|
const SizedBox(height: 16),
|
|
Padding(
|
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
|
child: TextField(
|
|
maxLength: 256,
|
|
controller: controller.packDisplayNameController,
|
|
readOnly: controller.readonly,
|
|
onSubmitted: (_) => controller.submitDisplaynameAction(),
|
|
decoration: InputDecoration(
|
|
counter: const SizedBox.shrink(),
|
|
hintText: controller.stateKey,
|
|
labelText: L10n.of(context).stickerPackName,
|
|
),
|
|
),
|
|
),
|
|
const SizedBox(height: 8),
|
|
Padding(
|
|
padding: const EdgeInsets.symmetric(horizontal: 16.0),
|
|
child: TextField(
|
|
maxLength: 256,
|
|
controller: controller.packAttributionController,
|
|
readOnly: controller.readonly,
|
|
keyboardType: TextInputType.url,
|
|
onSubmitted: (_) => controller.submitAttributionAction(),
|
|
decoration: InputDecoration(
|
|
counter: const SizedBox.shrink(),
|
|
labelText: L10n.of(context).attribution,
|
|
suffixIcon: attributionUrl == null
|
|
? null
|
|
: IconButton(
|
|
icon: const Icon(Icons.link_outlined),
|
|
onPressed: () => UrlLauncher(
|
|
context,
|
|
attributionUrl.toString(),
|
|
).launchUrl(),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
],
|
|
if (!controller.readonly) ...[
|
|
Padding(
|
|
padding: const EdgeInsets.all(16.0),
|
|
child: ElevatedButton.icon(
|
|
onPressed: controller.createStickers,
|
|
icon: const Icon(Icons.upload_outlined),
|
|
label: Text(L10n.of(context).createSticker),
|
|
),
|
|
),
|
|
const Divider(),
|
|
],
|
|
if (controller.room != null && imageKeys.isNotEmpty)
|
|
SwitchListTile.adaptive(
|
|
title: Text(L10n.of(context).enableEmotesGlobally),
|
|
value: controller.isGloballyActive(client),
|
|
onChanged: controller.setIsGloballyActive,
|
|
),
|
|
imageKeys.isEmpty
|
|
? Center(
|
|
child: Padding(
|
|
padding: const EdgeInsets.all(16),
|
|
child: Text(
|
|
L10n.of(context).noEmotesFound,
|
|
style: const TextStyle(fontSize: 20),
|
|
),
|
|
),
|
|
)
|
|
: ListView.separated(
|
|
shrinkWrap: true,
|
|
physics: const NeverScrollableScrollPhysics(),
|
|
separatorBuilder: (BuildContext context, int i) =>
|
|
const SizedBox.shrink(),
|
|
itemCount: imageKeys.length,
|
|
itemBuilder: (BuildContext context, int i) {
|
|
final imageCode = imageKeys[i];
|
|
final image = controller.pack!.images[imageCode]!;
|
|
final textEditingController = TextEditingController();
|
|
textEditingController.text = imageCode;
|
|
final useShortCuts =
|
|
(PlatformInfos.isWeb || PlatformInfos.isDesktop);
|
|
return ListTile(
|
|
title: Row(
|
|
children: [
|
|
Expanded(
|
|
child: Shortcuts(
|
|
shortcuts: !useShortCuts
|
|
? {}
|
|
: {
|
|
LogicalKeySet(LogicalKeyboardKey.enter):
|
|
SubmitLineIntent(),
|
|
},
|
|
child: Actions(
|
|
actions: !useShortCuts
|
|
? {}
|
|
: {
|
|
SubmitLineIntent: CallbackAction(
|
|
onInvoke: (i) {
|
|
controller.submitImageAction(
|
|
imageCode,
|
|
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,
|
|
image,
|
|
textEditingController,
|
|
),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
if (!controller.readonly)
|
|
PopupMenuButton<ImagePackUsage>(
|
|
onSelected: (usage) =>
|
|
controller.toggleUsage(imageCode, usage),
|
|
itemBuilder: (context) => [
|
|
PopupMenuItem(
|
|
value: ImagePackUsage.sticker,
|
|
child: Row(
|
|
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: .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),
|
|
trailing: controller.readonly
|
|
? null
|
|
: IconButton(
|
|
tooltip: L10n.of(context).delete,
|
|
onPressed: () =>
|
|
controller.removeImageAction(imageCode),
|
|
icon: const Icon(Icons.delete_outlined),
|
|
),
|
|
);
|
|
},
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class _EmoteImage extends StatelessWidget {
|
|
final Uri mxc;
|
|
|
|
const _EmoteImage(this.mxc);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
const size = 44.0;
|
|
final key = 'sticker_preview_$mxc';
|
|
return InkWell(
|
|
borderRadius: BorderRadius.circular(4),
|
|
onTap: () =>
|
|
showDialog(context: context, builder: (_) => MxcImageViewer(mxc)),
|
|
child: MxcImage(
|
|
key: ValueKey(key),
|
|
cacheKey: key,
|
|
uri: mxc,
|
|
fit: BoxFit.contain,
|
|
width: size,
|
|
height: size,
|
|
isThumbnail: true,
|
|
animated: true,
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
class SubmitLineIntent extends Intent {}
|