🎨 Continued to rearrange core folders content

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

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

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

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

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

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

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

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

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

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

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

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

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 {

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/drive/content/sheet_scaffold.dart';
-import 'package:island/core/widgets/payment/payment_overlay.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';

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

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:
+      sections: pools.asMap().entries.map((entry) {
-          pools.asMap().entries.map((entry) {
+        final pool = entry.value as Map<String, dynamic>;
-            final pool = entry.value as Map<String, dynamic>;
+        final title = pool['pool_name'] as String;
-            final title = pool['pool_name'] as String;
+        final truncatedTitle = title.length > 8
-            final truncatedTitle =
+            ? '${title.substring(0, 8)}...'
-                title.length > 8 ? '${title.substring(0, 8)}...' : title;
+            : title;
-            return PieChartSectionData(
+        return PieChartSectionData(
-              value: (pool['usage_bytes'] as num).toDouble(),
+          value: (pool['usage_bytes'] as num).toDouble(),
-              title: truncatedTitle,
+          title: truncatedTitle,
-              color: colors[entry.key % colors.length],
+          color: colors[entry.key % colors.length],
-              radius: 60,
+          radius: 60,
-              titleStyle: const TextStyle(
+          titleStyle: const TextStyle(
-                fontSize: 12,
+            fontSize: 12,
-                color: Colors.white,
+            color: Colors.white,
-                fontWeight: FontWeight.bold,
+            fontWeight: FontWeight.bold,
-              ),
+          ),
-            );
+        );
-          }).toList(),
+      }).toList(),
     );
   }
 

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<String?> show(BuildContext context) {

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<CaptchaScreen> {
 
     final captchaUrl = await ref.watch(captchaUrlProvider.future);
 
-    final iframe =
+    final iframe = web.HTMLIFrameElement()
-        web.HTMLIFrameElement()
+      ..src = captchaUrl
-          ..src = captchaUrl
+      ..style.border = 'none'
-          ..style.border = 'none'
+      ..width = '100%'
-          ..width = '100%'
+      ..height = '100%';
-          ..height = '100%';
 
     web.document.body!.append(iframe);
     ui.platformViewRegistry.registerViewFactory(
@@ -73,10 +72,9 @@ class _CaptchaScreenState extends ConsumerState<CaptchaScreen> {
   Widget build(BuildContext context) {
     return SheetScaffold(
       titleText: "Anti-Robot",
-      child:
+      child: _isInitialized
-          _isInitialized
+          ? HtmlElementView(viewType: 'captcha-iframe')
-              ? HtmlElementView(viewType: 'captcha-iframe')
+          : Center(child: CircularProgressIndicator()),
-              : Center(child: CircularProgressIndicator()),
     );
   }
 }

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

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

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

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

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

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

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

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

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 {

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(
+                  defaultTextStyle: Theme.of(context).textTheme.bodyMedium!
-                    context,
+                      .copyWith(
-                  ).textTheme.bodyMedium!.copyWith(
+                        color: Theme.of(context).colorScheme.onSurfaceVariant,
-                    color: Theme.of(context).colorScheme.onSurfaceVariant,
+                      ),
-                  ),
                   addedTextStyle: TextStyle(
                     backgroundColor: Theme.of(
                       context,

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

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/mapping.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/link.dart';
+import 'package:island/embeds/link.dart';
 
 class MessageListTile extends StatelessWidget {
   final LocalChatMessage message;

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

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

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/drive/content/network_status_sheet.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/core/config.dart';
 import 'package:talker_flutter/talker_flutter.dart';

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<XFile> files =
+    final List<XFile> files = sharedFiles
-        sharedFiles
+        .where(
-            .where(
+          (file) =>
-              (file) =>
+              file.type == SharedMediaType.file ||
-                  file.type == SharedMediaType.file ||
+              file.type == SharedMediaType.video ||
-                  file.type == SharedMediaType.video ||
+              file.type == SharedMediaType.image,
-                  file.type == SharedMediaType.image,
+        )
-            )
+        .map((file) => XFile(file.path, name: file.path.split('/').last))
-            .map((file) => XFile(file.path, name: file.path.split('/').last))
+        .toList();
-            .toList();
 
     // Extract links from shared content
-    final List<String> links =
+    final List<String> links = sharedFiles
-        sharedFiles
+        .where((file) => file.type == SharedMediaType.url)
-            .where((file) => file.type == SharedMediaType.url)
+        .map((file) => file.path)
-            .map((file) => file.path)
+        .toList();
-            .toList();
 
     // Show ShareSheet with the shared files
     if (files.isNotEmpty) {

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:
+      builder: (context) => _WindowsUpdateDialog(
-          (context) => _WindowsUpdateDialog(
+        updateUrl: url,
-            updateUrl: url,
+        onComplete: () {
-            onComplete: () {
+          // Close the update sheet
-              // Close the update sheet
+          Navigator.of(context).pop();
-              Navigator.of(context).pop();
+        },
-            },
+      ),
-          ),
     );
   }
 
   /// Fetch the latest release info from GitHub.
   /// Public so other screens (e.g., About) can manually trigger update checks.
   Future<GithubReleaseInfo?> fetchLatestRelease() async {
-    final apiEndpoint =
+    final apiEndpoint = useProxy
-        useProxy
+        ? '$_proxyBaseUrl${Uri.encodeComponent(_releasesLatestApi)}'
-            ? '$_proxyBaseUrl${Uri.encodeComponent(_releasesLatestApi)}'
+        : _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:
+      builder: (context) => AlertDialog(
-          (context) => AlertDialog(
+        title: const Text('Update Failed'),
-            title: const Text('Update Failed'),
+        content: Text(message),
-            content: Text(message),
+        actions: [
-            actions: [
+          TextButton(
-              TextButton(
+            onPressed: () => Navigator.of(context).pop(),
-                onPressed: () => Navigator.of(context).pop(),
+            child: const Text('OK'),
-                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 =
+      final exeFiles = dir
-          dir
+          .listSync()
-              .listSync()
+          .where((f) => f is File && f.path.endsWith('.exe'))
-              .where((f) => f is File && f.path.endsWith('.exe'))
+          .toList();
-              .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:
+                  content: widget.release.body.isEmpty
-                      widget.release.body.isEmpty
+                      ? 'noChangelogProvided'.tr()
-                          ? 'noChangelogProvided'.tr()
+                      : widget.release.body,
-                          : widget.release.body,
                 ),
               ),
             ),

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

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

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

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

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

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

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

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

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

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

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

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

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

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/drive/content/sensitive.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:super_context_menu/super_context_menu.dart';

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/drive/content/cloud_file_lightbox.dart';
-import 'package:island/core/widgets/content/sensitive.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';

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/drive/content/exif_info_overlay.dart';
-import 'package:island/core/widgets/content/file_action_button.dart';
+import 'package:island/drive/content/file_action_button.dart';
-import 'package:island/core/widgets/content/file_info_sheet.dart';
+import 'package:island/drive/content/file_info_sheet.dart';
-import 'package:island/core/widgets/content/image_control_overlay.dart';
+import 'package:island/drive/content/image_control_overlay.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:photo_view/photo_view.dart';
 

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

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

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/format.dart';
-import 'package:island/core/widgets/content/audio.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/drive/content/exif_info_overlay.dart';
-import 'package:island/core/widgets/content/file_info_sheet.dart';
+import 'package:island/drive/content/file_info_sheet.dart';
-import 'package:island/core/widgets/content/image_control_overlay.dart';
+import 'package:island/drive/content/image_control_overlay.dart';
-import 'package:island/core/widgets/content/video.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';

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/drive/content/cloud_file_lightbox.dart';
-import 'package:island/core/widgets/content/markdown_latex.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';

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

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/drive/content/file_viewer_contents.dart';
-import 'package:island/core/widgets/content/image.dart';
+import 'package:island/drive/content/image.dart';
-import 'package:island/core/widgets/content/video.native.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/format.dart';
-import 'package:island/core/widgets/content/profile_decoration.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;

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/drive/file_icon_utils.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';

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/drive/content/file_info_sheet.dart';
-import 'package:island/core/widgets/content/file_viewer_contents.dart';
+import 'package:island/drive/content/file_viewer_contents.dart';
 
 class FileDetailScreen extends HookConsumerWidget {
   final SnCloudFile item;

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

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/embeds/link.dart';
-import 'package:island/wallet/wallet_widgets/wallet/fund_envelope.dart';
+import 'package:island/wallets/wallet_widgets/wallet/fund_envelope.dart';
 import 'package:material_symbols_icons/material_symbols_icons.dart';
 
 class EmbedListWidget extends StatelessWidget {

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

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/wallets/wallet.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/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/core/widgets/payment/payment_overlay.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';

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/drive/content/markdown.dart';
-import 'package:island/core/widgets/content/sheet.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';

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

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/wallets/wallet_models/wallet.dart';
-import 'package:island/core/widgets/content/sheet.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';

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

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

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

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

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/posts/share_utils.dart';
-import 'package:island/core/widgets/share/share_sheet.dart';
+import 'package:island/sharing/share_sheet.dart';
-import 'package:island/thought/thought/think_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';

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

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

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

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.

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

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

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

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/wallets/wallet.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/core/widgets/content/sheet.dart';
+import 'package:island/drive/content/sheet_scaffold.dart';
-import 'package:island/core/widgets/payment/payment_overlay.dart';
+import 'package:island/payment/payment_overlay.dart';
 import 'package:material_symbols_icons/symbols.dart';
 import 'package:styled_widget/styled_widget.dart';
 

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