🐛 D&D プラグイン乗り換え

- `drag_and_drop_windows` → `desktop_drop`
wappon28dev · Oct 14, 2023 · d333ee3 · d333ee3
1 parent 0492ed0
commit d333ee3
Show file tree

Hide file tree

Showing 23 changed files with 208 additions and 212 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,3 @@
-import 'package:drag_and_drop_windows/drag_and_drop_windows.dart';
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -7,7 +6,6 @@ import 'package:logger/logger.dart';
 import 'package:window_manager/window_manager.dart';
 
 import 'view/root.dart';
-import 'vm/contents.dart';
 import 'vm/theme.dart';
 
 void main() async {
@@ -39,14 +37,8 @@ class Staplver extends ConsumerWidget with WindowListener {
     final themeState = ref.watch(appThemePod);
 
     // notifier
-    final contentsNotifier = ref.read(contentsPod.notifier);
     final themeNotifier = ref.watch(appThemePod.notifier);
 
-    // local
-    dropEventStream.listen(
-      (paths) async => contentsNotifier.handleDragAndDrop(paths),
-    );
-
     // view
     return DynamicColorBuilder(
       builder: (ColorScheme? lightColorScheme, ColorScheme? darkColorScheme) {

diff --git a/lib/model/error/exception.dart b/lib/model/error/exception.dart
@@ -239,7 +239,7 @@ final class PjConfigExceptions extends ConfigExceptions {
             (ref) => ref
                 .read(appThemePod.notifier)
                 .updateThemeMode(ThemeMode.system),
-          )
+          ),
         ],
       );
 }

diff --git a/lib/model/state.dart b/lib/model/state.dart
@@ -38,7 +38,6 @@ class AppThemeState with _$AppThemeState {
 class ContentsState with _$ContentsState {
   const factory ContentsState({
     Directory? defaultBackupDir,
-    void Function(Directory)? dragAndDropCallback,
   }) = _ContentsState;
 }
 

diff --git a/lib/view/components/create_pj/set_pj_details.dart b/lib/view/components/create_pj/set_pj_details.dart
@@ -40,7 +40,7 @@ class CompSetPjDetails extends ConsumerWidget {
                   style: TextStyle(
                     color: Theme.of(context).colorScheme.error,
                   ),
-                )
+                ),
               ],
             ),
           ),

diff --git a/lib/view/components/create_pj/set_working_dir.dart b/lib/view/components/create_pj/set_working_dir.dart
@@ -1,8 +1,10 @@
 import 'dart:io';
 
+import 'package:cross_file/cross_file.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:staplver/vm/contents.dart';
 
 import '../../../model/constant.dart';
 import '../../routes/fab/create_pj.dart';
@@ -33,15 +35,22 @@ class CompSetWorkingDir extends HookConsumerWidget {
       (_) => isValidContentsNotifier.state = isValidContents(),
     );
 
