* 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>
346 lines
9.9 KiB
Dart
346 lines
9.9 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/material.dart';
|
|
import 'package:flutter/services.dart';
|
|
|
|
import 'package:archive/archive.dart';
|
|
import 'package:collection/collection.dart';
|
|
import 'package:matrix/matrix.dart';
|
|
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/pages/settings_emotes/settings_emotes.dart';
|
|
import 'package:fluffychat/utils/client_manager.dart';
|
|
import 'package:fluffychat/widgets/adaptive_dialogs/show_ok_cancel_alert_dialog.dart';
|
|
import 'package:fluffychat/widgets/matrix.dart';
|
|
|
|
class ImportEmoteArchiveDialog extends StatefulWidget {
|
|
final EmotesSettingsController controller;
|
|
final Archive archive;
|
|
|
|
const ImportEmoteArchiveDialog({
|
|
super.key,
|
|
required this.controller,
|
|
required this.archive,
|
|
});
|
|
|
|
@override
|
|
State<ImportEmoteArchiveDialog> createState() =>
|
|
_ImportEmoteArchiveDialogState();
|
|
}
|
|
|
|
class _ImportEmoteArchiveDialogState extends State<ImportEmoteArchiveDialog> {
|
|
Map<ArchiveFile, String> _importMap = {};
|
|
|
|
bool _loading = false;
|
|
|
|
double _progress = 0;
|
|
|
|
@override
|
|
void initState() {
|
|
_importFileMap();
|
|
super.initState();
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return AlertDialog(
|
|
title: Text(L10n.of(context).importEmojis),
|
|
content: _loading
|
|
? Center(child: CircularProgressIndicator(value: _progress))
|
|
: SingleChildScrollView(
|
|
child: Wrap(
|
|
alignment: WrapAlignment.spaceEvenly,
|
|
crossAxisAlignment: WrapCrossAlignment.center,
|
|
runSpacing: 8,
|
|
spacing: 8,
|
|
children: _importMap.entries
|
|
.map(
|
|
(e) => _EmojiImportPreview(
|
|
key: ValueKey(e.key.name),
|
|
entry: e,
|
|
onNameChanged: (name) => _importMap[e.key] = name,
|
|
onRemove: () =>
|
|
setState(() => _importMap.remove(e.key)),
|
|
),
|
|
)
|
|
.toList(),
|
|
),
|
|
),
|
|
actions: [
|
|
TextButton(
|
|
onPressed: _loading ? null : Navigator.of(context).pop,
|
|
child: Text(L10n.of(context).cancel),
|
|
),
|
|
TextButton(
|
|
onPressed: _loading
|
|
? null
|
|
: _importMap.isNotEmpty
|
|
? _addEmotePack
|
|
: null,
|
|
child: Text(L10n.of(context).importNow),
|
|
),
|
|
],
|
|
);
|
|
}
|
|
|
|
void _importFileMap() {
|
|
_importMap = Map.fromEntries(
|
|
widget.archive.files
|
|
.where((e) => e.isFile)
|
|
.map((e) => MapEntry(e, e.name.emoteNameFromPath))
|
|
.sorted((a, b) => a.value.compareTo(b.value)),
|
|
);
|
|
}
|
|
|
|
Future<void> _addEmotePack() async {
|
|
setState(() {
|
|
_loading = true;
|
|
_progress = 0;
|
|
});
|
|
final imports = _importMap;
|
|
final successfulUploads = <String>{};
|
|
|
|
// check for duplicates first
|
|
|
|
final skipKeys = [];
|
|
|
|
for (final entry in imports.entries) {
|
|
final imageCode = entry.value;
|
|
|
|
if (widget.controller.pack!.images.containsKey(imageCode)) {
|
|
final completer = Completer<OkCancelResult>();
|
|
WidgetsBinding.instance.addPostFrameCallback((timeStamp) async {
|
|
final result = await showOkCancelAlertDialog(
|
|
useRootNavigator: false,
|
|
context: context,
|
|
title: L10n.of(context).emoteExists,
|
|
message: imageCode,
|
|
cancelLabel: L10n.of(context).replace,
|
|
okLabel: L10n.of(context).skip,
|
|
);
|
|
completer.complete(result);
|
|
});
|
|
|
|
final result = await completer.future;
|
|
if (result == OkCancelResult.ok) {
|
|
skipKeys.add(entry.key);
|
|
}
|
|
}
|
|
}
|
|
|
|
for (final key in skipKeys) {
|
|
imports.remove(key);
|
|
}
|
|
|
|
for (final entry in imports.entries) {
|
|
setState(() {
|
|
_progress += 1 / imports.length;
|
|
});
|
|
final file = entry.key;
|
|
final imageCode = entry.value;
|
|
|
|
try {
|
|
var mxcFile = MatrixImageFile(bytes: file.content, name: file.name);
|
|
|
|
final thumbnail = (await mxcFile.generateThumbnail(
|
|
nativeImplementations: ClientManager.nativeImplementations,
|
|
));
|
|
if (thumbnail == null) {
|
|
Logs().w('Unable to create thumbnail');
|
|
} else {
|
|
mxcFile = thumbnail;
|
|
}
|
|
final uri = await Matrix.of(context).client.uploadContent(
|
|
mxcFile.bytes,
|
|
filename: mxcFile.name,
|
|
contentType: mxcFile.mimeType,
|
|
);
|
|
|
|
final info = <String, dynamic>{...mxcFile.info};
|
|
|
|
// normalize width / height to 256, required for stickers
|
|
if (info['w'] is int && info['h'] is int) {
|
|
final ratio = info['w'] / info['h'];
|
|
if (info['w'] > info['h']) {
|
|
info['w'] = 256;
|
|
info['h'] = (256.0 / ratio).round();
|
|
} else {
|
|
info['h'] = 256;
|
|
info['w'] = (ratio * 256.0).round();
|
|
}
|
|
}
|
|
widget.controller.pack!.images[imageCode] =
|
|
ImagePackImageContent.fromJson(<String, dynamic>{
|
|
'url': uri.toString(),
|
|
'info': info,
|
|
});
|
|
successfulUploads.add(file.name);
|
|
} catch (e) {
|
|
Logs().d('Could not upload emote $imageCode');
|
|
}
|
|
}
|
|
|
|
await widget.controller.save(context);
|
|
_importMap.removeWhere(
|
|
(key, value) => successfulUploads.contains(key.name),
|
|
);
|
|
|
|
_loading = false;
|
|
_progress = 0;
|
|
|
|
// in case we have unhandled / duplicated emotes left, don't pop
|
|
if (mounted) setState(() {});
|
|
if (_importMap.isEmpty) {
|
|
WidgetsBinding.instance.addPostFrameCallback(
|
|
(_) => Navigator.of(context).pop(),
|
|
);
|
|
}
|
|
}
|
|
}
|
|
|
|
class _EmojiImportPreview extends StatefulWidget {
|
|
final MapEntry<ArchiveFile, String> entry;
|
|
final ValueChanged<String> onNameChanged;
|
|
final VoidCallback onRemove;
|
|
|
|
const _EmojiImportPreview({
|
|
super.key,
|
|
required this.entry,
|
|
required this.onNameChanged,
|
|
required this.onRemove,
|
|
});
|
|
|
|
@override
|
|
State<_EmojiImportPreview> createState() => _EmojiImportPreviewState();
|
|
}
|
|
|
|
class _EmojiImportPreviewState extends State<_EmojiImportPreview> {
|
|
final hasErrorNotifier = ValueNotifier(false);
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
|
|
// TODO: support Lottie here as well ...
|
|
final controller = TextEditingController(text: widget.entry.value);
|
|
|
|
return Stack(
|
|
alignment: Alignment.topRight,
|
|
children: [
|
|
IconButton(
|
|
onPressed: widget.onRemove,
|
|
icon: const Icon(Icons.remove_circle),
|
|
tooltip: L10n.of(context).remove,
|
|
),
|
|
ValueListenableBuilder(
|
|
valueListenable: hasErrorNotifier,
|
|
builder: (context, hasError, child) {
|
|
if (hasError) return _ImageFileError(name: widget.entry.key.name);
|
|
|
|
return Column(
|
|
mainAxisSize: .min,
|
|
mainAxisAlignment: .center,
|
|
crossAxisAlignment: .center,
|
|
children: [
|
|
Image.memory(
|
|
widget.entry.key.content,
|
|
height: 64,
|
|
width: 64,
|
|
errorBuilder: (context, e, s) {
|
|
WidgetsBinding.instance.addPostFrameCallback(
|
|
(_) => _setRenderError(),
|
|
);
|
|
|
|
return _ImageFileError(name: widget.entry.key.name);
|
|
},
|
|
),
|
|
SizedBox(
|
|
width: 128,
|
|
child: TextField(
|
|
controller: controller,
|
|
inputFormatters: [
|
|
FilteringTextInputFormatter.allow(RegExp(r'^[-\w]+$')),
|
|
],
|
|
autocorrect: false,
|
|
minLines: 1,
|
|
maxLines: 1,
|
|
decoration: InputDecoration(
|
|
hintText: L10n.of(context).emoteShortcode,
|
|
prefixText: ': ',
|
|
suffixText: ':',
|
|
border: const OutlineInputBorder(),
|
|
prefixStyle: TextStyle(
|
|
color: theme.colorScheme.secondary,
|
|
fontWeight: FontWeight.bold,
|
|
),
|
|
suffixStyle: TextStyle(
|
|
color: theme.colorScheme.secondary,
|
|
fontWeight: FontWeight.bold,
|
|
),
|
|
),
|
|
onChanged: widget.onNameChanged,
|
|
onSubmitted: widget.onNameChanged,
|
|
),
|
|
),
|
|
],
|
|
);
|
|
},
|
|
),
|
|
],
|
|
);
|
|
}
|
|
|
|
void _setRenderError() {
|
|
hasErrorNotifier.value = true;
|
|
widget.onRemove.call();
|
|
}
|
|
}
|
|
|
|
class _ImageFileError extends StatelessWidget {
|
|
final String name;
|
|
|
|
const _ImageFileError({required this.name});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final theme = Theme.of(context);
|
|
|
|
return SizedBox.square(
|
|
dimension: 64,
|
|
child: Tooltip(
|
|
message: name,
|
|
child: Column(
|
|
mainAxisAlignment: .start,
|
|
mainAxisSize: .min,
|
|
crossAxisAlignment: .center,
|
|
children: [
|
|
const Icon(Icons.error),
|
|
Text(
|
|
L10n.of(context).notAnImage,
|
|
textAlign: TextAlign.center,
|
|
style: theme.textTheme.labelSmall,
|
|
),
|
|
],
|
|
),
|
|
),
|
|
);
|
|
}
|
|
}
|
|
|
|
extension on String {
|
|
/// normalizes a file path into its name only replacing any special character
|
|
/// [^-\w] with an underscore and removing the extension
|
|
///
|
|
/// Used to compute emote name proposal based on file name
|
|
String get emoteNameFromPath {
|
|
// ... removing leading path
|
|
return split(RegExp(r'[/\\]')).last
|
|
// ... removing file extension
|
|
.split('.')
|
|
.first
|
|
// ... lowering
|
|
.toLowerCase()
|
|
// ... replacing unexpected characters
|
|
.replaceAll(RegExp(r'[^-\w]'), '_');
|
|
}
|
|
}
|