ImageDialogでファイルをそのまま保存できるように

shiosyakeyakini-info · Oct 23, 2023 · 7aa6c82 · 7aa6c82
1 parent 890ffc8
commit 7aa6c82
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 54 deletions.
diff --git a/lib/providers.dart b/lib/providers.dart
@@ -23,6 +23,7 @@ import 'package:miria/repository/tab_settings_repository.dart';
 import 'package:miria/repository/time_line_repository.dart';
 import 'package:miria/repository/user_list_time_line_repository.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:miria/state_notifier/common/download_file_notifier.dart';
 import 'package:miria/state_notifier/note_create_page/note_create_state_notifier.dart';
 import 'package:miria/state_notifier/photo_edit_page/photo_edit_state_notifier.dart';
 import 'package:misskey_dart/misskey_dart.dart';
@@ -216,3 +217,6 @@ final noteCreateProvider = StateNotifierProvider.family
       ref.read(errorEventProvider.notifier),
       ref.read(notesProvider(account))),
 );
+
+final downloadFileNotifierProvider =
+    NotifierProvider<DownloadFileNotifier, void>(DownloadFileNotifier.new);
diff --git a/lib/state_notifier/common/download_file_notifier.dart b/lib/state_notifier/common/download_file_notifier.dart
@@ -0,0 +1,48 @@
+import 'package:device_info_plus/device_info_plus.dart';
+import 'package:dio/dio.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:image_gallery_saver/image_gallery_saver.dart';
+import 'package:miria/providers.dart';
+import 'package:misskey_dart/misskey_dart.dart' hide Permission;
+import 'package:permission_handler/permission_handler.dart';
+
+class DownloadFileNotifier extends Notifier<void> {
+  @override
+  void build() {
+    return;
+  }
+
+  Future<void> downloadFile(DriveFile driveFile) async {
+    if (defaultTargetPlatform == TargetPlatform.android) {
+      final androidInfo = await DeviceInfoPlugin().androidInfo;
+      if (androidInfo.version.sdkInt <= 32) {
+        final permissionStatus = await Permission.storage.status;
+        if (permissionStatus.isDenied) {
+          await Permission.storage.request();
+        }
+      } else {
+        final permissionStatus = await Permission.photos.status;
+        if (permissionStatus.isDenied) {
+          await Permission.photos.request();
+        }
+      }
+    }
+
+    final tempDir = ref.read(fileSystemProvider).systemTempDirectory;
+    final savePath = "${tempDir.path}/${driveFile.name}";
+
+    await ref.read(dioProvider).download(
+          driveFile.url,
+          savePath,
+          options: Options(
+            responseType: ResponseType.bytes,
+          ),
+        );
+
+    await ImageGallerySaver.saveFile(
+      savePath,
+      name: driveFile.name,
+    );
+  }
+}
diff --git a/lib/view/common/image_dialog.dart b/lib/view/common/image_dialog.dart
@@ -1,22 +1,19 @@
 import 'dart:math';
 
-import 'package:device_info_plus/device_info_plus.dart';
-import 'package:dio/dio.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:miria/providers.dart';
 import 'package:miria/view/common/misskey_notes/network_image.dart';
