Bubble up selected folders to top

lib/ui/backup_folder_selection_page.dart

@@ -1,4 +1,8 @@
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
+import 'package:implicitly_animated_reorderable_list/implicitly_animated_reorderable_list.dart';
+import 'package:implicitly_animated_reorderable_list/transitions.dart';
 import 'package:photos/core/configuration.dart';
 import 'package:photos/core/event_bus.dart';
 import 'package:photos/db/files_db.dart';
@@ -25,13 +29,12 @@ class BackupFolderSelectionPage extends StatefulWidget {
 
 class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
   final Set<String> _allFolders = Set<String>();
-  Set<String> _backedupFolders = Set<String>();
+  Set<String> _selectedFolders = Set<String>();
   List<File> _latestFiles;
-  bool _isSelectAll = false;
 
   @override
   void initState() {
-    _backedupFolders = Configuration.instance.getPathsToBackUp();
+    _selectedFolders = Configuration.instance.getPathsToBackUp();
     FilesDB.instance.getLatestLocalFiles().then((files) {
       setState(() {
         _latestFiles = files;
@@ -39,9 +42,8 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
           _allFolders.add(file.deviceFolder);
         }
         if (widget.shouldSelectAll) {
-          _backedupFolders.addAll(_allFolders);
+          _selectedFolders.addAll(_allFolders);
         }
-        _isSelectAll = _backedupFolders.length == _allFolders.length;
       });
     });
     super.initState();
@@ -79,7 +81,9 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
                 child: Align(
                   alignment: Alignment.centerRight,
                   child: Text(
-                    _isSelectAll ? "unselect all" : "select all",
+                    _selectedFolders.length == _allFolders.length
+                        ? "unselect all"
+                        : "select all",
                     textAlign: TextAlign.right,
                     style: TextStyle(
                       fontSize: 12,
@@ -89,15 +93,17 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
                 ),
               ),
               onTap: () {
-                _isSelectAll = !_isSelectAll;
-                if (_isSelectAll) {
-                  _backedupFolders.addAll(_allFolders);
+                final hasSelectedAll =
+                    _selectedFolders.length == _allFolders.length;
+                // Flip selection
+                if (hasSelectedAll) {
+                  _selectedFolders.clear();
                 } else {
-                  _backedupFolders.clear();
+                  _selectedFolders.addAll(_allFolders);
                 }
                 setState(() {});
               }),
-          Expanded(child: _getFolderList()),
+          Expanded(child: _getFolders()),
           Padding(
             padding: EdgeInsets.all(20),
           ),
@@ -108,11 +114,11 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
               child: button(
                 widget.buttonText,
                 fontSize: 18,
-                onPressed: _backedupFolders.length == 0
+                onPressed: _selectedFolders.length == 0
                     ? null
                     : () async {
                         await Configuration.instance
-                            .setPathsToBackUp(_backedupFolders);
+                            .setPathsToBackUp(_selectedFolders);
                         Bus.instance.fire(BackupFoldersUpdatedEvent());
                         Navigator.of(context).pop();
                       },
@@ -128,16 +134,81 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
   Widget _getFolderList() {
     Widget child;
     if (_latestFiles != null) {
-      _latestFiles.sort((first, second) {
-        return first.deviceFolder
-            .toLowerCase()
-            .compareTo(second.deviceFolder.toLowerCase());
+      final foldersWidget = _getFolders();
+      final scrollController = ScrollController();
+      child = Scrollbar(
+        isAlwaysShown: true,
+        controller: scrollController,
+        child: SingleChildScrollView(
+          controller: scrollController,
+          child: Container(
+            padding: EdgeInsets.only(right: 4),
+            child: foldersWidget,
+          ),
+        ),
+      );
+    } else {
+      child = loadWidget;
+    }
+    return Container(
+      padding: EdgeInsets.only(left: 40, right: 40),
+      child: child,
+    );
+  }
+
+  Widget _getFolders() {
+    if (_latestFiles == null) {
+      return Container();
+    }
+    _sortFiles();
+    final scrollController = ScrollController();
+    return Container(
+      padding: EdgeInsets.only(left: 40, right: 40),
+      child: Scrollbar(
+        controller: scrollController,
+        isAlwaysShown: true,
+        child: ImplicitlyAnimatedReorderableList<File>(
+          controller: scrollController,
+          items: _latestFiles,
+          areItemsTheSame: (oldItem, newItem) =>
+              oldItem.deviceFolder == newItem.deviceFolder,
+          onReorderFinished: (item, from, to, newItems) {
+            setState(() {
+              _latestFiles
+                ..clear()
+                ..addAll(newItems);
             });
-      final List<Widget> foldersWidget = [];
-      for (final file in _latestFiles) {
-        final isSelected = _backedupFolders.contains(file.deviceFolder);
-        foldersWidget.add(
-          Padding(
+          },
+          itemBuilder: (context, itemAnimation, file, index) {
+            return Reorderable(
+              key: ValueKey(file),
+              builder: (context, dragAnimation, inDrag) {
+                final t = dragAnimation.value;
+                final elevation = lerpDouble(0, 8, t);
+                final color =
+                    Color.lerp(Colors.white, Colors.white.withOpacity(0.8), t);
+                return SizeFadeTransition(
+                  sizeFraction: 0.7,
+                  curve: Curves.easeInOut,
+                  animation: itemAnimation,
+                  child: Material(
+                    color: color,
+                    elevation: elevation,
+                    type: MaterialType.transparency,
+                    child: _getFileItem(file),
+                  ),
+                );
+              },
+            );
+          },
+        ),
+      ),
+    );
+  }
+
+  Padding _getFileItem(File file) {
+    final isSelected = _selectedFolders.contains(file.deviceFolder);
+    return Padding(
       padding: const EdgeInsets.only(bottom: 1, right: 4),
       child: Container(
         decoration: BoxDecoration(
@@ -177,9 +248,9 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
                 value: isSelected,
                 onChanged: (value) {
                   if (value) {
-                          _backedupFolders.add(file.deviceFolder);
+                    _selectedFolders.add(file.deviceFolder);
                   } else {
-                          _backedupFolders.remove(file.deviceFolder);
+                    _selectedFolders.remove(file.deviceFolder);
                   }
                   setState(() {});
                 },
@@ -187,42 +258,31 @@ class _BackupFolderSelectionPageState extends State<BackupFolderSelectionPage> {
             ],
           ),
           onTap: () {
-                  final value = !_backedupFolders.contains(file.deviceFolder);
+            final value = !_selectedFolders.contains(file.deviceFolder);
             if (value) {
-                    _backedupFolders.add(file.deviceFolder);
+              _selectedFolders.add(file.deviceFolder);
             } else {
-                    _backedupFolders.remove(file.deviceFolder);
+              _selectedFolders.remove(file.deviceFolder);
             }
             setState(() {});
           },
         ),
       ),
-          ),
     );
   }
 
-      final scrollController = ScrollController();
-      child = Scrollbar(
-        isAlwaysShown: true,
-        controller: scrollController,
-        child: SingleChildScrollView(
-          controller: scrollController,
-          child: Container(
-            padding: EdgeInsets.only(right: 4),
-            child: Column(
-              crossAxisAlignment: CrossAxisAlignment.stretch,
-              children: foldersWidget,
-            ),
-          ),
-        ),
-      );
-    } else {
-      child = loadWidget;
+  void _sortFiles() {
+    _latestFiles.sort((first, second) {
+      if (_selectedFolders.contains(first) &&
+          _selectedFolders.contains(second)) {
+        return first.deviceFolder.compareTo(second.deviceFolder);
+      } else if (_selectedFolders.contains(first.deviceFolder)) {
+        return -1;
+      } else if (_selectedFolders.contains(second.deviceFolder)) {
+        return 1;
       }
-    return Container(
-      padding: EdgeInsets.only(left: 40, right: 40),
-      child: child,
-    );
+      return first.deviceFolder.compareTo(second.deviceFolder);
+    });
   }
 
   Widget _getThumbnail(File file) {

pubspec.lock

@@ -466,6 +466,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.0"
+  implicitly_animated_reorderable_list:
+    dependency: "direct main"
+    description:
+      name: implicitly_animated_reorderable_list
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.4.0"
   in_app_purchase:
     dependency: "direct main"
     description:

pubspec.yaml

@@ -94,6 +94,7 @@ dependencies:
   device_info: ^2.0.2
   exif: ^3.0.0
   wallpaper_manager_flutter: ^0.0.2
+  implicitly_animated_reorderable_list: ^0.4.0
 
 dev_dependencies:
   flutter_test: