diff --git a/analysis_options.yaml b/analysis_options.yaml index daaf9c6..ae6a9b0 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -4,6 +4,9 @@ linter: rules: - camel_case_types - avoid_print + - avoid_relative_lib_imports + - prefer_relative_imports + - directives_ordering analyzer: errors: diff --git a/lib/components/audio_player.dart b/lib/components/audio_player.dart index 3b410af..642171e 100644 --- a/lib/components/audio_player.dart +++ b/lib/components/audio_player.dart @@ -2,15 +2,16 @@ import 'dart:async'; import 'dart:typed_data'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/message_download_content.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_sound/flutter_sound.dart'; import 'package:intl/intl.dart'; import 'package:universal_html/prefer_universal/html.dart' as html; -import 'dialogs/simple_dialogs.dart'; + import '../utils/ui_fake.dart' if (dart.library.html) 'dart:ui' as ui; +import 'dialogs/simple_dialogs.dart'; import 'matrix.dart'; +import 'message_download_content.dart'; class AudioPlayer extends StatefulWidget { final Color color; diff --git a/lib/components/avatar.dart b/lib/components/avatar.dart index 794f788..d5eaca2 100644 --- a/lib/components/avatar.dart +++ b/lib/components/avatar.dart @@ -1,10 +1,10 @@ +import 'package:cached_network_image/cached_network_image.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/utils/string_color.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:cached_network_image/cached_network_image.dart'; +import '../utils/platform_infos.dart'; +import '../utils/string_color.dart'; import 'matrix.dart'; class Avatar extends StatelessWidget { diff --git a/lib/components/chat_settings_popup_menu.dart b/lib/components/chat_settings_popup_menu.dart index f84f121..71ec664 100644 --- a/lib/components/chat_settings_popup_menu.dart +++ b/lib/components/chat_settings_popup_menu.dart @@ -1,13 +1,13 @@ import 'dart:async'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/chat_details.dart'; -import 'package:furrychat/views/chat_list.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../utils/app_route.dart'; +import '../views/chat_details.dart'; +import '../views/chat_list.dart'; import 'dialogs/simple_dialogs.dart'; import 'matrix.dart'; diff --git a/lib/components/content_banner.dart b/lib/components/content_banner.dart index 8c60f59..ed582e5 100644 --- a/lib/components/content_banner.dart +++ b/lib/components/content_banner.dart @@ -1,9 +1,9 @@ +import 'package:cached_network_image/cached_network_image.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:cached_network_image/cached_network_image.dart'; +import '../utils/platform_infos.dart'; import 'matrix.dart'; class ContentBanner extends StatelessWidget { diff --git a/lib/components/dialogs/send_file_dialog.dart b/lib/components/dialogs/send_file_dialog.dart index 1ad33ef..90cd3fc 100644 --- a/lib/components/dialogs/send_file_dialog.dart +++ b/lib/components/dialogs/send_file_dialog.dart @@ -4,8 +4,8 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../../components/dialogs/simple_dialogs.dart'; import '../../utils/matrix_file_extension.dart'; -import '../../utils/room_send_file_extension.dart'; import '../../utils/resize_image.dart'; +import '../../utils/room_send_file_extension.dart'; class SendFileDialog extends StatefulWidget { final Room room; diff --git a/lib/components/encryption_button.dart b/lib/components/encryption_button.dart index 9dec3d6..c028d5c 100644 --- a/lib/components/encryption_button.dart +++ b/lib/components/encryption_button.dart @@ -2,11 +2,11 @@ import 'dart:async'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/chat_encryption_settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../utils/app_route.dart'; +import '../views/chat_encryption_settings.dart'; import 'dialogs/simple_dialogs.dart'; import 'matrix.dart'; diff --git a/lib/components/image_bubble.dart b/lib/components/image_bubble.dart index 1ccf74e..232f044 100644 --- a/lib/components/image_bubble.dart +++ b/lib/components/image_bubble.dart @@ -1,11 +1,12 @@ -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/views/image_view.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:flutter_blurhash/flutter_blurhash.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:famedlysdk/famedlysdk.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_blurhash/flutter_blurhash.dart'; + +import '../utils/app_route.dart'; +import '../utils/platform_infos.dart'; +import '../views/image_view.dart'; class ImageBubble extends StatefulWidget { final Event event; diff --git a/lib/components/input_bar.dart b/lib/components/input_bar.dart index 84e0f8c..9b3a08d 100644 --- a/lib/components/input_bar.dart +++ b/lib/components/input_bar.dart @@ -1,9 +1,10 @@ -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; -import 'package:flutter/foundation.dart'; -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:flutter_typeahead/flutter_typeahead.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:famedlysdk/famedlysdk.dart'; +import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_typeahead/flutter_typeahead.dart'; + +import '../utils/platform_infos.dart'; import 'avatar.dart'; class InputBar extends StatelessWidget { diff --git a/lib/components/list_items/chat_list_item.dart b/lib/components/list_items/chat_list_item.dart index 8b882b0..1060b4e 100644 --- a/lib/components/list_items/chat_list_item.dart +++ b/lib/components/list_items/chat_list_item.dart @@ -1,13 +1,12 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; -import 'package:furrychat/views/chat.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:pedantic/pedantic.dart'; import '../../utils/app_route.dart'; import '../../utils/date_time_extension.dart'; +import '../../utils/matrix_locals.dart'; import '../../views/chat.dart'; import '../avatar.dart'; import '../dialogs/send_file_dialog.dart'; diff --git a/lib/components/list_items/message.dart b/lib/components/list_items/message.dart index d8c78cd..ba35e29 100644 --- a/lib/components/list_items/message.dart +++ b/lib/components/list_items/message.dart @@ -1,16 +1,16 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/message_content.dart'; -import 'package:furrychat/components/reply_content.dart'; -import 'package:furrychat/utils/date_time_extension.dart'; -import 'package:furrychat/utils/event_extension.dart'; -import 'package:furrychat/utils/string_color.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../../utils/date_time_extension.dart'; +import '../../utils/event_extension.dart'; +import '../../utils/string_color.dart'; import '../avatar.dart'; +import '../dialogs/simple_dialogs.dart'; import '../matrix.dart'; +import '../message_content.dart'; import '../message_reactions.dart'; +import '../reply_content.dart'; import 'state_message.dart'; class Message extends StatelessWidget { diff --git a/lib/components/list_items/participant_list_item.dart b/lib/components/list_items/participant_list_item.dart index 22627ab..e890f8f 100644 --- a/lib/components/list_items/participant_list_item.dart +++ b/lib/components/list_items/participant_list_item.dart @@ -1,11 +1,11 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/chat.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../../utils/app_route.dart'; +import '../../views/chat.dart'; import '../avatar.dart'; +import '../dialogs/simple_dialogs.dart'; import '../matrix.dart'; class ParticipantListItem extends StatelessWidget { diff --git a/lib/components/list_items/public_room_list_item.dart b/lib/components/list_items/public_room_list_item.dart index 9536c50..e28e7ab 100644 --- a/lib/components/list_items/public_room_list_item.dart +++ b/lib/components/list_items/public_room_list_item.dart @@ -1,12 +1,12 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../../utils/app_route.dart'; import '../../views/chat.dart'; import '../avatar.dart'; +import '../dialogs/simple_dialogs.dart'; import '../matrix.dart'; class PublicRoomListItem extends StatelessWidget { diff --git a/lib/components/list_items/state_message.dart b/lib/components/list_items/state_message.dart index 8eb2403..74f4831 100644 --- a/lib/components/list_items/state_message.dart +++ b/lib/components/list_items/state_message.dart @@ -1,8 +1,9 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../../utils/matrix_locals.dart'; + class StateMessage extends StatelessWidget { final Event event; const StateMessage(this.event); diff --git a/lib/components/list_items/status_list_item.dart b/lib/components/list_items/status_list_item.dart index 7dc82ee..5c8f1b9 100644 --- a/lib/components/list_items/status_list_item.dart +++ b/lib/components/list_items/status_list_item.dart @@ -1,7 +1,8 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/user_status.dart'; -import 'package:furrychat/views/status_view.dart'; import 'package:flutter/material.dart'; + +import '../../utils/user_status.dart'; +import '../../views/status_view.dart'; import '../avatar.dart'; import '../matrix.dart'; diff --git a/lib/components/matrix.dart b/lib/components/matrix.dart index 27b2219..03c0d41 100644 --- a/lib/components/matrix.dart +++ b/lib/components/matrix.dart @@ -3,11 +3,6 @@ import 'dart:io'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/utils/firebase_controller.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/utils/user_status.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -17,10 +12,14 @@ import 'package:url_launcher/url_launcher.dart'; import '../utils/app_route.dart'; import '../utils/beautify_string_extension.dart'; import '../utils/famedlysdk_store.dart'; -import '../utils/presence_extension.dart'; -import '../views/key_verification.dart'; +import '../utils/firebase_controller.dart'; +import '../utils/matrix_locals.dart'; import '../utils/platform_infos.dart'; +import '../utils/presence_extension.dart'; +import '../utils/user_status.dart'; +import '../views/key_verification.dart'; import 'avatar.dart'; +import 'dialogs/simple_dialogs.dart'; class Matrix extends StatefulWidget { static const String callNamespace = 'chat.fluffy.jitsi_call'; diff --git a/lib/components/message_content.dart b/lib/components/message_content.dart index 2db3720..ed67781 100644 --- a/lib/components/message_content.dart +++ b/lib/components/message_content.dart @@ -1,15 +1,15 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/audio_player.dart'; -import 'package:furrychat/components/image_bubble.dart'; -import 'package:furrychat/utils/event_extension.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix_link_text/link_text.dart'; import 'package:url_launcher/url_launcher.dart'; +import '../utils/event_extension.dart'; +import '../utils/matrix_locals.dart'; import '../utils/url_launcher.dart'; +import 'audio_player.dart'; import 'html_message.dart'; +import 'image_bubble.dart'; import 'matrix.dart'; import 'message_download_content.dart'; diff --git a/lib/components/message_download_content.dart b/lib/components/message_download_content.dart index b1d1aed..e2d0c0a 100644 --- a/lib/components/message_download_content.dart +++ b/lib/components/message_download_content.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter/material.dart'; -import 'package:furrychat/utils/event_extension.dart'; +import '../utils/event_extension.dart'; class MessageDownloadContent extends StatelessWidget { final Event event; diff --git a/lib/components/message_reactions.dart b/lib/components/message_reactions.dart index 00aee9c..9bd74c0 100644 --- a/lib/components/message_reactions.dart +++ b/lib/components/message_reactions.dart @@ -1,8 +1,8 @@ -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; import 'package:cached_network_image/cached_network_image.dart'; +import 'package:famedlysdk/famedlysdk.dart'; +import 'package:flutter/material.dart'; +import '../utils/platform_infos.dart'; import 'dialogs/simple_dialogs.dart'; import 'matrix.dart'; diff --git a/lib/components/reply_content.dart b/lib/components/reply_content.dart index 16c34e7..2497d38 100644 --- a/lib/components/reply_content.dart +++ b/lib/components/reply_content.dart @@ -1,8 +1,8 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../utils/matrix_locals.dart'; import 'html_message.dart'; import 'matrix.dart'; diff --git a/lib/main.dart b/lib/main.dart index 5ee416e..cd6df19 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -3,7 +3,6 @@ import 'dart:io'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/views/homeserver_picker.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -13,6 +12,7 @@ import 'package:universal_html/prefer_universal/html.dart' as html; import 'components/matrix.dart'; import 'components/theme_switcher.dart'; import 'views/chat_list.dart'; +import 'views/homeserver_picker.dart'; void main() { SystemChrome.setSystemUIOverlayStyle( diff --git a/lib/utils/app_route.dart b/lib/utils/app_route.dart index 6ab636e..7aba5ef 100644 --- a/lib/utils/app_route.dart +++ b/lib/utils/app_route.dart @@ -1,7 +1,8 @@ -import 'package:furrychat/components/adaptive_page_layout.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import '../components/adaptive_page_layout.dart'; + class AppRoute extends PageRouteBuilder { static Route defaultRoute(BuildContext context, Widget page) { return context != null && !AdaptivePageLayout.columnMode(context) diff --git a/lib/utils/database/mobile.dart b/lib/utils/database/mobile.dart index 30a2a75..d70571c 100644 --- a/lib/utils/database/mobile.dart +++ b/lib/utils/database/mobile.dart @@ -1,17 +1,19 @@ import 'dart:ffi'; import 'dart:io'; import 'dart:isolate'; + import 'package:famedlysdk/famedlysdk.dart'; +import 'package:flutter/material.dart'; +import 'package:moor/ffi.dart' as moor; +import 'package:moor/isolate.dart'; +import 'package:moor/moor.dart'; +import 'package:path/path.dart' as p; import 'package:path_provider/path_provider.dart'; import 'package:sqflite/sqflite.dart' show getDatabasesPath; -import 'package:path/path.dart' as p; -import 'package:flutter/material.dart'; -import 'package:moor/moor.dart'; -import 'package:moor/isolate.dart'; +import 'package:sqlite3/open.dart'; + import '../platform_infos.dart'; import 'cipher_db.dart' as cipher; -import 'package:moor/ffi.dart' as moor; -import 'package:sqlite3/open.dart'; bool _inited = false; diff --git a/lib/utils/database/web.dart b/lib/utils/database/web.dart index cd9e9ef..072f7ba 100644 --- a/lib/utils/database/web.dart +++ b/lib/utils/database/web.dart @@ -1,8 +1,9 @@ -import 'package:famedlysdk/famedlysdk.dart'; -import 'package:moor/moor_web.dart'; -import 'package:flutter/material.dart'; import 'dart:html'; +import 'package:famedlysdk/famedlysdk.dart'; +import 'package:flutter/material.dart'; +import 'package:moor/moor_web.dart'; + Future constructDb( {bool logStatements = false, String filename = 'database.sqlite', diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart index 96f3c7a..0c17ffd 100644 --- a/lib/utils/event_extension.dart +++ b/lib/utils/event_extension.dart @@ -1,10 +1,11 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'matrix_file_extension.dart'; -import 'app_route.dart'; + +import '../components/dialogs/simple_dialogs.dart'; import '../views/image_view.dart'; +import 'app_route.dart'; +import 'matrix_file_extension.dart'; extension LocalizedBody on Event { void openFile(BuildContext context, {bool downloadOnly = false}) async { diff --git a/lib/utils/famedlysdk_store.dart b/lib/utils/famedlysdk_store.dart index f7407ce..ee04d25 100644 --- a/lib/utils/famedlysdk_store.dart +++ b/lib/utils/famedlysdk_store.dart @@ -1,18 +1,19 @@ +import 'dart:async'; import 'dart:convert'; +import 'dart:core'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; +import 'package:flutter/material.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:localstorage/localstorage.dart'; -import 'package:path_provider/path_provider.dart'; -import 'dart:async'; -import 'dart:core'; -import './database/shared.dart'; import 'package:olm/olm.dart' as olm; // needed for migration +import 'package:path_provider/path_provider.dart'; import 'package:random_string/random_string.dart'; +import './database/shared.dart'; +import 'platform_infos.dart'; + Future getLocalStorage() async { final directory = PlatformInfos.isBetaDesktop ? await getApplicationSupportDirectory() diff --git a/lib/utils/firebase_controller.dart b/lib/utils/firebase_controller.dart index c38ebf0..2aaa4f6 100644 --- a/lib/utils/firebase_controller.dart +++ b/lib/utils/firebase_controller.dart @@ -4,9 +4,6 @@ import 'dart:io'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:firebase_messaging/firebase_messaging.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/chat.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -15,6 +12,8 @@ import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:path_provider/path_provider.dart'; import '../components/matrix.dart'; +import '../views/chat.dart'; +import 'app_route.dart'; import 'famedlysdk_store.dart'; import 'matrix_locals.dart'; diff --git a/lib/utils/resize_image.dart b/lib/utils/resize_image.dart index 102c78b..83774c6 100644 --- a/lib/utils/resize_image.dart +++ b/lib/utils/resize_image.dart @@ -1,5 +1,5 @@ -import 'dart:ui'; import 'dart:typed_data'; +import 'dart:ui'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:native_imaging/native_imaging.dart' as native; diff --git a/lib/utils/run_in_background.dart b/lib/utils/run_in_background.dart index 8a99337..e75d145 100644 --- a/lib/utils/run_in_background.dart +++ b/lib/utils/run_in_background.dart @@ -1,6 +1,7 @@ -import 'package:isolate/isolate.dart'; import 'dart:async'; +import 'package:isolate/isolate.dart'; + Future runInBackground( FutureOr Function(U arg) function, U arg) async { final isolate = await IsolateRunner.spawn(); diff --git a/lib/utils/url_launcher.dart b/lib/utils/url_launcher.dart index fa76a82..d4fc1b3 100644 --- a/lib/utils/url_launcher.dart +++ b/lib/utils/url_launcher.dart @@ -1,10 +1,11 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/chat.dart'; import 'package:flutter/material.dart'; import 'package:url_launcher/url_launcher.dart'; + +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; +import '../views/chat.dart'; +import 'app_route.dart'; import 'matrix_identifier_string_extension.dart'; class UrlLauncher { diff --git a/lib/views/archive.dart b/lib/views/archive.dart index 2276373..04c848a 100644 --- a/lib/views/archive.dart +++ b/lib/views/archive.dart @@ -1,10 +1,11 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/list_items/chat_list_item.dart'; -import 'package:furrychat/components/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/list_items/chat_list_item.dart'; +import '../components/matrix.dart'; + class Archive extends StatefulWidget { @override _ArchiveState createState() => _ArchiveState(); diff --git a/lib/views/auth_web_view.dart b/lib/views/auth_web_view.dart index 2c695a9..72505ad 100644 --- a/lib/views/auth_web_view.dart +++ b/lib/views/auth_web_view.dart @@ -1,10 +1,11 @@ -import 'package:furrychat/components/matrix.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:url_launcher/url_launcher.dart'; import 'package:webview_flutter/webview_flutter.dart'; +import '../components/matrix.dart'; + class AuthWebView extends StatelessWidget { final String authType; final String session; diff --git a/lib/views/chat.dart b/lib/views/chat.dart index f989262..904fd44 100644 --- a/lib/views/chat.dart +++ b/lib/views/chat.dart @@ -3,23 +3,7 @@ import 'dart:io'; import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; - import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/chat_settings_popup_menu.dart'; -import 'package:furrychat/components/connection_status_header.dart'; -import 'package:furrychat/components/dialogs/recording_dialog.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/encryption_button.dart'; -import 'package:furrychat/components/list_items/message.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/components/reply_content.dart'; -import 'package:furrychat/config/app_emojis.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/utils/room_status_extension.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/scheduler.dart'; @@ -30,9 +14,24 @@ import 'package:pedantic/pedantic.dart'; import 'package:scroll_to_index/scroll_to_index.dart'; import 'package:swipe_to_action/swipe_to_action.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/avatar.dart'; +import '../components/chat_settings_popup_menu.dart'; +import '../components/connection_status_header.dart'; +import '../components/dialogs/recording_dialog.dart'; import '../components/dialogs/send_file_dialog.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/encryption_button.dart'; import '../components/input_bar.dart'; +import '../components/list_items/message.dart'; +import '../components/matrix.dart'; +import '../components/reply_content.dart'; +import '../config/app_emojis.dart'; +import '../utils/app_route.dart'; import '../utils/matrix_file_extension.dart'; +import '../utils/matrix_locals.dart'; +import '../utils/platform_infos.dart'; +import '../utils/room_status_extension.dart'; import 'chat_details.dart'; import 'chat_list.dart'; diff --git a/lib/views/chat_details.dart b/lib/views/chat_details.dart index b5d396e..22fa4cf 100644 --- a/lib/views/chat_details.dart +++ b/lib/views/chat_details.dart @@ -1,18 +1,7 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; - import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/chat_settings_popup_menu.dart'; -import 'package:furrychat/components/content_banner.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/list_items/participant_list_item.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/utils/matrix_locals.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/views/chat_list.dart'; -import 'package:furrychat/views/invitation_selection.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; @@ -20,9 +9,19 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:image_picker/image_picker.dart'; import 'package:matrix_link_text/link_text.dart'; -import 'package:furrychat/views/settings/settings_emotes.dart'; -import 'package:furrychat/views/settings/settings_multiple_emotes.dart'; -import 'package:furrychat/utils/url_launcher.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/chat_settings_popup_menu.dart'; +import '../components/content_banner.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/list_items/participant_list_item.dart'; +import '../utils/app_route.dart'; +import '../utils/matrix_locals.dart'; +import '../utils/platform_infos.dart'; +import '../utils/url_launcher.dart'; +import 'chat_list.dart'; +import 'invitation_selection.dart'; +import 'settings/settings_emotes.dart'; +import 'settings/settings_multiple_emotes.dart'; class ChatDetails extends StatefulWidget { final Room room; diff --git a/lib/views/chat_encryption_settings.dart b/lib/views/chat_encryption_settings.dart index 7bdbf8f..288f448 100644 --- a/lib/views/chat_encryption_settings.dart +++ b/lib/views/chat_encryption_settings.dart @@ -1,15 +1,15 @@ import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/beautify_string_extension.dart'; -import 'package:furrychat/views/chat_list.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/avatar.dart'; import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; import '../utils/app_route.dart'; +import '../utils/beautify_string_extension.dart'; +import 'chat_list.dart'; import 'key_verification.dart'; class ChatEncryptionSettingsView extends StatelessWidget { diff --git a/lib/views/chat_list.dart b/lib/views/chat_list.dart index b56f457..8e0ad1c 100644 --- a/lib/views/chat_list.dart +++ b/lib/views/chat_list.dart @@ -3,13 +3,6 @@ import 'dart:io'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/connection_status_header.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/list_items/status_list_item.dart'; -import 'package:furrychat/components/list_items/public_room_list_item.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/views/status_view.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; @@ -17,16 +10,23 @@ import 'package:receive_sharing_intent/receive_sharing_intent.dart'; import 'package:share/share.dart'; import '../components/adaptive_page_layout.dart'; +import '../components/avatar.dart'; +import '../components/connection_status_header.dart'; +import '../components/dialogs/simple_dialogs.dart'; import '../components/list_items/chat_list_item.dart'; +import '../components/list_items/public_room_list_item.dart'; +import '../components/list_items/status_list_item.dart'; import '../components/matrix.dart'; import '../utils/app_route.dart'; import '../utils/matrix_file_extension.dart'; +import '../utils/platform_infos.dart'; import '../utils/url_launcher.dart'; import 'archive.dart'; import 'homeserver_picker.dart'; import 'new_group.dart'; import 'new_private_chat.dart'; import 'settings.dart'; +import 'status_view.dart'; enum SelectMode { normal, share, select } diff --git a/lib/views/homeserver_picker.dart b/lib/views/homeserver_picker.dart index 9ff1057..f479ec0 100644 --- a/lib/views/homeserver_picker.dart +++ b/lib/views/homeserver_picker.dart @@ -1,13 +1,14 @@ import 'dart:math'; import 'package:famedlysdk/matrix_api/model/well_known_informations.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/login.dart'; -import 'package:furrychat/views/sign_up.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; + +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; +import 'login.dart'; +import 'sign_up.dart'; class HomeserverPicker extends StatefulWidget { @override diff --git a/lib/views/image_view.dart b/lib/views/image_view.dart index 6c128dc..6f97571 100644 --- a/lib/views/image_view.dart +++ b/lib/views/image_view.dart @@ -1,8 +1,9 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/image_bubble.dart'; -import 'package:furrychat/components/matrix.dart'; import 'package:flutter/material.dart'; import 'package:photo_view/photo_view.dart'; + +import '../components/image_bubble.dart'; +import '../components/matrix.dart'; import '../utils/event_extension.dart'; class ImageView extends StatelessWidget { diff --git a/lib/views/invitation_selection.dart b/lib/views/invitation_selection.dart index 4c9b8ab..60755c4 100644 --- a/lib/views/invitation_selection.dart +++ b/lib/views/invitation_selection.dart @@ -3,13 +3,13 @@ import 'dart:async'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/avatar.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; import 'chat_list.dart'; class InvitationSelection extends StatefulWidget { diff --git a/lib/views/login.dart b/lib/views/login.dart index 4edab6b..e64023e 100644 --- a/lib/views/login.dart +++ b/lib/views/login.dart @@ -2,14 +2,14 @@ import 'dart:async'; import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/utils/firebase_controller.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; +import '../utils/firebase_controller.dart'; import 'chat_list.dart'; class Login extends StatefulWidget { diff --git a/lib/views/new_group.dart b/lib/views/new_group.dart index 3e74db2..fe2394b 100644 --- a/lib/views/new_group.dart +++ b/lib/views/new_group.dart @@ -1,12 +1,12 @@ import 'package:famedlysdk/matrix_api.dart' as api; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:pedantic/pedantic.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; import 'chat.dart'; import 'chat_list.dart'; import 'invitation_selection.dart'; diff --git a/lib/views/new_private_chat.dart b/lib/views/new_private_chat.dart index 276f7bc..4610d0d 100644 --- a/lib/views/new_private_chat.dart +++ b/lib/views/new_private_chat.dart @@ -2,15 +2,15 @@ import 'dart:async'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:famedlysdk/matrix_api.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:share/share.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/avatar.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; import 'chat.dart'; import 'chat_list.dart'; diff --git a/lib/views/settings.dart b/lib/views/settings.dart index 4e5db81..fa78a6d 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -1,18 +1,18 @@ -import 'package:furrychat/config/app_config.dart'; -import 'package:furrychat/views/settings/settings_account.dart'; -import 'package:furrychat/views/settings/settings_chat.dart'; -import 'package:furrychat/views/settings/settings_devices.dart'; -import 'package:furrychat/views/settings/settings_encryption.dart'; -import 'package:furrychat/views/settings/settings_homeserver.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/views/settings/settings_themes.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/settings/settings_emotes.dart'; +import '../components/adaptive_page_layout.dart'; +import '../components/matrix.dart'; +import '../config/app_config.dart'; +import '../utils/app_route.dart'; +import 'settings/settings_account.dart'; +import 'settings/settings_chat.dart'; +import 'settings/settings_devices.dart'; +import 'settings/settings_emotes.dart'; +import 'settings/settings_encryption.dart'; +import 'settings/settings_homeserver.dart'; +import 'settings/settings_themes.dart'; enum SettingsViews { account, diff --git a/lib/views/settings/app_info.dart b/lib/views/settings/app_info.dart index d10d441..67e61f7 100644 --- a/lib/views/settings/app_info.dart +++ b/lib/views/settings/app_info.dart @@ -1,11 +1,12 @@ -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/beautify_string_extension.dart'; -import 'package:furrychat/views/settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:olm/olm.dart' as olm; +import '../../components/adaptive_page_layout.dart'; +import '../../components/matrix.dart'; +import '../../utils/beautify_string_extension.dart'; +import '../settings.dart'; + class AppInfoView extends StatelessWidget { @override Widget build(BuildContext context) { diff --git a/lib/views/settings/settings_account.dart b/lib/views/settings/settings_account.dart index 4cb251f..c00050d 100644 --- a/lib/views/settings/settings_account.dart +++ b/lib/views/settings/settings_account.dart @@ -1,19 +1,19 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/utils/platform_infos.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/views/settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; - -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/views/settings/settings_ignore_list.dart'; import 'package:image_picker/image_picker.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/avatar.dart'; +import '../../components/dialogs/simple_dialogs.dart'; +import '../../components/matrix.dart'; +import '../../utils/app_route.dart'; +import '../../utils/platform_infos.dart'; +import '../settings.dart'; +import 'settings_ignore_list.dart'; + class AccountSettingsView extends StatelessWidget { @override Widget build(BuildContext context) { diff --git a/lib/views/settings/settings_chat.dart b/lib/views/settings/settings_chat.dart index 43c6268..7bf4a6b 100644 --- a/lib/views/settings/settings_chat.dart +++ b/lib/views/settings/settings_chat.dart @@ -1,9 +1,9 @@ -import 'package:furrychat/views/settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/matrix.dart'; +import '../settings.dart'; class ChatSettingsView extends StatelessWidget { @override diff --git a/lib/views/settings/settings_devices.dart b/lib/views/settings/settings_devices.dart index 009503f..dc8c83d 100644 --- a/lib/views/settings/settings_devices.dart +++ b/lib/views/settings/settings_devices.dart @@ -1,12 +1,12 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/views/settings.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/date_time_extension.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/dialogs/simple_dialogs.dart'; +import '../../components/matrix.dart'; +import '../../utils/date_time_extension.dart'; +import '../settings.dart'; class DevicesSettingsView extends StatelessWidget { @override diff --git a/lib/views/settings/settings_emotes.dart b/lib/views/settings/settings_emotes.dart index ac2c63b..facb925 100644 --- a/lib/views/settings/settings_emotes.dart +++ b/lib/views/settings/settings_emotes.dart @@ -2,17 +2,16 @@ import 'package:bot_toast/bot_toast.dart'; import 'package:cached_network_image/cached_network_image.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; - -import 'package:furrychat/utils/platform_infos.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/views/settings.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/dialogs/simple_dialogs.dart'; +import '../../components/matrix.dart'; +import '../../utils/platform_infos.dart'; +import '../settings.dart'; class EmotesSettingsView extends StatelessWidget { final Room room; diff --git a/lib/views/settings/settings_encryption.dart b/lib/views/settings/settings_encryption.dart index 23b8f1a..422079f 100644 --- a/lib/views/settings/settings_encryption.dart +++ b/lib/views/settings/settings_encryption.dart @@ -1,13 +1,13 @@ -import 'package:furrychat/views/settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/utils/beautify_string_extension.dart'; - -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; import 'package:olm/olm.dart' as olm; +import '../../components/adaptive_page_layout.dart'; +import '../../components/dialogs/simple_dialogs.dart'; +import '../../components/matrix.dart'; +import '../../utils/beautify_string_extension.dart'; +import '../settings.dart'; + class EncryptionSettingsView extends StatelessWidget { @override Widget build(BuildContext context) { diff --git a/lib/views/settings/settings_homeserver.dart b/lib/views/settings/settings_homeserver.dart index 29d562f..186925a 100644 --- a/lib/views/settings/settings_homeserver.dart +++ b/lib/views/settings/settings_homeserver.dart @@ -1,9 +1,9 @@ -import 'package:furrychat/views/settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/matrix.dart'; +import '../settings.dart'; class HomeserverSettingsView extends StatelessWidget { @override diff --git a/lib/views/settings/settings_ignore_list.dart b/lib/views/settings/settings_ignore_list.dart index dbddbba..0e0d6f5 100644 --- a/lib/views/settings/settings_ignore_list.dart +++ b/lib/views/settings/settings_ignore_list.dart @@ -1,12 +1,12 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/views/settings.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/avatar.dart'; +import '../../components/dialogs/simple_dialogs.dart'; +import '../../components/matrix.dart'; +import '../settings.dart'; class SettingsIgnoreListView extends StatelessWidget { @override diff --git a/lib/views/settings/settings_multiple_emotes.dart b/lib/views/settings/settings_multiple_emotes.dart index 38db907..d0ed070 100644 --- a/lib/views/settings/settings_multiple_emotes.dart +++ b/lib/views/settings/settings_multiple_emotes.dart @@ -1,9 +1,10 @@ import 'package:flutter/material.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/settings.dart'; + +import '../../components/adaptive_page_layout.dart'; +import '../../utils/app_route.dart'; +import '../settings.dart'; import 'settings_emotes.dart'; class MultipleEmotesSettingsView extends StatelessWidget { diff --git a/lib/views/settings/settings_themes.dart b/lib/views/settings/settings_themes.dart index 09085a9..932d540 100644 --- a/lib/views/settings/settings_themes.dart +++ b/lib/views/settings/settings_themes.dart @@ -1,14 +1,13 @@ import 'dart:io'; -import 'package:furrychat/views/settings.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; - -import 'package:furrychat/components/adaptive_page_layout.dart'; -import 'package:furrychat/components/matrix.dart'; import 'package:image_picker/image_picker.dart'; -import 'package:furrychat/components/theme_switcher.dart'; +import '../../components/adaptive_page_layout.dart'; +import '../../components/matrix.dart'; +import '../../components/theme_switcher.dart'; +import '../settings.dart'; class ThemesSettingsView extends StatelessWidget { @override diff --git a/lib/views/sign_up.dart b/lib/views/sign_up.dart index 89c5520..a8f20ae 100644 --- a/lib/views/sign_up.dart +++ b/lib/views/sign_up.dart @@ -2,15 +2,15 @@ import 'dart:math'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; - -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/login.dart'; -import 'package:furrychat/views/sign_up_password.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; +import 'login.dart'; +import 'sign_up_password.dart'; + class SignUp extends StatefulWidget { SignUp({Key key, this.wellknown}) : super(key: key); diff --git a/lib/views/sign_up_password.dart b/lib/views/sign_up_password.dart index fd286f3..32f0bf0 100644 --- a/lib/views/sign_up_password.dart +++ b/lib/views/sign_up_password.dart @@ -2,13 +2,12 @@ import 'dart:math'; import 'package:bot_toast/bot_toast.dart'; import 'package:famedlysdk/famedlysdk.dart'; - -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/views/auth_web_view.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; +import 'auth_web_view.dart'; import 'chat_list.dart'; class SignUpPassword extends StatefulWidget { diff --git a/lib/views/status_view.dart b/lib/views/status_view.dart index 88606a2..7e7d17a 100644 --- a/lib/views/status_view.dart +++ b/lib/views/status_view.dart @@ -1,15 +1,15 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:furrychat/components/avatar.dart'; -import 'package:furrychat/components/dialogs/simple_dialogs.dart'; -import 'package:furrychat/components/matrix.dart'; -import 'package:furrychat/utils/url_launcher.dart'; -import 'package:furrychat/utils/user_status.dart'; -import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'package:furrychat/utils/app_route.dart'; -import 'package:furrychat/utils/string_color.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:matrix_link_text/link_text.dart'; +import '../components/avatar.dart'; +import '../components/dialogs/simple_dialogs.dart'; +import '../components/matrix.dart'; +import '../utils/app_route.dart'; +import '../utils/string_color.dart'; +import '../utils/url_launcher.dart'; +import '../utils/user_status.dart'; import 'chat.dart'; class StatusView extends StatelessWidget {