メディアをアップロードできるように

shiosyakeyakini-info · Nov 13, 2024 · 5152702 · 5152702
1 parent 3dd5159
commit 5152702
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 37 deletions.
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -290,7 +290,8 @@
         }
     },
     "chooseFile": "ファイルを選択",
-    "uploadFile": "アップロード",
+    "uploadMedia": "メディアをアップロード",
+    "uploadFile": "ファイルをアップロード",
     "fromDrive": "ドライブから",
     "fileName": "ファイル名",
     "randomizeFileName": "ファイル名をランダムにする",

diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.dart
@@ -488,40 +488,48 @@ class NoteCreateNotifier extends _$NoteCreateNotifier {
         .read(appRouterProvider)
         .push<DriveModalSheetReturnValue>(const DriveModalRoute());
 
-    if (result == DriveModalSheetReturnValue.drive) {
-      final result = await ref.read(appRouterProvider).push<List<DriveFile>>(
-            DriveFileSelectRoute(
-              account: ref.read(accountContextProvider).postAccount,
-              allowMultiple: true,
-            ),
-          );
-      if (result == null || result.isEmpty) return;
+    switch (result) {
+      case DriveModalSheetReturnValue.drive:
+        final result = await ref.read(appRouterProvider).push<List<DriveFile>>(
+              DriveFileSelectRoute(
+                account: ref.read(accountContextProvider).postAccount,
+                allowMultiple: true,
+              ),
+            );
+        if (result == null || result.isEmpty) return;
 
-      final files = result.map((file) => AlreadyPostedFile.file(file));
+        final files = result.map((file) => AlreadyPostedFile.file(file));
 
-      state = state.copyWith(
-        files: [
-          ...state.files,
-          ...files,
-        ],
-      );
-    } else if (result == DriveModalSheetReturnValue.upload) {
-      final result = await FilePicker.platform.pickFiles(
-        allowMultiple: true,
-        allowCompression: Platform.isIOS, // v8.1.3ではiOS以外でこの値を使用していない
-        compressionQuality: 0, // Androidでは0にすることで圧縮パススルー
-      );
-      if (result == null || result.files.isEmpty) return;
+        state = state.copyWith(
+          files: [
+            ...state.files,
+            ...files,
+          ],
+        );
+      case DriveModalSheetReturnValue.uploadFile ||
+            DriveModalSheetReturnValue.uploadMedia:
+        final pickerResult = await FilePicker.platform.pickFiles(
+          type: result == DriveModalSheetReturnValue.uploadMedia
+              ? FileType.media
+              : FileType.any,
+          allowMultiple: true,
+          allowCompression: Platform.isIOS, // v8.1.3ではiOS以外でこの値を使用していない
+          compressionQuality: 0, // Androidでは0にすることで圧縮パススルー
+        );
+        if (pickerResult == null || pickerResult.files.isEmpty) return;
 
-      final files = result.files.map((file) {
-        final path = file.path;
-        if (path != null) {
-          return PostFile.file(_fileSystem.file(path));
-        }
-        return null;
-      }).nonNulls;
+        final files = pickerResult.files.map(
+          (file) {
+            final path = file.path;
+            if (path != null) {
+              return PostFile.file(_fileSystem.file(path));
+            }
+            return null;
+          },
+        ).nonNulls;
 
-      state = state.copyWith(files: [...state.files, ...files]);
+        state = state.copyWith(files: [...state.files, ...files]);
+      default:
     }
   }
 

diff --git a/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart b/lib/state_notifier/note_create_page/note_create_state_notifier.g.dart
diff --git a/lib/view/note_create_page/drive_modal_sheet.dart b/lib/view/note_create_page/drive_modal_sheet.dart
@@ -2,7 +2,7 @@ import "package:auto_route/auto_route.dart";
 import "package:flutter/material.dart";
 import "package:flutter_gen/gen_l10n/app_localizations.dart";
 
-enum DriveModalSheetReturnValue { upload, drive }
+enum DriveModalSheetReturnValue { uploadMedia, uploadFile, drive }
 
 @RoutePage<DriveModalSheetReturnValue>()
 class DriveModalSheet extends StatelessWidget {
@@ -13,10 +13,17 @@ class DriveModalSheet extends StatelessWidget {
     return ListView(
       children: [
         ListTile(
-          title: Text(S.of(context).uploadFile),
+          title: Text(S.of(context).uploadMedia),
           leading: const Icon(Icons.upload),
           onTap: () async =>
-              context.maybePop(DriveModalSheetReturnValue.upload),
+              context.maybePop(DriveModalSheetReturnValue.uploadMedia),
+        ),
+        ListTile(
+          title: Text(S.of(context).uploadFile),
+          leading: const Icon(Icons.upload_file),
+          onTap: () {
+            Navigator.of(context).pop(DriveModalSheetReturnValue.uploadFile);
+          },
         ),
         ListTile(
           title: Text(S.of(context).fromDrive),

diff --git a/test/view/note_create_page/note_create_page_test.dart b/test/view/note_create_page/note_create_page_test.dart
@@ -3014,7 +3014,7 @@ void main() {
             await tester.tap(find.byIcon(Icons.image));
             await tester.pumpAndSettle();
 
-            await tester.tap(find.text("アップロード"));
+            await tester.tap(find.text("ファイルをアップロード"));
             await tester.pumpAndSettle();
 
             await tester.enterText(
@@ -3102,7 +3102,7 @@ void main() {
           await tester.tap(find.byIcon(Icons.image));
           await tester.pumpAndSettle();
 
-          await tester.tap(find.text("アップロード"));
+          await tester.tap(find.text("ファイルをアップロード"));
           await tester.pumpAndSettle();
 
           await tester.enterText(