GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-04-27 04:47:51 +02:00
Code Issues Projects Releases Wiki Activity

feat: Implement Snack instead of BotToast

Browse Source
This commit is contained in:
Christian Pauly 2020-10-04 12:54:43 +02:00
parent 2f8491b41b
commit 32d5fdd0eb
13 changed files with 61 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/components/dialogs/simple_dialogs.dart
View File

@ -1,4 +1,5 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -169,10 +170,10 @@ class SimpleDialogs {
onAdditionalAuth != null) {
return await tryRequestWithErrorToast(onAdditionalAuth(exception));
} else {
BotToast.showText(text: exception.errorMessage);
await Flushbar(message: exception.errorMessage).show(context);
}
} catch (exception) {
BotToast.showText(text: exception.toString());
await Flushbar(message: exception.toString()).show(context);
return false;
}
}

9
lib/components/encryption_button.dart
View File

@ -1,6 +1,7 @@
import 'dart:async';
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/utils/app_route.dart';
import 'package:fluffychat/views/chat_encryption_settings.dart';
@ -22,7 +23,8 @@ class _EncryptionButtonState extends State<EncryptionButton> {
void _enableEncryptionAction() async {
if (widget.room.encrypted) {
BotToast.showText(text: L10n.of(context).warningEncryptionInBeta);
await Flushbar(message: L10n.of(context).warningEncryptionInBeta)
.show(context);
await Navigator.of(context).push(
AppRoute.defaultRoute(
context,
@ -32,7 +34,8 @@ class _EncryptionButtonState extends State<EncryptionButton> {
return;
}
if (!widget.room.client.encryptionEnabled) {
BotToast.showText(text: L10n.of(context).needPantalaimonWarning);
await Flushbar(message: L10n.of(context).needPantalaimonWarning)
.show(context);
return;
}
if (await SimpleDialogs(context).askConfirmation(

6
lib/components/list_items/chat_list_item.dart
View File

@ -1,4 +1,5 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/utils/matrix_locals.dart';
import 'package:fluffychat/views/chat.dart';
@ -41,7 +42,8 @@ class ChatListItem extends StatelessWidget {
}
if (room.membership == Membership.ban) {
BotToast.showText(text: L10n.of(context).youHaveBeenBannedFromThisChat);
await Flushbar(message: L10n.of(context).youHaveBeenBannedFromThisChat)
.show(context);
return;
}

3
lib/main.dart
View File

@ -1,7 +1,6 @@
import 'dart:async';
import 'dart:io';
import 'package:bot_toast/bot_toast.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/views/homeserver_picker.dart';
import 'package:flutter/foundation.dart';
@ -51,8 +50,6 @@ class App extends StatelessWidget {
child: Builder(
builder: (BuildContext context) => MaterialApp(
title: 'FluffyChat',
builder: BotToastInit(),
navigatorObservers: [BotToastNavigatorObserver()],
theme: ThemeSwitcherWidget.of(context).themeData,
localizationsDelegates: L10n.localizationsDelegates,
supportedLocales: L10n.supportedLocales,

11
lib/utils/firebase_controller.dart
View File

@ -1,7 +1,8 @@
import 'dart:convert';
import 'dart:io';
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:fluffychat/components/matrix.dart';
@ -46,10 +47,10 @@ abstract class FirebaseController {
await matrix.store.getItem('chat.fluffy.show_no_google');
final configOptionMissing = storeItem == null || storeItem.isEmpty;
if (configOptionMissing || (!configOptionMissing && storeItem == '1')) {
BotToast.showText(
text: L10n.of(context).noGoogleServicesWarning,
await Flushbar(
message: L10n.of(context).noGoogleServicesWarning,
duration: Duration(seconds: 15),
);
).show(context);
if (configOptionMissing) {
await matrix.store.setItem('chat.fluffy.show_no_google', '0');
}
@ -120,7 +121,7 @@ abstract class FirebaseController {
),
(r) => r.isFirst);
} catch (_) {
BotToast.showText(text: 'Failed to open chat...');
await Flushbar(message: 'Failed to open chat...').show(context);
debugPrint(_);
}
};

6
lib/utils/sentry_controller.dart
View File

@ -1,4 +1,5 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:fluffychat/components/dialogs/simple_dialogs.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
@ -15,7 +16,8 @@ abstract class SentryController {
);
await storage.ready;
await storage.setItem('sentry', enableSentry);
BotToast.showText(text: L10n.of(context).changesHaveBeenSaved);
await Flushbar(message: L10n.of(context).changesHaveBeenSaved)
.show(context);
return;
}

17
lib/views/chat_details.dart
View File

@ -1,4 +1,5 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:famedlysdk/matrix_api.dart';
import 'package:fluffychat/components/adaptive_page_layout.dart';
@ -46,7 +47,8 @@ class _ChatDetailsState extends State<ChatDetails> {
widget.room.setName(displayname),
);
if (success != false) {
BotToast.showText(text: L10n.of(context).displaynameHasBeenChanged);
await Flushbar(message: L10n.of(context).displaynameHasBeenChanged)
.show(context);
}
}
@ -99,7 +101,8 @@ class _ChatDetailsState extends State<ChatDetails> {
widget.room.setDescription(displayname),
);
if (success != false) {
BotToast.showText(text: L10n.of(context).groupDescriptionHasBeenChanged);
await Flushbar(message: L10n.of(context).groupDescriptionHasBeenChanged)
.show(context);
}
}
@ -119,7 +122,8 @@ class _ChatDetailsState extends State<ChatDetails> {
),
);
if (success != false) {
BotToast.showText(text: L10n.of(context).avatarHasBeenChanged);
await Flushbar(message: L10n.of(context).avatarHasBeenChanged)
.show(context);
}
}
@ -170,8 +174,9 @@ class _ChatDetailsState extends State<ChatDetails> {
Clipboard.setData(
ClipboardData(text: widget.room.canonicalAlias),
);
BotToast.showText(
text: L10n.of(context).copiedToClipboard);
Flushbar(
message: L10n.of(context).copiedToClipboard)
.show(context);
},
),
ChatSettingsPopupMenu(widget.room, false)

6
lib/views/invitation_selection.dart
View File

@ -1,6 +1,7 @@
import 'dart:async';
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:famedlysdk/matrix_api.dart';
import 'package:fluffychat/components/adaptive_page_layout.dart';
@ -60,7 +61,8 @@ class _InvitationSelectionState extends State<InvitationSelection> {
widget.room.invite(id),
);
if (success != false) {
BotToast.showText(text: L10n.of(context).contactHasBeenInvitedToTheGroup);
await Flushbar(message: L10n.of(context).contactHasBeenInvitedToTheGroup)
.show(context);
}
}

6
lib/views/settings.dart
View File

@ -1,6 +1,7 @@
import 'dart:io';
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/components/settings_themes.dart';
import 'package:fluffychat/config/app_config.dart';
@ -72,7 +73,8 @@ class _SettingsState extends State<Settings> {
.client
.changePassword(newPassword, oldPassword: oldPassword),
);
BotToast.showText(text: L10n.of(context).passwordHasBeenChanged);
await Flushbar(message: L10n.of(context).passwordHasBeenChanged)
.show(context);
}
void _deleteAccountAction(BuildContext context) async {

6
lib/views/settings_emotes.dart
View File

@ -1,4 +1,5 @@
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:cached_network_image/cached_network_image.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:flutter/foundation.dart';
@ -447,7 +448,8 @@ class _EmoteImagePickerState extends State<_EmoteImagePicker> {
),
onPressed: () async {
if (kIsWeb) {
BotToast.showText(text: L10n.of(context).notSupportedInWeb);
await Flushbar(message: L10n.of(context).notSupportedInWeb)
.show(context);
return;
}
var file = await MemoryFilePicker.getImage(

9
lib/views/sign_up_password.dart
View File

@ -1,6 +1,7 @@
import 'dart:math';
import 'package:bot_toast/bot_toast.dart';
import 'package:flushbar/flushbar.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:fluffychat/components/matrix.dart';
import 'package:fluffychat/utils/app_route.dart';
@ -95,7 +96,8 @@ class _SignUpPasswordState extends State<SignUpPassword> {
await matrix.client
.setDisplayname(matrix.client.userID, widget.displayname);
} catch (exception) {
BotToast.showText(text: L10n.of(context).couldNotSetDisplayname);
await Flushbar(message: L10n.of(context).couldNotSetDisplayname)
.show(context);
}
if (widget.avatar != null) {
try {
@ -106,7 +108,8 @@ class _SignUpPasswordState extends State<SignUpPassword> {
),
);
} catch (exception) {
BotToast.showText(text: L10n.of(context).couldNotSetAvatar);
await Flushbar(message: L10n.of(context).couldNotSetAvatar)
.show(context);
}
}
await Navigator.of(context).pushAndRemoveUntil(

14
pubspec.lock
View File

@ -64,13 +64,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.0-nullsafety.1"
bot_toast:
dependency: "direct main"
description:
name: bot_toast
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.4"
cached_network_image:
dependency: "direct main"
description:
@ -248,6 +241,13 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "7.0.2"
flushbar:
dependency: "direct main"
description:
name: flushbar
url: "https://pub.dartlang.org"
source: hosted
version: "1.10.4"
flutter:
dependency: "direct main"
description: flutter

2
pubspec.yaml
View File

@ -49,7 +49,7 @@ dependencies:
flutter_sound: ^2.1.1
open_file: ^3.0.1
mime_type: ^0.3.0
bot_toast: ^3.0.0
flushbar: ^1.10.4
flutter_matrix_html: ^0.1.5
moor: ^3.3.1
sqlite3_flutter_libs: ^0.2.0