* 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>
255 lines
7.6 KiB
Dart
255 lines
7.6 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:async/async.dart';
|
|
|
|
import 'package:fluffychat/l10n/l10n.dart';
|
|
import 'package:fluffychat/utils/localized_exception_extension.dart';
|
|
import 'package:fluffychat/widgets/adaptive_dialogs/adaptive_dialog_action.dart';
|
|
|
|
/// Displays a loading dialog which reacts to the given [future]. The dialog
|
|
/// will be dismissed and the value will be returned when the future completes.
|
|
/// If an error occured, then [onError] will be called and this method returns
|
|
/// null.
|
|
Future<Result<T>> showFutureLoadingDialog<T>({
|
|
required BuildContext context,
|
|
Future<T> Function()? future,
|
|
Future<T> Function(void Function(double?) setProgress)? futureWithProgress,
|
|
String? title,
|
|
String? backLabel,
|
|
bool barrierDismissible = false,
|
|
bool delay = true,
|
|
ExceptionContext? exceptionContext,
|
|
bool ignoreError = false,
|
|
// #Pangea
|
|
bool Function(Object)? showError,
|
|
Object? Function(Object, StackTrace?)? onError,
|
|
String? Function()? onSuccess,
|
|
VoidCallback? onDismiss,
|
|
// Pangea#
|
|
}) async {
|
|
assert(future != null || futureWithProgress != null);
|
|
final onProgressStream = StreamController<double?>();
|
|
final futureExec =
|
|
futureWithProgress?.call(onProgressStream.add) ?? future!();
|
|
final resultFuture = ResultFuture(futureExec);
|
|
|
|
if (delay) {
|
|
var i = 3;
|
|
while (i > 0) {
|
|
final result = resultFuture.result;
|
|
if (result != null) {
|
|
if (result.isError) break;
|
|
return result;
|
|
}
|
|
await Future.delayed(const Duration(milliseconds: 100));
|
|
i--;
|
|
}
|
|
}
|
|
|
|
final result = await showAdaptiveDialog<Result<T>>(
|
|
context: context,
|
|
barrierDismissible: barrierDismissible,
|
|
builder: (BuildContext context) => LoadingDialog<T>(
|
|
future: futureExec,
|
|
title: title,
|
|
backLabel: backLabel,
|
|
exceptionContext: exceptionContext,
|
|
onProgressStream: onProgressStream.stream,
|
|
// #Pangea
|
|
showError: showError,
|
|
onError: onError,
|
|
onDismiss: onDismiss,
|
|
onSuccess: onSuccess,
|
|
// Pangea#
|
|
),
|
|
);
|
|
return result ??
|
|
Result.error(Exception('FutureDialog canceled'), StackTrace.current);
|
|
}
|
|
|
|
class LoadingDialog<T> extends StatefulWidget {
|
|
final String? title;
|
|
final String? backLabel;
|
|
final Future<T> future;
|
|
final ExceptionContext? exceptionContext;
|
|
final Stream<double?> onProgressStream;
|
|
// #Pangea
|
|
final bool Function(Object)? showError;
|
|
final Object? Function(Object, StackTrace?)? onError;
|
|
final String? Function()? onSuccess;
|
|
final VoidCallback? onDismiss;
|
|
// Pangea#
|
|
|
|
const LoadingDialog({
|
|
super.key,
|
|
required this.future,
|
|
this.title,
|
|
this.backLabel,
|
|
this.exceptionContext,
|
|
required this.onProgressStream,
|
|
// #Pangea
|
|
this.showError,
|
|
this.onError,
|
|
this.onSuccess,
|
|
this.onDismiss,
|
|
// Pangea#
|
|
});
|
|
|
|
@override
|
|
LoadingDialogState<T> createState() => LoadingDialogState<T>();
|
|
}
|
|
|
|
class LoadingDialogState<T> extends State<LoadingDialog> {
|
|
Object? exception;
|
|
StackTrace? stackTrace;
|
|
// #Pangea
|
|
Object? _result;
|
|
String? _successMessage;
|
|
// Pangea#
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
// #Pangea
|
|
// widget.future.then(
|
|
// (result) => Navigator.of(context).pop<Result<T>>(Result.value(result)),
|
|
// onError: (e, s) => setState(() {
|
|
// exception = e;
|
|
// stackTrace = s;
|
|
// }),
|
|
// );
|
|
WidgetsBinding.instance.addPostFrameCallback(
|
|
(_) => widget.future.then(
|
|
(result) {
|
|
if (mounted && widget.onSuccess != null) {
|
|
_successMessage = widget.onSuccess!();
|
|
_result = result;
|
|
setState(() {});
|
|
} else if (mounted && Navigator.of(context).canPop()) {
|
|
Navigator.of(context).pop<Result<T>>(Result.value(result));
|
|
}
|
|
},
|
|
onError: (e, s) {
|
|
if (widget.showError != null && !widget.showError!(e)) {
|
|
if (mounted && Navigator.of(context).canPop()) {
|
|
Navigator.of(context).pop<Result<T>>(Result.error(e, s));
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (mounted) {
|
|
setState(() {
|
|
exception = widget.onError?.call(e, s) ?? e;
|
|
stackTrace = s;
|
|
});
|
|
}
|
|
},
|
|
),
|
|
);
|
|
// Pangea#
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
final exception = this.exception;
|
|
// #Pangea
|
|
// final titleLabel = exception != null
|
|
// ? exception.toLocalizedString(context, widget.exceptionContext)
|
|
// : widget.title ?? L10n.of(context).loadingPleaseWait;
|
|
final titleLabel = exception != null
|
|
? exception.toLocalizedString(context, widget.exceptionContext)
|
|
: _successMessage ?? widget.title ?? L10n.of(context).loadingPleaseWait;
|
|
// Pangea#
|
|
|
|
return AlertDialog.adaptive(
|
|
title: exception == null
|
|
? null
|
|
: Icon(
|
|
Icons.error_outline_outlined,
|
|
color: Theme.of(context).colorScheme.error,
|
|
size: 48,
|
|
),
|
|
content: ConstrainedBox(
|
|
constraints: const BoxConstraints(maxWidth: 256),
|
|
child: Row(
|
|
crossAxisAlignment: .center,
|
|
children: [
|
|
// #Pangea
|
|
// if (exception == null) ...[
|
|
if (exception == null && _successMessage == null) ...[
|
|
// Pangea#
|
|
StreamBuilder(
|
|
stream: widget.onProgressStream,
|
|
builder: (context, snapshot) =>
|
|
CircularProgressIndicator.adaptive(value: snapshot.data),
|
|
),
|
|
const SizedBox(width: 20),
|
|
],
|
|
Expanded(
|
|
child: Text(
|
|
titleLabel,
|
|
maxLines: 4,
|
|
// #Pangea
|
|
// textAlign: exception == null ? TextAlign.left : null,
|
|
textAlign: exception == null && _successMessage == null
|
|
? TextAlign.left
|
|
: null,
|
|
// Pangea#
|
|
overflow: TextOverflow.ellipsis,
|
|
),
|
|
),
|
|
],
|
|
),
|
|
),
|
|
// #Pangea
|
|
// actions: exception == null
|
|
// ? null
|
|
// : [
|
|
// AdaptiveDialogAction(
|
|
// onPressed: () => Navigator.of(
|
|
// context,
|
|
// ).pop<Result<T>>(Result.error(exception, stackTrace)),
|
|
// child: Text(widget.backLabel ?? L10n.of(context).close),
|
|
// ),
|
|
// ],
|
|
actions: _successMessage != null
|
|
? [
|
|
AdaptiveDialogAction(
|
|
onPressed: () => Navigator.of(
|
|
context,
|
|
).pop<Result<T>>(Result.value(_result as T)),
|
|
child: Text(L10n.of(context).close),
|
|
),
|
|
]
|
|
: exception == null
|
|
? widget.onDismiss != null
|
|
? [
|
|
AdaptiveDialogAction(
|
|
onPressed: () {
|
|
widget.onDismiss!();
|
|
Navigator.of(context).pop();
|
|
},
|
|
child: Text(L10n.of(context).cancel),
|
|
),
|
|
]
|
|
: null
|
|
: [
|
|
AdaptiveDialogAction(
|
|
onPressed: () => Navigator.of(
|
|
context,
|
|
).pop<Result<T>>(Result.error(exception, stackTrace)),
|
|
child: Text(widget.backLabel ?? L10n.of(context).close),
|
|
),
|
|
],
|
|
// Pangea#
|
|
);
|
|
}
|
|
}
|
|
|
|
extension DeprecatedApiAccessExtension<T> on Result<T> {
|
|
T? get result => asValue?.value;
|
|
|
|
Object? get error => asError?.error;
|
|
}
|