-    Future<void> selectDir() async {
-      final selectedDirectory = await FilePicker.platform.getDirectoryPath();
-      if (selectedDirectory == null) return;
-      final dir = Directory(selectedDirectory);
+    void updateDir(Directory dir) {
       workingDirNotifier.state = dir;
       textController.text = dir.path;
       pjNameNotifier.state = dir.name;
     }
 
+    Future<void> selectDir() async {
+      final selectedDirectory = await FilePicker.platform.getDirectoryPath();
+      if (selectedDirectory == null) return;
+      updateDir(Directory(selectedDirectory));
+    }
+
+    Future<void> onDragDone(List<XFile> files) async {
+      updateDir(await Contents.getSingleDirectory(files));
+    }
+
     String? validator(String? newVal) {
       if (newVal == null || newVal.isEmpty) {
         return '作業フォルダーのパスを入力してください';
@@ -106,12 +115,13 @@ class CompSetWorkingDir extends HookConsumerWidget {
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         const SizedBox(height: 20),
-        dragAndDropSquare(
-          selectDir,
-          Theme.of(context).colorScheme,
-          'バージョン管理をするフォルダーを\nドラッグ & ドロップ',
-          'または, クリックしてフォルダーを選択',
-          Icons.create_new_folder,
+        DragAndDropSquare(
+          onClick: selectDir,
+          onDragDone: onDragDone,
+          colorScheme: Theme.of(context).colorScheme,
+          aboveText: 'バージョン管理をするフォルダーを\nドラッグ & ドロップ',
+          belowText: 'または, クリックしてフォルダーを選択',
+          icon: Icons.create_new_folder,
         ),
         const SizedBox(height: 30),
         workingDirField,

diff --git a/lib/view/components/drag_and_drop.dart b/lib/view/components/drag_and_drop.dart
@@ -1,44 +1,68 @@
+import 'package:cross_file/cross_file.dart';
+import 'package:desktop_drop/desktop_drop.dart';
 import 'package:dotted_border/dotted_border.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-Widget dragAndDropSquare(
-  VoidCallback onClick,
-  ColorScheme colorScheme,
-  String aboveText,
-  String belowText,
-  IconData icon,
-) {
-  return GestureDetector(
-    onTap: onClick,
-    child: DottedBorder(
-      color: colorScheme.tertiary,
-      dashPattern: const [15, 6],
-      strokeWidth: 3,
-      child: MouseRegion(
-        cursor: SystemMouseCursors.click,
-        child: Container(
-          height: 350,
-          width: 350,
-          color: colorScheme.tertiaryContainer,
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-            children: [
-              Text(
-                aboveText,
-                style:
-                    const TextStyle(fontWeight: FontWeight.w500, fontSize: 18),
-                textAlign: TextAlign.center,
-              ),
-              Icon(icon, size: 100),
-              Text(
-                belowText,
-                style:
-                    const TextStyle(fontWeight: FontWeight.w500, fontSize: 18),
+class DragAndDropSquare extends ConsumerWidget {
+  const DragAndDropSquare({
+    required this.onClick,
+    required this.onDragDone,
+    required this.colorScheme,
+    required this.aboveText,
+    required this.belowText,
+    required this.icon,
+    super.key,
+  });
+
+  final VoidCallback onClick;
+  final void Function(List<XFile> files) onDragDone;
+  final ColorScheme colorScheme;
+  final String aboveText;
+  final String belowText;
+  final IconData icon;
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    return GestureDetector(
+      onTap: onClick,
+      child: DropTarget(
+        onDragDone: (details) => onDragDone(details.files),
+        child: DottedBorder(
+          color: colorScheme.tertiary,
+          dashPattern: const [15, 6],
+          strokeWidth: 3,
+          child: MouseRegion(
+            cursor: SystemMouseCursors.click,
+            child: Container(
+              height: 350,
+              width: 350,
+              color: colorScheme.tertiaryContainer,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.spaceEvenly,
+                children: [
+                  Text(
+                    aboveText,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.w500,
+                      fontSize: 18,
+                    ),
+                    textAlign: TextAlign.center,
+                  ),
+                  Icon(icon, size: 100),
+                  Text(
+                    belowText,
+                    style: const TextStyle(
+                      fontWeight: FontWeight.w500,
+                      fontSize: 18,
+                    ),
+                  ),
+                ],
               ),
-            ],
+            ),
           ),
         ),
       ),
-    ),
-  );
+    );
+  }
 }
diff --git a/lib/view/components/import_pj/set_working_dir.dart b/lib/view/components/import_pj/set_working_dir.dart
@@ -1,8 +1,10 @@
 import 'dart:io';
 
+import 'package:cross_file/cross_file.dart';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
+import 'package:staplver/vm/contents.dart';
 
 import '../../../model/error/exception.dart';
 import '../../../model/error/handler.dart';
@@ -67,12 +69,19 @@ class CompSetWorkingDir extends ConsumerWidget {
       }
     });
 
+    void updateDir(Directory dir) {
+      workingDirNotifier.state = dir;
+      textController.text = dir.path;
+    }
+
     Future<void> selectDir() async {
       final selectedDirectory = await FilePicker.platform.getDirectoryPath();
       if (selectedDirectory == null) return;
-      final dir = Directory(selectedDirectory);
-      workingDirNotifier.state = dir;
-      textController.text = dir.path;
+      updateDir(Directory(selectedDirectory));
+    }
+
+    Future<void> onDragDone(List<XFile> files) async {
+      updateDir(await Contents.getSingleDirectory(files));
     }
 
     String? validator(String? newVal) {
@@ -139,12 +148,13 @@ class CompSetWorkingDir extends ConsumerWidget {
       mainAxisAlignment: MainAxisAlignment.center,
       children: [
         const SizedBox(height: 20),
-        dragAndDropSquare(
-          selectDir,
-          Theme.of(context).colorScheme,
-          '作業フォルダーをドラッグ & ドロップ',
-          'または, クリックしてフォルダーを選択',
-          Icons.create_new_folder,
+        DragAndDropSquare(
+          onClick: selectDir,
+          onDragDone: onDragDone,
+          colorScheme: Theme.of(context).colorScheme,
+          aboveText: '作業フォルダーをドラッグ & ドロップ',
+          belowText: 'または, クリックしてフォルダーを選択',
+          icon: Icons.create_new_folder,
         ),
         const SizedBox(height: 40),
         workingDirField,

diff --git a/lib/view/components/navbar.dart b/lib/view/components/navbar.dart
@@ -3,7 +3,6 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
 
 import '../../model/class/app.dart';
-import '../../vm/contents.dart';
 import '../../vm/page.dart';
 import '../routes/fab/checkout.dart';
 import '../routes/fab/create_pj.dart';
@@ -20,28 +19,24 @@ class NavBar {
   Orientation orientation;
 
   List<Destination> getDest() {
-    final contentsNotifier = ref.read(contentsPod.notifier);
-
     return <Destination>[
       Destination(
         icon: const Icon(Icons.rocket_launch_outlined),
         selectedIcon: const Icon(Icons.rocket_launch),
         label: 'プロジェクト',
-        runInit: () => contentsNotifier.updateDragAndDropCallback(null),
+        runInit: () {},
       ),
       Destination(
         icon: const Icon(Icons.settings_outlined),
         selectedIcon: const Icon(Icons.settings),
         label: '設定',
-        runInit: () => contentsNotifier.updateDragAndDropCallback(
-          contentsNotifier.updateDefaultBackupDir,
-        ),
+        runInit: () {},
       ),
       Destination(
         icon: const Icon(Icons.bug_report_outlined),
         selectedIcon: const Icon(Icons.bug_report),
         label: 'デバッグ',
-        runInit: () => contentsNotifier.updateDragAndDropCallback(null),
+        runInit: () {},
       ),
     ];
   }

diff --git a/lib/view/components/projects/save_point.dart/diff.dart b/lib/view/components/projects/save_point.dart/diff.dart
@@ -2,11 +2,9 @@ import 'dart:io';
 
 import 'package:dynamic_color/dynamic_color.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:staplver/model/class/svn.dart';
 import 'package:staplver/model/constant.dart';
-import 'package:staplver/view/components/projects/save_point.dart/history.dart';
 import 'package:staplver/view/routes/projects/details.dart';
 import 'package:staplver/vm/page.dart';
 import 'package:staplver/vm/svn.dart';

diff --git a/lib/view/root.dart b/lib/view/root.dart
@@ -10,7 +10,6 @@ import '../vm/now.dart';
 import '../vm/page.dart';
 import 'components/navbar.dart';
 import 'routes/debug.dart';
-import 'routes/home.dart';
 import 'routes/projects/projects.dart';
 import 'routes/settings.dart';
 import 'util/route.dart';
@@ -87,7 +86,7 @@ class _AppRootState extends ConsumerState<AppRoot> with WindowListener {
               Text(
                 ' / ${dest[pageState.navbarIndex].label}',
                 style: const TextStyle(fontSize: 18),
-              )
+              ),
             ],
           ),
           leading: const SizedBox(),

diff --git a/lib/view/routes/debug.dart b/lib/view/routes/debug.dart
@@ -186,7 +186,7 @@ class PageDebug extends HookConsumerWidget {
                   Text('log => ${logState.logs.join('\n')}'),
                 ],
               ),
-            )
+            ),
           ],
         ),
       ),