✨ Ability to crop image

2025-08-04 22:08:18 +08:00
parent ba269dbbb8
commit edd760fbcb
20 changed files with 605 additions and 444 deletions
--- a/lib/widgets/post/compose_link_attachments.dart
+++ b/lib/widgets/post/compose_link_attachments.dart
@@ -0,0 +1,193 @@
+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:hooks_riverpod/hooks_riverpod.dart';
+import 'package:island/models/file.dart';
+import 'package:island/pods/network.dart';
+import 'package:island/widgets/content/cloud_files.dart';
+import 'package:island/widgets/content/sheet.dart';
+import 'package:material_symbols_icons/symbols.dart';
+import 'package:riverpod_annotation/riverpod_annotation.dart';
+import 'package:riverpod_paging_utils/riverpod_paging_utils.dart';
+import 'package:styled_widget/styled_widget.dart';
+
+part 'compose_link_attachments.g.dart';
+
+@riverpod
+class CloudFileListNotifier extends _$CloudFileListNotifier
+    with CursorPagingNotifierMixin<SnCloudFile> {
+  @override
+  Future<CursorPagingData<SnCloudFile>> build() => fetch(cursor: null);
+
+  @override
+  Future<CursorPagingData<SnCloudFile>> fetch({required String? cursor}) async {
+    final client = ref.read(apiClientProvider);
+    final offset = cursor == null ? 0 : int.parse(cursor);
+    final take = 20;
+
+    final queryParameters = {'offset': offset, 'take': take};
+
+    final response = await client.get(
+      '/drive/files/me',
+      queryParameters: queryParameters,
+    );
+
+    final List<SnCloudFile> items =
+        (response.data as List)
+            .map((e) => SnCloudFile.fromJson(e as Map<String, dynamic>))
+            .toList();
+    final total = int.parse(response.headers.value('X-Total') ?? '0');
+
+    final hasMore = offset + items.length < total;
+    final nextCursor = hasMore ? (offset + items.length).toString() : null;
+
+    return CursorPagingData(
+      items: items,
+      hasMore: hasMore,
+      nextCursor: nextCursor,
+    );
+  }
+}
+
+class ComposeLinkAttachment extends HookConsumerWidget {
+  const ComposeLinkAttachment({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final idController = useTextEditingController();
+    final errorMessage = useState<String?>(null);
+
+    return SheetScaffold(
+      heightFactor: 0.6,
+      titleText: 'linkAttachment'.tr(),
+      child: DefaultTabController(
+        length: 2,
+        child: Column(
+          mainAxisSize: MainAxisSize.min,
+          crossAxisAlignment: CrossAxisAlignment.stretch,
+          children: [
+            TabBar(
+              tabs: [
+                Tab(text: 'attachmentsRecentUploads'.tr()),
+                Tab(text: 'attachmentsManualInput'.tr()),
+              ],
+            ),
+            Expanded(
+              child: TabBarView(
+                children: [
+                  PagingHelperView(
+                    provider: cloudFileListNotifierProvider,
+                    futureRefreshable: cloudFileListNotifierProvider.future,
+                    notifierRefreshable: cloudFileListNotifierProvider.notifier,
+                    contentBuilder:
+                        (data, widgetCount, endItemView) => ListView.builder(
+                          padding: EdgeInsets.zero,
+                          itemCount: widgetCount,
+                          itemBuilder: (context, index) {
+                            if (index == widgetCount - 1) {
+                              return endItemView;
+                            }
+
+                            final item = data.items[index];
+                            final itemType =
+                                item.mimeType?.split('/').firstOrNull;
+                            return ListTile(
+                              leading: ClipRRect(
+                                borderRadius: const BorderRadius.all(
+                                  Radius.circular(8),
+                                ),
+                                child: SizedBox(
+                                  height: 48,
+                                  width: 48,
+                                  child: switch (itemType) {
+                                    'image' => CloudImageWidget(file: item),
+                                    'audio' =>
+                                      const Icon(
+                                        Symbols.audio_file,
+                                        fill: 1,
+                                      ).center(),
+                                    'video' =>
+                                      const Icon(
+                                        Symbols.video_file,
+                                        fill: 1,
+                                      ).center(),
+                                    _ =>
+                                      const Icon(
+                                        Symbols.body_system,
+                                        fill: 1,
+                                      ).center(),
+                                  },
+                                ),
+                              ),
+                              title:
+                                  item.name.isEmpty
+                                      ? Text('untitled').tr().italic()
+                                      : Text(item.name),
+                              onTap: () {
+                                Navigator.pop(context, item);
+                              },
+                            );
+                          },
+                        ),
+                  ),
+                  SingleChildScrollView(
+                    child: Column(
+                      children: [
+                        TextField(
+                          controller: idController,
+                          decoration: InputDecoration(
+                            labelText: 'fileId'.tr(),
+                            helperText: 'fileIdHint'.tr(),
+                            helperMaxLines: 3,
+                            errorText: errorMessage.value,
+                            border: OutlineInputBorder(),
+                          ),
+                          onTapOutside:
+                              (_) =>
+                                  FocusManager.instance.primaryFocus?.unfocus(),
+                        ),
+                        const Gap(16),
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: TextButton.icon(
+                            icon: const Icon(Symbols.add),
+                            label: Text('add'.tr()),
+                            onPressed: () async {
+                              final fileId = idController.text.trim();
+                              if (fileId.isEmpty) {
+                                errorMessage.value = 'fileIdCannotBeEmpty'.tr();
+                                return;
+                              }
+
+                              try {
+                                final client = ref.read(apiClientProvider);
+                                final response = await client.get(
+                                  '/drive/files/$fileId/info',
+                                );
+                                final SnCloudFile cloudFile =
+                                    SnCloudFile.fromJson(response.data);
+
+                                if (context.mounted) {
+                                  Navigator.of(context).pop(cloudFile);
+                                }
+                              } catch (e) {
+                                errorMessage.value = 'failedToFetchFile'.tr(
+                                  args: [e.toString()],
+                                );
+                              }
+                            },
+                          ),
+                        ),
+                      ],
+                    ).padding(horizontal: 24, vertical: 24),
+                  ),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
--- a/lib/widgets/post/compose_link_attachments.g.dart
+++ b/lib/widgets/post/compose_link_attachments.g.dart
@@ -0,0 +1,31 @@
+// GENERATED CODE - DO NOT MODIFY BY HAND
+
+part of 'compose_link_attachments.dart';
+
+// **************************************************************************
+// RiverpodGenerator
+// **************************************************************************
+
+String _$cloudFileListNotifierHash() =>
+    r'e2c8a076a9e635c7b43a87d00f78775427ba6334';
+
+/// See also [CloudFileListNotifier].
+@ProviderFor(CloudFileListNotifier)
+final cloudFileListNotifierProvider = AutoDisposeAsyncNotifierProvider<
+  CloudFileListNotifier,
+  CursorPagingData<SnCloudFile>
+>.internal(
+  CloudFileListNotifier.new,
+  name: r'cloudFileListNotifierProvider',
+  debugGetCreateSourceHash:
+      const bool.fromEnvironment('dart.vm.product')
+          ? null
+          : _$cloudFileListNotifierHash,
+  dependencies: null,
+  allTransitiveDependencies: null,
+);
+
+typedef _$CloudFileListNotifier =
+    AutoDisposeAsyncNotifier<CursorPagingData<SnCloudFile>>;
+// ignore_for_file: type=lint
+// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member, deprecated_member_use_from_same_package
--- a/lib/widgets/post/compose_recorder.dart
+++ b/lib/widgets/post/compose_recorder.dart
@@ -126,7 +126,7 @@ class ComposeRecorder extends HookConsumerWidget {
                ),
              ),
            ),
-          ),
+          ).padding(horizontal: 24),
          const Gap(12),
          IconButton.filled(
            onPressed: recording.value ? stopRecord : startRecord,
--- a/lib/widgets/post/compose_shared.dart
+++ b/lib/widgets/post/compose_shared.dart
@@ -3,7 +3,6 @@ import 'package:dio/dio.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
-import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:island/models/file.dart';
@@ -14,11 +13,9 @@ import 'package:island/pods/network.dart';
 import 'package:island/services/file.dart';
 import 'package:island/services/compose_storage_db.dart';
 import 'package:island/widgets/alert.dart';
-import 'package:island/widgets/content/sheet.dart';
+import 'package:island/widgets/post/compose_link_attachments.dart';
 import 'package:island/widgets/post/compose_recorder.dart';
-import 'package:material_symbols_icons/symbols.dart';
 import 'package:pasteboard/pasteboard.dart';
-import 'package:styled_widget/styled_widget.dart';
 import 'package:textfield_tags/textfield_tags.dart';
 import 'dart:async';
 import 'dart:developer';
@@ -424,88 +421,39 @@ class ComposeLogic {
    ComposeState state,
    BuildContext context,
  ) async {
-    final TextEditingController idController = TextEditingController();
-    String? errorMessage;
-
-    await showModalBottomSheet(
+    final cloudFile = await showModalBottomSheet<SnCloudFile?>(
      context: context,
-      builder: (BuildContext dialogContext) {
-        return StatefulBuilder(
-          builder: (context, setState) {
-            return SheetScaffold(
-              titleText: 'linkAttachment'.tr(),
-              child: Column(
-                mainAxisSize: MainAxisSize.min,
-                crossAxisAlignment: CrossAxisAlignment.stretch,
-                children: [
-                  TextField(
-                    controller: idController,
-                    decoration: InputDecoration(
-                      labelText: 'fileId'.tr(),
-                      helperText: 'fileIdHint'.tr(),
-                      helperMaxLines: 3,
-                      errorText: errorMessage,
-                      border: OutlineInputBorder(),
-                    ),
-                  ),
-                  const Gap(16),
-                  Align(
-                    alignment: Alignment.centerRight,
-                    child: TextButton.icon(
-                      icon: const Icon(Symbols.add),
-                      label: Text('add'.tr()),
-                      onPressed: () async {
-                        final fileId = idController.text.trim();
-                        if (fileId.isEmpty) {
-                          setState(() {
-                            errorMessage = 'fileIdCannotBeEmpty'.tr();
-                          });
-                          return;
-                        }
-
-                        try {
-                          final client = ref.read(apiClientProvider);
-                          final response = await client.get(
-                            '/drive/files/$fileId/info',
-                          );
-                          final SnCloudFile cloudFile = SnCloudFile.fromJson(
-                            response.data,
-                          );
-
-                          state.attachments.value = [
-                            ...state.attachments.value,
-                            UniversalFile(
-                              data: cloudFile,
-                              type: switch (cloudFile.mimeType
-                                  ?.split('/')
-                                  .firstOrNull) {
-                                'image' => UniversalFileType.image,
-                                'video' => UniversalFileType.video,
-                                'audio' => UniversalFileType.audio,
-                                _ => UniversalFileType.file,
-                              },
-                            ),
-                          ];
-                          if (context.mounted) {
-                            Navigator.of(dialogContext).pop();
-                          }
-                        } catch (e) {
-                          setState(() {
-                            errorMessage = 'failedToFetchFile'.tr(
-                              args: [e.toString()],
-                            );
-                          });
-                        }
-                      },
-                    ),
-                  ),
-                ],
-              ).padding(horizontal: 24, vertical: 24),
-            );
-          },
-        );
-      },
+      useRootNavigator: true,
+      isScrollControlled: true,
+      builder: (context) => ComposeLinkAttachment(),
    );
+    if (cloudFile == null) return;
+
+    state.attachments.value = [
+      ...state.attachments.value,
+      UniversalFile(
+        data: cloudFile,
+        type: switch (cloudFile.mimeType?.split('/').firstOrNull) {
+          'image' => UniversalFileType.image,
+          'video' => UniversalFileType.video,
+          'audio' => UniversalFileType.audio,
+          _ => UniversalFileType.file,
+        },
+        isLink: true,
+      ),
+    ];
+  }
+
+  static void updateAttachment(
+    ComposeState state,
+    UniversalFile value,
+    int index,
+  ) {
+    state.attachments.value =
+        state.attachments.value.mapIndexed((idx, ele) {
+          if (idx == index) return value;
+          return ele;
+        }).toList();
  }

  static Future<void> uploadAttachment(
@@ -581,7 +529,7 @@ class ComposeLogic {
    int index,
  ) async {
    final attachment = state.attachments.value[index];
-    if (attachment.isOnCloud) {
+    if (attachment.isOnCloud && !attachment.isLink) {
      final client = ref.watch(apiClientProvider);
      await client.delete('/drive/files/${attachment.data.id}');
    }
--- a/lib/widgets/post/post_item.dart
+++ b/lib/widgets/post/post_item.dart
@@ -9,7 +9,6 @@ import 'package:gap/gap.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:island/models/embed.dart';
 import 'package:island/models/post.dart';
-import 'package:island/pods/config.dart';
 import 'package:island/pods/network.dart';
 import 'package:island/pods/translate.dart';
 import 'package:island/pods/userinfo.dart';
@@ -179,7 +178,7 @@ class PostActionableItem extends HookConsumerWidget {
              callback: () {
                showShareSheetLink(
                  context: context,
-                  link: '${ref.read(serverUrlProvider)}/posts/${item.id}',
+                  link: 'https://solian.app/posts/${item.id}',
                  title: 'sharePost'.tr(),
                  toSystem: true,
                );
@@ -410,7 +409,9 @@ class PostItem extends HookConsumerWidget {
        if (!isFullPost && item.type == 1)
          Container(
            decoration: BoxDecoration(
-              border: Border.all(color: Theme.of(context).dividerColor),
+              border: Border.all(
+                color: Theme.of(context).dividerColor.withOpacity(0.5),
+              ),
              borderRadius: const BorderRadius.all(Radius.circular(16)),
            ),
            padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12),
@@ -596,7 +597,7 @@ Widget _buildReferencePost(
      color: Theme.of(context).colorScheme.surfaceVariant.withOpacity(0.5),
      borderRadius: BorderRadius.circular(12),
      border: Border.all(
-        color: Theme.of(context).colorScheme.outline.withOpacity(0.3),
+        color: Theme.of(context).dividerColor.withOpacity(0.5),
      ),
    ),
    child: Column(
@@ -912,7 +913,9 @@ class PostReplyPreview extends HookConsumerWidget {
              padding: EdgeInsets.symmetric(horizontal: 16, vertical: 12),
              decoration: BoxDecoration(
                color: Theme.of(context).colorScheme.surfaceContainerLow,
-                border: Border.all(color: Theme.of(context).dividerColor),
+                border: Border.all(
+                  color: Theme.of(context).dividerColor.withOpacity(0.5),
+                ),
                borderRadius: BorderRadius.all(Radius.circular(8)),
              ),
              child: Column(