diff --git a/lib/views/widgets/dialogs/bootstrap_dialog.dart b/lib/views/bootstrap_dialog.dart similarity index 99% rename from lib/views/widgets/dialogs/bootstrap_dialog.dart rename to lib/views/bootstrap_dialog.dart index 28a21d74..7b0d971a 100644 --- a/lib/views/widgets/dialogs/bootstrap_dialog.dart +++ b/lib/views/bootstrap_dialog.dart @@ -2,7 +2,7 @@ import 'package:adaptive_dialog/adaptive_dialog.dart'; import 'package:famedlysdk/encryption.dart'; import 'package:famedlysdk/encryption/utils/bootstrap.dart'; import 'package:famedlysdk/famedlysdk.dart'; -import 'package:fluffychat/views/widgets/dialogs/adaptive_flat_button.dart'; +import 'package:fluffychat/views/widgets/adaptive_flat_button.dart'; import 'package:flutter/services.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/views/chat.dart b/lib/views/chat.dart index 7c112c83..d9f4500e 100644 --- a/lib/views/chat.dart +++ b/lib/views/chat.dart @@ -8,7 +8,7 @@ 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/widgets/dialogs/recording_dialog.dart'; +import 'package:fluffychat/views/recording_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/views/widgets/matrix.dart'; @@ -25,7 +25,7 @@ import 'package:scroll_to_index/scroll_to_index.dart'; import 'package:shared_preferences/shared_preferences.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'widgets/dialogs/send_file_dialog.dart'; +import 'send_file_dialog.dart'; import '../utils/filtered_timeline_extension.dart'; import '../utils/matrix_file_extension.dart'; diff --git a/lib/views/chat_encryption_settings.dart b/lib/views/chat_encryption_settings.dart index 6f77aa50..40828c3f 100644 --- a/lib/views/chat_encryption_settings.dart +++ b/lib/views/chat_encryption_settings.dart @@ -3,7 +3,7 @@ import 'package:famedlysdk/famedlysdk.dart'; import 'package:fluffychat/views/ui/chat_encryption_settings_ui.dart'; import 'package:fluffychat/views/widgets/matrix.dart'; import 'package:flutter/material.dart'; -import 'widgets/dialogs/key_verification_dialog.dart'; +import 'key_verification_dialog.dart'; class ChatEncryptionSettings extends StatefulWidget { final String id; diff --git a/lib/views/chat_permissions_settings.dart b/lib/views/chat_permissions_settings.dart index 1dfd3a31..e427883c 100644 --- a/lib/views/chat_permissions_settings.dart +++ b/lib/views/chat_permissions_settings.dart @@ -3,7 +3,7 @@ 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/widgets/dialogs/permission_slider_dialog.dart'; +import 'package:fluffychat/views/permission_slider_dialog.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/views/widgets/matrix.dart'; diff --git a/lib/views/device_settings.dart b/lib/views/device_settings.dart index c5578c79..2a126d31 100644 --- a/lib/views/device_settings.dart +++ b/lib/views/device_settings.dart @@ -2,7 +2,7 @@ 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/widgets/dialogs/key_verification_dialog.dart'; +import 'package:fluffychat/views/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/widgets/dialogs/key_verification_dialog.dart b/lib/views/key_verification_dialog.dart similarity index 98% rename from lib/views/widgets/dialogs/key_verification_dialog.dart rename to lib/views/key_verification_dialog.dart index 3023f3b9..4652d00d 100644 --- a/lib/views/widgets/dialogs/key_verification_dialog.dart +++ b/lib/views/key_verification_dialog.dart @@ -5,10 +5,10 @@ import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; -import 'adaptive_flat_button.dart'; +import 'widgets/adaptive_flat_button.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import '../../../utils/string_color.dart'; -import '../../../utils/beautify_string_extension.dart'; +import '../utils/string_color.dart'; +import '../utils/beautify_string_extension.dart'; class KeyVerificationDialog extends StatefulWidget { Future show(BuildContext context) => PlatformInfos.isCupertinoStyle diff --git a/lib/views/widgets/dialogs/permission_slider_dialog.dart b/lib/views/permission_slider_dialog.dart similarity index 97% rename from lib/views/widgets/dialogs/permission_slider_dialog.dart rename to lib/views/permission_slider_dialog.dart index 44a522cb..deb91f9c 100644 --- a/lib/views/widgets/dialogs/permission_slider_dialog.dart +++ b/lib/views/permission_slider_dialog.dart @@ -1,4 +1,4 @@ -import 'package:fluffychat/views/widgets/dialogs/adaptive_flat_button.dart'; +import 'package:fluffychat/views/widgets/adaptive_flat_button.dart'; import 'package:fluffychat/utils/platform_infos.dart'; import 'package:flutter/material.dart'; import 'package:flutter/cupertino.dart'; diff --git a/lib/views/widgets/dialogs/recording_dialog.dart b/lib/views/recording_dialog.dart similarity index 100% rename from lib/views/widgets/dialogs/recording_dialog.dart rename to lib/views/recording_dialog.dart diff --git a/lib/views/widgets/dialogs/send_file_dialog.dart b/lib/views/send_file_dialog.dart similarity index 95% rename from lib/views/widgets/dialogs/send_file_dialog.dart rename to lib/views/send_file_dialog.dart index eb5d91e5..5e6842a6 100644 --- a/lib/views/widgets/dialogs/send_file_dialog.dart +++ b/lib/views/send_file_dialog.dart @@ -3,9 +3,9 @@ import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import '../../../utils/matrix_file_extension.dart'; -import '../../../utils/room_send_file_extension.dart'; -import '../../../utils/resize_image.dart'; +import '../utils/matrix_file_extension.dart'; +import '../utils/room_send_file_extension.dart'; +import '../utils/resize_image.dart'; class SendFileDialog extends StatefulWidget { final Room room; diff --git a/lib/views/settings.dart b/lib/views/settings.dart index 6141f49b..d5dfca62 100644 --- a/lib/views/settings.dart +++ b/lib/views/settings.dart @@ -17,7 +17,7 @@ import 'package:image_picker/image_picker.dart'; import 'ui/settings_ui.dart'; import 'package:future_loading_dialog/future_loading_dialog.dart'; -import 'widgets/dialogs/bootstrap_dialog.dart'; +import 'bootstrap_dialog.dart'; import 'widgets/matrix.dart'; import '../config/app_config.dart'; import '../config/setting_keys.dart'; diff --git a/lib/views/widgets/dialogs/adaptive_flat_button.dart b/lib/views/widgets/adaptive_flat_button.dart similarity index 100% rename from lib/views/widgets/dialogs/adaptive_flat_button.dart rename to lib/views/widgets/adaptive_flat_button.dart diff --git a/lib/views/widgets/list_items/chat_list_item.dart b/lib/views/widgets/list_items/chat_list_item.dart index c58344da..4fd85e1b 100644 --- a/lib/views/widgets/list_items/chat_list_item.dart +++ b/lib/views/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 '../dialogs/send_file_dialog.dart'; +import '../../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/views/widgets/matrix.dart b/lib/views/widgets/matrix.dart index fa0f1917..2426a84c 100644 --- a/lib/views/widgets/matrix.dart +++ b/lib/views/widgets/matrix.dart @@ -27,7 +27,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 'dialogs/key_verification_dialog.dart'; +import '../key_verification_dialog.dart'; import '../../utils/platform_infos.dart'; import '../../config/app_config.dart'; import '../../config/setting_keys.dart'; diff --git a/lib/views/widgets/message_content.dart b/lib/views/widgets/message_content.dart index 652bb3ed..ab57aa41 100644 --- a/lib/views/widgets/message_content.dart +++ b/lib/views/widgets/message_content.dart @@ -6,7 +6,7 @@ import 'package:future_loading_dialog/future_loading_dialog.dart'; import 'package:fluffychat/views/widgets/image_bubble.dart'; import 'package:fluffychat/utils/event_extension.dart'; import 'package:fluffychat/utils/matrix_locals.dart'; -import 'package:fluffychat/views/widgets/dialogs/key_verification_dialog.dart'; +import 'package:fluffychat/views/key_verification_dialog.dart'; import 'package:flutter/material.dart'; import 'package:flutter_gen/gen_l10n/l10n.dart'; diff --git a/lib/views/widgets/user_bottom_sheet.dart b/lib/views/widgets/user_bottom_sheet.dart index 706bd0dc..db306533 100644 --- a/lib/views/widgets/user_bottom_sheet.dart +++ b/lib/views/widgets/user_bottom_sheet.dart @@ -3,7 +3,7 @@ import 'dart:math'; 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/widgets/dialogs/permission_slider_dialog.dart'; +import 'package:fluffychat/views/permission_slider_dialog.dart'; import 'package:fluffychat/config/themes.dart'; import 'package:fluffychat/utils/fluffy_share.dart'; import 'package:flutter/material.dart';