2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Switch to pub.dev version of matrix sdk

Browse source
This commit is contained in:
Christian Pauly 2021-06-18 10:29:48 +02:00
commit a055098105
88 changed files with 103 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/widgets/avatar.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/string_color.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';

2
lib/widgets/chat_settings_popup_menu.dart
View file

@ -2,7 +2,7 @@ import 'dart:async';
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/contacts_list.dart
View file

@ -1,6 +1,6 @@
import 'dart:async';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/widgets/avatar.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';

2
lib/widgets/content_banner.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:cached_network_image/cached_network_image.dart';

2
lib/widgets/encryption_button.dart
View file

@ -1,7 +1,7 @@
import 'dart:async';
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/event_content/audio_player.dart
View file

@ -2,7 +2,7 @@ import 'dart:async';
import 'dart:io';
import 'package:audioplayers/audioplayers.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/sentry_controller.dart';
import 'package:fluffychat/widgets/event_content/message_download_content.dart';

2
lib/widgets/event_content/html_message.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter_matrix_html/flutter_html.dart';
import 'package:flutter/material.dart';
import '../../utils/url_launcher.dart';

2
lib/widgets/event_content/image_bubble.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/image_viewer.dart';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';

2
lib/widgets/event_content/message.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/widgets/event_content/message_content.dart';
import 'package:fluffychat/widgets/event_content/reply_content.dart';
import 'package:fluffychat/config/themes.dart';

4
lib/widgets/event_content/message_content.dart
View file

@ -1,5 +1,5 @@
import 'package:famedlysdk/encryption/utils/key_verification.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/encryption/utils/key_verification.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/widgets/event_content/audio_player.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:fluffychat/widgets/event_content/image_bubble.dart';

2
lib/widgets/event_content/message_download_content.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart';

2
lib/widgets/event_content/message_reactions.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/fluffy_client.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/widgets/avatar.dart';

2
lib/widgets/event_content/reply_content.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/event_content/state_message.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/input_bar.dart
View file

@ -1,7 +1,7 @@
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:flutter/material.dart';
import 'package:flutter/foundation.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/services.dart';
import 'package:flutter_typeahead/flutter_typeahead.dart';
import 'package:cached_network_image/cached_network_image.dart';

2
lib/widgets/layouts/loading_view.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:vrouter/vrouter.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';

2
lib/widgets/layouts/wait_for_login.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import '../matrix.dart';

2
lib/widgets/list_items/chat_list_item.dart
View file

@ -1,6 +1,6 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/event_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';

2
lib/widgets/list_items/participant_list_item.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/list_items/permission_list_tile.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/list_items/public_room_list_item.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/list_items/user_device_list_item.dart
View file

@ -1,5 +1,5 @@
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/widgets/log_view.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
class LogViewer extends StatefulWidget {

6
lib/widgets/matrix.dart
View file

@ -3,8 +3,8 @@ import 'dart:io';
import 'dart:convert';
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:famedlysdk/encryption.dart';
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/encryption.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions.dart/matrix_locals.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:fluffychat/utils/sentry_controller.dart';
@ -429,7 +429,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
onBlurSub?.cancel();
_backgroundPush?.onLogin?.cancel();
linuxNotifications.close();
linuxNotifications?.close();
super.dispose();
}

2
lib/widgets/unread_badge_back_button.dart
View file

@ -1,4 +1,4 @@
import 'package:famedlysdk/famedlysdk.dart';
import 'package:matrix/matrix.dart';
import 'package:flutter/material.dart';
import '../config/app_config.dart';