From a93165e7fff36c6326bc122f9772c268025b5c5c Mon Sep 17 00:00:00 2001 From: Christian Pauly Date: Sat, 22 May 2021 08:57:49 +0200 Subject: [PATCH] refactor: Rename views to pages --- lib/config/routes.dart | 46 +++++++++---------- lib/{views => pages}/archive.dart | 4 +- lib/{views => pages}/bootstrap_dialog.dart | 0 lib/{views => pages}/chat.dart | 4 +- lib/{views => pages}/chat_details.dart | 2 +- .../chat_encryption_settings.dart | 2 +- lib/{views => pages}/chat_list.dart | 2 +- .../chat_permissions_settings.dart | 4 +- lib/{views => pages}/device_settings.dart | 4 +- lib/{views => pages}/homeserver_picker.dart | 2 +- lib/{views => pages}/image_viewer.dart | 2 +- .../invitation_selection.dart | 2 +- .../key_verification_dialog.dart | 0 lib/{views => pages}/new_group.dart | 2 +- lib/{views => pages}/new_private_chat.dart | 2 +- .../permission_slider_dialog.dart | 0 lib/{views => pages}/recording_dialog.dart | 0 lib/{views => pages}/search.dart | 2 +- lib/{views => pages}/send_file_dialog.dart | 0 lib/{views => pages}/settings.dart | 2 +- lib/{views => pages}/settings_3pid.dart | 2 +- lib/{views => pages}/settings_emotes.dart | 2 +- .../settings_ignore_list.dart | 2 +- .../settings_multiple_emotes.dart | 2 +- .../settings_notifications.dart | 2 +- lib/{views => pages}/settings_style.dart | 2 +- lib/{views => pages}/sign_up.dart | 2 +- lib/{views => pages}/sign_up_password.dart | 2 +- lib/{views => pages}/user_bottom_sheet.dart | 4 +- .../views/archive_view.dart} | 6 +-- .../ui => pages/views}/chat_details_ui.dart | 2 +- .../views}/chat_encryption_settings_ui.dart | 2 +- .../ui => pages/views}/chat_list_ui.dart | 2 +- .../views}/chat_permissions_settings_ui.dart | 2 +- lib/{views/ui => pages/views}/chat_ui.dart | 4 +- .../views}/device_settings_ui.dart | 2 +- .../ui => pages/views}/empty_page_ui.dart | 0 .../views}/homeserver_picker_ui.dart | 0 .../ui => pages/views}/image_viewer_ui.dart | 0 .../views}/invitation_selection_ui.dart | 2 +- lib/{views/ui => pages/views}/login_ui.dart | 0 .../ui => pages/views}/new_group_ui.dart | 2 +- .../views}/new_private_chat_ui.dart | 2 +- lib/{views/ui => pages/views}/search_ui.dart | 0 .../ui => pages/views}/settings_3pid_ui.dart | 2 +- .../views}/settings_emotes_ui.dart | 0 .../views}/settings_ignore_list_ui.dart | 0 .../views}/settings_multiple_emotes_ui.dart | 2 +- .../views}/settings_notifications_ui.dart | 0 .../ui => pages/views}/settings_style_ui.dart | 0 .../ui => pages/views}/settings_ui.dart | 0 .../views}/sign_up_password_ui.dart | 2 +- lib/{views/ui => pages/views}/sign_up_ui.dart | 2 +- .../views}/user_bottom_sheet_ui.dart | 0 lib/utils/event_extension.dart | 2 +- lib/widgets/image_bubble.dart | 2 +- lib/widgets/list_items/chat_list_item.dart | 2 +- .../list_items/participant_list_item.dart | 2 +- lib/widgets/matrix.dart | 2 +- lib/widgets/message_content.dart | 2 +- test/homeserver_picker_test.dart | 2 +- test/sign_up_password_test.dart | 2 +- test/sign_up_test.dart | 2 +- 63 files changed, 77 insertions(+), 77 deletions(-) rename lib/{views => pages}/archive.dart (92%) rename lib/{views => pages}/bootstrap_dialog.dart (100%) rename lib/{views => pages}/chat.dart (99%) rename lib/{views => pages}/chat_details.dart (99%) rename lib/{views => pages}/chat_encryption_settings.dart (96%) rename lib/{views => pages}/chat_list.dart (99%) rename lib/{views => pages}/chat_permissions_settings.dart (96%) rename lib/{views => pages}/device_settings.dart (96%) rename lib/{views => pages}/homeserver_picker.dart (98%) rename lib/{views => pages}/image_viewer.dart (95%) rename lib/{views => pages}/invitation_selection.dart (98%) rename lib/{views => pages}/key_verification_dialog.dart (100%) rename lib/{views => pages}/new_group.dart (96%) rename lib/{views => pages}/new_private_chat.dart (98%) rename lib/{views => pages}/permission_slider_dialog.dart (100%) rename lib/{views => pages}/recording_dialog.dart (100%) rename lib/{views => pages}/search.dart (99%) rename lib/{views => pages}/send_file_dialog.dart (100%) rename lib/{views => pages}/settings.dart (99%) rename lib/{views => pages}/settings_3pid.dart (98%) rename lib/{views => pages}/settings_emotes.dart (99%) rename lib/{views => pages}/settings_ignore_list.dart (95%) rename lib/{views => pages}/settings_multiple_emotes.dart (90%) rename lib/{views => pages}/settings_notifications.dart (98%) rename lib/{views => pages}/settings_style.dart (97%) rename lib/{views => pages}/sign_up.dart (97%) rename lib/{views => pages}/sign_up_password.dart (98%) rename lib/{views => pages}/user_bottom_sheet.dart (96%) rename lib/{views/ui/archive_ui.dart => pages/views/archive_view.dart} (92%) rename lib/{views/ui => pages/views}/chat_details_ui.dart (99%) rename lib/{views/ui => pages/views}/chat_encryption_settings_ui.dart (99%) rename lib/{views/ui => pages/views}/chat_list_ui.dart (99%) rename lib/{views/ui => pages/views}/chat_permissions_settings_ui.dart (98%) rename lib/{views/ui => pages/views}/chat_ui.dart (99%) rename lib/{views/ui => pages/views}/device_settings_ui.dart (98%) rename lib/{views/ui => pages/views}/empty_page_ui.dart (100%) rename lib/{views/ui => pages/views}/homeserver_picker_ui.dart (100%) rename lib/{views/ui => pages/views}/image_viewer_ui.dart (100%) rename lib/{views/ui => pages/views}/invitation_selection_ui.dart (98%) rename lib/{views/ui => pages/views}/login_ui.dart (100%) rename lib/{views/ui => pages/views}/new_group_ui.dart (97%) rename lib/{views/ui => pages/views}/new_private_chat_ui.dart (98%) rename lib/{views/ui => pages/views}/search_ui.dart (100%) rename lib/{views/ui => pages/views}/settings_3pid_ui.dart (98%) rename lib/{views/ui => pages/views}/settings_emotes_ui.dart (100%) rename lib/{views/ui => pages/views}/settings_ignore_list_ui.dart (100%) rename lib/{views/ui => pages/views}/settings_multiple_emotes_ui.dart (97%) rename lib/{views/ui => pages/views}/settings_notifications_ui.dart (100%) rename lib/{views/ui => pages/views}/settings_style_ui.dart (100%) rename lib/{views/ui => pages/views}/settings_ui.dart (100%) rename lib/{views/ui => pages/views}/sign_up_password_ui.dart (98%) rename lib/{views/ui => pages/views}/sign_up_ui.dart (98%) rename lib/{views/ui => pages/views}/user_bottom_sheet_ui.dart (100%) diff --git a/lib/config/routes.dart b/lib/config/routes.dart index d212aec5..66438afb 100644 --- a/lib/config/routes.dart +++ b/lib/config/routes.dart @@ -1,31 +1,31 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/archive.dart'; -import 'package:fluffychat/views/homeserver_picker.dart'; -import 'package:fluffychat/views/invitation_selection.dart'; -import 'package:fluffychat/views/settings_emotes.dart'; -import 'package:fluffychat/views/settings_multiple_emotes.dart'; -import 'package:fluffychat/views/sign_up.dart'; -import 'package:fluffychat/views/sign_up_password.dart'; +import 'package:fluffychat/pages/archive.dart'; +import 'package:fluffychat/pages/homeserver_picker.dart'; +import 'package:fluffychat/pages/invitation_selection.dart'; +import 'package:fluffychat/pages/settings_emotes.dart'; +import 'package:fluffychat/pages/settings_multiple_emotes.dart'; +import 'package:fluffychat/pages/sign_up.dart'; +import 'package:fluffychat/pages/sign_up_password.dart'; import 'package:fluffychat/widgets/matrix.dart'; -import 'package:fluffychat/views/chat.dart'; -import 'package:fluffychat/views/chat_details.dart'; -import 'package:fluffychat/views/chat_encryption_settings.dart'; -import 'package:fluffychat/views/chat_list.dart'; -import 'package:fluffychat/views/chat_permissions_settings.dart'; -import 'package:fluffychat/views/ui/empty_page_ui.dart'; +import 'package:fluffychat/pages/chat.dart'; +import 'package:fluffychat/pages/chat_details.dart'; +import 'package:fluffychat/pages/chat_encryption_settings.dart'; +import 'package:fluffychat/pages/chat_list.dart'; +import 'package:fluffychat/pages/chat_permissions_settings.dart'; +import 'package:fluffychat/pages/views/empty_page_ui.dart'; import 'package:fluffychat/widgets/layouts/loading_view.dart'; import 'package:fluffychat/widgets/log_view.dart'; -import 'package:fluffychat/views/ui/login_ui.dart'; -import 'package:fluffychat/views/new_group.dart'; -import 'package:fluffychat/views/new_private_chat.dart'; -import 'package:fluffychat/views/search.dart'; -import 'package:fluffychat/views/settings.dart'; -import 'package:fluffychat/views/settings_3pid.dart'; -import 'package:fluffychat/views/device_settings.dart'; -import 'package:fluffychat/views/settings_ignore_list.dart'; -import 'package:fluffychat/views/settings_notifications.dart'; -import 'package:fluffychat/views/settings_style.dart'; +import 'package:fluffychat/pages/views/login_ui.dart'; +import 'package:fluffychat/pages/new_group.dart'; +import 'package:fluffychat/pages/new_private_chat.dart'; +import 'package:fluffychat/pages/search.dart'; +import 'package:fluffychat/pages/settings.dart'; +import 'package:fluffychat/pages/settings_3pid.dart'; +import 'package:fluffychat/pages/device_settings.dart'; +import 'package:fluffychat/pages/settings_ignore_list.dart'; +import 'package:fluffychat/pages/settings_notifications.dart'; +import 'package:fluffychat/pages/settings_style.dart'; import 'package:flutter/material.dart'; class FluffyRoutes { diff --git a/lib/views/archive.dart b/lib/pages/archive.dart similarity index 92% rename from lib/views/archive.dart rename to lib/pages/archive.dart index 6c48a1a6..cb870392 100644 --- a/lib/views/archive.dart +++ b/lib/pages/archive.dart @@ -1,6 +1,6 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/ui/archive_ui.dart'; +import 'package:fluffychat/pages/views/archive_view.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; @@ -47,5 +47,5 @@ class ArchiveController extends State { } @override - Widget build(BuildContext context) => ArchiveUI(this); + Widget build(BuildContext context) => ArchiveView(this); } diff --git a/lib/views/bootstrap_dialog.dart b/lib/pages/bootstrap_dialog.dart similarity index 100% rename from lib/views/bootstrap_dialog.dart rename to lib/pages/bootstrap_dialog.dart diff --git a/lib/views/chat.dart b/lib/pages/chat.dart similarity index 99% rename from lib/views/chat.dart rename to lib/pages/chat.dart index 70faf049..cbe94e56 100644 --- a/lib/views/chat.dart +++ b/lib/pages/chat.dart @@ -6,8 +6,8 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/views/ui/chat_ui.dart'; -import 'package:fluffychat/views/recording_dialog.dart'; +import 'package:fluffychat/pages/views/chat_ui.dart'; +import 'package:fluffychat/pages/recording_dialog.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/views/chat_details.dart b/lib/pages/chat_details.dart similarity index 99% rename from lib/views/chat_details.dart rename to lib/pages/chat_details.dart index 221197e4..7af01cee 100644 --- a/lib/views/chat_details.dart +++ b/lib/pages/chat_details.dart @@ -4,7 +4,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/views/ui/chat_details_ui.dart'; +import 'package:fluffychat/pages/views/chat_details_ui.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/services.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; diff --git a/lib/views/chat_encryption_settings.dart b/lib/pages/chat_encryption_settings.dart similarity index 96% rename from lib/views/chat_encryption_settings.dart rename to lib/pages/chat_encryption_settings.dart index 6e923f8e..e772909e 100644 --- a/lib/views/chat_encryption_settings.dart +++ b/lib/pages/chat_encryption_settings.dart @@ -1,6 +1,6 @@ import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/ui/chat_encryption_settings_ui.dart'; +import 'package:fluffychat/pages/views/chat_encryption_settings_ui.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'key_verification_dialog.dart'; diff --git a/lib/views/chat_list.dart b/lib/pages/chat_list.dart similarity index 99% rename from lib/views/chat_list.dart rename to lib/pages/chat_list.dart index aea4e8db..b3eddf25 100644 --- a/lib/views/chat_list.dart +++ b/lib/pages/chat_list.dart @@ -5,7 +5,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/views/ui/chat_list_ui.dart'; +import 'package:fluffychat/pages/views/chat_list_ui.dart'; import 'package:flutter/cupertino.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/utils/platform_infos.dart'; diff --git a/lib/views/chat_permissions_settings.dart b/lib/pages/chat_permissions_settings.dart similarity index 96% rename from lib/views/chat_permissions_settings.dart rename to lib/pages/chat_permissions_settings.dart index 041b5d9a..4793cacb 100644 --- a/lib/views/chat_permissions_settings.dart +++ b/lib/pages/chat_permissions_settings.dart @@ -2,8 +2,8 @@ import 'dart:developer'; import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; -import 'package:fluffychat/views/ui/chat_permissions_settings_ui.dart'; -import 'package:fluffychat/views/permission_slider_dialog.dart'; +import 'package:fluffychat/pages/views/chat_permissions_settings_ui.dart'; +import 'package:fluffychat/pages/permission_slider_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/views/device_settings.dart b/lib/pages/device_settings.dart similarity index 96% rename from lib/views/device_settings.dart rename to lib/pages/device_settings.dart index 9c2cf531..e5f0d73e 100644 --- a/lib/views/device_settings.dart +++ b/lib/pages/device_settings.dart @@ -1,8 +1,8 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:famedlysdk/encryption/utils/key_verification.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/ui/device_settings_ui.dart'; -import 'package:fluffychat/views/key_verification_dialog.dart'; +import 'package:fluffychat/pages/views/device_settings_ui.dart'; +import 'package:fluffychat/pages/key_verification_dialog.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/views/homeserver_picker.dart b/lib/pages/homeserver_picker.dart similarity index 98% rename from lib/views/homeserver_picker.dart rename to lib/pages/homeserver_picker.dart index c8cfd25e..887b5d30 100644 --- a/lib/views/homeserver_picker.dart +++ b/lib/pages/homeserver_picker.dart @@ -2,7 +2,7 @@ import 'dart:async'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/ui/homeserver_picker_ui.dart'; +import 'package:fluffychat/pages/views/homeserver_picker_ui.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/config/app_config.dart'; import 'package:fluffychat/config/setting_keys.dart'; diff --git a/lib/views/image_viewer.dart b/lib/pages/image_viewer.dart similarity index 95% rename from lib/views/image_viewer.dart rename to lib/pages/image_viewer.dart index 3f5bb636..c711f38a 100644 --- a/lib/views/image_viewer.dart +++ b/lib/pages/image_viewer.dart @@ -1,7 +1,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/utils/platform_infos.dart'; -import 'package:fluffychat/views/ui/image_viewer_ui.dart'; +import 'package:fluffychat/pages/views/image_viewer_ui.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/invitation_selection.dart b/lib/pages/invitation_selection.dart similarity index 98% rename from lib/views/invitation_selection.dart rename to lib/pages/invitation_selection.dart index 0a25d707..6efe33fd 100644 --- a/lib/views/invitation_selection.dart +++ b/lib/pages/invitation_selection.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/ui/invitation_selection_ui.dart'; +import 'package:fluffychat/pages/views/invitation_selection_ui.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/views/key_verification_dialog.dart b/lib/pages/key_verification_dialog.dart similarity index 100% rename from lib/views/key_verification_dialog.dart rename to lib/pages/key_verification_dialog.dart diff --git a/lib/views/new_group.dart b/lib/pages/new_group.dart similarity index 96% rename from lib/views/new_group.dart rename to lib/pages/new_group.dart index 479f1c7e..bb40453d 100644 --- a/lib/views/new_group.dart +++ b/lib/pages/new_group.dart @@ -1,6 +1,6 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart' as sdk; -import 'package:fluffychat/views/ui/new_group_ui.dart'; +import 'package:fluffychat/pages/views/new_group_ui.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/views/new_private_chat.dart b/lib/pages/new_private_chat.dart similarity index 98% rename from lib/views/new_private_chat.dart rename to lib/pages/new_private_chat.dart index a08e4530..6085e554 100644 --- a/lib/views/new_private_chat.dart +++ b/lib/pages/new_private_chat.dart @@ -3,7 +3,7 @@ import 'dart:async'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; -import 'package:fluffychat/views/ui/new_private_chat_ui.dart'; +import 'package:fluffychat/pages/views/new_private_chat_ui.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/views/permission_slider_dialog.dart b/lib/pages/permission_slider_dialog.dart similarity index 100% rename from lib/views/permission_slider_dialog.dart rename to lib/pages/permission_slider_dialog.dart diff --git a/lib/views/recording_dialog.dart b/lib/pages/recording_dialog.dart similarity index 100% rename from lib/views/recording_dialog.dart rename to lib/pages/recording_dialog.dart diff --git a/lib/views/search.dart b/lib/pages/search.dart similarity index 99% rename from lib/views/search.dart rename to lib/pages/search.dart index 59ea1f40..1ea02b29 100644 --- a/lib/views/search.dart +++ b/lib/pages/search.dart @@ -7,7 +7,7 @@ import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'ui/search_ui.dart'; +import 'views/search_ui.dart'; class Search extends StatefulWidget { final String alias; diff --git a/lib/views/send_file_dialog.dart b/lib/pages/send_file_dialog.dart similarity index 100% rename from lib/views/send_file_dialog.dart rename to lib/pages/send_file_dialog.dart diff --git a/lib/views/settings.dart b/lib/pages/settings.dart similarity index 99% rename from lib/views/settings.dart rename to lib/pages/settings.dart index 2bf9a056..fd83266a 100644 --- a/lib/views/settings.dart +++ b/lib/pages/settings.dart @@ -14,7 +14,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:image_picker/image_picker.dart'; -import 'ui/settings_ui.dart'; +import 'views/settings_ui.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'bootstrap_dialog.dart'; import '../widgets/matrix.dart'; diff --git a/lib/views/settings_3pid.dart b/lib/pages/settings_3pid.dart similarity index 98% rename from lib/views/settings_3pid.dart rename to lib/pages/settings_3pid.dart index 06fd5a75..d4cd3adc 100644 --- a/lib/views/settings_3pid.dart +++ b/lib/pages/settings_3pid.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 'ui/settings_3pid_ui.dart'; +import 'views/settings_3pid_ui.dart'; class Settings3Pid extends StatefulWidget { static int sendAttempt = 0; diff --git a/lib/views/settings_emotes.dart b/lib/pages/settings_emotes.dart similarity index 99% rename from lib/views/settings_emotes.dart rename to lib/pages/settings_emotes.dart index fb733466..085b7ecc 100644 --- a/lib/views/settings_emotes.dart +++ b/lib/pages/settings_emotes.dart @@ -9,7 +9,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:image_picker/image_picker.dart'; -import 'ui/settings_emotes_ui.dart'; +import 'views/settings_emotes_ui.dart'; import '../widgets/matrix.dart'; class EmotesSettings extends StatefulWidget { diff --git a/lib/views/settings_ignore_list.dart b/lib/pages/settings_ignore_list.dart similarity index 95% rename from lib/views/settings_ignore_list.dart rename to lib/pages/settings_ignore_list.dart index caa0af56..4c18e909 100644 --- a/lib/views/settings_ignore_list.dart +++ b/lib/pages/settings_ignore_list.dart @@ -1,7 +1,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:flutter/material.dart'; -import 'ui/settings_ignore_list_ui.dart'; +import 'views/settings_ignore_list_ui.dart'; import '../widgets/matrix.dart'; class SettingsIgnoreList extends StatefulWidget { diff --git a/lib/views/settings_multiple_emotes.dart b/lib/pages/settings_multiple_emotes.dart similarity index 90% rename from lib/views/settings_multiple_emotes.dart rename to lib/pages/settings_multiple_emotes.dart index 5d8ea674..8314cf6b 100644 --- a/lib/views/settings_multiple_emotes.dart +++ b/lib/pages/settings_multiple_emotes.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; -import 'ui/settings_multiple_emotes_ui.dart'; +import 'views/settings_multiple_emotes_ui.dart'; class MultipleEmotesSettings extends StatefulWidget { final String roomId; diff --git a/lib/views/settings_notifications.dart b/lib/pages/settings_notifications.dart similarity index 98% rename from lib/views/settings_notifications.dart rename to lib/pages/settings_notifications.dart index e773f2e1..29e21a34 100644 --- a/lib/views/settings_notifications.dart +++ b/lib/pages/settings_notifications.dart @@ -6,7 +6,7 @@ import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; import 'package:open_noti_settings/open_noti_settings.dart'; -import 'ui/settings_notifications_ui.dart'; +import 'views/settings_notifications_ui.dart'; import '../widgets/matrix.dart'; class NotificationSettingsItem { diff --git a/lib/views/settings_style.dart b/lib/pages/settings_style.dart similarity index 97% rename from lib/views/settings_style.dart rename to lib/pages/settings_style.dart index db2e82f9..e6d0766d 100644 --- a/lib/views/settings_style.dart +++ b/lib/pages/settings_style.dart @@ -6,7 +6,7 @@ import 'package:fluffychat/config/setting_keys.dart'; import 'package:flutter/material.dart'; import 'package:image_picker/image_picker.dart'; -import 'ui/settings_style_ui.dart'; +import 'views/settings_style_ui.dart'; import '../widgets/matrix.dart'; class SettingsStyle extends StatefulWidget { diff --git a/lib/views/sign_up.dart b/lib/pages/sign_up.dart similarity index 97% rename from lib/views/sign_up.dart rename to lib/pages/sign_up.dart index 92ff36ea..782a6613 100644 --- a/lib/views/sign_up.dart +++ b/lib/pages/sign_up.dart @@ -1,7 +1,7 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:file_picker_cross/file_picker_cross.dart'; -import 'package:fluffychat/views/ui/sign_up_ui.dart'; +import 'package:fluffychat/pages/views/sign_up_ui.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/views/sign_up_password.dart b/lib/pages/sign_up_password.dart similarity index 98% rename from lib/views/sign_up_password.dart rename to lib/pages/sign_up_password.dart index 2fc9a569..ba31c56c 100644 --- a/lib/views/sign_up_password.dart +++ b/lib/pages/sign_up_password.dart @@ -4,7 +4,7 @@ import 'package:email_validator/email_validator.dart'; import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/utils/get_client_secret.dart'; -import 'package:fluffychat/views/ui/sign_up_password_ui.dart'; +import 'package:fluffychat/pages/views/sign_up_password_ui.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/user_bottom_sheet.dart b/lib/pages/user_bottom_sheet.dart similarity index 96% rename from lib/views/user_bottom_sheet.dart rename to lib/pages/user_bottom_sheet.dart index a6e6af09..c060d3db 100644 --- a/lib/views/user_bottom_sheet.dart +++ b/lib/pages/user_bottom_sheet.dart @@ -1,13 +1,13 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/permission_slider_dialog.dart'; +import 'package:fluffychat/pages/permission_slider_dialog.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'ui/user_bottom_sheet_ui.dart'; +import 'views/user_bottom_sheet_ui.dart'; class UserBottomSheet extends StatefulWidget { final User user; diff --git a/lib/views/ui/archive_ui.dart b/lib/pages/views/archive_view.dart similarity index 92% rename from lib/views/ui/archive_ui.dart rename to lib/pages/views/archive_view.dart index bb37fa23..a9d42164 100644 --- a/lib/views/ui/archive_ui.dart +++ b/lib/pages/views/archive_view.dart @@ -1,13 +1,13 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/archive.dart'; +import 'package:fluffychat/pages/archive.dart'; import 'package:fluffychat/widgets/list_items/chat_list_item.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -class ArchiveUI extends StatelessWidget { +class ArchiveView extends StatelessWidget { final ArchiveController controller; - const ArchiveUI(this.controller, {Key key}) : super(key: key); + const ArchiveView(this.controller, {Key key}) : super(key: key); @override Widget build(BuildContext context) { diff --git a/lib/views/ui/chat_details_ui.dart b/lib/pages/views/chat_details_ui.dart similarity index 99% rename from lib/views/ui/chat_details_ui.dart rename to lib/pages/views/chat_details_ui.dart index 3c4f9978..9b9f8a5b 100644 --- a/lib/views/ui/chat_details_ui.dart +++ b/lib/pages/views/chat_details_ui.dart @@ -1,6 +1,6 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:fluffychat/config/app_config.dart'; -import 'package:fluffychat/views/chat_details.dart'; +import 'package:fluffychat/pages/chat_details.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; diff --git a/lib/views/ui/chat_encryption_settings_ui.dart b/lib/pages/views/chat_encryption_settings_ui.dart similarity index 99% rename from lib/views/ui/chat_encryption_settings_ui.dart rename to lib/pages/views/chat_encryption_settings_ui.dart index 7c469956..26f557e8 100644 --- a/lib/views/ui/chat_encryption_settings_ui.dart +++ b/lib/pages/views/chat_encryption_settings_ui.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/chat_encryption_settings.dart'; +import 'package:fluffychat/pages/chat_encryption_settings.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; diff --git a/lib/views/ui/chat_list_ui.dart b/lib/pages/views/chat_list_ui.dart similarity index 99% rename from lib/views/ui/chat_list_ui.dart rename to lib/pages/views/chat_list_ui.dart index daae6ff8..6837d6e7 100644 --- a/lib/views/ui/chat_list_ui.dart +++ b/lib/pages/views/chat_list_ui.dart @@ -1,6 +1,6 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/chat_list.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'; import 'package:flutter/cupertino.dart'; diff --git a/lib/views/ui/chat_permissions_settings_ui.dart b/lib/pages/views/chat_permissions_settings_ui.dart similarity index 98% rename from lib/views/ui/chat_permissions_settings_ui.dart rename to lib/pages/views/chat_permissions_settings_ui.dart index 95f04d62..93de808d 100644 --- a/lib/views/ui/chat_permissions_settings_ui.dart +++ b/lib/pages/views/chat_permissions_settings_ui.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/chat_permissions_settings.dart'; +import 'package:fluffychat/pages/chat_permissions_settings.dart'; import 'package:fluffychat/widgets/list_items/permission_list_tile.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/views/ui/chat_ui.dart b/lib/pages/views/chat_ui.dart similarity index 99% rename from lib/views/ui/chat_ui.dart rename to lib/pages/views/chat_ui.dart index 071df4d1..30aa2a12 100644 --- a/lib/views/ui/chat_ui.dart +++ b/lib/pages/views/chat_ui.dart @@ -4,7 +4,7 @@ import 'dart:ui'; import 'package:adaptive_page_layout/adaptive_page_layout.dart'; import 'package:emoji_picker_flutter/emoji_picker_flutter.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/chat.dart'; +import 'package:fluffychat/pages/chat.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/chat_settings_popup_menu.dart'; import 'package:fluffychat/widgets/connection_status_header.dart'; @@ -17,7 +17,7 @@ import 'package:fluffychat/widgets/encryption_button.dart'; import 'package:fluffychat/widgets/list_items/message.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:fluffychat/widgets/reply_content.dart'; -import 'package:fluffychat/views/user_bottom_sheet.dart'; +import 'package:fluffychat/pages/user_bottom_sheet.dart'; import 'package:fluffychat/config/app_emojis.dart'; import 'package:fluffychat/utils/matrix_locals.dart'; import 'package:fluffychat/utils/platform_infos.dart'; diff --git a/lib/views/ui/device_settings_ui.dart b/lib/pages/views/device_settings_ui.dart similarity index 98% rename from lib/views/ui/device_settings_ui.dart rename to lib/pages/views/device_settings_ui.dart index e2c32ad7..f79aeafd 100644 --- a/lib/views/ui/device_settings_ui.dart +++ b/lib/pages/views/device_settings_ui.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/device_settings.dart'; +import 'package:fluffychat/pages/device_settings.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/ui/empty_page_ui.dart b/lib/pages/views/empty_page_ui.dart similarity index 100% rename from lib/views/ui/empty_page_ui.dart rename to lib/pages/views/empty_page_ui.dart diff --git a/lib/views/ui/homeserver_picker_ui.dart b/lib/pages/views/homeserver_picker_ui.dart similarity index 100% rename from lib/views/ui/homeserver_picker_ui.dart rename to lib/pages/views/homeserver_picker_ui.dart diff --git a/lib/views/ui/image_viewer_ui.dart b/lib/pages/views/image_viewer_ui.dart similarity index 100% rename from lib/views/ui/image_viewer_ui.dart rename to lib/pages/views/image_viewer_ui.dart diff --git a/lib/views/ui/invitation_selection_ui.dart b/lib/pages/views/invitation_selection_ui.dart similarity index 98% rename from lib/views/ui/invitation_selection_ui.dart rename to lib/pages/views/invitation_selection_ui.dart index b24e9064..015516c8 100644 --- a/lib/views/ui/invitation_selection_ui.dart +++ b/lib/pages/views/invitation_selection_ui.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/invitation_selection.dart'; +import 'package:fluffychat/pages/invitation_selection.dart'; import 'package:fluffychat/widgets/default_app_bar_search_field.dart'; import 'package:famedlysdk/famedlysdk.dart'; diff --git a/lib/views/ui/login_ui.dart b/lib/pages/views/login_ui.dart similarity index 100% rename from lib/views/ui/login_ui.dart rename to lib/pages/views/login_ui.dart diff --git a/lib/views/ui/new_group_ui.dart b/lib/pages/views/new_group_ui.dart similarity index 97% rename from lib/views/ui/new_group_ui.dart rename to lib/pages/views/new_group_ui.dart index d8e635a8..a887bcd4 100644 --- a/lib/views/ui/new_group_ui.dart +++ b/lib/pages/views/new_group_ui.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/new_group.dart'; +import 'package:fluffychat/pages/new_group.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/ui/new_private_chat_ui.dart b/lib/pages/views/new_private_chat_ui.dart similarity index 98% rename from lib/views/ui/new_private_chat_ui.dart rename to lib/pages/views/new_private_chat_ui.dart index 050d7cba..5f671461 100644 --- a/lib/views/ui/new_private_chat_ui.dart +++ b/lib/pages/views/new_private_chat_ui.dart @@ -1,5 +1,5 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; -import 'package:fluffychat/views/new_private_chat.dart'; +import 'package:fluffychat/pages/new_private_chat.dart'; import 'package:fluffychat/widgets/avatar.dart'; import 'package:fluffychat/widgets/contacts_list.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; diff --git a/lib/views/ui/search_ui.dart b/lib/pages/views/search_ui.dart similarity index 100% rename from lib/views/ui/search_ui.dart rename to lib/pages/views/search_ui.dart diff --git a/lib/views/ui/settings_3pid_ui.dart b/lib/pages/views/settings_3pid_ui.dart similarity index 98% rename from lib/views/ui/settings_3pid_ui.dart rename to lib/pages/views/settings_3pid_ui.dart index 7dd48398..1352898f 100644 --- a/lib/views/ui/settings_3pid_ui.dart +++ b/lib/pages/views/settings_3pid_ui.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/settings_3pid.dart'; +import 'package:fluffychat/pages/settings_3pid.dart'; import 'package:fluffychat/widgets/layouts/max_width_body.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/ui/settings_emotes_ui.dart b/lib/pages/views/settings_emotes_ui.dart similarity index 100% rename from lib/views/ui/settings_emotes_ui.dart rename to lib/pages/views/settings_emotes_ui.dart diff --git a/lib/views/ui/settings_ignore_list_ui.dart b/lib/pages/views/settings_ignore_list_ui.dart similarity index 100% rename from lib/views/ui/settings_ignore_list_ui.dart rename to lib/pages/views/settings_ignore_list_ui.dart diff --git a/lib/views/ui/settings_multiple_emotes_ui.dart b/lib/pages/views/settings_multiple_emotes_ui.dart similarity index 97% rename from lib/views/ui/settings_multiple_emotes_ui.dart rename to lib/pages/views/settings_multiple_emotes_ui.dart index b35552ce..aadfb6e0 100644 --- a/lib/views/ui/settings_multiple_emotes_ui.dart +++ b/lib/pages/views/settings_multiple_emotes_ui.dart @@ -1,5 +1,5 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; -import 'package:fluffychat/views/settings_multiple_emotes.dart'; +import 'package:fluffychat/pages/settings_multiple_emotes.dart'; import 'package:fluffychat/widgets/matrix.dart'; import 'package:flutter/material.dart'; import 'package:famedlysdk/famedlysdk.dart'; diff --git a/lib/views/ui/settings_notifications_ui.dart b/lib/pages/views/settings_notifications_ui.dart similarity index 100% rename from lib/views/ui/settings_notifications_ui.dart rename to lib/pages/views/settings_notifications_ui.dart diff --git a/lib/views/ui/settings_style_ui.dart b/lib/pages/views/settings_style_ui.dart similarity index 100% rename from lib/views/ui/settings_style_ui.dart rename to lib/pages/views/settings_style_ui.dart diff --git a/lib/views/ui/settings_ui.dart b/lib/pages/views/settings_ui.dart similarity index 100% rename from lib/views/ui/settings_ui.dart rename to lib/pages/views/settings_ui.dart diff --git a/lib/views/ui/sign_up_password_ui.dart b/lib/pages/views/sign_up_password_ui.dart similarity index 98% rename from lib/views/ui/sign_up_password_ui.dart rename to lib/pages/views/sign_up_password_ui.dart index 989b0919..dc67e798 100644 --- a/lib/views/ui/sign_up_password_ui.dart +++ b/lib/pages/views/sign_up_password_ui.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/sign_up_password.dart'; +import 'package:fluffychat/pages/sign_up_password.dart'; import 'package:fluffychat/widgets/layouts/one_page_card.dart'; import 'package:flutter/material.dart'; diff --git a/lib/views/ui/sign_up_ui.dart b/lib/pages/views/sign_up_ui.dart similarity index 98% rename from lib/views/ui/sign_up_ui.dart rename to lib/pages/views/sign_up_ui.dart index 46558482..fe14b398 100644 --- a/lib/views/ui/sign_up_ui.dart +++ b/lib/pages/views/sign_up_ui.dart @@ -1,5 +1,5 @@ import 'package:adaptive_page_layout/adaptive_page_layout.dart'; -import 'package:fluffychat/views/sign_up.dart'; +import 'package:fluffychat/pages/sign_up.dart'; import 'package:fluffychat/widgets/fluffy_banner.dart'; import 'package:fluffychat/widgets/matrix.dart'; diff --git a/lib/views/ui/user_bottom_sheet_ui.dart b/lib/pages/views/user_bottom_sheet_ui.dart similarity index 100% rename from lib/views/ui/user_bottom_sheet_ui.dart rename to lib/pages/views/user_bottom_sheet_ui.dart diff --git a/lib/utils/event_extension.dart b/lib/utils/event_extension.dart index f68f4963..08dd9ebc 100644 --- a/lib/utils/event_extension.dart +++ b/lib/utils/event_extension.dart @@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; import 'matrix_file_extension.dart'; -import '../views/image_viewer.dart'; +import '../pages/image_viewer.dart'; extension LocalizedBody on Event { void openFile(BuildContext context, {bool downloadOnly = false}) async { diff --git a/lib/widgets/image_bubble.dart b/lib/widgets/image_bubble.dart index 1a62cb81..86655d34 100644 --- a/lib/widgets/image_bubble.dart +++ b/lib/widgets/image_bubble.dart @@ -1,5 +1,5 @@ import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/image_viewer.dart'; +import 'package:fluffychat/pages/image_viewer.dart'; import 'package:flutter/material.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter_blurhash/flutter_blurhash.dart'; diff --git a/lib/widgets/list_items/chat_list_item.dart b/lib/widgets/list_items/chat_list_item.dart index c67a5725..ec5c9cee 100644 --- a/lib/widgets/list_items/chat_list_item.dart +++ b/lib/widgets/list_items/chat_list_item.dart @@ -12,7 +12,7 @@ import 'package:pedantic/pedantic.dart'; import '../../utils/date_time_extension.dart'; import '../avatar.dart'; -import '../../views/send_file_dialog.dart'; +import '../../pages/send_file_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import '../matrix.dart'; import '../mouse_over_builder.dart'; diff --git a/lib/widgets/list_items/participant_list_item.dart b/lib/widgets/list_items/participant_list_item.dart index bda9e0f8..1c008732 100644 --- a/lib/widgets/list_items/participant_list_item.dart +++ b/lib/widgets/list_items/participant_list_item.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import '../avatar.dart'; -import '../../views/user_bottom_sheet.dart'; +import '../../pages/user_bottom_sheet.dart'; class ParticipantListItem extends StatelessWidget { final User user; diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart index a6564994..54810974 100644 --- a/lib/widgets/matrix.dart +++ b/lib/widgets/matrix.dart @@ -24,7 +24,7 @@ import 'package:desktop_notifications/desktop_notifications.dart'; import '../utils/beautify_string_extension.dart'; import '../utils/localized_exception_extension.dart'; import '../utils/famedlysdk_store.dart'; -import '../views/key_verification_dialog.dart'; +import '../pages/key_verification_dialog.dart'; import '../utils/platform_infos.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; diff --git a/lib/widgets/message_content.dart b/lib/widgets/message_content.dart index d930f80e..b08c7025 100644 --- a/lib/widgets/message_content.dart +++ b/lib/widgets/message_content.dart @@ -6,7 +6,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/widgets/image_bubble.dart'; import 'package:fluffychat/utils/event_extension.dart'; import 'package:fluffychat/utils/matrix_locals.dart'; -import 'package:fluffychat/views/key_verification_dialog.dart'; +import 'package:fluffychat/pages/key_verification_dialog.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/test/homeserver_picker_test.dart b/test/homeserver_picker_test.dart index 6d141ad0..e3769ebf 100644 --- a/test/homeserver_picker_test.dart +++ b/test/homeserver_picker_test.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/homeserver_picker.dart'; +import 'package:fluffychat/pages/homeserver_picker.dart'; import 'package:fluffychat/main.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/sign_up_password_test.dart b/test/sign_up_password_test.dart index 75bf36c3..03473c70 100644 --- a/test/sign_up_password_test.dart +++ b/test/sign_up_password_test.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/sign_up_password.dart'; +import 'package:fluffychat/pages/sign_up_password.dart'; import 'package:fluffychat/main.dart'; import 'package:flutter_test/flutter_test.dart'; diff --git a/test/sign_up_test.dart b/test/sign_up_test.dart index 1013c4b1..d0fd8e2b 100644 --- a/test/sign_up_test.dart +++ b/test/sign_up_test.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/sign_up.dart'; +import 'package:fluffychat/pages/sign_up.dart'; import 'package:fluffychat/main.dart'; import 'package:flutter_test/flutter_test.dart';