Fullscreen image actions

Author: ReightI

lib/app.dart

@@ -113,7 +113,9 @@ Route<dynamic> generateRoute(RouteSettings settings) {
       );
     case ImageSearchViewPage.routeName:
       return SlideUpPageRoute(
-        page: const ImageSearchViewPage(),
+        page: ImageSearchViewPage(
+          isAdmin: arguments['isAdmin'] ?? isAdmin,
+        ),
         settings: settings,
       );
     case UploadViewPage.routeName:

lib/components/modals/delete_images_modal.dart

@@ -9,11 +9,11 @@ class DeleteImagesModal extends StatelessWidget {
   const DeleteImagesModal({
     Key? key,
     required this.imageList,
-    required this.album,
+    this.album,
   }) : super(key: key);
 
   final List<ImageModel> imageList;
-  final AlbumModel album;
+  final AlbumModel? album;
 
   bool get _safeDelete {
     for (ImageModel image in imageList) {
@@ -27,7 +27,9 @@ class DeleteImagesModal extends StatelessWidget {
   bool get _canMakeOrphans {
     for (ImageModel image in imageList) {
       List<int> albums = image.categories.map<int>((a) => a['id']).toList();
-      albums.removeWhere((a) => a == album.id);
+      if (album != null) {
+        albums.removeWhere((a) => a == album!.id);
+      }
       if (albums.isEmpty) {
         return true;
       }

lib/services/upload_provider.dart

@@ -0,0 +1,33 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:piwigo_ng/models/album_model.dart';
+
+class UploadProvider extends ChangeNotifier {
+  final List<UploadItem> _uploadList = [];
+
+  UploadProvider();
+
+  void addItem(UploadItem item) {
+    _uploadList.add(item);
+  }
+
+  void removeItem(UploadItem item) {
+    _uploadList.remove(item);
+  }
+
+  List<UploadItem> get uploadList => _uploadList;
+}
+
+class UploadItem {
+  final XFile file;
+  final StreamController<double> progress;
+  final AlbumModel destination;
+
+  UploadItem({
+    required this.file,
+    required this.destination,
+    required this.progress,
+  });
+}

lib/utils/image_actions.dart

@@ -60,6 +60,13 @@ Future<bool?> onEditPhotos(BuildContext context, List<ImageModel> images) async
 }
 
 Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, AlbumModel album) async {
+  AlbumModel origin = album;
+  if (images.length == 1) {
+    origin = AlbumModel(
+      id: images.first.categories.first['id'],
+      name: '',
+    );
+  }
   return showModalBottomSheet<dynamic>(
     context: context,
     isScrollControlled: true,
@@ -69,7 +76,7 @@ Future<dynamic> onMovePhotos(BuildContext context, List<ImageModel> images, Albu
         title: appStrings.moveImage_title,
         subtitle: appStrings.moveImage_selectAlbum(images.length, images.first),
         isImage: true,
-        album: album,
+        album: origin,
         onSelected: (selectedAlbum) async {
           final int? choice = await showModalBottomSheet<int>(
             context: context,

lib/views/image/image_search_view_page.dart

@@ -4,18 +4,23 @@ import 'package:piwigo_ng/api/api_error.dart';
 import 'package:piwigo_ng/api/images.dart';
 import 'package:piwigo_ng/components/popup_list_item.dart';
 import 'package:piwigo_ng/components/scroll_widgets/image_grid_view.dart';
+import 'package:piwigo_ng/models/album_model.dart';
 import 'package:piwigo_ng/models/image_model.dart';
+import 'package:piwigo_ng/utils/image_actions.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
 import 'package:piwigo_ng/utils/page_routes.dart';
+import 'package:piwigo_ng/views/image/image_view_page.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
 import '../../components/fields/app_field.dart';
 
 class ImageSearchViewPage extends StatefulWidget {
-  const ImageSearchViewPage({Key? key}) : super(key: key);
+  const ImageSearchViewPage({Key? key, this.isAdmin = false}) : super(key: key);
 
   static const String routeName = '/images/search';
 
+  final bool isAdmin;
+
   @override
   State<ImageSearchViewPage> createState() => _ImageSearchViewPageState();
 }
@@ -54,6 +59,8 @@ class _ImageSearchViewPageState extends State<ImageSearchViewPage> {
     super.dispose();
   }
 
+  bool get _hasNonFavorites => _selectedList.where((image) => !image.favorite).isNotEmpty;
+
   Future<bool> _onWillPop() async {
     if (_selectedList.isNotEmpty) {
       setState(() {
@@ -104,11 +111,26 @@ class _ImageSearchViewPageState extends State<ImageSearchViewPage> {
     _refreshController.loadComplete();
   }
 
-  void _onEdit() {}
-  void _onMove() {}
-  void _onDelete() {}
-  void _onDownload() {}
-  void _onShare() {}
+  void _onTapPhoto(ImageModel image) => Navigator.of(context).pushNamed(
+        ImageViewPage.routeName,
+        arguments: {
+          'images': _searchList,
+          'startId': image.id,
+          'album': AlbumModel(
+            id: -1,
+            name: 'Search',
+            nbImages: _nbImages,
+            nbTotalImages: _nbImages,
+          ),
+        },
+      ).whenComplete(() => _onRefresh());
+  void _onEditPhotos() => onEditPhotos(context, _selectedList).then((success) {
+        if (success == true) {
+          _selectedList.clear();
+          _onRefresh();
+        }
+      });
+  void _onLikePhotos() => onLikePhotos(_selectedList, _hasNonFavorites).whenComplete(() => _onRefresh());
 
   @override
   Widget build(BuildContext context) {
@@ -180,36 +202,65 @@ class _ImageSearchViewPageState extends State<ImageSearchViewPage> {
         ),
       ),
       actions: [
-        if (_selectedList.isNotEmpty)
+        AnimatedSize(
+          duration: const Duration(milliseconds: 300),
+          curve: Curves.ease,
+          child: SizedBox(
+            width: _selectedList.isEmpty ? (widget.isAdmin ? 0.0 : 16.0) : null,
+            child: AnimatedScale(
+              duration: const Duration(milliseconds: 300),
+              curve: Curves.ease,
+              scale: _selectedList.isEmpty ? 0 : 1,
+              child: AnimatedOpacity(
+                duration: const Duration(milliseconds: 300),
+                curve: Curves.ease,
+                opacity: _selectedList.isEmpty ? 0 : 1,
+                child: IconButton(
+                  onPressed: () => setState(() {
+                    _selectedList.clear();
+                  }),
+                  icon: Icon(Icons.cancel),
+                ),
+              ),
+            ),
+          ),
+        ),
+        if (widget.isAdmin)
           PopupMenuButton(
+            padding: EdgeInsets.zero,
+            enabled: _selectedList.isNotEmpty,
             position: PopupMenuPosition.under,
             itemBuilder: (context) => [
-              if (_selectedList.isNotEmpty)
-                PopupMenuItem(
-                  onTap: () => setState(() {
-                    _selectedList.clear();
-                  }),
-                  child: PopupListItem(
-                    icon: Icons.cancel,
-                    text: appStrings.categoryImageList_deselectButton,
-                  ),
+              PopupMenuItem(
+                onTap: () => Future.delayed(
+                  const Duration(seconds: 0),
+                  () => share(_selectedList),
                 ),
-              if (_selectedList.isNotEmpty)
-                PopupMenuItem(
-                  onTap: _onShare,
-                  child: PopupListItem(
-                    icon: Icons.share,
-                    text: appStrings.imageOptions_share,
-                  ),
+                child: PopupListItem(
+                  icon: Icons.share,
+                  text: appStrings.imageOptions_share,
                 ),
-              if (_selectedList.isNotEmpty)
-                PopupMenuItem(
-                  onTap: _onDownload,
-                  child: PopupListItem(
-                    icon: Icons.download,
-                    text: appStrings.downloadImage_title(_selectedList.length),
-                  ),
+              ),
+              PopupMenuItem(
+                onTap: () => Future.delayed(
+                  const Duration(seconds: 0),
+                  () => _onLikePhotos(),
+                ),
+                child: PopupListItem(
+                  icon: _hasNonFavorites ? Icons.favorite_border : Icons.favorite,
+                  text: _hasNonFavorites ? appStrings.imageOptions_addFavorites : appStrings.imageOptions_removeFavorites,
+                ),
+              ),
+              PopupMenuItem(
+                onTap: () => Future.delayed(
+                  const Duration(seconds: 0),
+                  () => downloadImages(_selectedList),
+                ),
+                child: PopupListItem(
+                  icon: Icons.download,
+                  text: appStrings.downloadImage_title(_selectedList.length),
                 ),
+              ),
             ],
           ),
       ],
@@ -251,6 +302,7 @@ class _ImageSearchViewPageState extends State<ImageSearchViewPage> {
             onDeselectImage: (image) => setState(() {
               _selectedList.remove(image);
             }),
+            onTapImage: _onTapPhoto,
           );
         }
         return Center(child: CircularProgressIndicator());
@@ -265,26 +317,54 @@ class _ImageSearchViewPageState extends State<ImageSearchViewPage> {
         curve: Curves.easeInOut,
         height: _selectedList.isEmpty ? 0 : 56.0,
         child: Row(
-          children: [
-            Expanded(
-              child: IconButton(
-                onPressed: _onEdit,
-                icon: Icon(Icons.edit),
-              ),
-            ),
-            Expanded(
-              child: IconButton(
-                onPressed: _onMove,
-                icon: Icon(Icons.drive_file_move),
-              ),
-            ),
-            Expanded(
-              child: IconButton(
-                onPressed: _onDelete,
-                icon: Icon(Icons.delete),
-              ),
-            ),
-          ],
+          children: widget.isAdmin
+              ? [
+                  Expanded(
+                    child: IconButton(
+                      onPressed: _onEditPhotos,
+                      icon: Icon(Icons.edit),
+                    ),
+                  ),
+                  Expanded(
+                    child: IconButton(
+                      onPressed: () {}, // todo: on move
+                      icon: Icon(Icons.drive_file_move),
+                    ),
+                  ),
+                  Expanded(
+                    child: IconButton(
+                      onPressed: () {}, // todo: on delete
+                      icon: Icon(Icons.delete),
+                    ),
+                  ),
+                ]
+              : [
+                  Expanded(
+                    child: IconButton(
+                      onPressed: () => share(_selectedList),
+                      icon: Icon(Icons.share),
+                    ),
+                  ),
+                  Expanded(
+                    child: IconButton(
+                      onPressed: _onLikePhotos,
+                      icon: Builder(
+                        builder: (context) {
+                          if (_hasNonFavorites) {
+                            return Icon(Icons.favorite_border);
+                          }
+                          return Icon(Icons.favorite);
+                        },
+                      ),
+                    ),
+                  ),
+                  Expanded(
+                    child: IconButton(
+                      onPressed: () => downloadImages(_selectedList),
+                      icon: Icon(Icons.download),
+                    ),
+                  ),
+                ],
         ),
       ),
     );

lib/views/image/image_view_page.dart

@@ -86,6 +86,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
   /// Load more images with API pagination
   /// Triggers when changing to last page
   Future<void> _loadMoreImages() async {
+    if (_album.id == -1) return;
     if (_album.nbImages <= _imageList.length) return;
     ApiResult<List<ImageModel>> result = await fetchImages(_album.id, _imagePage + 1);
     if (result.hasError || !result.hasData) return;