From dfcbfcb31e80799b99ffd201e791651681ec7ff6 Mon Sep 17 00:00:00 2001 From: LittleSheep Date: Fri, 6 Feb 2026 00:57:17 +0800 Subject: [PATCH] :art: Continued to rearrange core folders content --- .../account/me/settings_auth_factors.dart | 2 +- .../account/me/settings_connections.dart | 4 +- .../account/me/settings_contacts.dart | 2 +- lib/accounts/account/profile.dart | 4 +- lib/accounts/accounts_models/account.dart | 2 +- .../account/account_devices.dart | 2 +- .../account/account_name.dart | 2 +- .../account/activity_presence.dart | 2 +- .../account/event_details_widget.dart | 2 +- .../account/fortune_graph.dart | 2 +- .../account/restore_purchase_sheet.dart | 2 +- .../accounts_widgets/account/status.dart | 2 +- .../account/status_creation.dart | 2 +- .../account/stellar_program_tab.dart | 6 +- lib/accounts/check_in.dart | 2 +- lib/accounts/usage_overview.dart | 38 ++++++------ .../utils => activity}/activity_utils.dart | 0 lib/auth/captcha.native.dart | 2 +- lib/auth/captcha.web.dart | 20 +++--- lib/auth/create_account_modal.dart | 2 +- lib/auth/login_modal.dart | 2 +- lib/chat/chat_widgets/call_overlay.dart | 2 +- lib/chat/chat_widgets/chat_detail_screen.dart | 2 +- lib/chat/chat_widgets/chat_input.dart | 6 +- lib/chat/chat_widgets/chat_invites_sheet.dart | 2 +- .../chat_widgets/chat_link_attachments.dart | 2 +- lib/chat/chat_widgets/chat_room_form.dart | 2 +- lib/chat/chat_widgets/chat_room_screen.dart | 2 +- lib/chat/chat_widgets/message_content.dart | 11 ++-- lib/chat/chat_widgets/message_item.dart | 6 +- lib/chat/chat_widgets/message_list_tile.dart | 6 +- lib/chat/hooks/use_room_input.dart | 2 +- lib/chat/messages_notifier.dart | 2 +- lib/core/debug_sheet.dart | 4 +- lib/core/{utils => }/format.dart | 0 lib/core/{utils => }/mapping.dart | 0 lib/core/services/sharing_intent.dart | 30 +++++---- lib/core/services/update_service.dart | 61 +++++++++---------- lib/core/{utils => }/text.dart | 0 lib/creators/creators/hub.dart | 4 +- lib/creators/creators/publishers_form.dart | 2 +- lib/creators/creators/sites/site_edit.dart | 2 +- .../creators/stickers/pack_detail.dart | 4 +- lib/creators/creators/stickers/stickers.dart | 4 +- .../creators/webfeed/webfeed_list.dart | 2 +- lib/developers/developers/app_secrets.dart | 2 +- lib/developers/developers/apps.dart | 2 +- lib/developers/developers/bot_keys.dart | 2 +- lib/developers/developers/bots.dart | 2 +- lib/developers/developers/edit_app.dart | 2 +- lib/developers/developers/hub.dart | 2 +- lib/discovery/discovery/article_detail.dart | 2 +- .../content/attachment_preview.dart | 6 +- .../widgets => drive}/content/audio.dart | 0 .../content/cloud_file_collection.dart | 4 +- .../content/cloud_file_lightbox.dart | 8 +-- .../content/cloud_file_picker.dart | 2 +- .../content/exif_info_overlay.dart | 0 .../content/file_action_button.dart | 0 .../content/file_info_sheet.dart | 4 +- .../content/file_viewer_contents.dart | 12 ++-- .../widgets => drive}/content/image.dart | 0 .../content/image_control_overlay.dart | 0 .../widgets => drive}/content/markdown.dart | 4 +- .../content/markdown_latex.dart | 0 .../content/network_status_sheet.dart | 2 +- .../content/profile_decoration.dart | 0 .../content/profile_decoration.freezed.dart | 0 .../widgets => drive}/content/sensitive.dart | 0 .../content/sheet_scaffold.dart} | 0 .../widgets => drive}/content/video.dart | 0 .../content/video.native.dart | 0 .../widgets => drive}/content/video.web.dart | 0 lib/drive/drive_widgets/cloud_files.dart | 10 +-- lib/drive/drive_widgets/file_list_view.dart | 4 +- .../utils => drive}/file_icon_utils.dart | 0 lib/drive/files/file_detail.dart | 4 +- lib/drive/files/file_list.dart | 2 +- .../widgets/shared => drive}/upload_menu.dart | 0 .../content/embed => embeds}/embed_list.dart | 4 +- .../content/embed => embeds}/link.dart | 2 +- lib/lotteries/lottery.dart | 8 +-- lib/notifications/notification.dart | 4 +- lib/notifications/notification_tile.dart | 2 +- lib/{core/widgets => }/payment/README.md | 0 .../widgets => }/payment/payment_overlay.dart | 4 +- lib/polls/poll/poll_editor.dart | 2 +- .../polls_widgets/poll/poll_feedback.dart | 2 +- lib/posts/compose_article.dart | 2 +- lib/posts/posts/compose_article.dart | 2 +- lib/posts/posts/post_detail.dart | 8 +-- lib/posts/posts/publisher_profile.dart | 2 +- lib/posts/posts_models/post_category.dart | 2 +- lib/posts/posts_widgets/compose_sheet.dart | 2 +- .../post/compose_attachments.dart | 2 +- .../posts_widgets/post/compose_card.dart | 2 +- .../posts_widgets/post/compose_dialog.dart | 2 +- .../post/compose_embed_sheet.dart | 2 +- .../posts_widgets/post/compose_fund.dart | 8 +-- .../post/compose_link_attachments.dart | 2 +- .../posts_widgets/post/compose_poll.dart | 2 +- .../posts_widgets/post/compose_recorder.dart | 2 +- .../post/compose_settings_sheet.dart | 2 +- .../posts_widgets/post/compose_sheet.dart | 2 +- .../posts_widgets/post/compose_toolbar.dart | 2 +- .../posts_widgets/post/draft_manager.dart | 2 +- .../post/post_award_history_sheet.dart | 2 +- .../posts_widgets/post/post_award_sheet.dart | 6 +- lib/posts/posts_widgets/post/post_item.dart | 8 +-- .../post/post_item_screenshot.dart | 4 +- .../posts_widgets/post/post_pin_sheet.dart | 2 +- .../post/post_reaction_sheet.dart | 2 +- .../post/post_replies_sheet.dart | 2 +- lib/posts/posts_widgets/post/post_shared.dart | 6 +- lib/posts/publisher_profile.dart | 2 +- lib/{core/utils => posts}/share_utils.dart | 0 lib/realms/realm/realms.dart | 2 +- .../utils => reports}/abuse_report_utils.dart | 0 .../safety/abuse_report_sheet.dart | 2 +- lib/route.dart | 4 +- lib/settings/dashboard/dash.dart | 2 +- lib/settings/dashboard/dash_customize.dart | 2 +- lib/settings/tabs_screen.dart | 2 +- .../tour/techincal_review_intro.dart | 2 +- lib/{core => shared}/tour/tour.dart | 0 lib/shared/widgets/app_wrapper.dart | 6 +- lib/shared/widgets/attachment_uploader.dart | 4 +- .../navigation/conditional_bottom_nav.dart | 0 .../share => sharing}/share_sheet.dart | 2 +- lib/sites/sites_widgets/file_item.dart | 2 +- .../sites_widgets/file_upload_dialog.dart | 2 +- lib/sites/sites_widgets/page_form.dart | 2 +- lib/{thought/thought => thoughts}/think.dart | 6 +- .../thought => thoughts}/think.g.dart | 0 .../thought => thoughts}/think_sheet.dart | 6 +- lib/{thought => thoughts}/thought.dart | 0 .../thought.freezed.dart | 0 lib/{thought => thoughts}/thought.g.dart | 0 .../thought/function_calls_section.dart | 0 .../thought/proposals_section.dart | 0 .../thought/reasoning_section.dart | 0 .../thought/thought_content.dart | 6 +- .../thought/thought_header.dart | 0 .../thought/thought_proposal.dart | 0 .../thought/thought_sequence_list.dart | 4 +- .../thought/thought_shared.dart | 16 ++--- .../thought_widgets/thought/token_info.dart | 2 +- lib/{wallet => wallets}/wallet.dart | 6 +- lib/{wallet => wallets}/wallet.g.dart | 0 .../wallet_models/wallet.dart | 0 .../wallet_models/wallet.freezed.dart | 0 .../wallet_models/wallet.g.dart | 0 .../wallet_widgets/wallet/fund_envelope.dart | 2 +- .../wallet/fund_envelope.g.dart | 0 154 files changed, 259 insertions(+), 269 deletions(-) rename lib/{core/utils => activity}/activity_utils.dart (100%) rename lib/core/{utils => }/format.dart (100%) rename lib/core/{utils => }/mapping.dart (100%) rename lib/core/{utils => }/text.dart (100%) rename lib/{core/widgets => drive}/content/attachment_preview.dart (99%) rename lib/{core/widgets => drive}/content/audio.dart (100%) rename lib/{core/widgets => drive}/content/cloud_file_collection.dart (99%) rename lib/{core/widgets => drive}/content/cloud_file_lightbox.dart (94%) rename lib/{core/widgets => drive}/content/cloud_file_picker.dart (99%) rename lib/{core/widgets => drive}/content/exif_info_overlay.dart (100%) rename lib/{core/widgets => drive}/content/file_action_button.dart (100%) rename lib/{core/widgets => drive}/content/file_info_sheet.dart (99%) rename lib/{core/widgets => drive}/content/file_viewer_contents.dart (96%) rename lib/{core/widgets => drive}/content/image.dart (100%) rename lib/{core/widgets => drive}/content/image_control_overlay.dart (100%) rename lib/{core/widgets => drive}/content/markdown.dart (99%) rename lib/{core/widgets => drive}/content/markdown_latex.dart (100%) rename lib/{core/widgets => drive}/content/network_status_sheet.dart (99%) rename lib/{core/widgets => drive}/content/profile_decoration.dart (100%) rename lib/{core/widgets => drive}/content/profile_decoration.freezed.dart (100%) rename lib/{core/widgets => drive}/content/sensitive.dart (100%) rename lib/{core/widgets/content/sheet.dart => drive/content/sheet_scaffold.dart} (100%) rename lib/{core/widgets => drive}/content/video.dart (100%) rename lib/{core/widgets => drive}/content/video.native.dart (100%) rename lib/{core/widgets => drive}/content/video.web.dart (100%) rename lib/{core/utils => drive}/file_icon_utils.dart (100%) rename lib/{core/widgets/shared => drive}/upload_menu.dart (100%) rename lib/{core/widgets/content/embed => embeds}/embed_list.dart (97%) rename lib/{core/widgets/content/embed => embeds}/link.dart (99%) rename lib/{core/widgets => }/payment/README.md (100%) rename lib/{core/widgets => }/payment/payment_overlay.dart (99%) rename lib/{core/utils => posts}/share_utils.dart (100%) rename lib/{core/utils => reports}/abuse_report_utils.dart (100%) rename lib/{core => shared}/tour/techincal_review_intro.dart (96%) rename lib/{core => shared}/tour/tour.dart (100%) rename lib/{core => shared/widgets}/navigation/conditional_bottom_nav.dart (100%) rename lib/{core/widgets/share => sharing}/share_sheet.dart (99%) rename lib/{thought/thought => thoughts}/think.dart (96%) rename lib/{thought/thought => thoughts}/think.g.dart (100%) rename lib/{thought/thought => thoughts}/think_sheet.dart (94%) rename lib/{thought => thoughts}/thought.dart (100%) rename lib/{thought => thoughts}/thought.freezed.dart (100%) rename lib/{thought => thoughts}/thought.g.dart (100%) rename lib/{thought => thoughts}/thought_widgets/thought/function_calls_section.dart (100%) rename lib/{thought => thoughts}/thought_widgets/thought/proposals_section.dart (100%) rename lib/{thought => thoughts}/thought_widgets/thought/reasoning_section.dart (100%) rename lib/{thought => thoughts}/thought_widgets/thought/thought_content.dart (91%) rename lib/{thought => thoughts}/thought_widgets/thought/thought_header.dart (100%) rename lib/{thought => thoughts}/thought_widgets/thought/thought_proposal.dart (100%) rename lib/{thought => thoughts}/thought_widgets/thought/thought_sequence_list.dart (94%) rename lib/{thought => thoughts}/thought_widgets/thought/thought_shared.dart (98%) rename lib/{thought => thoughts}/thought_widgets/thought/token_info.dart (96%) rename lib/{wallet => wallets}/wallet.dart (99%) rename lib/{wallet => wallets}/wallet.g.dart (100%) rename lib/{wallet => wallets}/wallet_models/wallet.dart (100%) rename lib/{wallet => wallets}/wallet_models/wallet.freezed.dart (100%) rename lib/{wallet => wallets}/wallet_models/wallet.g.dart (100%) rename lib/{wallet => wallets}/wallet_widgets/wallet/fund_envelope.dart (99%) rename lib/{wallet => wallets}/wallet_widgets/wallet/fund_envelope.g.dart (100%) diff --git a/lib/accounts/account/me/settings_auth_factors.dart b/lib/accounts/account/me/settings_auth_factors.dart index c72de26e..2145f25f 100644 --- a/lib/accounts/account/me/settings_auth_factors.dart +++ b/lib/accounts/account/me/settings_auth_factors.dart @@ -11,7 +11,7 @@ import 'package:island/auth/auth_models/auth.dart'; import 'package:island/core/network.dart'; import 'package:island/auth/login.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:qr_flutter/qr_flutter.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/account/me/settings_connections.dart b/lib/accounts/account/me/settings_connections.dart index 802090b8..58cdd01f 100644 --- a/lib/accounts/account/me/settings_connections.dart +++ b/lib/accounts/account/me/settings_connections.dart @@ -8,10 +8,10 @@ import 'package:island/auth/auth_models/auth.dart'; import 'package:island/core/config.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/account/me/account_settings.dart'; -import 'package:island/core/utils/text.dart'; +import 'package:island/core/text.dart'; import 'package:island/core/services/time.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:sign_in_with_apple/sign_in_with_apple.dart'; diff --git a/lib/accounts/account/me/settings_contacts.dart b/lib/accounts/account/me/settings_contacts.dart index c1dc1108..56c6b9a6 100644 --- a/lib/accounts/account/me/settings_contacts.dart +++ b/lib/accounts/account/me/settings_contacts.dart @@ -6,7 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/accounts/accounts_models/account.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/account/profile.dart b/lib/accounts/account/profile.dart index d4ed7afb..ed2e65a2 100644 --- a/lib/accounts/account/profile.dart +++ b/lib/accounts/account/profile.dart @@ -24,13 +24,13 @@ import 'package:island/core/network.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/core/services/color.dart'; import 'package:island/core/services/responsive.dart'; -import 'package:island/core/utils/text.dart'; +import 'package:island/core/text.dart'; import 'package:island/core/services/time.dart'; import 'package:island/core/services/timezone/native.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/reports/reports_widgets/safety/abuse_report_helper.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:island/core/services/color_extraction.dart'; diff --git a/lib/accounts/accounts_models/account.dart b/lib/accounts/accounts_models/account.dart index 2889514f..8db71d73 100644 --- a/lib/accounts/accounts_models/account.dart +++ b/lib/accounts/accounts_models/account.dart @@ -2,7 +2,7 @@ import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:island/core/models/activity.dart'; import 'package:island/auth/auth_models/auth.dart'; import 'package:island/drive/drive_models/file.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; part 'account.freezed.dart'; part 'account.g.dart'; diff --git a/lib/accounts/accounts_widgets/account/account_devices.dart b/lib/accounts/accounts_widgets/account/account_devices.dart index 9179cb9b..d5d5bc26 100644 --- a/lib/accounts/accounts_widgets/account/account_devices.dart +++ b/lib/accounts/accounts_widgets/account/account_devices.dart @@ -10,7 +10,7 @@ import 'package:island/core/services/responsive.dart'; import 'package:island/core/services/time.dart'; import 'package:island/core/services/udid.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:island/shared/widgets/info_row.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/accounts/accounts_widgets/account/account_name.dart b/lib/accounts/accounts_widgets/account/account_name.dart index d0d87a88..54a51c47 100644 --- a/lib/accounts/accounts_widgets/account/account_name.dart +++ b/lib/accounts/accounts_widgets/account/account_name.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/accounts/accounts_models/account.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/accounts/accounts_widgets/account/activity_presence.dart b/lib/accounts/accounts_widgets/account/activity_presence.dart index c2de982c..50b4da3c 100644 --- a/lib/accounts/accounts_widgets/account/activity_presence.dart +++ b/lib/accounts/accounts_widgets/account/activity_presence.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/core/models/activity.dart'; import 'package:island/activity/activity_rpc.dart'; -import 'package:island/core/widgets/content/image.dart'; +import 'package:island/drive/content/image.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/accounts_widgets/account/event_details_widget.dart b/lib/accounts/accounts_widgets/account/event_details_widget.dart index d054a115..5822b058 100644 --- a/lib/accounts/accounts_widgets/account/event_details_widget.dart +++ b/lib/accounts/accounts_widgets/account/event_details_widget.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:island/core/models/activity.dart'; import 'package:island/core/services/time.dart'; -import 'package:island/core/utils/activity_utils.dart'; +import 'package:island/activity/activity_utils.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/accounts_widgets/account/fortune_graph.dart b/lib/accounts/accounts_widgets/account/fortune_graph.dart index ab6f8caf..2fdd427f 100644 --- a/lib/accounts/accounts_widgets/account/fortune_graph.dart +++ b/lib/accounts/accounts_widgets/account/fortune_graph.dart @@ -4,7 +4,7 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/accounts/accounts_widgets/account/event_calendar_content.dart'; import 'package:island/core/models/activity.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:styled_widget/styled_widget.dart'; /// A widget that displays a graph of fortune levels over time diff --git a/lib/accounts/accounts_widgets/account/restore_purchase_sheet.dart b/lib/accounts/accounts_widgets/account/restore_purchase_sheet.dart index dc236a85..c04d39d2 100644 --- a/lib/accounts/accounts_widgets/account/restore_purchase_sheet.dart +++ b/lib/accounts/accounts_widgets/account/restore_purchase_sheet.dart @@ -5,7 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/account/me/settings_connections.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/accounts_widgets/account/status.dart b/lib/accounts/accounts_widgets/account/status.dart index 22ce1a31..56a29908 100644 --- a/lib/accounts/accounts_widgets/account/status.dart +++ b/lib/accounts/accounts_widgets/account/status.dart @@ -8,7 +8,7 @@ import 'package:island/accounts/accounts_widgets/account/status_creation.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/core/services/time.dart'; -import 'package:island/core/utils/activity_utils.dart'; +import 'package:island/activity/activity_utils.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/accounts_widgets/account/status_creation.dart b/lib/accounts/accounts_widgets/account/status_creation.dart index 8838390f..dcebfd4d 100644 --- a/lib/accounts/accounts_widgets/account/status_creation.dart +++ b/lib/accounts/accounts_widgets/account/status_creation.dart @@ -9,7 +9,7 @@ import 'package:island/accounts/accounts_widgets/account/status.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; class AccountStatusCreationSheet extends HookConsumerWidget { diff --git a/lib/accounts/accounts_widgets/account/stellar_program_tab.dart b/lib/accounts/accounts_widgets/account/stellar_program_tab.dart index 2aa7aa05..ad78e4e4 100644 --- a/lib/accounts/accounts_widgets/account/stellar_program_tab.dart +++ b/lib/accounts/accounts_widgets/account/stellar_program_tab.dart @@ -11,14 +11,14 @@ import 'package:island/accounts/accounts_models/account.dart'; import 'package:island/accounts/accounts_widgets/account/account_pfc.dart'; import 'package:island/accounts/accounts_widgets/account/account_picker.dart'; import 'package:island/accounts/accounts_widgets/account/restore_purchase_sheet.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/core/services/time.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; -import 'package:island/core/widgets/payment/payment_overlay.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; +import 'package:island/payment/payment_overlay.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/accounts/check_in.dart b/lib/accounts/check_in.dart index 0aa9b570..816d1596 100644 --- a/lib/accounts/check_in.dart +++ b/lib/accounts/check_in.dart @@ -15,7 +15,7 @@ import 'package:island/accounts/accounts_pod.dart'; import 'package:island/auth/captcha.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/accounts/usage_overview.dart b/lib/accounts/usage_overview.dart index 1a5b452d..1d0294ef 100644 --- a/lib/accounts/usage_overview.dart +++ b/lib/accounts/usage_overview.dart @@ -1,7 +1,7 @@ import 'package:fl_chart/fl_chart.dart'; import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; -import 'package:island/core/utils/format.dart'; +import 'package:island/core/format.dart'; import 'package:styled_widget/styled_widget.dart'; class UsageOverviewWidget extends StatelessWidget { @@ -112,24 +112,24 @@ class UsageOverviewWidget extends StatelessWidget { Colors.purple, ]; return PieChartData( - sections: - pools.asMap().entries.map((entry) { - final pool = entry.value as Map; - final title = pool['pool_name'] as String; - final truncatedTitle = - title.length > 8 ? '${title.substring(0, 8)}...' : title; - return PieChartSectionData( - value: (pool['usage_bytes'] as num).toDouble(), - title: truncatedTitle, - color: colors[entry.key % colors.length], - radius: 60, - titleStyle: const TextStyle( - fontSize: 12, - color: Colors.white, - fontWeight: FontWeight.bold, - ), - ); - }).toList(), + sections: pools.asMap().entries.map((entry) { + final pool = entry.value as Map; + final title = pool['pool_name'] as String; + final truncatedTitle = title.length > 8 + ? '${title.substring(0, 8)}...' + : title; + return PieChartSectionData( + value: (pool['usage_bytes'] as num).toDouble(), + title: truncatedTitle, + color: colors[entry.key % colors.length], + radius: 60, + titleStyle: const TextStyle( + fontSize: 12, + color: Colors.white, + fontWeight: FontWeight.bold, + ), + ); + }).toList(), ); } diff --git a/lib/core/utils/activity_utils.dart b/lib/activity/activity_utils.dart similarity index 100% rename from lib/core/utils/activity_utils.dart rename to lib/activity/activity_utils.dart diff --git a/lib/auth/captcha.native.dart b/lib/auth/captcha.native.dart index 03122e17..bc328986 100644 --- a/lib/auth/captcha.native.dart +++ b/lib/auth/captcha.native.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_inappwebview/flutter_inappwebview.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:island/auth/captcha.config.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; class CaptchaScreen extends ConsumerWidget { static Future show(BuildContext context) { diff --git a/lib/auth/captcha.web.dart b/lib/auth/captcha.web.dart index 754513d6..3d9765ee 100644 --- a/lib/auth/captcha.web.dart +++ b/lib/auth/captcha.web.dart @@ -2,7 +2,7 @@ import 'dart:ui_web' as ui; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/core/config.dart'; import 'package:island/auth/captcha.config.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:web/web.dart' as web; import 'package:flutter/material.dart'; @@ -42,12 +42,11 @@ class _CaptchaScreenState extends ConsumerState { final captchaUrl = await ref.watch(captchaUrlProvider.future); - final iframe = - web.HTMLIFrameElement() - ..src = captchaUrl - ..style.border = 'none' - ..width = '100%' - ..height = '100%'; + final iframe = web.HTMLIFrameElement() + ..src = captchaUrl + ..style.border = 'none' + ..width = '100%' + ..height = '100%'; web.document.body!.append(iframe); ui.platformViewRegistry.registerViewFactory( @@ -73,10 +72,9 @@ class _CaptchaScreenState extends ConsumerState { Widget build(BuildContext context) { return SheetScaffold( titleText: "Anti-Robot", - child: - _isInitialized - ? HtmlElementView(viewType: 'captcha-iframe') - : Center(child: CircularProgressIndicator()), + child: _isInitialized + ? HtmlElementView(viewType: 'captcha-iframe') + : Center(child: CircularProgressIndicator()), ); } } diff --git a/lib/auth/create_account_modal.dart b/lib/auth/create_account_modal.dart index c455110c..28f3a905 100644 --- a/lib/auth/create_account_modal.dart +++ b/lib/auth/create_account_modal.dart @@ -1,7 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'create_account_content.dart'; diff --git a/lib/auth/login_modal.dart b/lib/auth/login_modal.dart index 44807e65..ab74aeff 100644 --- a/lib/auth/login_modal.dart +++ b/lib/auth/login_modal.dart @@ -1,7 +1,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'login_content.dart'; diff --git a/lib/chat/chat_widgets/call_overlay.dart b/lib/chat/chat_widgets/call_overlay.dart index 0148c905..ed52dd69 100644 --- a/lib/chat/chat_widgets/call_overlay.dart +++ b/lib/chat/chat_widgets/call_overlay.dart @@ -13,7 +13,7 @@ import 'package:island/chat/chat_widgets/call_participant_tile.dart'; import 'package:island/chat/chat_widgets/call_screen.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:livekit_client/livekit_client.dart'; diff --git a/lib/chat/chat_widgets/chat_detail_screen.dart b/lib/chat/chat_widgets/chat_detail_screen.dart index bbfe7dc7..b9ccc399 100644 --- a/lib/chat/chat_widgets/chat_detail_screen.dart +++ b/lib/chat/chat_widgets/chat_detail_screen.dart @@ -14,7 +14,7 @@ import 'package:island/chat/chat_widgets/chat_room_form.dart'; import 'package:island/chat/chat_widgets/chat_search_screen.dart'; import 'package:island/core/database.dart'; import 'package:island/core/network.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; import 'package:island/pagination/pagination.dart'; import 'package:island/shared/widgets/alert.dart'; diff --git a/lib/chat/chat_widgets/chat_input.dart b/lib/chat/chat_widgets/chat_input.dart index 74a0aa6f..a437c453 100644 --- a/lib/chat/chat_widgets/chat_input.dart +++ b/lib/chat/chat_widgets/chat_input.dart @@ -11,21 +11,21 @@ import "package:island/accounts/accounts_models/account.dart"; import "package:island/discovery/discovery_models/autocomplete_response.dart"; import "package:island/chat/chat_models/chat.dart"; import "package:island/drive/drive_models/file.dart"; +import "package:island/drive/upload_menu.dart"; import "package:island/posts/posts_models/poll.dart"; import "package:island/posts/posts_models/publisher.dart"; import "package:island/posts/posts_widgets/post/compose_fund.dart"; import "package:island/posts/posts_widgets/post/compose_poll.dart"; import "package:island/stickers/stickers_widgets/stickers/sticker_picker.dart"; -import "package:island/wallet/wallet_models/wallet.dart"; +import "package:island/wallets/wallet_models/wallet.dart"; import "package:island/realms/realms_models/realm.dart"; import "package:island/stickers/stickers_models/sticker.dart"; import "package:island/core/config.dart"; import "package:island/accounts/accounts_pod.dart"; import "package:island/discovery/discovery_service.dart"; import "package:island/core/services/responsive.dart"; -import "package:island/core/widgets/content/attachment_preview.dart"; +import "package:island/drive/content/attachment_preview.dart"; import "package:island/drive/drive_widgets/cloud_files.dart"; -import "package:island/core/widgets/shared/upload_menu.dart"; import "package:material_symbols_icons/material_symbols_icons.dart"; import "package:pasteboard/pasteboard.dart"; import "package:styled_widget/styled_widget.dart"; diff --git a/lib/chat/chat_widgets/chat_invites_sheet.dart b/lib/chat/chat_widgets/chat_invites_sheet.dart index 8cb4b716..51ed6494 100644 --- a/lib/chat/chat_widgets/chat_invites_sheet.dart +++ b/lib/chat/chat_widgets/chat_invites_sheet.dart @@ -5,7 +5,7 @@ import 'package:island/chat/chat_models/chat.dart'; import 'package:island/chat/chat_pod/chat_room.dart'; import 'package:island/chat/chat_widgets/chat_room_list_tile.dart'; import 'package:island/core/network.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/realms/realm/realms.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/chat/chat_widgets/chat_link_attachments.dart b/lib/chat/chat_widgets/chat_link_attachments.dart index 0aa1a7f8..f366a628 100644 --- a/lib/chat/chat_widgets/chat_link_attachments.dart +++ b/lib/chat/chat_widgets/chat_link_attachments.dart @@ -7,7 +7,7 @@ import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/network.dart'; import 'package:island/pagination/pagination.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/chat/chat_widgets/chat_room_form.dart b/lib/chat/chat_widgets/chat_room_form.dart index 053eec51..a87bad14 100644 --- a/lib/chat/chat_widgets/chat_room_form.dart +++ b/lib/chat/chat_widgets/chat_room_form.dart @@ -11,7 +11,7 @@ import 'package:island/chat/chat_models/chat.dart'; import 'package:island/chat/chat_pod/chat_room.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/image.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; diff --git a/lib/chat/chat_widgets/chat_room_screen.dart b/lib/chat/chat_widgets/chat_room_screen.dart index 75b6e78f..2bd838c4 100644 --- a/lib/chat/chat_widgets/chat_room_screen.dart +++ b/lib/chat/chat_widgets/chat_room_screen.dart @@ -29,7 +29,7 @@ import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/shared/widgets/attachment_uploader.dart'; import 'package:island/shared/widgets/response.dart'; -import 'package:island/thought/thought/think_sheet.dart'; +import 'package:island/thoughts/think_sheet.dart'; import 'package:styled_widget/styled_widget.dart'; class ChatRoomScreen extends HookConsumerWidget { diff --git a/lib/chat/chat_widgets/message_content.dart b/lib/chat/chat_widgets/message_content.dart index b8d4059e..9a142480 100644 --- a/lib/chat/chat_widgets/message_content.dart +++ b/lib/chat/chat_widgets/message_content.dart @@ -5,7 +5,7 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:island/chat/chat_models/chat.dart'; import 'package:island/chat/chat_pod/call.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:pretty_diff_text/pretty_diff_text.dart'; import 'package:styled_widget/styled_widget.dart'; @@ -83,11 +83,10 @@ class MessageContent extends StatelessWidget { (item.type == 'messages.update.links' ? 'messageUpdateLinks'.tr() : 'messageUpdateEdited'.tr()), - defaultTextStyle: Theme.of( - context, - ).textTheme.bodyMedium!.copyWith( - color: Theme.of(context).colorScheme.onSurfaceVariant, - ), + defaultTextStyle: Theme.of(context).textTheme.bodyMedium! + .copyWith( + color: Theme.of(context).colorScheme.onSurfaceVariant, + ), addedTextStyle: TextStyle( backgroundColor: Theme.of( context, diff --git a/lib/chat/chat_widgets/message_item.dart b/lib/chat/chat_widgets/message_item.dart index 1e336f1b..7f739e8b 100644 --- a/lib/chat/chat_widgets/message_item.dart +++ b/lib/chat/chat_widgets/message_item.dart @@ -19,14 +19,14 @@ import 'package:island/core/translate.dart'; import 'package:island/core/config.dart'; import 'package:island/core/services/time.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/cloud_file_collection.dart'; +import 'package:island/drive/content/cloud_file_collection.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/embed/embed_list.dart'; +import 'package:island/embeds/embed_list.dart'; import 'package:island/posts/posts_widgets/post/post_shared.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:swipe_to/swipe_to.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; class MessageItemAction { static const String edit = "edit"; diff --git a/lib/chat/chat_widgets/message_list_tile.dart b/lib/chat/chat_widgets/message_list_tile.dart index 4393af65..4cab9b57 100644 --- a/lib/chat/chat_widgets/message_list_tile.dart +++ b/lib/chat/chat_widgets/message_list_tile.dart @@ -5,10 +5,10 @@ import 'package:island/chat/chat_widgets/message_content.dart'; import 'package:island/chat/chat_widgets/message_sender_info.dart'; import 'package:island/data/message.dart'; import 'package:island/posts/posts_models/embed.dart'; -import 'package:island/core/utils/mapping.dart'; -import 'package:island/core/widgets/content/cloud_file_collection.dart'; +import 'package:island/core/mapping.dart'; +import 'package:island/drive/content/cloud_file_collection.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/embed/link.dart'; +import 'package:island/embeds/link.dart'; class MessageListTile extends StatelessWidget { final LocalChatMessage message; diff --git a/lib/chat/hooks/use_room_input.dart b/lib/chat/hooks/use_room_input.dart index 71c283db..39aef6df 100644 --- a/lib/chat/hooks/use_room_input.dart +++ b/lib/chat/hooks/use_room_input.dart @@ -8,7 +8,7 @@ import 'package:island/chat/messages_notifier.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/chat/chat_models/chat.dart'; import 'package:island/posts/posts_models/poll.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/chat/chat_pod/chat_subscribe.dart'; import 'package:island/data/message.dart'; import 'package:pasteboard/pasteboard.dart'; diff --git a/lib/chat/messages_notifier.dart b/lib/chat/messages_notifier.dart index 16bf3a8b..98e9fce9 100644 --- a/lib/chat/messages_notifier.dart +++ b/lib/chat/messages_notifier.dart @@ -10,7 +10,7 @@ import "package:island/accounts/accounts_models/account.dart"; import "package:island/chat/chat_models/chat.dart"; import "package:island/drive/drive_models/file.dart"; import "package:island/posts/posts_models/poll.dart"; -import "package:island/wallet/wallet_models/wallet.dart"; +import "package:island/wallets/wallet_models/wallet.dart"; import "package:island/chat/chat_pod/chat_room.dart"; import "package:island/core/database.dart"; import "package:island/core/lifecycle.dart"; diff --git a/lib/core/debug_sheet.dart b/lib/core/debug_sheet.dart index ee49dfa6..ea0a6e50 100644 --- a/lib/core/debug_sheet.dart +++ b/lib/core/debug_sheet.dart @@ -9,8 +9,8 @@ import 'package:island/fitness/fitness_data.dart'; import 'package:island/fitness/fitness_service.dart'; import 'package:island/core/services/update_service.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/network_status_sheet.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/network_status_sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:island/core/config.dart'; import 'package:talker_flutter/talker_flutter.dart'; diff --git a/lib/core/utils/format.dart b/lib/core/format.dart similarity index 100% rename from lib/core/utils/format.dart rename to lib/core/format.dart diff --git a/lib/core/utils/mapping.dart b/lib/core/mapping.dart similarity index 100% rename from lib/core/utils/mapping.dart rename to lib/core/mapping.dart diff --git a/lib/core/services/sharing_intent.dart b/lib/core/services/sharing_intent.dart index f72f23cc..fc5f6d19 100644 --- a/lib/core/services/sharing_intent.dart +++ b/lib/core/services/sharing_intent.dart @@ -3,7 +3,7 @@ import 'dart:io'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:receive_sharing_intent/receive_sharing_intent.dart'; -import 'package:island/core/widgets/share/share_sheet.dart'; +import 'package:island/sharing/share_sheet.dart'; import 'package:share_plus/share_plus.dart'; class SharingIntentService { @@ -76,23 +76,21 @@ class SharingIntentService { } // Convert SharedMediaFile to XFile for files - final List files = - sharedFiles - .where( - (file) => - file.type == SharedMediaType.file || - file.type == SharedMediaType.video || - file.type == SharedMediaType.image, - ) - .map((file) => XFile(file.path, name: file.path.split('/').last)) - .toList(); + final List files = sharedFiles + .where( + (file) => + file.type == SharedMediaType.file || + file.type == SharedMediaType.video || + file.type == SharedMediaType.image, + ) + .map((file) => XFile(file.path, name: file.path.split('/').last)) + .toList(); // Extract links from shared content - final List links = - sharedFiles - .where((file) => file.type == SharedMediaType.url) - .map((file) => file.path) - .toList(); + final List links = sharedFiles + .where((file) => file.type == SharedMediaType.url) + .map((file) => file.path) + .toList(); // Show ShareSheet with the shared files if (files.isNotEmpty) { diff --git a/lib/core/services/update_service.dart b/lib/core/services/update_service.dart index 203bcab4..982ae320 100644 --- a/lib/core/services/update_service.dart +++ b/lib/core/services/update_service.dart @@ -8,7 +8,7 @@ import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:flutter_app_update/azhon_app_update.dart'; import 'package:flutter_app_update/update_model.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:package_info_plus/package_info_plus.dart'; import 'package:path_provider/path_provider.dart'; @@ -17,7 +17,7 @@ import 'package:process_run/process_run.dart'; import 'package:collection/collection.dart'; // Added for firstWhereOrNull import 'package:styled_widget/styled_widget.dart'; import 'package:url_launcher/url_launcher.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/talker.dart'; /// Data model for a GitHub release we care about @@ -264,24 +264,22 @@ class UpdateService { showDialog( context: context, barrierDismissible: false, - builder: - (context) => _WindowsUpdateDialog( - updateUrl: url, - onComplete: () { - // Close the update sheet - Navigator.of(context).pop(); - }, - ), + builder: (context) => _WindowsUpdateDialog( + updateUrl: url, + onComplete: () { + // Close the update sheet + Navigator.of(context).pop(); + }, + ), ); } /// Fetch the latest release info from GitHub. /// Public so other screens (e.g., About) can manually trigger update checks. Future fetchLatestRelease() async { - final apiEndpoint = - useProxy - ? '$_proxyBaseUrl${Uri.encodeComponent(_releasesLatestApi)}' - : _releasesLatestApi; + final apiEndpoint = useProxy + ? '$_proxyBaseUrl${Uri.encodeComponent(_releasesLatestApi)}' + : _releasesLatestApi; talker.info( '[Update] Fetching latest release from GitHub API: $apiEndpoint (Proxy: $useProxy)', @@ -415,17 +413,16 @@ class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> { Navigator.of(context).pop(); showDialog( context: context, - builder: - (context) => AlertDialog( - title: const Text('Update Failed'), - content: Text(message), - actions: [ - TextButton( - onPressed: () => Navigator.of(context).pop(), - child: const Text('OK'), - ), - ], + builder: (context) => AlertDialog( + title: const Text('Update Failed'), + content: Text(message), + actions: [ + TextButton( + onPressed: () => Navigator.of(context).pop(), + child: const Text('OK'), ), + ], + ), ); } @@ -542,11 +539,10 @@ class _WindowsUpdateDialogState extends State<_WindowsUpdateDialog> { talker.info('[Update] Running Windows installer from: $extractDir'); final dir = Directory(extractDir); - final exeFiles = - dir - .listSync() - .where((f) => f is File && f.path.endsWith('.exe')) - .toList(); + final exeFiles = dir + .listSync() + .where((f) => f is File && f.path.endsWith('.exe')) + .toList(); if (exeFiles.isEmpty) { talker.info('[Update] No .exe file found in extracted directory'); @@ -652,10 +648,9 @@ class _UpdateSheetState extends State<_UpdateSheet> { vertical: 16, ), child: MarkdownTextContent( - content: - widget.release.body.isEmpty - ? 'noChangelogProvided'.tr() - : widget.release.body, + content: widget.release.body.isEmpty + ? 'noChangelogProvided'.tr() + : widget.release.body, ), ), ), diff --git a/lib/core/utils/text.dart b/lib/core/text.dart similarity index 100% rename from lib/core/utils/text.dart rename to lib/core/text.dart diff --git a/lib/creators/creators/hub.dart b/lib/creators/creators/hub.dart index 54273272..5ab8d365 100644 --- a/lib/creators/creators/hub.dart +++ b/lib/creators/creators/hub.dart @@ -16,11 +16,11 @@ import 'package:island/posts/posts_models/publisher.dart'; import 'package:island/posts/posts_models/heatmap.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/responsive.dart'; -import 'package:island/core/utils/text.dart'; +import 'package:island/core/text.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:island/posts/activity_heatmap.dart'; diff --git a/lib/creators/creators/publishers_form.dart b/lib/creators/creators/publishers_form.dart index 174fc1cf..5d784e85 100644 --- a/lib/creators/creators/publishers_form.dart +++ b/lib/creators/creators/publishers_form.dart @@ -17,7 +17,7 @@ import 'package:island/accounts/accounts_pod.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/creators/creators/sites/site_edit.dart b/lib/creators/creators/sites/site_edit.dart index 1266f603..21df9449 100644 --- a/lib/creators/creators/sites/site_edit.dart +++ b/lib/creators/creators/sites/site_edit.dart @@ -8,7 +8,7 @@ import 'package:island/creators/creators/sites/widgets/site_config_form.dart'; import 'package:island/creators/publication_site.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/creators/creators/stickers/pack_detail.dart b/lib/creators/creators/stickers/pack_detail.dart index e3018827..76a7039d 100644 --- a/lib/creators/creators/stickers/pack_detail.dart +++ b/lib/creators/creators/stickers/pack_detail.dart @@ -13,9 +13,9 @@ import 'package:island/drive/drive_models/file.dart'; import 'package:island/stickers/stickers_models/sticker.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/cloud_file_picker.dart'; +import 'package:island/drive/content/cloud_file_picker.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/creators/creators/stickers/stickers.dart b/lib/creators/creators/stickers/stickers.dart index 1d5b8e80..6059d27e 100644 --- a/lib/creators/creators/stickers/stickers.dart +++ b/lib/creators/creators/stickers/stickers.dart @@ -12,9 +12,9 @@ import 'package:island/core/network.dart'; import 'package:island/core/services/responsive.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; -import 'package:island/core/widgets/content/cloud_file_picker.dart'; +import 'package:island/drive/content/cloud_file_picker.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/creators/creators/webfeed/webfeed_list.dart b/lib/creators/creators/webfeed/webfeed_list.dart index b70ea46d..accad598 100644 --- a/lib/creators/creators/webfeed/webfeed_list.dart +++ b/lib/creators/creators/webfeed/webfeed_list.dart @@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:island/creators/creators/webfeed/webfeed_edit.dart'; import 'package:island/discovery/webfeed.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/empty_state.dart'; import 'package:island/shared/widgets/extended_refresh_indicator.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/developers/developers/app_secrets.dart b/lib/developers/developers/app_secrets.dart index 85ce43f2..ca35b075 100644 --- a/lib/developers/developers/app_secrets.dart +++ b/lib/developers/developers/app_secrets.dart @@ -8,7 +8,7 @@ import 'package:island/developers/developers_models/custom_app_secret.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/developers/developers/apps.dart b/lib/developers/developers/apps.dart index d0986da3..24d03f22 100644 --- a/lib/developers/developers/apps.dart +++ b/lib/developers/developers/apps.dart @@ -10,7 +10,7 @@ import 'package:island/developers/developers_models/custom_app.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/extended_refresh_indicator.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/developers/developers/bot_keys.dart b/lib/developers/developers/bot_keys.dart index 77d901ae..a343734c 100644 --- a/lib/developers/developers/bot_keys.dart +++ b/lib/developers/developers/bot_keys.dart @@ -8,7 +8,7 @@ import 'package:island/developers/developers_models/bot_key.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/developers/developers/bots.dart b/lib/developers/developers/bots.dart index c2b8a9f8..2701b83a 100644 --- a/lib/developers/developers/bots.dart +++ b/lib/developers/developers/bots.dart @@ -9,7 +9,7 @@ import 'package:island/developers/developers_models/bot.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/developers/developers/edit_app.dart b/lib/developers/developers/edit_app.dart index 87ca790a..087a8515 100644 --- a/lib/developers/developers/edit_app.dart +++ b/lib/developers/developers/edit_app.dart @@ -17,7 +17,7 @@ import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; part 'edit_app.g.dart'; diff --git a/lib/developers/developers/hub.dart b/lib/developers/developers/hub.dart index c6130d87..869e3379 100644 --- a/lib/developers/developers/hub.dart +++ b/lib/developers/developers/hub.dart @@ -14,7 +14,7 @@ import 'package:island/core/services/responsive.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/discovery/discovery/article_detail.dart b/lib/discovery/discovery/article_detail.dart index 172ccad1..3eab4f50 100644 --- a/lib/discovery/discovery/article_detail.dart +++ b/lib/discovery/discovery/article_detail.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/discovery/discovery/article_pod.dart'; import 'package:url_launcher/url_launcher_string.dart'; import 'package:island/discovery/discovery_models/webfeed.dart'; diff --git a/lib/core/widgets/content/attachment_preview.dart b/lib/drive/content/attachment_preview.dart similarity index 99% rename from lib/core/widgets/content/attachment_preview.dart rename to lib/drive/content/attachment_preview.dart index 19bb2065..5ca12888 100644 --- a/lib/core/widgets/content/attachment_preview.dart +++ b/lib/drive/content/attachment_preview.dart @@ -13,11 +13,11 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/network.dart'; import 'package:island/drive/drive_service.dart'; -import 'package:island/core/utils/format.dart'; +import 'package:island/core/format.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sensitive.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sensitive.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:super_context_menu/super_context_menu.dart'; diff --git a/lib/core/widgets/content/audio.dart b/lib/drive/content/audio.dart similarity index 100% rename from lib/core/widgets/content/audio.dart rename to lib/drive/content/audio.dart diff --git a/lib/core/widgets/content/cloud_file_collection.dart b/lib/drive/content/cloud_file_collection.dart similarity index 99% rename from lib/core/widgets/content/cloud_file_collection.dart rename to lib/drive/content/cloud_file_collection.dart index b48d738f..2a4dc7e3 100644 --- a/lib/core/widgets/content/cloud_file_collection.dart +++ b/lib/drive/content/cloud_file_collection.dart @@ -10,8 +10,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/config.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/cloud_file_lightbox.dart'; -import 'package:island/core/widgets/content/sensitive.dart'; +import 'package:island/drive/content/cloud_file_lightbox.dart'; +import 'package:island/drive/content/sensitive.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:uuid/uuid.dart'; diff --git a/lib/core/widgets/content/cloud_file_lightbox.dart b/lib/drive/content/cloud_file_lightbox.dart similarity index 94% rename from lib/core/widgets/content/cloud_file_lightbox.dart rename to lib/drive/content/cloud_file_lightbox.dart index 9f21139a..d4271d61 100644 --- a/lib/core/widgets/content/cloud_file_lightbox.dart +++ b/lib/drive/content/cloud_file_lightbox.dart @@ -8,10 +8,10 @@ import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/config.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/exif_info_overlay.dart'; -import 'package:island/core/widgets/content/file_action_button.dart'; -import 'package:island/core/widgets/content/file_info_sheet.dart'; -import 'package:island/core/widgets/content/image_control_overlay.dart'; +import 'package:island/drive/content/exif_info_overlay.dart'; +import 'package:island/drive/content/file_action_button.dart'; +import 'package:island/drive/content/file_info_sheet.dart'; +import 'package:island/drive/content/image_control_overlay.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:photo_view/photo_view.dart'; diff --git a/lib/core/widgets/content/cloud_file_picker.dart b/lib/drive/content/cloud_file_picker.dart similarity index 99% rename from lib/core/widgets/content/cloud_file_picker.dart rename to lib/drive/content/cloud_file_picker.dart index bb6f57f6..221bce95 100644 --- a/lib/core/widgets/content/cloud_file_picker.dart +++ b/lib/drive/content/cloud_file_picker.dart @@ -8,7 +8,7 @@ import 'package:image_picker/image_picker.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/attachment_preview.dart'; +import 'package:island/drive/content/attachment_preview.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/core/widgets/content/exif_info_overlay.dart b/lib/drive/content/exif_info_overlay.dart similarity index 100% rename from lib/core/widgets/content/exif_info_overlay.dart rename to lib/drive/content/exif_info_overlay.dart diff --git a/lib/core/widgets/content/file_action_button.dart b/lib/drive/content/file_action_button.dart similarity index 100% rename from lib/core/widgets/content/file_action_button.dart rename to lib/drive/content/file_action_button.dart diff --git a/lib/core/widgets/content/file_info_sheet.dart b/lib/drive/content/file_info_sheet.dart similarity index 99% rename from lib/core/widgets/content/file_info_sheet.dart rename to lib/drive/content/file_info_sheet.dart index 1eb728ee..a90c1938 100644 --- a/lib/core/widgets/content/file_info_sheet.dart +++ b/lib/drive/content/file_info_sheet.dart @@ -4,9 +4,9 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:island/drive/drive_models/file.dart'; -import 'package:island/core/utils/format.dart'; +import 'package:island/core/format.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/core/widgets/content/file_viewer_contents.dart b/lib/drive/content/file_viewer_contents.dart similarity index 96% rename from lib/core/widgets/content/file_viewer_contents.dart rename to lib/drive/content/file_viewer_contents.dart index 520616e9..487cd5a7 100644 --- a/lib/core/widgets/content/file_viewer_contents.dart +++ b/lib/drive/content/file_viewer_contents.dart @@ -11,13 +11,13 @@ import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/config.dart'; import 'package:island/core/network.dart'; import 'package:island/drive/drive_service.dart'; -import 'package:island/core/utils/format.dart'; -import 'package:island/core/widgets/content/audio.dart'; +import 'package:island/core/format.dart'; +import 'package:island/drive/content/audio.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/exif_info_overlay.dart'; -import 'package:island/core/widgets/content/file_info_sheet.dart'; -import 'package:island/core/widgets/content/image_control_overlay.dart'; -import 'package:island/core/widgets/content/video.dart'; +import 'package:island/drive/content/exif_info_overlay.dart'; +import 'package:island/drive/content/file_info_sheet.dart'; +import 'package:island/drive/content/image_control_overlay.dart'; +import 'package:island/drive/content/video.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:photo_view/photo_view.dart'; import 'package:syncfusion_flutter_pdfviewer/pdfviewer.dart'; diff --git a/lib/core/widgets/content/image.dart b/lib/drive/content/image.dart similarity index 100% rename from lib/core/widgets/content/image.dart rename to lib/drive/content/image.dart diff --git a/lib/core/widgets/content/image_control_overlay.dart b/lib/drive/content/image_control_overlay.dart similarity index 100% rename from lib/core/widgets/content/image_control_overlay.dart rename to lib/drive/content/image_control_overlay.dart diff --git a/lib/core/widgets/content/markdown.dart b/lib/drive/content/markdown.dart similarity index 99% rename from lib/core/widgets/content/markdown.dart rename to lib/drive/content/markdown.dart index bdd947cd..fc0c0054 100644 --- a/lib/core/widgets/content/markdown.dart +++ b/lib/drive/content/markdown.dart @@ -17,8 +17,8 @@ import 'package:island/core/config.dart'; import 'package:island/posts/publisher_profile.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/cloud_file_lightbox.dart'; -import 'package:island/core/widgets/content/markdown_latex.dart'; +import 'package:island/drive/content/cloud_file_lightbox.dart'; +import 'package:island/drive/content/markdown_latex.dart'; import 'package:markdown/markdown.dart' as markdown; import 'package:markdown_widget/markdown_widget.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/core/widgets/content/markdown_latex.dart b/lib/drive/content/markdown_latex.dart similarity index 100% rename from lib/core/widgets/content/markdown_latex.dart rename to lib/drive/content/markdown_latex.dart diff --git a/lib/core/widgets/content/network_status_sheet.dart b/lib/drive/content/network_status_sheet.dart similarity index 99% rename from lib/core/widgets/content/network_status_sheet.dart rename to lib/drive/content/network_status_sheet.dart index cfe3306a..42961df4 100644 --- a/lib/core/widgets/content/network_status_sheet.dart +++ b/lib/drive/content/network_status_sheet.dart @@ -6,7 +6,7 @@ import 'package:island/core/config.dart'; import 'package:island/core/network.dart'; import 'package:island/core/websocket.dart'; import 'package:material_symbols_icons/symbols.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:url_launcher/url_launcher_string.dart'; diff --git a/lib/core/widgets/content/profile_decoration.dart b/lib/drive/content/profile_decoration.dart similarity index 100% rename from lib/core/widgets/content/profile_decoration.dart rename to lib/drive/content/profile_decoration.dart diff --git a/lib/core/widgets/content/profile_decoration.freezed.dart b/lib/drive/content/profile_decoration.freezed.dart similarity index 100% rename from lib/core/widgets/content/profile_decoration.freezed.dart rename to lib/drive/content/profile_decoration.freezed.dart diff --git a/lib/core/widgets/content/sensitive.dart b/lib/drive/content/sensitive.dart similarity index 100% rename from lib/core/widgets/content/sensitive.dart rename to lib/drive/content/sensitive.dart diff --git a/lib/core/widgets/content/sheet.dart b/lib/drive/content/sheet_scaffold.dart similarity index 100% rename from lib/core/widgets/content/sheet.dart rename to lib/drive/content/sheet_scaffold.dart diff --git a/lib/core/widgets/content/video.dart b/lib/drive/content/video.dart similarity index 100% rename from lib/core/widgets/content/video.dart rename to lib/drive/content/video.dart diff --git a/lib/core/widgets/content/video.native.dart b/lib/drive/content/video.native.dart similarity index 100% rename from lib/core/widgets/content/video.native.dart rename to lib/drive/content/video.native.dart diff --git a/lib/core/widgets/content/video.web.dart b/lib/drive/content/video.web.dart similarity index 100% rename from lib/core/widgets/content/video.web.dart rename to lib/drive/content/video.web.dart diff --git a/lib/drive/drive_widgets/cloud_files.dart b/lib/drive/drive_widgets/cloud_files.dart index 1afcd7e5..f7770af1 100644 --- a/lib/drive/drive_widgets/cloud_files.dart +++ b/lib/drive/drive_widgets/cloud_files.dart @@ -5,14 +5,14 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:gap/gap.dart'; import 'package:go_router/go_router.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/core/widgets/content/file_viewer_contents.dart'; -import 'package:island/core/widgets/content/image.dart'; -import 'package:island/core/widgets/content/video.native.dart'; +import 'package:island/drive/content/file_viewer_contents.dart'; +import 'package:island/drive/content/image.dart'; +import 'package:island/drive/content/video.native.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/config.dart'; import 'package:island/core/services/time.dart'; -import 'package:island/core/utils/format.dart'; -import 'package:island/core/widgets/content/profile_decoration.dart'; +import 'package:island/core/format.dart'; +import 'package:island/drive/content/profile_decoration.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; import 'dart:math' as math; diff --git a/lib/drive/drive_widgets/file_list_view.dart b/lib/drive/drive_widgets/file_list_view.dart index 1ce366dd..2e499cd0 100644 --- a/lib/drive/drive_widgets/file_list_view.dart +++ b/lib/drive/drive_widgets/file_list_view.dart @@ -16,8 +16,8 @@ import 'package:island/drive/drive/file_pool.dart'; import 'package:island/core/network.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/core/services/responsive.dart'; -import 'package:island/core/utils/file_icon_utils.dart'; -import 'package:island/core/utils/format.dart'; +import 'package:island/drive/file_icon_utils.dart'; +import 'package:island/core/format.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; diff --git a/lib/core/utils/file_icon_utils.dart b/lib/drive/file_icon_utils.dart similarity index 100% rename from lib/core/utils/file_icon_utils.dart rename to lib/drive/file_icon_utils.dart diff --git a/lib/drive/files/file_detail.dart b/lib/drive/files/file_detail.dart index 4024fdb9..35a1c99e 100644 --- a/lib/drive/files/file_detail.dart +++ b/lib/drive/files/file_detail.dart @@ -8,8 +8,8 @@ import 'package:island/core/config.dart'; import 'package:island/core/services/responsive.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; -import 'package:island/core/widgets/content/file_info_sheet.dart'; -import 'package:island/core/widgets/content/file_viewer_contents.dart'; +import 'package:island/drive/content/file_info_sheet.dart'; +import 'package:island/drive/content/file_viewer_contents.dart'; class FileDetailScreen extends HookConsumerWidget { final SnCloudFile item; diff --git a/lib/drive/files/file_list.dart b/lib/drive/files/file_list.dart index d28a0303..7fab1140 100644 --- a/lib/drive/files/file_list.dart +++ b/lib/drive/files/file_list.dart @@ -11,7 +11,7 @@ import 'package:island/drive/drive/file_list.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/drive/drive_widgets/file_list_view.dart'; import 'package:island/accounts/usage_overview.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/core/widgets/shared/upload_menu.dart b/lib/drive/upload_menu.dart similarity index 100% rename from lib/core/widgets/shared/upload_menu.dart rename to lib/drive/upload_menu.dart diff --git a/lib/core/widgets/content/embed/embed_list.dart b/lib/embeds/embed_list.dart similarity index 97% rename from lib/core/widgets/content/embed/embed_list.dart rename to lib/embeds/embed_list.dart index 1df478a7..4954dc77 100644 --- a/lib/core/widgets/content/embed/embed_list.dart +++ b/lib/embeds/embed_list.dart @@ -2,8 +2,8 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:island/polls/polls_widgets/poll/poll_submit.dart'; import 'package:island/posts/posts_models/embed.dart'; -import 'package:island/core/widgets/content/embed/link.dart'; -import 'package:island/wallet/wallet_widgets/wallet/fund_envelope.dart'; +import 'package:island/embeds/link.dart'; +import 'package:island/wallets/wallet_widgets/wallet/fund_envelope.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; class EmbedListWidget extends StatelessWidget { diff --git a/lib/core/widgets/content/embed/link.dart b/lib/embeds/link.dart similarity index 99% rename from lib/core/widgets/content/embed/link.dart rename to lib/embeds/link.dart index 1d92a840..dedf8620 100644 --- a/lib/core/widgets/content/embed/link.dart +++ b/lib/embeds/link.dart @@ -4,7 +4,7 @@ import 'package:cached_network_image/cached_network_image.dart'; import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:island/posts/posts_models/embed.dart'; -import 'package:island/core/widgets/content/image.dart'; +import 'package:island/drive/content/image.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:url_launcher/url_launcher.dart'; diff --git a/lib/lotteries/lottery.dart b/lib/lotteries/lottery.dart index 9b1c99f4..926ff871 100644 --- a/lib/lotteries/lottery.dart +++ b/lib/lotteries/lottery.dart @@ -2,13 +2,13 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/wallet/wallet.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; -import 'package:island/core/widgets/payment/payment_overlay.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; +import 'package:island/payment/payment_overlay.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/notifications/notification.dart b/lib/notifications/notification.dart index 48b94b76..6512c7f0 100644 --- a/lib/notifications/notification.dart +++ b/lib/notifications/notification.dart @@ -10,8 +10,8 @@ import 'package:island/core/network.dart'; import 'package:island/pagination/pagination.dart'; import 'package:island/core/websocket.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/markdown.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/markdown.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/notifications/notification_tile.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; diff --git a/lib/notifications/notification_tile.dart b/lib/notifications/notification_tile.dart index e539adff..a42ec798 100644 --- a/lib/notifications/notification_tile.dart +++ b/lib/notifications/notification_tile.dart @@ -4,7 +4,7 @@ import 'package:go_router/go_router.dart'; import 'package:island/accounts/accounts_models/account.dart'; import 'package:island/route.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:relative_time/relative_time.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/core/widgets/payment/README.md b/lib/payment/README.md similarity index 100% rename from lib/core/widgets/payment/README.md rename to lib/payment/README.md diff --git a/lib/core/widgets/payment/payment_overlay.dart b/lib/payment/payment_overlay.dart similarity index 99% rename from lib/core/widgets/payment/payment_overlay.dart rename to lib/payment/payment_overlay.dart index 3daebe80..3f0fbf80 100644 --- a/lib/core/widgets/payment/payment_overlay.dart +++ b/lib/payment/payment_overlay.dart @@ -5,8 +5,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:easy_localization/easy_localization.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/core/network.dart'; import 'package:dio/dio.dart'; import 'package:local_auth/local_auth.dart'; diff --git a/lib/polls/poll/poll_editor.dart b/lib/polls/poll/poll_editor.dart index 80d120b0..89595cb2 100644 --- a/lib/polls/poll/poll_editor.dart +++ b/lib/polls/poll/poll_editor.dart @@ -8,7 +8,7 @@ import 'package:island/core/network.dart'; import 'package:island/talker.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/posts/posts_models/poll.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:uuid/uuid.dart'; import 'package:easy_localization/easy_localization.dart'; diff --git a/lib/polls/polls_widgets/poll/poll_feedback.dart b/lib/polls/polls_widgets/poll/poll_feedback.dart index 28f95c89..c719fd94 100644 --- a/lib/polls/polls_widgets/poll/poll_feedback.dart +++ b/lib/polls/polls_widgets/poll/poll_feedback.dart @@ -10,7 +10,7 @@ import 'package:island/posts/posts_models/poll.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/compose_article.dart b/lib/posts/compose_article.dart index 9f1ffcbd..4292b1e4 100644 --- a/lib/posts/compose_article.dart +++ b/lib/posts/compose_article.dart @@ -20,7 +20,7 @@ import 'package:island/posts/posts_widgets/post/compose_toolbar.dart'; import 'package:island/posts/posts_widgets/post/publishers_modal.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/shared/widgets/responsive_sidebar.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts/compose_article.dart b/lib/posts/posts/compose_article.dart index b21bb36c..b1082321 100644 --- a/lib/posts/posts/compose_article.dart +++ b/lib/posts/posts/compose_article.dart @@ -20,7 +20,7 @@ import 'package:island/posts/posts_widgets/post/compose_toolbar.dart'; import 'package:island/posts/posts_widgets/post/publishers_modal.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/shared/widgets/responsive_sidebar.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts/post_detail.dart b/lib/posts/posts/post_detail.dart index ee1f80a6..40223ef5 100644 --- a/lib/posts/posts/post_detail.dart +++ b/lib/posts/posts/post_detail.dart @@ -20,13 +20,13 @@ import 'package:island/posts/posts_widgets/post/post_shared.dart'; import 'package:island/reports/reports_widgets/safety/abuse_report_helper.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; -import 'package:island/core/widgets/content/cloud_file_collection.dart'; +import 'package:island/drive/content/cloud_file_collection.dart'; import 'package:island/shared/widgets/extended_refresh_indicator.dart'; import 'package:island/posts/posts_widgets/compose_sheet.dart'; import 'package:island/shared/widgets/response.dart'; -import 'package:island/core/utils/share_utils.dart'; -import 'package:island/core/widgets/share/share_sheet.dart'; -import 'package:island/thought/thought/think_sheet.dart'; +import 'package:island/posts/share_utils.dart'; +import 'package:island/sharing/share_sheet.dart'; +import 'package:island/thoughts/think_sheet.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts/publisher_profile.dart b/lib/posts/posts/publisher_profile.dart index a17503dc..af7dcc46 100644 --- a/lib/posts/posts/publisher_profile.dart +++ b/lib/posts/posts/publisher_profile.dart @@ -24,7 +24,7 @@ import 'package:island/core/services/responsive.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/posts/activity_heatmap.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:island/core/services/color_extraction.dart'; diff --git a/lib/posts/posts_models/post_category.dart b/lib/posts/posts_models/post_category.dart index 9103459d..1c4e6bb7 100644 --- a/lib/posts/posts_models/post_category.dart +++ b/lib/posts/posts_models/post_category.dart @@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:freezed_annotation/freezed_annotation.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/posts/posts_models/post_tag.dart'; -import 'package:island/core/utils/text.dart'; +import 'package:island/core/text.dart'; part 'post_category.freezed.dart'; part 'post_category.g.dart'; diff --git a/lib/posts/posts_widgets/compose_sheet.dart b/lib/posts/posts_widgets/compose_sheet.dart index 71f992ab..8a64054e 100644 --- a/lib/posts/posts_widgets/compose_sheet.dart +++ b/lib/posts/posts_widgets/compose_sheet.dart @@ -12,7 +12,7 @@ import 'package:island/posts/posts_models/post.dart'; import 'package:island/posts/compose.dart'; import 'package:island/posts/compose_storage_db.dart'; import 'package:island/core/services/responsive.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/posts/posts_widgets/post/compose_card.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; import 'package:island/posts/posts_widgets/post/compose_state_utils.dart'; diff --git a/lib/posts/posts_widgets/post/compose_attachments.dart b/lib/posts/posts_widgets/post/compose_attachments.dart index 0d51baff..ecba0657 100644 --- a/lib/posts/posts_widgets/post/compose_attachments.dart +++ b/lib/posts/posts_widgets/post/compose_attachments.dart @@ -8,7 +8,7 @@ import 'package:island/core/services/responsive.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; import 'package:island/shared/widgets/attachment_uploader.dart'; -import 'package:island/core/widgets/content/attachment_preview.dart'; +import 'package:island/drive/content/attachment_preview.dart'; import 'package:material_symbols_icons/symbols.dart'; /// A reusable widget for displaying attachments in compose screens. diff --git a/lib/posts/posts_widgets/post/compose_card.dart b/lib/posts/posts_widgets/post/compose_card.dart index 39bd5e57..4eebb842 100644 --- a/lib/posts/posts_widgets/post/compose_card.dart +++ b/lib/posts/posts_widgets/post/compose_card.dart @@ -12,7 +12,7 @@ import 'package:island/posts/posts_models/publisher.dart'; import 'package:island/posts/compose.dart'; import 'package:island/posts/compose_storage_db.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/posts/posts_widgets/post/compose_attachments.dart'; import 'package:island/posts/posts_widgets/post/compose_form_fields.dart'; import 'package:island/posts/posts_widgets/post/compose_info_banner.dart'; diff --git a/lib/posts/posts_widgets/post/compose_dialog.dart b/lib/posts/posts_widgets/post/compose_dialog.dart index 2401cd81..ba6e9752 100644 --- a/lib/posts/posts_widgets/post/compose_dialog.dart +++ b/lib/posts/posts_widgets/post/compose_dialog.dart @@ -7,7 +7,7 @@ import 'package:island/posts/posts_models/post.dart'; import 'package:island/posts/compose.dart'; import 'package:island/posts/compose_storage_db.dart'; import 'package:island/core/services/event_bus.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/posts/posts_widgets/post/compose_card.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; import 'package:island/posts/posts_widgets/post/compose_state_utils.dart'; diff --git a/lib/posts/posts_widgets/post/compose_embed_sheet.dart b/lib/posts/posts_widgets/post/compose_embed_sheet.dart index 6a6c57d6..201ce9d0 100644 --- a/lib/posts/posts_widgets/post/compose_embed_sheet.dart +++ b/lib/posts/posts_widgets/post/compose_embed_sheet.dart @@ -8,7 +8,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts_widgets/post/compose_fund.dart b/lib/posts/posts_widgets/post/compose_fund.dart index ec8263d5..c906139d 100644 --- a/lib/posts/posts_widgets/post/compose_fund.dart +++ b/lib/posts/posts_widgets/post/compose_fund.dart @@ -4,12 +4,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/wallet/wallet.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; -import 'package:island/core/widgets/payment/payment_overlay.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; +import 'package:island/payment/payment_overlay.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts_widgets/post/compose_link_attachments.dart b/lib/posts/posts_widgets/post/compose_link_attachments.dart index 64219f5a..9257c3f5 100644 --- a/lib/posts/posts_widgets/post/compose_link_attachments.dart +++ b/lib/posts/posts_widgets/post/compose_link_attachments.dart @@ -7,7 +7,7 @@ import 'package:island/drive/drive_models/file.dart'; import 'package:island/core/network.dart'; import 'package:island/pagination/pagination.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts_widgets/post/compose_poll.dart b/lib/posts/posts_widgets/post/compose_poll.dart index c7b0ec5c..b3b65283 100644 --- a/lib/posts/posts_widgets/post/compose_poll.dart +++ b/lib/posts/posts_widgets/post/compose_poll.dart @@ -8,7 +8,7 @@ import 'package:island/polls/poll/poll_editor.dart'; import 'package:island/posts/posts_models/poll.dart'; import 'package:island/posts/posts_models/publisher.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/posts/posts_widgets/post/publishers_modal.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/posts/posts_widgets/post/compose_recorder.dart b/lib/posts/posts_widgets/post/compose_recorder.dart index 1df294b3..4a8fb1a4 100644 --- a/lib/posts/posts_widgets/post/compose_recorder.dart +++ b/lib/posts/posts_widgets/post/compose_recorder.dart @@ -9,7 +9,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/core/services/time.dart'; import 'package:island/talker.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:path_provider/path_provider.dart'; import 'package:record/record.dart' hide Amplitude; diff --git a/lib/posts/posts_widgets/post/compose_settings_sheet.dart b/lib/posts/posts_widgets/post/compose_settings_sheet.dart index 8c6aa3a5..09257ec8 100644 --- a/lib/posts/posts_widgets/post/compose_settings_sheet.dart +++ b/lib/posts/posts_widgets/post/compose_settings_sheet.dart @@ -13,7 +13,7 @@ import 'package:island/realms/realm/realms.dart'; import 'package:island/realms/realms_models/realm.dart'; import 'package:island/core/network.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts_widgets/post/compose_sheet.dart b/lib/posts/posts_widgets/post/compose_sheet.dart index 71f992ab..8a64054e 100644 --- a/lib/posts/posts_widgets/post/compose_sheet.dart +++ b/lib/posts/posts_widgets/post/compose_sheet.dart @@ -12,7 +12,7 @@ import 'package:island/posts/posts_models/post.dart'; import 'package:island/posts/compose.dart'; import 'package:island/posts/compose_storage_db.dart'; import 'package:island/core/services/responsive.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/posts/posts_widgets/post/compose_card.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; import 'package:island/posts/posts_widgets/post/compose_state_utils.dart'; diff --git a/lib/posts/posts_widgets/post/compose_toolbar.dart b/lib/posts/posts_widgets/post/compose_toolbar.dart index e33c9949..30d47b00 100644 --- a/lib/posts/posts_widgets/post/compose_toolbar.dart +++ b/lib/posts/posts_widgets/post/compose_toolbar.dart @@ -1,9 +1,9 @@ import 'package:easy_localization/easy_localization.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +import 'package:island/drive/upload_menu.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/posts/compose_storage_db.dart'; -import 'package:island/core/widgets/shared/upload_menu.dart'; import 'package:island/posts/posts_widgets/post/compose_embed_sheet.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; import 'package:island/posts/posts_widgets/post/draft_manager.dart'; diff --git a/lib/posts/posts_widgets/post/draft_manager.dart b/lib/posts/posts_widgets/post/draft_manager.dart index a58cf396..5efb80fd 100644 --- a/lib/posts/posts_widgets/post/draft_manager.dart +++ b/lib/posts/posts_widgets/post/draft_manager.dart @@ -5,7 +5,7 @@ import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/posts/compose_storage_db.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; class DraftManagerSheet extends HookConsumerWidget { diff --git a/lib/posts/posts_widgets/post/post_award_history_sheet.dart b/lib/posts/posts_widgets/post/post_award_history_sheet.dart index 6e0ea542..f945e131 100644 --- a/lib/posts/posts_widgets/post/post_award_history_sheet.dart +++ b/lib/posts/posts_widgets/post/post_award_history_sheet.dart @@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/pagination/pagination.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/core/network.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; final postAwardListNotifierProvider = AsyncNotifierProvider.autoDispose.family( diff --git a/lib/posts/posts_widgets/post/post_award_sheet.dart b/lib/posts/posts_widgets/post/post_award_sheet.dart index c908032b..3302ebd4 100644 --- a/lib/posts/posts_widgets/post/post_award_sheet.dart +++ b/lib/posts/posts_widgets/post/post_award_sheet.dart @@ -4,12 +4,12 @@ import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/posts/posts_models/post.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; -import 'package:island/core/widgets/payment/payment_overlay.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; +import 'package:island/payment/payment_overlay.dart'; import 'package:material_symbols_icons/symbols.dart'; class PostAwardSheet extends HookConsumerWidget { diff --git a/lib/posts/posts_widgets/post/post_item.dart b/lib/posts/posts_widgets/post/post_item.dart index 8080e0f3..597e1deb 100644 --- a/lib/posts/posts_widgets/post/post_item.dart +++ b/lib/posts/posts_widgets/post/post_item.dart @@ -13,7 +13,7 @@ import 'package:island/core/network.dart'; import 'package:island/core/translate.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/posts/compose.dart'; -import 'package:island/core/utils/share_utils.dart'; +import 'package:island/posts/share_utils.dart'; import 'package:island/posts/posts_widgets/post/embed_view_renderer.dart'; import 'package:island/posts/posts_widgets/post/post_award_sheet.dart'; import 'package:island/posts/posts_widgets/post/post_pin_sheet.dart'; @@ -21,9 +21,9 @@ import 'package:island/posts/posts_widgets/post/post_reaction_sheet.dart'; import 'package:island/posts/posts_widgets/post/post_shared.dart'; import 'package:island/reports/reports_widgets/safety/abuse_report_helper.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/markdown.dart'; -import 'package:island/core/widgets/content/image.dart'; -import 'package:island/core/widgets/share/share_sheet.dart'; +import 'package:island/drive/content/markdown.dart'; +import 'package:island/drive/content/image.dart'; +import 'package:island/sharing/share_sheet.dart'; import 'package:island/posts/posts_widgets/compose_sheet.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts_widgets/post/post_item_screenshot.dart b/lib/posts/posts_widgets/post/post_item_screenshot.dart index daf10668..d898db84 100644 --- a/lib/posts/posts_widgets/post/post_item_screenshot.dart +++ b/lib/posts/posts_widgets/post/post_item_screenshot.dart @@ -5,8 +5,8 @@ import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/core/config.dart'; -import 'package:island/core/widgets/content/image.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/image.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; import 'package:island/posts/posts_widgets/post/post_shared.dart'; import 'package:qr_flutter/qr_flutter.dart'; diff --git a/lib/posts/posts_widgets/post/post_pin_sheet.dart b/lib/posts/posts_widgets/post/post_pin_sheet.dart index cadff96d..4e2166dc 100644 --- a/lib/posts/posts_widgets/post/post_pin_sheet.dart +++ b/lib/posts/posts_widgets/post/post_pin_sheet.dart @@ -5,7 +5,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/posts_widgets/post/post_reaction_sheet.dart b/lib/posts/posts_widgets/post/post_reaction_sheet.dart index 08680a11..731790a6 100644 --- a/lib/posts/posts_widgets/post/post_reaction_sheet.dart +++ b/lib/posts/posts_widgets/post/post_reaction_sheet.dart @@ -13,7 +13,7 @@ import 'package:island/posts/posts_models/post.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; import 'package:island/stickers/stickers_widgets/stickers/sticker_picker.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/posts/posts_widgets/post/post_replies_sheet.dart b/lib/posts/posts_widgets/post/post_replies_sheet.dart index 2aa6d2ce..4f5e1cf6 100644 --- a/lib/posts/posts_widgets/post/post_replies_sheet.dart +++ b/lib/posts/posts_widgets/post/post_replies_sheet.dart @@ -3,7 +3,7 @@ import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/posts/posts_models/post.dart'; import 'package:island/accounts/accounts_pod.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:island/posts/posts_widgets/post/post_quick_reply.dart'; import 'package:island/posts/posts_widgets/post/post_replies.dart'; diff --git a/lib/posts/posts_widgets/post/post_shared.dart b/lib/posts/posts_widgets/post/post_shared.dart index da4b803d..e05d7683 100644 --- a/lib/posts/posts_widgets/post/post_shared.dart +++ b/lib/posts/posts_widgets/post/post_shared.dart @@ -16,10 +16,10 @@ import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; import 'package:island/posts/posts_widgets/post/post_replies_sheet.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/cloud_file_collection.dart'; +import 'package:island/drive/content/cloud_file_collection.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/embed/embed_list.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/embeds/embed_list.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/posts/publisher_profile.dart b/lib/posts/publisher_profile.dart index 5377bf19..7b655728 100644 --- a/lib/posts/publisher_profile.dart +++ b/lib/posts/publisher_profile.dart @@ -24,7 +24,7 @@ import 'package:island/core/services/color.dart'; import 'package:island/core/services/responsive.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; -import 'package:island/core/widgets/content/markdown.dart'; +import 'package:island/drive/content/markdown.dart'; import 'package:island/posts/activity_heatmap.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:island/core/services/color_extraction.dart'; diff --git a/lib/core/utils/share_utils.dart b/lib/posts/share_utils.dart similarity index 100% rename from lib/core/utils/share_utils.dart rename to lib/posts/share_utils.dart diff --git a/lib/realms/realm/realms.dart b/lib/realms/realm/realms.dart index 363283cd..9b384523 100644 --- a/lib/realms/realm/realms.dart +++ b/lib/realms/realm/realms.dart @@ -10,7 +10,7 @@ import 'package:island/realms/realms_widgets/realm/realm_list_tile.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/core/utils/abuse_report_utils.dart b/lib/reports/abuse_report_utils.dart similarity index 100% rename from lib/core/utils/abuse_report_utils.dart rename to lib/reports/abuse_report_utils.dart diff --git a/lib/reports/reports_widgets/safety/abuse_report_sheet.dart b/lib/reports/reports_widgets/safety/abuse_report_sheet.dart index 0be4ee24..ca419dfe 100644 --- a/lib/reports/reports_widgets/safety/abuse_report_sheet.dart +++ b/lib/reports/reports_widgets/safety/abuse_report_sheet.dart @@ -5,7 +5,7 @@ import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; class AbuseReportSheet extends HookConsumerWidget { diff --git a/lib/route.dart b/lib/route.dart index fd926b3a..eb4ebd02 100644 --- a/lib/route.dart +++ b/lib/route.dart @@ -61,8 +61,8 @@ import 'package:island/auth/create_account.dart'; import 'package:island/stickers/stickers/pack_detail.dart'; import 'package:island/stickers/stickers/sticker_marketplace.dart'; import 'package:island/talker.dart'; -import 'package:island/thought/thought/think.dart'; -import 'package:island/wallet/wallet.dart'; +import 'package:island/thoughts/think.dart'; +import 'package:island/wallets/wallet.dart'; import 'package:talker_flutter/talker_flutter.dart'; // Shell route keys for nested navigation diff --git a/lib/settings/dashboard/dash.dart b/lib/settings/dashboard/dash.dart index 2261e537..7dbe4709 100644 --- a/lib/settings/dashboard/dash.dart +++ b/lib/settings/dashboard/dash.dart @@ -28,7 +28,7 @@ import 'package:island/auth/login_modal.dart'; import 'package:island/core/models/activity.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:slide_countdown/slide_countdown.dart'; -import 'package:island/core/widgets/share/share_sheet.dart'; +import 'package:island/sharing/share_sheet.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:island/settings/dashboard/dash_customize.dart'; import 'package:island/core/config.dart'; diff --git a/lib/settings/dashboard/dash_customize.dart b/lib/settings/dashboard/dash_customize.dart index b54ffa4e..39442af1 100644 --- a/lib/settings/dashboard/dash_customize.dart +++ b/lib/settings/dashboard/dash_customize.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/core/config.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/settings/tabs_screen.dart b/lib/settings/tabs_screen.dart index 15dfd457..f0e8e802 100644 --- a/lib/settings/tabs_screen.dart +++ b/lib/settings/tabs_screen.dart @@ -9,7 +9,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/core/services/responsive.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; -import 'package:island/core/navigation/conditional_bottom_nav.dart'; +import 'package:island/shared/widgets/navigation/conditional_bottom_nav.dart'; import 'package:island/notifications/notification.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:island/chat/chat_pod/chat_summary.dart'; diff --git a/lib/core/tour/techincal_review_intro.dart b/lib/shared/tour/techincal_review_intro.dart similarity index 96% rename from lib/core/tour/techincal_review_intro.dart rename to lib/shared/tour/techincal_review_intro.dart index cfa0c983..1050ab13 100644 --- a/lib/core/tour/techincal_review_intro.dart +++ b/lib/shared/tour/techincal_review_intro.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:styled_widget/styled_widget.dart'; class TechicalReviewIntroWidget extends StatelessWidget { diff --git a/lib/core/tour/tour.dart b/lib/shared/tour/tour.dart similarity index 100% rename from lib/core/tour/tour.dart rename to lib/shared/tour/tour.dart diff --git a/lib/shared/widgets/app_wrapper.dart b/lib/shared/widgets/app_wrapper.dart index ff605cd6..415fe450 100644 --- a/lib/shared/widgets/app_wrapper.dart +++ b/lib/shared/widgets/app_wrapper.dart @@ -6,7 +6,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:in_app_review/in_app_review.dart'; import 'package:island/auth/web_auth/web_auth_providers.dart'; import 'package:island/notifications/notification.dart'; -import 'package:island/thought/thought/think_sheet.dart'; +import 'package:island/thoughts/think_sheet.dart'; import 'package:protocol_handler/protocol_handler.dart'; import 'package:island/activity/activity_rpc.dart'; import 'package:island/core/config.dart'; @@ -18,8 +18,8 @@ import 'package:island/settings/tray_manager.dart'; import 'package:island/core/services/notify.dart'; import 'package:island/core/services/sharing_intent.dart'; import 'package:island/core/services/update_service.dart'; -import 'package:island/core/widgets/content/network_status_sheet.dart'; -import 'package:island/core/tour/tour.dart'; +import 'package:island/drive/content/network_status_sheet.dart'; +import 'package:island/shared/tour/tour.dart'; import 'package:island/posts/posts_widgets/compose_sheet.dart'; import 'package:island/core/services/event_bus.dart'; import 'package:snow_fall_animation/snow_fall_animation.dart'; diff --git a/lib/shared/widgets/attachment_uploader.dart b/lib/shared/widgets/attachment_uploader.dart index 1eff1fdd..75e30faa 100644 --- a/lib/shared/widgets/attachment_uploader.dart +++ b/lib/shared/widgets/attachment_uploader.dart @@ -6,8 +6,8 @@ import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/drive/drive_models/file.dart'; import 'package:island/drive/drive_models/file_pool.dart'; import 'package:island/drive/drive/file_pool.dart'; -import 'package:island/core/widgets/content/attachment_preview.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/attachment_preview.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:easy_localization/easy_localization.dart'; import 'package:gap/gap.dart'; import 'package:island/posts/posts_widgets/post/compose_shared.dart'; diff --git a/lib/core/navigation/conditional_bottom_nav.dart b/lib/shared/widgets/navigation/conditional_bottom_nav.dart similarity index 100% rename from lib/core/navigation/conditional_bottom_nav.dart rename to lib/shared/widgets/navigation/conditional_bottom_nav.dart diff --git a/lib/core/widgets/share/share_sheet.dart b/lib/sharing/share_sheet.dart similarity index 99% rename from lib/core/widgets/share/share_sheet.dart rename to lib/sharing/share_sheet.dart index fccf9c49..f3300a11 100644 --- a/lib/core/widgets/share/share_sheet.dart +++ b/lib/sharing/share_sheet.dart @@ -8,7 +8,7 @@ import 'package:island/chat/chat_pod/chat_room.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/drive/drive_service.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:island/posts/compose.dart'; import 'package:island/drive/drive_models/file.dart'; diff --git a/lib/sites/sites_widgets/file_item.dart b/lib/sites/sites_widgets/file_item.dart index 085f0bdc..082e0d14 100644 --- a/lib/sites/sites_widgets/file_item.dart +++ b/lib/sites/sites_widgets/file_item.dart @@ -10,7 +10,7 @@ import 'package:island/discovery/discovery_models/site_file.dart'; import 'package:island/creators/publication_site.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/sites/site_files.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:path_provider/path_provider.dart'; diff --git a/lib/sites/sites_widgets/file_upload_dialog.dart b/lib/sites/sites_widgets/file_upload_dialog.dart index abf391ad..26e01825 100644 --- a/lib/sites/sites_widgets/file_upload_dialog.dart +++ b/lib/sites/sites_widgets/file_upload_dialog.dart @@ -5,7 +5,7 @@ import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/creators/publication_site.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/sites/site_files.dart'; import 'package:material_symbols_icons/symbols.dart'; diff --git a/lib/sites/sites_widgets/page_form.dart b/lib/sites/sites_widgets/page_form.dart index 1b837a9d..017ac5c4 100644 --- a/lib/sites/sites_widgets/page_form.dart +++ b/lib/sites/sites_widgets/page_form.dart @@ -4,7 +4,7 @@ import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/creators/publication_site.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/sites/site_pages.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:styled_widget/styled_widget.dart'; diff --git a/lib/thought/thought/think.dart b/lib/thoughts/think.dart similarity index 96% rename from lib/thought/thought/think.dart rename to lib/thoughts/think.dart index bd6a0fdc..621caca9 100644 --- a/lib/thought/thought/think.dart +++ b/lib/thoughts/think.dart @@ -2,11 +2,11 @@ import "package:easy_localization/easy_localization.dart"; import "package:flutter/material.dart"; import "package:flutter_hooks/flutter_hooks.dart"; import "package:gap/gap.dart"; -import "package:island/thought/thought_widgets/thought/thought_sequence_list.dart"; -import "package:island/thought/thought_widgets/thought/thought_shared.dart"; +import "package:island/thoughts/thought_widgets/thought/thought_sequence_list.dart"; +import "package:island/thoughts/thought_widgets/thought/thought_shared.dart"; import "package:riverpod_annotation/riverpod_annotation.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; -import "package:island/thought/thought.dart"; +import "package:island/thoughts/thought.dart"; import "package:island/core/network.dart"; import "package:island/shared/widgets/alert.dart"; import "package:island/shared/widgets/app_scaffold.dart"; diff --git a/lib/thought/thought/think.g.dart b/lib/thoughts/think.g.dart similarity index 100% rename from lib/thought/thought/think.g.dart rename to lib/thoughts/think.g.dart diff --git a/lib/thought/thought/think_sheet.dart b/lib/thoughts/think_sheet.dart similarity index 94% rename from lib/thought/thought/think_sheet.dart rename to lib/thoughts/think_sheet.dart index 749645f6..a0658ccc 100644 --- a/lib/thought/thought/think_sheet.dart +++ b/lib/thoughts/think_sheet.dart @@ -4,9 +4,9 @@ import "package:flutter_hooks/flutter_hooks.dart"; import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:island/core/network.dart"; import "package:island/shared/widgets/alert.dart"; -import "package:island/core/widgets/content/sheet.dart"; -import "package:island/thought/thought/think.dart"; -import "package:island/thought/thought_widgets/thought/thought_shared.dart"; +import "package:island/drive/content/sheet_scaffold.dart"; +import "package:island/thoughts/think.dart"; +import "package:island/thoughts/thought_widgets/thought/thought_shared.dart"; import "package:material_symbols_icons/material_symbols_icons.dart"; class ThoughtSheet extends HookConsumerWidget { diff --git a/lib/thought/thought.dart b/lib/thoughts/thought.dart similarity index 100% rename from lib/thought/thought.dart rename to lib/thoughts/thought.dart diff --git a/lib/thought/thought.freezed.dart b/lib/thoughts/thought.freezed.dart similarity index 100% rename from lib/thought/thought.freezed.dart rename to lib/thoughts/thought.freezed.dart diff --git a/lib/thought/thought.g.dart b/lib/thoughts/thought.g.dart similarity index 100% rename from lib/thought/thought.g.dart rename to lib/thoughts/thought.g.dart diff --git a/lib/thought/thought_widgets/thought/function_calls_section.dart b/lib/thoughts/thought_widgets/thought/function_calls_section.dart similarity index 100% rename from lib/thought/thought_widgets/thought/function_calls_section.dart rename to lib/thoughts/thought_widgets/thought/function_calls_section.dart diff --git a/lib/thought/thought_widgets/thought/proposals_section.dart b/lib/thoughts/thought_widgets/thought/proposals_section.dart similarity index 100% rename from lib/thought/thought_widgets/thought/proposals_section.dart rename to lib/thoughts/thought_widgets/thought/proposals_section.dart diff --git a/lib/thought/thought_widgets/thought/reasoning_section.dart b/lib/thoughts/thought_widgets/thought/reasoning_section.dart similarity index 100% rename from lib/thought/thought_widgets/thought/reasoning_section.dart rename to lib/thoughts/thought_widgets/thought/reasoning_section.dart diff --git a/lib/thought/thought_widgets/thought/thought_content.dart b/lib/thoughts/thought_widgets/thought/thought_content.dart similarity index 91% rename from lib/thought/thought_widgets/thought/thought_content.dart rename to lib/thoughts/thought_widgets/thought/thought_content.dart index eb8d7cd5..6acf2dce 100644 --- a/lib/thought/thought_widgets/thought/thought_content.dart +++ b/lib/thoughts/thought_widgets/thought/thought_content.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:island/thought/thought.dart'; -import 'package:island/core/widgets/content/markdown.dart'; -import 'package:island/thought/thought_widgets/thought/thought_proposal.dart'; +import 'package:island/thoughts/thought.dart'; +import 'package:island/drive/content/markdown.dart'; +import 'package:island/thoughts/thought_widgets/thought/thought_proposal.dart'; class ThoughtContent extends StatelessWidget { const ThoughtContent({ diff --git a/lib/thought/thought_widgets/thought/thought_header.dart b/lib/thoughts/thought_widgets/thought/thought_header.dart similarity index 100% rename from lib/thought/thought_widgets/thought/thought_header.dart rename to lib/thoughts/thought_widgets/thought/thought_header.dart diff --git a/lib/thought/thought_widgets/thought/thought_proposal.dart b/lib/thoughts/thought_widgets/thought/thought_proposal.dart similarity index 100% rename from lib/thought/thought_widgets/thought/thought_proposal.dart rename to lib/thoughts/thought_widgets/thought/thought_proposal.dart diff --git a/lib/thought/thought_widgets/thought/thought_sequence_list.dart b/lib/thoughts/thought_widgets/thought/thought_sequence_list.dart similarity index 94% rename from lib/thought/thought_widgets/thought/thought_sequence_list.dart rename to lib/thoughts/thought_widgets/thought/thought_sequence_list.dart index 8cd0d6bc..4a1063a1 100644 --- a/lib/thought/thought_widgets/thought/thought_sequence_list.dart +++ b/lib/thoughts/thought_widgets/thought/thought_sequence_list.dart @@ -1,10 +1,10 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:island/pagination/pagination.dart'; -import 'package:island/thought/thought.dart'; +import 'package:island/thoughts/thought.dart'; import 'package:island/core/network.dart'; import 'package:island/core/services/time.dart'; -import 'package:island/core/widgets/content/sheet.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; import 'package:island/shared/widgets/pagination_list.dart'; final thoughtSequenceListNotifierProvider = AsyncNotifierProvider.autoDispose( diff --git a/lib/thought/thought_widgets/thought/thought_shared.dart b/lib/thoughts/thought_widgets/thought/thought_shared.dart similarity index 98% rename from lib/thought/thought_widgets/thought/thought_shared.dart rename to lib/thoughts/thought_widgets/thought/thought_shared.dart index 01993e5e..585f0e55 100644 --- a/lib/thought/thought_widgets/thought/thought_shared.dart +++ b/lib/thoughts/thought_widgets/thought/thought_shared.dart @@ -8,20 +8,20 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:gap/gap.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/thought/thought.dart'; +import 'package:island/thoughts/thought.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/posts/compose.dart'; import 'package:island/talker.dart'; import 'package:island/shared/widgets/alert.dart'; import 'package:island/posts/posts_widgets/compose_sheet.dart'; -import 'package:island/thought/thought/think.dart'; -import 'package:island/thought/thought_widgets/thought/function_calls_section.dart'; -import 'package:island/thought/thought_widgets/thought/proposals_section.dart'; -import 'package:island/thought/thought_widgets/thought/reasoning_section.dart'; -import 'package:island/thought/thought_widgets/thought/thought_content.dart'; -import 'package:island/thought/thought_widgets/thought/thought_header.dart'; -import 'package:island/thought/thought_widgets/thought/token_info.dart'; +import 'package:island/thoughts/think.dart'; +import 'package:island/thoughts/thought_widgets/thought/function_calls_section.dart'; +import 'package:island/thoughts/thought_widgets/thought/proposals_section.dart'; +import 'package:island/thoughts/thought_widgets/thought/reasoning_section.dart'; +import 'package:island/thoughts/thought_widgets/thought/thought_content.dart'; +import 'package:island/thoughts/thought_widgets/thought/thought_header.dart'; +import 'package:island/thoughts/thought_widgets/thought/token_info.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; import 'package:styled_widget/styled_widget.dart'; import 'package:super_sliver_list/super_sliver_list.dart'; diff --git a/lib/thought/thought_widgets/thought/token_info.dart b/lib/thoughts/thought_widgets/thought/token_info.dart similarity index 96% rename from lib/thought/thought_widgets/thought/token_info.dart rename to lib/thoughts/thought_widgets/thought/token_info.dart index 11d30936..6588e9c7 100644 --- a/lib/thought/thought_widgets/thought/token_info.dart +++ b/lib/thoughts/thought_widgets/thought/token_info.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:gap/gap.dart'; import 'package:material_symbols_icons/material_symbols_icons.dart'; -import 'package:island/thought/thought.dart'; +import 'package:island/thoughts/thought.dart'; class TokenInfo extends StatelessWidget { const TokenInfo({super.key, required this.thought}); diff --git a/lib/wallet/wallet.dart b/lib/wallets/wallet.dart similarity index 99% rename from lib/wallet/wallet.dart rename to lib/wallets/wallet.dart index ae0afb75..b5ed20e4 100644 --- a/lib/wallet/wallet.dart +++ b/lib/wallets/wallet.dart @@ -10,13 +10,13 @@ import 'package:island/accounts/accounts_widgets/account/account_pfc.dart'; import 'package:island/accounts/accounts_widgets/account/account_picker.dart'; import 'package:island/lotteries/lottery.dart'; import 'package:island/pagination/pagination.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/shared/widgets/app_scaffold.dart'; import 'package:island/drive/drive_widgets/cloud_files.dart'; import 'package:island/shared/widgets/alert.dart'; -import 'package:island/core/widgets/content/sheet.dart'; -import 'package:island/core/widgets/payment/payment_overlay.dart'; +import 'package:island/drive/content/sheet_scaffold.dart'; +import 'package:island/payment/payment_overlay.dart'; import 'package:island/shared/widgets/response.dart'; import 'package:material_symbols_icons/symbols.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; diff --git a/lib/wallet/wallet.g.dart b/lib/wallets/wallet.g.dart similarity index 100% rename from lib/wallet/wallet.g.dart rename to lib/wallets/wallet.g.dart diff --git a/lib/wallet/wallet_models/wallet.dart b/lib/wallets/wallet_models/wallet.dart similarity index 100% rename from lib/wallet/wallet_models/wallet.dart rename to lib/wallets/wallet_models/wallet.dart diff --git a/lib/wallet/wallet_models/wallet.freezed.dart b/lib/wallets/wallet_models/wallet.freezed.dart similarity index 100% rename from lib/wallet/wallet_models/wallet.freezed.dart rename to lib/wallets/wallet_models/wallet.freezed.dart diff --git a/lib/wallet/wallet_models/wallet.g.dart b/lib/wallets/wallet_models/wallet.g.dart similarity index 100% rename from lib/wallet/wallet_models/wallet.g.dart rename to lib/wallets/wallet_models/wallet.g.dart diff --git a/lib/wallet/wallet_widgets/wallet/fund_envelope.dart b/lib/wallets/wallet_widgets/wallet/fund_envelope.dart similarity index 99% rename from lib/wallet/wallet_widgets/wallet/fund_envelope.dart rename to lib/wallets/wallet_widgets/wallet/fund_envelope.dart index c9e150b9..bcf957f6 100644 --- a/lib/wallet/wallet_widgets/wallet/fund_envelope.dart +++ b/lib/wallets/wallet_widgets/wallet/fund_envelope.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:island/wallet/wallet_models/wallet.dart'; +import 'package:island/wallets/wallet_models/wallet.dart'; import 'package:island/core/network.dart'; import 'package:island/accounts/accounts_pod.dart'; import 'package:island/shared/widgets/alert.dart'; diff --git a/lib/wallet/wallet_widgets/wallet/fund_envelope.g.dart b/lib/wallets/wallet_widgets/wallet/fund_envelope.g.dart similarity index 100% rename from lib/wallet/wallet_widgets/wallet/fund_envelope.g.dart rename to lib/wallets/wallet_widgets/wallet/fund_envelope.g.dart