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/pages/archive.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:fluffychat/pages/views/archive_view.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';

6
lib/pages/bootstrap_dialog.dart
View file

@ -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';

2
lib/pages/chat.dart
View file

@ -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';

2
lib/pages/chat_details.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:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/pages/views/chat_details_view.dart';

4
lib/pages/chat_encryption_settings.dart
View file

@ -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';

2
lib/pages/chat_list.dart
View file

@ -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';

2
lib/pages/chat_permissions_settings.dart
View file

@ -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 {

4
lib/pages/device_settings.dart
View file

@ -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';

2
lib/pages/homeserver_picker.dart
View file

@ -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';

2
lib/pages/image_viewer.dart
View file

@ -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';

2
lib/pages/invitation_selection.dart
View file

@ -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';

4
lib/pages/key_verification_dialog.dart
View file

@ -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';

2
lib/pages/login.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:future_loading_dialog/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';

2
lib/pages/new_group.dart
View file

@ -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';

2
lib/pages/new_private_chat.dart
View file

@ -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';

2
lib/pages/search.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:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/pages/send_file_dialog.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/pages/settings.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:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/config/app_config.dart';

2
lib/pages/settings_3pid.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:future_loading_dialog/future_loading_dialog.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';

2
lib/pages/settings_emotes.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:file_picker_cross/file_picker_cross.dart';
import 'package:fluffychat/utils/platform_infos.dart';
import 'package:flutter/foundation.dart';

2
lib/pages/settings_notifications.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:fluffychat/config/app_config.dart';
import 'package:flutter/material.dart';

2
lib/pages/user_bottom_sheet.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/pages/permission_slider_dialog.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';

2
lib/pages/views/archive_view.dart
View file

@ -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';

2
lib/pages/views/chat_details_view.dart
View file

@ -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';

2
lib/pages/views/chat_encryption_settings_view.dart
View file

@ -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';

2
lib/pages/views/chat_list_view.dart
View file

@ -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';

2
lib/pages/views/chat_permissions_settings_view.dart
View file

@ -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 {

2
lib/pages/views/chat_view.dart
View file

@ -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';

2
lib/pages/views/homeserver_picker_view.dart
View file

@ -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;

2
lib/pages/views/invitation_selection_view.dart
View file

@ -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';

2
lib/pages/views/new_private_chat_view.dart
View file

@ -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 {

2
lib/pages/views/search_view.dart
View file

@ -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';

2
lib/pages/views/settings_3pid_view.dart
View file

@ -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';

2
lib/pages/views/settings_emotes_view.dart
View file

@ -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';

2
lib/pages/views/settings_ignore_list_view.dart
View file

@ -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';

2
lib/pages/views/settings_multiple_emotes_view.dart
View file

@ -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';

2
lib/pages/views/settings_notifications_view.dart
View file

@ -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';

2
lib/pages/views/settings_view.dart
View file

@ -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';

2
lib/pages/views/user_bottom_sheet_view.dart
View file

@ -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';