* build: Update snapcraft * build: Follow up snapcraft build * build: Install flutter via git in snapcraft * chore: Follow up typo * fix: Request notification permissions on iOS before getToken * chore: Follow up request iOS permissions * Revert "chore: Follow up request iOS permissions" This reverts commit2625e89a33. * chore: Combine mimetype types in send file dialog logic * build: Update flutter to 3.29.0 * Translated using Weblate (Basque) Currently translated at 99.8% (758 of 759 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Revert "build: Update flutter to 3.29.0" * fix: Crash in settings when using MAS * build: Fix build tailwindcss for website * feat: Navigate in image viewer with keyboard keys * chore: Nicer colors for reactions * chore: Better error handling for image rendering * Translated using Weblate (Latvian) Currently translated at 100.0% (759 of 759 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * fix: Index of numbered lists are off * fix(macos): update dependencies to make the build work This commit was generated mostly by running `flutter run -d macos` and then `pod update` in the `macos/` directory after that failed. * fix: never use a transition on the shell route Changing the PageBuilder here based on a MediaQuery causes the child to briefly be rendered twice with the same GlobalKey, blowing up the rendering. I believe this fixes https://github.com/krille-chan/fluffychat/issues/1534. * feat: New video file picker button * feat: Send optional message with images or files * chore: Follow up send file dialog design * chore: Follow up paddings in room input row * chore: Follow up paddings * chore: Follow up paddings * chore: Follow up input row * Translated using Weblate (Italian) Currently translated at 99.6% (756 of 759 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/it/ * Translated using Weblate (Latvian) Currently translated at 100.0% (759 of 759 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Estonian) Currently translated at 100.0% (762 of 762 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (762 of 762 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * chore: Follow up gallery picker * chore: Better no compression supported UX * fix: prevent users from creating spaces with empty names * fix: update condition in account deletion function to allow deletion to go through * Translated using Weblate (Latvian) Currently translated at 100.0% (762 of 762 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Estonian) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Basque) Currently translated at 99.8% (762 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Galician) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Latvian) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Basque) Currently translated at 99.8% (762 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/eu/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * Translated using Weblate (Korean) Currently translated at 96.4% (736 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ko/ * Translated using Weblate (Irish) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (Filipino) Currently translated at 25.8% (197 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fil/ * Translated using Weblate (Polish) Currently translated at 98.4% (751 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/pl/ * Translated using Weblate (Polish) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/pl/ * fix: Remove too sensitive dismiss gesture on chat list items * fix: Add missing <s> html tag to render * Translated using Weblate (Dutch) Currently translated at 81.6% (623 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * refactor: Remove custom font and emoji font workaround * build: Add android namespace * build: Update kotlin gradle plugin * Revert "build: Update kotlin gradle plugin" * feat: Add advanced configuration page * refactor: Improved UX for room upgrades * Translated using Weblate (French) Currently translated at 86.3% (659 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/fr/ * Translated using Weblate (Dutch) Currently translated at 82.0% (626 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 88.8% (678 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hant/ * Translated using Weblate (Dutch) Currently translated at 83.3% (636 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Translated using Weblate (German) Currently translated at 93.9% (717 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (German) Currently translated at 93.9% (717 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (German) Currently translated at 93.9% (717 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (German) Currently translated at 95.6% (730 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (Dutch) Currently translated at 94.4% (721 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Translated using Weblate (Spanish) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (763 of 763 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * Translated using Weblate (Spanish) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/es/ * Translated using Weblate (Polish) Currently translated at 99.8% (763 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/pl/ * Translated using Weblate (Ukrainian) Currently translated at 93.3% (713 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * chore: divider when scrolled up * refactor: Easier shift enter logic for text input * Translated using Weblate (Irish) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (Latvian) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Estonian) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Ukrainian) Currently translated at 94.8% (725 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * build: Downgrade packages and move to fixed flutter typeahead fork * chore: Use other join endpoint for room upgrades * chore: disable echoCancel for audio messages * chore: Simpler changing config variables Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up config editor Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Make push gateway configurable Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up code formatting * build: Update flutter 3.29.2 Signed-off-by: Krille <c.kussowski@famedly.com> * Revert "chore: Follow up code formatting" This reverts commit0f000f952f. * Revert "build: Update flutter 3.29.2" This reverts commitbfd23952b7. * refactor: Formatting * build: Update matrix dart sdk Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up update matrix dart sdk Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up formatting Signed-off-by: Krille <c.kussowski@famedly.com> * build: Update openssl to 0.5.0 Signed-off-by: Krille <c.kussowski@famedly.com> * build: Update gorouter package Signed-off-by: Krille <c.kussowski@famedly.com> * build: Update to flutter 3.29.2 Signed-off-by: Krille <c.kussowski@famedly.com> * Translated using Weblate (Dutch) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Added translation using Weblate (Telugu) * Translated using Weblate (Dutch) Currently translated at 100.0% (764 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Translated using Weblate (Telugu) Currently translated at 0.5% (4 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/te/ * Translated using Weblate (German) Currently translated at 96.5% (738 of 764 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/de/ * Translated using Weblate (Estonian) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/et/ * Translated using Weblate (Irish) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ga/ * Translated using Weblate (Chinese (Simplified Han script)) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hans/ * Translated using Weblate (Galician) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/gl/ * Translated using Weblate (Dutch) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Translated using Weblate (Latvian) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Latvian) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/lv/ * Translated using Weblate (Ukrainian) Currently translated at 95.9% (734 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/uk/ * Translated using Weblate (Indonesian) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/id/ * fix: Consistent element padding between server picker and login view * refactor: Migrate more config options to config viewer Signed-off-by: Krille <c.kussowski@famedly.com> * refactor: Reuse unused kotlin imports Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Update pubspec.lock Signed-off-by: Krille <c.kussowski@famedly.com> * Revert "build: Install flutter via git in snapcraft" This reverts commitcd12f773fe. * chore: Update locale config for localizations Signed-off-by: Krille <c.kussowski@famedly.com> * build: Add libpciaccess0 package to snap Signed-off-by: Krille <c.kussowski@famedly.com> * Translated using Weblate (Dutch) Currently translated at 100.0% (765 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/nl/ * Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 93.3% (714 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hant/ * Translated using Weblate (Russian) Currently translated at 95.6% (732 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/ru/ * chore: upgrade chewie and video_player packages This bumps the minimum Flutter version to 3.27. I think this is not an issue, sincee93fdebe20upgraded to 3.29.2 already. * fix: properly dispose VideoPlayerController This ensures that a playing video stops playing when we navigate away from the chat. I also reorganized the code a little. * feat: support inline video playback on macOS It turns out that video_player supports macOS, so we can simply enable it. * feat: clearly mark when a video is to be downloaded This shows a download icon instead of the play icon on top of the video if the video player isn't supported. * Translated using Weblate (Chinese (Traditional Han script)) Currently translated at 93.7% (717 of 765 strings) Translation: FluffyChat/Translations Translate-URL: https://hosted.weblate.org/projects/fluffychat/translations/zh_Hant/ * build: Add libpciaccess0 for snapcraft * build: Add libpciaccess-dev for snapcraft * build: use singleInstance as launchmode * fix: Null error in ClientChooserButton * chore: Improve avatar designg Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up new room design Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Correct availability of desktop builds * refactor: Replace user bottom sheet with menu and small dialog Signed-off-by: Krille <c.kussowski@famedly.com> * refactor: Replace user bottom sheet with menu and small dialog Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up dialog themes Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up dialog themes Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up dialog themes Signed-off-by: Krille <c.kussowski@famedly.com> * build: Update matrix dart sdk to 0.39.0 Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up user dialog theme * chore: Use Cupertino Activity Indicator in ChatEventList * chore: Follow up permissions slider dialog Signed-off-by: Krille <c.kussowski@famedly.com> * refactor: Implement avatar image viewer and adjust design Signed-off-by: Krille <c.kussowski@famedly.com> * feat: Filter for room members page and easier approve knocking users Signed-off-by: Krille <c.kussowski@famedly.com> * refactor: Move public room bottom sheet into dialog Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up public rooms dialog Signed-off-by: Krille <c.kussowski@famedly.com> * fix: Text scale factor in Linkify widgets Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Add matrix notifications for issues Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up matrix notification Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up matrix notification Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up matrix notification Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up matrix notification Signed-off-by: Krille <c.kussowski@famedly.com> * android updates * chore: update fetching of chat details display setting in message overlay positioner * fluffychat merge * build: Flutter 3.29.3 Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Nicer scaffold dialog for column mode Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up scaffold dialog Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up members list * chore: Follow up message design * chore: Follow up message design * chore: Follow up file message design Signed-off-by: Krille <c.kussowski@famedly.com> * build: Bump version to 1.26.0 Signed-off-by: Krille <c.kussowski@famedly.com> * chore: Follow up message design * build: Use 0.1.0 fcm_shared_isolate on ios Signed-off-by: Krille <c.kussowski@famedly.com> * chore: disable matrix notification github action * fix import error * make overlay message padding match message bubble padding --------- Signed-off-by: Krille <c.kussowski@famedly.com> Co-authored-by: Krille-chan <christian-kussowski@posteo.de> Co-authored-by: Krille <c.kussowski@famedly.com> Co-authored-by: xabirequejo <xabi.rn@gmail.com> Co-authored-by: Edgars Andersons <Edgars+Weblate@gaitenis.id.lv> Co-authored-by: Rafał Hirsch <rafal@hirsch.net> Co-authored-by: Angelo Schirinzi <Odi-3@users.noreply.hosted.weblate.org> Co-authored-by: Priit Jõerüüt <hwlate@joeruut.com> Co-authored-by: Poesty Li <poesty7450@gmail.com> Co-authored-by: josé m <correoxm@disroot.org> Co-authored-by: 大王叫我来巡山 <hamburger2048@users.noreply.hosted.weblate.org> Co-authored-by: Linerly <linerly@proton.me> Co-authored-by: kdh8219 <kdh8219@monamo.dev> Co-authored-by: Aindriú Mac Giolla Eoin <aindriu80@gmail.com> Co-authored-by: searinminecraft <kitakita@disroot.org> Co-authored-by: Piotr Orzechowski <piotr@orzechowski.tech> Co-authored-by: Jelv <post@jelv.nl> Co-authored-by: Antonin Del Fabbro <message@antonin.one> Co-authored-by: Mare JP <seraphmare@gmail.com> Co-authored-by: nautilusx <translate@disroot.org> Co-authored-by: Very Able <veryable@proton.me> Co-authored-by: Kimby <kimisaes@naver.com> Co-authored-by: José Muñoz <dr.cabra@disroot.org> Co-authored-by: Ihor Hordiichuk <igor_ck@outlook.com> Co-authored-by: katakam chakri <katakam.chakri@gmail.com> Co-authored-by: ℂ𝕠𝕠𝕠𝕝 (𝕘𝕚𝕥𝕙𝕦𝕓.𝕔𝕠𝕞/ℂ𝕠𝕠𝕠𝕝) <coool@mail.lv> Co-authored-by: xegim <ja3lpark@gmail.com> Co-authored-by: miullu <satou.ide@gmail.com> Co-authored-by: Yurt Page <yurtpage@gmail.com> Co-authored-by: Lenni <87639068+Lenni-builder@users.noreply.github.com>
253 lines
7.2 KiB
Dart
253 lines
7.2 KiB
Dart
import 'dart:async';
|
|
|
|
import 'package:flutter/material.dart';
|
|
|
|
import 'package:async/async.dart';
|
|
import 'package:flutter_gen/gen_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,
|
|
required Future<T> Function() future,
|
|
String? title,
|
|
String? backLabel,
|
|
bool barrierDismissible = false,
|
|
bool delay = true,
|
|
ExceptionContext? exceptionContext,
|
|
bool ignoreError = false,
|
|
// #Pangea
|
|
String? Function(Object, StackTrace?)? onError,
|
|
String? Function()? onSuccess,
|
|
VoidCallback? onDismiss,
|
|
// Pangea#
|
|
}) async {
|
|
final futureExec = 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--;
|
|
}
|
|
}
|
|
|
|
// #Pangea
|
|
if (context.mounted) {
|
|
// Pangea#
|
|
final result = await showAdaptiveDialog<Result<T>>(
|
|
context: context,
|
|
barrierDismissible: barrierDismissible,
|
|
builder: (BuildContext context) => LoadingDialog<T>(
|
|
future: futureExec,
|
|
title: title,
|
|
backLabel: backLabel,
|
|
exceptionContext: exceptionContext,
|
|
// #Pangea
|
|
onError: onError,
|
|
onDismiss: onDismiss,
|
|
onSuccess: onSuccess,
|
|
// Pangea#
|
|
),
|
|
);
|
|
return result ??
|
|
Result.error(
|
|
Exception('FutureDialog canceled'),
|
|
StackTrace.current,
|
|
);
|
|
}
|
|
|
|
// #Pangea
|
|
return Result.error(
|
|
Exception('FutureDialog canceled'),
|
|
StackTrace.current,
|
|
);
|
|
// Pangea#
|
|
}
|
|
|
|
class LoadingDialog<T> extends StatefulWidget {
|
|
final String? title;
|
|
final String? backLabel;
|
|
final Future<T> future;
|
|
final ExceptionContext? exceptionContext;
|
|
// #Pangea
|
|
final String? 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,
|
|
// #Pangea
|
|
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 (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: CrossAxisAlignment.center,
|
|
children: [
|
|
// #Pangea
|
|
// if (exception == null) ...[
|
|
if (exception == null && _successMessage == null) ...[
|
|
// Pangea#
|
|
const CircularProgressIndicator.adaptive(),
|
|
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;
|
|
}
|