From 938d1d054c90d4d59a1374f6dcdcee842fe233ab Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Fri, 18 Jun 2021 10:29:48 +0200 Subject: [PATCH] refactor: Switch to pub.dev version of matrix sdk --- lib/main.dart | 2 +- lib/pages/archive.dart | 2 +- lib/pages/bootstrap_dialog.dart | 6 +++--- lib/pages/chat.dart | 2 +- lib/pages/chat_details.dart | 2 +- lib/pages/chat_encryption_settings.dart | 4 ++-- lib/pages/chat_list.dart | 2 +- lib/pages/chat_permissions_settings.dart | 2 +- lib/pages/device_settings.dart | 4 ++-- lib/pages/homeserver_picker.dart | 2 +- lib/pages/image_viewer.dart | 2 +- lib/pages/invitation_selection.dart | 2 +- lib/pages/key_verification_dialog.dart | 4 ++-- lib/pages/login.dart | 2 +- lib/pages/new_group.dart | 2 +- lib/pages/new_private_chat.dart | 2 +- lib/pages/search.dart | 2 +- lib/pages/send_file_dialog.dart | 2 +- lib/pages/settings.dart | 2 +- lib/pages/settings_3pid.dart | 2 +- lib/pages/settings_emotes.dart | 2 +- lib/pages/settings_notifications.dart | 2 +- lib/pages/user_bottom_sheet.dart | 2 +- lib/pages/views/archive_view.dart | 2 +- lib/pages/views/chat_details_view.dart | 2 +- .../views/chat_encryption_settings_view.dart | 2 +- lib/pages/views/chat_list_view.dart | 2 +- .../views/chat_permissions_settings_view.dart | 2 +- lib/pages/views/chat_view.dart | 2 +- lib/pages/views/homeserver_picker_view.dart | 2 +- lib/pages/views/invitation_selection_view.dart | 2 +- lib/pages/views/new_private_chat_view.dart | 2 +- lib/pages/views/search_view.dart | 2 +- lib/pages/views/settings_3pid_view.dart | 2 +- lib/pages/views/settings_emotes_view.dart | 2 +- lib/pages/views/settings_ignore_list_view.dart | 2 +- .../views/settings_multiple_emotes_view.dart | 2 +- lib/pages/views/settings_notifications_view.dart | 2 +- lib/pages/views/settings_view.dart | 2 +- lib/pages/views/user_bottom_sheet_view.dart | 2 +- lib/utils/background_push.dart | 2 +- .../flutter_famedly_sdk_hive_database.dart | 2 +- lib/utils/database/mobile.dart | 2 +- lib/utils/database/unsupported.dart | 2 +- lib/utils/database/web.dart | 2 +- lib/utils/famedlysdk_store.dart | 2 +- lib/utils/localized_exception_extension.dart | 2 +- .../client_presence_extension.dart | 2 +- .../device_extension.dart | 2 +- .../event_extension.dart | 2 +- .../filtered_timeline_extension.dart | 2 +- .../fluffy_client.dart | 4 ++-- .../matrix_file_extension.dart | 2 +- .../matrix_locals.dart | 2 +- .../presence_extension.dart | 2 +- lib/utils/resize_image.dart | 2 +- lib/utils/room_send_file_extension.dart | 2 +- lib/utils/room_status_extension.dart | 2 +- lib/utils/sentry_controller.dart | 2 +- lib/utils/url_launcher.dart | 2 +- lib/widgets/avatar.dart | 2 +- lib/widgets/chat_settings_popup_menu.dart | 2 +- lib/widgets/contacts_list.dart | 2 +- lib/widgets/content_banner.dart | 2 +- lib/widgets/encryption_button.dart | 2 +- lib/widgets/event_content/audio_player.dart | 2 +- lib/widgets/event_content/html_message.dart | 2 +- lib/widgets/event_content/image_bubble.dart | 2 +- lib/widgets/event_content/message.dart | 2 +- lib/widgets/event_content/message_content.dart | 4 ++-- .../event_content/message_download_content.dart | 2 +- lib/widgets/event_content/message_reactions.dart | 2 +- lib/widgets/event_content/reply_content.dart | 2 +- lib/widgets/event_content/state_message.dart | 2 +- lib/widgets/input_bar.dart | 2 +- lib/widgets/layouts/loading_view.dart | 2 +- lib/widgets/layouts/wait_for_login.dart | 2 +- lib/widgets/list_items/chat_list_item.dart | 2 +- .../list_items/participant_list_item.dart | 2 +- lib/widgets/list_items/permission_list_tile.dart | 2 +- .../list_items/public_room_list_item.dart | 2 +- .../list_items/user_device_list_item.dart | 2 +- lib/widgets/log_view.dart | 2 +- lib/widgets/matrix.dart | 6 +++--- lib/widgets/unread_badge_back_button.dart | 2 +- pubspec.lock | 16 +++++++--------- pubspec.yaml | 5 +---- test/utils/test_client.dart | 2 +- 88 files changed, 103 insertions(+), 108 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index d2a8d01d..315f1ddc 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:adaptive_theme/adaptive_theme.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/routes.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/utils/sentry_controller.dart'; diff --git a/lib/pages/archive.dart b/lib/pages/archive.dart index c0a35db3..f9ec56dc 100644 --- a/lib/pages/archive.dart +++ b/lib/pages/archive.dart @@ -1,5 +1,5 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/views/archive_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/bootstrap_dialog.dart b/lib/pages/bootstrap_dialog.dart index 794cec92..6022dae3 100644 --- a/lib/pages/bootstrap_dialog.dart +++ b/lib/pages/bootstrap_dialog.dart @@ -1,7 +1,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/encryption.dart'; -import 'package:famedlysdk/encryption/utils/bootstrap.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/encryption.dart'; +import 'package:matrix/encryption/utils/bootstrap.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/adaptive_flat_button.dart'; import 'package:flutter/services.dart'; import 'package:fluffychat/utils/platform_infos.dart'; diff --git a/lib/pages/chat.dart b/lib/pages/chat.dart index 4aee61a8..ccc9814c 100644 --- a/lib/pages/chat.dart +++ b/lib/pages/chat.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/pages/views/chat_view.dart'; diff --git a/lib/pages/chat_details.dart b/lib/pages/chat_details.dart index 0adda97c..448ca27c 100644 --- a/lib/pages/chat_details.dart +++ b/lib/pages/chat_details.dart @@ -1,6 +1,6 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; import 'package:fluffychat/pages/views/chat_details_view.dart'; diff --git a/lib/pages/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings.dart index 282cc49f..cfb89edd 100644 --- a/lib/pages/chat_encryption_settings.dart +++ b/lib/pages/chat_encryption_settings.dart @@ -1,5 +1,5 @@ -import 'package:famedlysdk/encryption.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/encryption.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/views/chat_encryption_settings_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/chat_list.dart b/lib/pages/chat_list.dart index a4427e7b..a2034dd3 100644 --- a/lib/pages/chat_list.dart +++ b/lib/pages/chat_list.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/pages/views/chat_list_view.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/pages/chat_permissions_settings.dart b/lib/pages/chat_permissions_settings.dart index 019e475d..81bf666d 100644 --- a/lib/pages/chat_permissions_settings.dart +++ b/lib/pages/chat_permissions_settings.dart @@ -9,7 +9,7 @@ import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; class ChatPermissionsSettings extends StatefulWidget { diff --git a/lib/pages/device_settings.dart b/lib/pages/device_settings.dart index 2c0f7702..735aedb3 100644 --- a/lib/pages/device_settings.dart +++ b/lib/pages/device_settings.dart @@ -1,6 +1,6 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -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/pages/views/device_settings_view.dart'; import 'package:fluffychat/pages/key_verification_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/pages/homeserver_picker.dart b/lib/pages/homeserver_picker.dart index 4e288222..650c7e24 100644 --- a/lib/pages/homeserver_picker.dart +++ b/lib/pages/homeserver_picker.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/views/homeserver_picker_view.dart'; import 'package:fluffychat/utils/famedlysdk_store.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/image_viewer.dart b/lib/pages/image_viewer.dart index 20fba498..b62bab0f 100644 --- a/lib/pages/image_viewer.dart +++ b/lib/pages/image_viewer.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:fluffychat/pages/views/image_viewer_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/invitation_selection.dart b/lib/pages/invitation_selection.dart index f76b5740..266ac40b 100644 --- a/lib/pages/invitation_selection.dart +++ b/lib/pages/invitation_selection.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/views/invitation_selection_view.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/key_verification_dialog.dart b/lib/pages/key_verification_dialog.dart index 64fd8c3d..56360393 100644 --- a/lib/pages/key_verification_dialog.dart +++ b/lib/pages/key_verification_dialog.dart @@ -1,6 +1,6 @@ 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/platform_infos.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/login.dart b/lib/pages/login.dart index 067b50a4..b8024b88 100644 --- a/lib/pages/login.dart +++ b/lib/pages/login.dart @@ -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:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/new_group.dart b/lib/pages/new_group.dart index 02c1927d..fbf5cbf1 100644 --- a/lib/pages/new_group.dart +++ b/lib/pages/new_group.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart' as sdk; +import 'package:matrix/matrix.dart' as sdk; import 'package:fluffychat/pages/views/new_group_view.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/new_private_chat.dart b/lib/pages/new_private_chat.dart index 1421f00e..36323bef 100644 --- a/lib/pages/new_private_chat.dart +++ b/lib/pages/new_private_chat.dart @@ -1,6 +1,6 @@ import 'dart:async'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:fluffychat/pages/views/new_private_chat_view.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/pages/search.dart b/lib/pages/search.dart index f1a70f06..dfc442ff 100644 --- a/lib/pages/search.dart +++ b/lib/pages/search.dart @@ -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:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/pages/send_file_dialog.dart b/lib/pages/send_file_dialog.dart index d2b87e5d..8449a7d4 100644 --- a/lib/pages/send_file_dialog.dart +++ b/lib/pages/send_file_dialog.dart @@ -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'; diff --git a/lib/pages/settings.dart b/lib/pages/settings.dart index dcd3eb2f..5dad1bbb 100644 --- a/lib/pages/settings.dart +++ b/lib/pages/settings.dart @@ -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:file_picker_cross/file_picker_cross.dart'; import 'package:fluffychat/config/app_config.dart'; diff --git a/lib/pages/settings_3pid.dart b/lib/pages/settings_3pid.dart index 214227b6..4fc34050 100644 --- a/lib/pages/settings_3pid.dart +++ b/lib/pages/settings_3pid.dart @@ -1,5 +1,5 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/settings_emotes.dart b/lib/pages/settings_emotes.dart index 0f8c568c..7824e262 100644 --- a/lib/pages/settings_emotes.dart +++ b/lib/pages/settings_emotes.dart @@ -1,6 +1,6 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/pages/settings_notifications.dart b/lib/pages/settings_notifications.dart index 85eb4f2d..21979142 100644 --- a/lib/pages/settings_notifications.dart +++ b/lib/pages/settings_notifications.dart @@ -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:fluffychat/config/app_config.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/user_bottom_sheet.dart b/lib/pages/user_bottom_sheet.dart index 41b93417..de742975 100644 --- a/lib/pages/user_bottom_sheet.dart +++ b/lib/pages/user_bottom_sheet.dart @@ -1,6 +1,6 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/permission_slider_dialog.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/pages/views/archive_view.dart b/lib/pages/views/archive_view.dart index a9d42164..a430699e 100644 --- a/lib/pages/views/archive_view.dart +++ b/lib/pages/views/archive_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/archive.dart'; import 'package:fluffychat/widgets/list_items/chat_list_item.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/views/chat_details_view.dart b/lib/pages/views/chat_details_view.dart index a95a333a..abcdc354 100644 --- a/lib/pages/views/chat_details_view.dart +++ b/lib/pages/views/chat_details_view.dart @@ -4,7 +4,7 @@ import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; import 'package:fluffychat/widgets/content_banner.dart'; diff --git a/lib/pages/views/chat_encryption_settings_view.dart b/lib/pages/views/chat_encryption_settings_view.dart index 4c8172fb..1d428290 100644 --- a/lib/pages/views/chat_encryption_settings_view.dart +++ b/lib/pages/views/chat_encryption_settings_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/chat_encryption_settings.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/views/chat_list_view.dart b/lib/pages/views/chat_list_view.dart index c8cc5e3f..c906e1c6 100644 --- a/lib/pages/views/chat_list_view.dart +++ b/lib/pages/views/chat_list_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/chat_list.dart'; import 'package:fluffychat/widgets/connection_status_header.dart'; import 'package:fluffychat/widgets/list_items/chat_list_item.dart'; diff --git a/lib/pages/views/chat_permissions_settings_view.dart b/lib/pages/views/chat_permissions_settings_view.dart index 8a8953a0..4cd498a2 100644 --- a/lib/pages/views/chat_permissions_settings_view.dart +++ b/lib/pages/views/chat_permissions_settings_view.dart @@ -5,7 +5,7 @@ import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; class ChatPermissionsSettingsView extends StatelessWidget { diff --git a/lib/pages/views/chat_view.dart b/lib/pages/views/chat_view.dart index 49153f79..a1544f44 100644 --- a/lib/pages/views/chat_view.dart +++ b/lib/pages/views/chat_view.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/chat.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; diff --git a/lib/pages/views/homeserver_picker_view.dart b/lib/pages/views/homeserver_picker_view.dart index 59af6fce..82bae657 100644 --- a/lib/pages/views/homeserver_picker_view.dart +++ b/lib/pages/views/homeserver_picker_view.dart @@ -15,7 +15,7 @@ import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; import '../../utils/localized_exception_extension.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; class HomeserverPickerView extends StatelessWidget { final HomeserverPickerController controller; diff --git a/lib/pages/views/invitation_selection_view.dart b/lib/pages/views/invitation_selection_view.dart index c03a551b..c51796b5 100644 --- a/lib/pages/views/invitation_selection_view.dart +++ b/lib/pages/views/invitation_selection_view.dart @@ -1,7 +1,7 @@ import 'package:fluffychat/pages/invitation_selection.dart'; import 'package:fluffychat/widgets/default_app_bar_search_field.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/views/new_private_chat_view.dart b/lib/pages/views/new_private_chat_view.dart index 3f51b0c8..854cabf5 100644 --- a/lib/pages/views/new_private_chat_view.dart +++ b/lib/pages/views/new_private_chat_view.dart @@ -5,7 +5,7 @@ import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:vrouter/vrouter.dart'; class NewPrivateChatView extends StatelessWidget { diff --git a/lib/pages/views/search_view.dart b/lib/pages/views/search_view.dart index a0f9b5ad..29f7106e 100644 --- a/lib/pages/views/search_view.dart +++ b/lib/pages/views/search_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/contacts_list.dart'; import 'package:fluffychat/widgets/default_app_bar_search_field.dart'; diff --git a/lib/pages/views/settings_3pid_view.dart b/lib/pages/views/settings_3pid_view.dart index ea6b0de0..90b5849a 100644 --- a/lib/pages/views/settings_3pid_view.dart +++ b/lib/pages/views/settings_3pid_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/pages/settings_3pid.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/pages/views/settings_emotes_view.dart b/lib/pages/views/settings_emotes_view.dart index 7a14e705..f2650d39 100644 --- a/lib/pages/views/settings_emotes_view.dart +++ b/lib/pages/views/settings_emotes_view.dart @@ -1,5 +1,5 @@ import 'package:cached_network_image/cached_network_image.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/pages/views/settings_ignore_list_view.dart b/lib/pages/views/settings_ignore_list_view.dart index 1a81a68a..09ddea6d 100644 --- a/lib/pages/views/settings_ignore_list_view.dart +++ b/lib/pages/views/settings_ignore_list_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/pages/views/settings_multiple_emotes_view.dart b/lib/pages/views/settings_multiple_emotes_view.dart index 18a03e5a..17fce177 100644 --- a/lib/pages/views/settings_multiple_emotes_view.dart +++ b/lib/pages/views/settings_multiple_emotes_view.dart @@ -1,7 +1,7 @@ import 'package:fluffychat/pages/settings_multiple_emotes.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:vrouter/vrouter.dart'; diff --git a/lib/pages/views/settings_notifications_view.dart b/lib/pages/views/settings_notifications_view.dart index 1f4cc9d9..d0554ac1 100644 --- a/lib/pages/views/settings_notifications_view.dart +++ b/lib/pages/views/settings_notifications_view.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/pages/views/settings_view.dart b/lib/pages/views/settings_view.dart index 74af05c9..45cd5192 100644 --- a/lib/pages/views/settings_view.dart +++ b/lib/pages/views/settings_view.dart @@ -3,7 +3,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:fluffychat/widgets/sentry_switch_list_tile.dart'; import 'package:fluffychat/widgets/settings_switch_list_tile.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/beautify_string_extension.dart'; import 'package:fluffychat/config/app_config.dart'; diff --git a/lib/pages/views/user_bottom_sheet_view.dart b/lib/pages/views/user_bottom_sheet_view.dart index 25e78cf9..993ccbf9 100644 --- a/lib/pages/views/user_bottom_sheet_view.dart +++ b/lib/pages/views/user_bottom_sheet_view.dart @@ -1,6 +1,6 @@ import 'dart:math'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/background_push.dart b/lib/utils/background_push.dart index a839cfc8..d4970c6a 100644 --- a/lib/utils/background_push.dart +++ b/lib/utils/background_push.dart @@ -22,7 +22,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:ui'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fcm_shared_isolate/fcm_shared_isolate.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/utils/database/flutter_famedly_sdk_hive_database.dart b/lib/utils/database/flutter_famedly_sdk_hive_database.dart index 72e61659..cfb12678 100644 --- a/lib/utils/database/flutter_famedly_sdk_hive_database.dart +++ b/lib/utils/database/flutter_famedly_sdk_hive_database.dart @@ -2,7 +2,7 @@ import 'dart:convert'; import 'dart:io'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; diff --git a/lib/utils/database/mobile.dart b/lib/utils/database/mobile.dart index ae0ba2d9..3e0965fa 100644 --- a/lib/utils/database/mobile.dart +++ b/lib/utils/database/mobile.dart @@ -1,7 +1,7 @@ import 'dart:ffi'; import 'dart:io'; import 'dart:isolate'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:path_provider/path_provider.dart'; import 'package:sqflite/sqflite.dart' show getDatabasesPath; import 'package:path/path.dart' as p; diff --git a/lib/utils/database/unsupported.dart b/lib/utils/database/unsupported.dart index 996b1f58..945ca601 100644 --- a/lib/utils/database/unsupported.dart +++ b/lib/utils/database/unsupported.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; Future constructDb( {bool logStatements = false, diff --git a/lib/utils/database/web.dart b/lib/utils/database/web.dart index 05c8035b..9ffe689f 100644 --- a/lib/utils/database/web.dart +++ b/lib/utils/database/web.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:moor/moor_web.dart'; import 'dart:html'; diff --git a/lib/utils/famedlysdk_store.dart b/lib/utils/famedlysdk_store.dart index b5c52643..c00684ef 100644 --- a/lib/utils/famedlysdk_store.dart +++ b/lib/utils/famedlysdk_store.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:localstorage/localstorage.dart'; diff --git a/lib/utils/localized_exception_extension.dart b/lib/utils/localized_exception_extension.dart index 4afac423..63a6fc21 100644 --- a/lib/utils/localized_exception_extension.dart +++ b/lib/utils/localized_exception_extension.dart @@ -1,6 +1,6 @@ import 'dart:io'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart b/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart index b404515e..fcabae5e 100644 --- a/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/client_presence_extension.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; extension ClientPresenceExtension on Client { List get contactList { diff --git a/lib/utils/matrix_sdk_extensions.dart/device_extension.dart b/lib/utils/matrix_sdk_extensions.dart/device_extension.dart index fcfb04db..fc0df95b 100644 --- a/lib/utils/matrix_sdk_extensions.dart/device_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/device_extension.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/material.dart'; extension DeviceExtension on Device { diff --git a/lib/utils/matrix_sdk_extensions.dart/event_extension.dart b/lib/utils/matrix_sdk_extensions.dart/event_extension.dart index 396384f7..407d140a 100644 --- a/lib/utils/matrix_sdk_extensions.dart/event_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/event_extension.dart @@ -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/foundation.dart'; import 'package:flutter/material.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart b/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart index 08e69225..497a0e10 100644 --- a/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/filtered_timeline_extension.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import '../../config/app_config.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart b/lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart index f4d9df30..2a2991c8 100644 --- a/lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart +++ b/lib/utils/matrix_sdk_extensions.dart/fluffy_client.dart @@ -1,5 +1,5 @@ -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:famedlysdk/encryption.dart'; +import 'package:matrix/matrix.dart'; +import 'package:matrix/encryption.dart'; import 'package:fluffychat/utils/database/flutter_famedly_sdk_hive_database.dart'; import 'package:matrix_api_lite/fake_matrix_api.dart'; import '../platform_infos.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart b/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart index c2084319..4a359093 100644 --- a/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/matrix_file_extension.dart @@ -1,7 +1,7 @@ import 'dart:io'; import 'package:android_path_provider/android_path_provider.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; import 'package:open_file/open_file.dart'; diff --git a/lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart b/lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart index 38be8bcd..56307252 100644 --- a/lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart +++ b/lib/utils/matrix_sdk_extensions.dart/matrix_locals.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; /// This is a temporary helper class until there is a proper solution to this with the new system diff --git a/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart b/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart index 4dab9e84..50961604 100644 --- a/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart +++ b/lib/utils/matrix_sdk_extensions.dart/presence_extension.dart @@ -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'; diff --git a/lib/utils/resize_image.dart b/lib/utils/resize_image.dart index 102c78b4..47b9f04e 100644 --- a/lib/utils/resize_image.dart +++ b/lib/utils/resize_image.dart @@ -1,7 +1,7 @@ import 'dart:ui'; import 'dart:typed_data'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:native_imaging/native_imaging.dart' as native; import 'run_in_background.dart'; diff --git a/lib/utils/room_send_file_extension.dart b/lib/utils/room_send_file_extension.dart index 55b27568..3035e058 100644 --- a/lib/utils/room_send_file_extension.dart +++ b/lib/utils/room_send_file_extension.dart @@ -16,7 +16,7 @@ * along with this program. If not, see . */ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'resize_image.dart'; diff --git a/lib/utils/room_status_extension.dart b/lib/utils/room_status_extension.dart index 757b5e19..789ae8a4 100644 --- a/lib/utils/room_status_extension.dart +++ b/lib/utils/room_status_extension.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/widgets.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'matrix_sdk_extensions.dart/filtered_timeline_extension.dart'; diff --git a/lib/utils/sentry_controller.dart b/lib/utils/sentry_controller.dart index cb44b528..0e0a9089 100644 --- a/lib/utils/sentry_controller.dart +++ b/lib/utils/sentry_controller.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index 423b2425..e25c2d84 100644 --- a/lib/utils/url_launcher.dart +++ b/lib/utils/url_launcher.dart @@ -1,6 +1,6 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/config/app_config.dart'; diff --git a/lib/widgets/avatar.dart b/lib/widgets/avatar.dart index 1bdeee0d..eb4d3826 100644 --- a/lib/widgets/avatar.dart +++ b/lib/widgets/avatar.dart @@ -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'; diff --git a/lib/widgets/chat_settings_popup_menu.dart b/lib/widgets/chat_settings_popup_menu.dart index 12bf3615..397c2732 100644 --- a/lib/widgets/chat_settings_popup_menu.dart +++ b/lib/widgets/chat_settings_popup_menu.dart @@ -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'; diff --git a/lib/widgets/contacts_list.dart b/lib/widgets/contacts_list.dart index 42ea5769..4bac80de 100644 --- a/lib/widgets/contacts_list.dart +++ b/lib/widgets/contacts_list.dart @@ -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'; diff --git a/lib/widgets/content_banner.dart b/lib/widgets/content_banner.dart index e2715992..7bf1954f 100644 --- a/lib/widgets/content_banner.dart +++ b/lib/widgets/content_banner.dart @@ -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'; diff --git a/lib/widgets/encryption_button.dart b/lib/widgets/encryption_button.dart index 2c32104b..723e22c3 100644 --- a/lib/widgets/encryption_button.dart +++ b/lib/widgets/encryption_button.dart @@ -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'; diff --git a/lib/widgets/event_content/audio_player.dart b/lib/widgets/event_content/audio_player.dart index fd70b098..bd3c06b8 100644 --- a/lib/widgets/event_content/audio_player.dart +++ b/lib/widgets/event_content/audio_player.dart @@ -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'; diff --git a/lib/widgets/event_content/html_message.dart b/lib/widgets/event_content/html_message.dart index bbb3e479..b2a5207f 100644 --- a/lib/widgets/event_content/html_message.dart +++ b/lib/widgets/event_content/html_message.dart @@ -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'; diff --git a/lib/widgets/event_content/image_bubble.dart b/lib/widgets/event_content/image_bubble.dart index 83df0d38..9645b258 100644 --- a/lib/widgets/event_content/image_bubble.dart +++ b/lib/widgets/event_content/image_bubble.dart @@ -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'; diff --git a/lib/widgets/event_content/message.dart b/lib/widgets/event_content/message.dart index 75cbee96..01fffc3f 100644 --- a/lib/widgets/event_content/message.dart +++ b/lib/widgets/event_content/message.dart @@ -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'; diff --git a/lib/widgets/event_content/message_content.dart b/lib/widgets/event_content/message_content.dart index a2f6d129..6833c542 100644 --- a/lib/widgets/event_content/message_content.dart +++ b/lib/widgets/event_content/message_content.dart @@ -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'; diff --git a/lib/widgets/event_content/message_download_content.dart b/lib/widgets/event_content/message_download_content.dart index 40fd22ce..41aa4053 100644 --- a/lib/widgets/event_content/message_download_content.dart +++ b/lib/widgets/event_content/message_download_content.dart @@ -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'; diff --git a/lib/widgets/event_content/message_reactions.dart b/lib/widgets/event_content/message_reactions.dart index 265cf2b2..8ce67639 100644 --- a/lib/widgets/event_content/message_reactions.dart +++ b/lib/widgets/event_content/message_reactions.dart @@ -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'; diff --git a/lib/widgets/event_content/reply_content.dart b/lib/widgets/event_content/reply_content.dart index 2e040c66..da41de2c 100644 --- a/lib/widgets/event_content/reply_content.dart +++ b/lib/widgets/event_content/reply_content.dart @@ -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'; diff --git a/lib/widgets/event_content/state_message.dart b/lib/widgets/event_content/state_message.dart index fc160943..25546760 100644 --- a/lib/widgets/event_content/state_message.dart +++ b/lib/widgets/event_content/state_message.dart @@ -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'; diff --git a/lib/widgets/input_bar.dart b/lib/widgets/input_bar.dart index ed8fdf3c..98ed56eb 100644 --- a/lib/widgets/input_bar.dart +++ b/lib/widgets/input_bar.dart @@ -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'; diff --git a/lib/widgets/layouts/loading_view.dart b/lib/widgets/layouts/loading_view.dart index 89e71ee0..3c22deb4 100644 --- a/lib/widgets/layouts/loading_view.dart +++ b/lib/widgets/layouts/loading_view.dart @@ -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'; diff --git a/lib/widgets/layouts/wait_for_login.dart b/lib/widgets/layouts/wait_for_login.dart index 480056af..635f8f26 100644 --- a/lib/widgets/layouts/wait_for_login.dart +++ b/lib/widgets/layouts/wait_for_login.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/material.dart'; import '../matrix.dart'; diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart index 6e068ae5..4e555ecc 100644 --- a/lib/widgets/list_items/chat_list_item.dart +++ b/lib/widgets/list_items/chat_list_item.dart @@ -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'; diff --git a/lib/widgets/list_items/participant_list_item.dart b/lib/widgets/list_items/participant_list_item.dart index 1c008732..2de25856 100644 --- a/lib/widgets/list_items/participant_list_item.dart +++ b/lib/widgets/list_items/participant_list_item.dart @@ -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'; diff --git a/lib/widgets/list_items/permission_list_tile.dart b/lib/widgets/list_items/permission_list_tile.dart index d850eeb5..719684e6 100644 --- a/lib/widgets/list_items/permission_list_tile.dart +++ b/lib/widgets/list_items/permission_list_tile.dart @@ -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'; diff --git a/lib/widgets/list_items/public_room_list_item.dart b/lib/widgets/list_items/public_room_list_item.dart index 6de588e2..5ab846e2 100644 --- a/lib/widgets/list_items/public_room_list_item.dart +++ b/lib/widgets/list_items/public_room_list_item.dart @@ -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'; diff --git a/lib/widgets/list_items/user_device_list_item.dart b/lib/widgets/list_items/user_device_list_item.dart index 5db9ebb3..c7ff460d 100644 --- a/lib/widgets/list_items/user_device_list_item.dart +++ b/lib/widgets/list_items/user_device_list_item.dart @@ -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'; diff --git a/lib/widgets/log_view.dart b/lib/widgets/log_view.dart index bc31699d..ccf2cdc4 100644 --- a/lib/widgets/log_view.dart +++ b/lib/widgets/log_view.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/material.dart'; class LogViewer extends StatefulWidget { diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index 90faa1b5..d9f6de85 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -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 with WidgetsBindingObserver { onBlurSub?.cancel(); _backgroundPush?.onLogin?.cancel(); - linuxNotifications.close(); + linuxNotifications?.close(); super.dispose(); } diff --git a/lib/widgets/unread_badge_back_button.dart b/lib/widgets/unread_badge_back_button.dart index 9bd7f904..3cdfef7e 100644 --- a/lib/widgets/unread_badge_back_button.dart +++ b/lib/widgets/unread_badge_back_button.dart @@ -1,4 +1,4 @@ -import 'package:famedlysdk/famedlysdk.dart'; +import 'package:matrix/matrix.dart'; import 'package:flutter/material.dart'; import '../config/app_config.dart'; diff --git a/pubspec.lock b/pubspec.lock index 1f4671c8..a90bcb14 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -218,15 +218,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.2.0" - famedlysdk: - dependency: "direct main" - description: - path: "." - ref: main - resolved-ref: "38d81d60933b46085ad5458b0fad6e62eaf92815" - url: "https://gitlab.com/famedly/famedlysdk.git" - source: git - version: "0.1.0" fcm_shared_isolate: dependency: "direct main" description: @@ -592,6 +583,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.12.10" + matrix: + dependency: "direct main" + description: + name: matrix + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.1" matrix_api_lite: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index ea8852b1..52ea876a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -16,10 +16,6 @@ dependencies: desktop_notifications: ^0.4.0 email_validator: ^2.0.1 emoji_picker_flutter: ^1.0.5 - famedlysdk: - git: - url: https://gitlab.com/famedly/famedlysdk.git - ref: krille/hive fcm_shared_isolate: git: url: https://gitlab.com/famedly/libraries/fcm_shared_isolate.git @@ -45,6 +41,7 @@ dependencies: image_picker: ^0.7.4 intl: any localstorage: ^4.0.0+1 + matrix: ^0.1.1 mime_type: ^1.0.0 moor: ^4.2.1 native_imaging: diff --git a/test/utils/test_client.dart b/test/utils/test_client.dart index 535a4c9b..1e8ceb01 100644 --- a/test/utils/test_client.dart +++ b/test/utils/test_client.dart @@ -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'; Future testClient({