-import 'package:permission_handler/permission_handler.dart';
+import 'package:misskey_dart/misskey_dart.dart';
 
 class ImageDialog extends ConsumerStatefulWidget {
-  final List<String> imageUrlList;
+  final List<DriveFile> driveFiles;
   final int initialPage;
 
   const ImageDialog({
     super.key,
-    required this.imageUrlList,
+    required this.driveFiles,
     required this.initialPage,
   });
 
@@ -47,6 +44,8 @@ class ImageDialogState extends ConsumerState<ImageDialog> {
 
   @override
   Widget build(BuildContext context) {
+    final imageUrlList = widget.driveFiles.map((file) => file.url);
+
     return AlertDialog(
         backgroundColor: Colors.transparent,
         titlePadding: EdgeInsets.zero,
@@ -117,7 +116,7 @@ class ImageDialogState extends ConsumerState<ImageDialog> {
                                   ? const ScrollPhysics()
                                   : const NeverScrollableScrollPhysics(),
                               children: [
-                                for (final url in widget.imageUrlList)
+                                for (final url in imageUrlList)
                                   ScaleNotifierInteractiveViewer(
                                     imageUrl: url,
                                     controller: _transformationController,
@@ -162,33 +161,14 @@ class ImageDialogState extends ConsumerState<ImageDialog> {
                         onPressed: () async {
                           final page = pageController.page?.toInt();
                           if (page == null) return;
-                          final response = await ref.read(dioProvider).get(
-                              widget.imageUrlList[page],
-                              options:
-                                  Options(responseType: ResponseType.bytes));
-
-                          if (defaultTargetPlatform == TargetPlatform.android) {
-                            final androidInfo =
-                                await DeviceInfoPlugin().androidInfo;
-                            if (androidInfo.version.sdkInt <= 32) {
-                              final permissionStatus =
-                                  await Permission.storage.status;
-                              if (permissionStatus.isDenied) {
-                                await Permission.storage.request();
-                              }
-                            } else {
-                              final permissionStatus =
-                                  await Permission.photos.status;
-                              if (permissionStatus.isDenied) {
-                                await Permission.photos.request();
-                              }
-                            }
-                          }
-
-                          await ImageGallerySaver.saveImage(response.data);
+                          final driveFile = widget.driveFiles[page];
+                          ref
+                              .read(downloadFileNotifierProvider.notifier)
+                              .downloadFile(driveFile);
                           if (!mounted) return;
                           ScaffoldMessenger.of(context).showSnackBar(
-                              const SnackBar(content: Text("画像保存したで")));
+                            const SnackBar(content: Text("画像保存したで")),
+                          );
                         },
                         constraints:
                             const BoxConstraints(minWidth: 0, minHeight: 0),

diff --git a/lib/view/common/misskey_notes/misskey_file_view.dart b/lib/view/common/misskey_notes/misskey_file_view.dart
@@ -43,7 +43,7 @@ class MisskeyFileViewState extends ConsumerState<MisskeyFileView> {
               isSensitive: targetFile.isSensitive,
               thumbnailUrl:
                   (targetFile.thumbnailUrl ?? targetFile.url).toString(),
-              targetFiles: [targetFile.url.toString()],
+              targetFiles: [targetFile],
               fileType: targetFile.type,
               name: targetFile.name,
               position: 0,
@@ -70,7 +70,7 @@ class MisskeyFileViewState extends ConsumerState<MisskeyFileView> {
                     child: MisskeyImage(
                       isSensitive: targetFile.element.isSensitive,
                       thumbnailUrl: targetFile.element.thumbnailUrl?.toString(),
-                      targetFiles: targetFiles.map((e) => e.url).toList(),
+                      targetFiles: targetFiles,
                       fileType: targetFile.element.type,
                       name: targetFile.element.name,
                       position: targetFile.index,
@@ -92,7 +92,7 @@ class MisskeyFileViewState extends ConsumerState<MisskeyFileView> {
 class MisskeyImage extends ConsumerStatefulWidget {
   final bool isSensitive;
   final String? thumbnailUrl;
-  final List<String> targetFiles;
+  final List<DriveFile> targetFiles;
   final int position;
   final String fileType;
   final String name;
@@ -168,14 +168,17 @@ class MisskeyImageState extends ConsumerState<MisskeyImage> {
             } else {
               if (widget.fileType.startsWith("image")) {
                 showDialog(
-                    context: context,
-                    builder: (context) => ImageDialog(
-                          imageUrlList: widget.targetFiles,
-                          initialPage: widget.position,
-                        ));
+                  context: context,
+                  builder: (context) => ImageDialog(
+                    driveFiles: widget.targetFiles,
+                    initialPage: widget.position,
+                  ),
+                );
               } else {
-                launchUrl(Uri.parse(widget.targetFiles[widget.position]),
-                    mode: LaunchMode.externalApplication);
+                launchUrl(
+                  Uri.parse(widget.targetFiles[widget.position].url),
+                  mode: LaunchMode.externalApplication,
+                );
               }
             }
           }, child: Builder(
@@ -231,7 +234,7 @@ class MisskeyImageState extends ConsumerState<MisskeyImage> {
                         height: 200,
                         child: NetworkImageView(
                           url: widget.thumbnailUrl ??
-                              widget.targetFiles[widget.position],
+                              widget.targetFiles[widget.position].url,
                           type: ImageType.imageThumbnail,
                           loadingBuilder: (context, widget, chunkEvent) =>
                               SizedBox(
@@ -268,7 +271,9 @@ class MisskeyImageState extends ConsumerState<MisskeyImage> {
                       cachedWidget = TextButton.icon(
                           onPressed: () {
                             launchUrl(
-                                Uri.parse(widget.targetFiles[widget.position]),
+                                Uri.parse(
+                                  widget.targetFiles[widget.position].url,
+                                ),
                                 mode: LaunchMode.externalApplication);
                           },
                           icon: const Icon(Icons.file_download_outlined),

diff --git a/lib/view/misskey_page_page/misskey_page_page.dart b/lib/view/misskey_page_page/misskey_page_page.dart
@@ -126,18 +126,19 @@ class PageContent extends ConsumerWidget {
       return MfmText(mfmText: content.text);
     }
     if (content is misskey.PageImage) {
-      final url = page.attachedFiles
-          .firstWhereOrNull((e) => e.id == content.fileId)
-          ?.url;
-      final thumbnailUrl = page.attachedFiles
-          .firstWhereOrNull((e) => e.id == content.fileId)
-          ?.thumbnailUrl;
-      if (url != null) {
+      final file =
+          page.attachedFiles.firstWhereOrNull((e) => e.id == content.fileId);
+      if (file != null) {
+        final url = file.url;
+        final thumbnailUrl = file.thumbnailUrl;
         return GestureDetector(
             onTap: () => showDialog(
-                context: context,
-                builder: (context) =>
-                    ImageDialog(imageUrlList: [url], initialPage: 0)),
+                  context: context,
+                  builder: (context) => ImageDialog(
+                    driveFiles: [file],
+                    initialPage: 0,
+                  ),
+                ),
             child: NetworkImageView(
                 url: thumbnailUrl ?? url, type: ImageType.image));
       } else {