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

shiosyakeyakini-info · Apr 20, 2024 · bf5faef · bf5faef
1 parent f5ccd94
commit bf5faef
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 41 deletions.
diff --git a/lib/l10n/app_ja.arb b/lib/l10n/app_ja.arb
@@ -288,7 +288,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
@@ -455,44 +455,54 @@ class NoteCreateNotifier extends StateNotifier<NoteCreate> {
     final result = await showModalBottomSheet<DriveModalSheetReturnValue?>(
         context: context, builder: (context) => const DriveModalSheet());
 
-    if (result == DriveModalSheetReturnValue.drive) {
-      if (!mounted) return;
-      final result = await showDialog<List<DriveFile>?>(
-        context: context,
-        builder: (context) => DriveFileSelectDialog(
-          account: state.account,
-          allowMultiple: true,
-        ),
-      );
-      if (result == null || result.isEmpty) return;
+    switch (result) {
+      case DriveModalSheetReturnValue.drive:
+        if (!context.mounted) return;
+        final result = await showDialog<List<DriveFile>?>(
+          context: context,
+          builder: (context) => DriveFileSelectDialog(
+            account: state.account,
+            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);
-      if (result == null || result.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;
+        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,
+        );
+        if (pickerResult == null || pickerResult.files.isEmpty) return;
 
-      if (!mounted) return;
-      state = state.copyWith(
-        files: [
-          ...state.files,
-          ...files,
-        ],
-      );
+        final files = pickerResult.files.map(
+          (file) {
+            final path = file.path;
+            if (path != null) {
+              return PostFile.file(fileSystem.file(path));
+            }
+            return null;
+          },
+        ).nonNulls;
+
+        if (!mounted) return;
+        state = state.copyWith(
+          files: [
+            ...state.files,
+            ...files,
+          ],
+        );
+      default:
     }
   }
 

diff --git a/lib/view/note_create_page/drive_modal_sheet.dart b/lib/view/note_create_page/drive_modal_sheet.dart
@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 
-enum DriveModalSheetReturnValue { upload, drive }
+enum DriveModalSheetReturnValue { uploadMedia, uploadFile, drive }
 
 class DriveModalSheet extends StatelessWidget {
   const DriveModalSheet({super.key});
@@ -11,10 +11,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: () {
-            Navigator.of(context).pop(DriveModalSheetReturnValue.upload);
+            Navigator.of(context).pop(DriveModalSheetReturnValue.uploadMedia);
+          },
+        ),
+        ListTile(
+          title: Text(S.of(context).uploadFile),
+          leading: const Icon(Icons.upload_file),
+          onTap: () {
+            Navigator.of(context).pop(DriveModalSheetReturnValue.uploadFile);
           },
         ),
         ListTile(

diff --git a/test/view/note_create_page/note_create_page_test.dart b/test/view/note_create_page/note_create_page_test.dart
@@ -2235,7 +2235,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(
@@ -2296,7 +2296,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(