Fixed "no album displayed" bug

remi-martin · remi-martin · commit bac1b6ed1ad6 · 2021-10-18T11:07:15.000+02:00
Added new image deletion mode
Changed confirmation dialogs style
Added "Select All" option
diff --git a/lib/api/ImageAPI.dart b/lib/api/ImageAPI.dart
@@ -42,6 +42,38 @@ Future<Map<String,dynamic>> fetchImages(String albumID, int page) async {
   }
 }
 
+Future<dynamic> getImageInfo(int imageId) async {
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.images.getInfo",
+  };
+  FormData formData =  FormData.fromMap({
+    "image_id": imageId
+  });
+  try {
+    Response response = await API.dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
+
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+
+
 Future<bool> _requestPermissions() async {
   var permission = await Permission.storage.status;
   print(permission.isGranted);
@@ -149,6 +181,7 @@ Future<int> deleteImages(BuildContext context, List<int> imageIdList) async {
       ScaffoldMessenger.of(context).showSnackBar(
         errorSnackBar(context, '${response['result']}'),
       );
+      break;
     } else {
       nbSuccess++;
     }
@@ -187,6 +220,71 @@ Future<dynamic> deleteImage(int imageId) async {
   }
 }
 
+Future<int> removeImages(BuildContext context, List<int> imageIdList, String catId) async {
+  int nbSuccess = 0;
+  for(int id in imageIdList) {
+    var response = await removeImage(id, catId);
+    if(response['stat'] == 'fail') {
+      print(response);
+      ScaffoldMessenger.of(context).hideCurrentSnackBar();
+      ScaffoldMessenger.of(context).showSnackBar(
+        errorSnackBar(context, '${response['result']}'),
+      );
+      break;
+    } else {
+      nbSuccess++;
+    }
+  }
+  return nbSuccess;
+}
+Future<dynamic> removeImage(int imageId, String catId) async {
+  var imageInfo = await getImageInfo(imageId);
+  if(imageInfo['stat'] == 'fail') return imageInfo;
+
+  List<String> categories = imageInfo['result']['categories'].map<String>(
+      (cat) => cat['id'].toString()
+  ).toList();
+  categories.removeWhere((cat) => cat == catId);
+
+  if(categories.isEmpty) {
+    return await deleteImage(imageId);
+  }
+
+  Map<String, String> queries = {
+    "format": "json",
+    "method": "pwg.images.setInfo",
+  };
+  FormData formData =  FormData.fromMap({
+    "image_id": imageId,
+    "categories": categories,
+    "multiple_value_mode": "replace"
+  });
+
+  try {
+    Response response = await API.dio.post('ws.php',
+        data: formData,
+        queryParameters: queries
+    );
+
+    print(response.data);
+
+    if (response.statusCode == 200) {
+      return json.decode(response.data);
+    } else {
+      return {
+        'stat': 'fail',
+        'result': response.statusMessage
+      };
+    }
+  } catch (e) {
+    var error = e as DioError;
+    return {
+      'stat': 'fail',
+      'result': error.message
+    };
+  }
+}
+
 Future<int> moveImages(BuildContext context, List<dynamic> images, int category) async {
   int nbMoved = 0;
   for(var image in images) {
@@ -196,6 +294,7 @@ Future<int> moveImages(BuildContext context, List<dynamic> images, int category)
       ScaffoldMessenger.of(context).showSnackBar(
           errorSnackBar(context, '${response['result']}')
       );
+      break;
     } else {
       nbMoved++;
     }
@@ -251,6 +350,7 @@ Future<int> assignImages(BuildContext context, List<dynamic> images, int categor
       ScaffoldMessenger.of(context).showSnackBar(
           errorSnackBar(context, '${response['result']}')
       );
+      break;
     } else {
       nbAssigned++;
     }
diff --git a/lib/constants/SettingsConstants.dart b/lib/constants/SettingsConstants.dart
@@ -33,11 +33,12 @@ class Constants {
 
   static double CONFIRM_DIALOG_MAX_WIDTH = 500.0;
 
+  static double ALBUM_MIN_WIDTH = 400.0;
+
   static double PORTRAIT_IMAGE_COUNT_MIN = 1.0;
   static double PORTRAIT_IMAGE_COUNT_MAX = 6.0;
   static double LANDSCAPE_IMAGE_COUNT_MIN = 4.0;
   static double LANDSCAPE_IMAGE_COUNT_MAX = 10.0;
-
 }
 
 AppLocalizations appStrings(context) {
diff --git a/lib/views/CategoryViewPage.dart b/lib/views/CategoryViewPage.dart
@@ -198,12 +198,11 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
     }
   }
   void _onDeleteSelection() async {
-    print(_imageDeletionMode());
-    if(await confirmDeleteDialog(context,
-      content: appStrings(context).deleteImageCount_title(_selectedItems.length),
-    )) {
-      print('Delete ${_selectedItems.keys}');
-
+    int choice = await confirmRemoveImagesFromAlbumDialog(context,
+      content: appStrings(context).deleteImage_message(_selectedItems.length),
+      count: _selectedItems.length,
+    );
+    if(choice != -1) {
       List<int> selection = [];
       selection.addAll(_selectedItems.keys.toList());
 
@@ -212,11 +211,19 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
         _selectedItems.clear();
       });
 
-      int nbSuccess = await deleteImages(context, selection);
+      int nbSuccess = 0;
+      switch(choice) {
+        case 0: nbSuccess = await deleteImages(context, selection);
+        break;
+        case 1: nbSuccess = await removeImages(context, selection, widget.category);
+        break;
+        default: break;
+      }
 
       ScaffoldMessenger.of(context).showSnackBar(SnackBar(
         content: Text(appStrings(context).deleteImageSuccess_message(nbSuccess)),
       ));
+
       setState(() {});
     }
   }
@@ -233,25 +240,6 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
     });
   }
 
-  int _imageDeletionMode() {
-    int nbUnique = 0;
-    _selectedItems.values.forEach((image) {
-      print(image["categories"]);
-      if(image["categories"].length == 1) nbUnique++;
-    });
-    if(nbUnique == 0) {
-      print(appStrings(context).deleteCategory_allImages(_selectedItems.length));
-      print(appStrings(context).removeSingleImage_title);
-      return 0;
-    }
-    if(nbUnique == _selectedItems.length) {
-      print(appStrings(context).deleteCategory_allImages(_selectedItems.length));
-      return 1;
-    }
-    print(appStrings(context).deleteCategory_allImages(_selectedItems.length));
-    print(appStrings(context).removeSingleImage_title);
-    return 2;
-  }
 
   handleAlbumSnapshot(AsyncSnapshot albumSnapshot, int nbImages) {
     if(albumSnapshot.data['stat'] == 'fail') {
@@ -490,6 +478,10 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
 
   Widget createPageContent(dynamic albums, int nbImages) {
     ThemeData _theme = Theme.of(context);
+
+    int albumCrossAxisCount = MediaQuery.of(context).size.width <= Constants.ALBUM_MIN_WIDTH ? 1
+        : (MediaQuery.of(context).size.width/Constants.ALBUM_MIN_WIDTH).floor();
+
     return RefreshIndicator(
       displacement: 20,
       notificationPredicate: (notification) {
@@ -502,7 +494,7 @@ class _CategoryViewPageState extends State<CategoryViewPage> with SingleTickerPr
             albums.length > 0 ?
             GridView.builder(
               gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                crossAxisCount: (MediaQuery.of(context).size.width/400).floor(),
+                crossAxisCount: albumCrossAxisCount,
                 mainAxisSpacing: 10,
                 crossAxisSpacing: 10,
                 childAspectRatio: albumGridAspectRatio(context),
diff --git a/lib/views/ImageViewPage.dart b/lib/views/ImageViewPage.dart
@@ -167,19 +167,40 @@ class _ImageViewPageState extends State<ImageViewPage> {
     }
   }
   void _onDeleteImage() async {
-    if(await confirmDeleteDialog(context,
+    int choice = await confirmRemoveImagesFromAlbumDialog(context,
       content: appStrings(context).deleteImage_message(1),
-    )) {
-      var response = await deleteImage(images[_page]['id']);
-      if(response['stat'] == 'fail') {
-        ScaffoldMessenger.of(context).showSnackBar(
-            errorSnackBar(context, '${response['result']}')
-        );
-      } else {
-        ScaffoldMessenger.of(context).showSnackBar(SnackBar(
-          content: Text(appStrings(context).deleteImageHUD_deleting(1)),
-        ));
+      count: 1,
+    );
+
+    if(choice != -1) {
+      switch(choice) {
+        case 0:
+          var response = await deleteImage(images[_page]['id']);
+          if(response['stat'] == 'fail') {
+            ScaffoldMessenger.of(context).showSnackBar(
+                errorSnackBar(context, '${response['result']}')
+            );
+          } else {
+            ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+              content: Text(appStrings(context).deleteImageHUD_deleting(1)),
+            ));
+          }
+          break;
+        case 1:
+          var response = await removeImage(images[_page]['id'], widget.category);
+          if(response['stat'] == 'fail') {
+            ScaffoldMessenger.of(context).showSnackBar(
+                errorSnackBar(context, '${response['result']}')
+            );
+          } else {
+            ScaffoldMessenger.of(context).showSnackBar(SnackBar(
+              content: Text(appStrings(context).removeImageHUD_removing(1)),
+            ));
+          }
+          break;
+        default: break;
       }
+
       int page = _page;
       if(page == images.length-1) {
         if (page == 0) {
diff --git a/lib/views/LoginViewPage.dart b/lib/views/LoginViewPage.dart
@@ -13,6 +13,8 @@ import 'package:piwigo_ng/constants/SettingsConstants.dart';
 import 'package:piwigo_ng/views/PrivacyPolicyViewPage.dart';
 import 'package:piwigo_ng/views/components/buttons.dart';
 
+import 'components/dialogs/error_dialog.dart';
+
 
 class LoginViewPage extends StatefulWidget {
   LoginViewPage({Key key}) : super(key: key);
@@ -65,7 +67,10 @@ class _LoginViewPageState extends State<LoginViewPage> {
         barrierDismissible: true,
         context: context,
         builder: (BuildContext context) {
-          return connectionErrorDialog(message);
+          return ErrorDialog(
+            errorTitle: appStrings(context).loginError_title,
+            errorMessage: message
+          );
         }
       );
     }
@@ -171,7 +176,10 @@ class _LoginViewPageState extends State<LoginViewPage> {
         barrierDismissible: true,
         context: context,
         builder: (BuildContext context) {
-          return connectionErrorDialog(errorMessage);
+          return ErrorDialog(
+              errorTitle: appStrings(context).loginError_title,
+              errorMessage: errorMessage
+          );
         }
     );
   }
@@ -377,22 +385,6 @@ class _LoginViewPageState extends State<LoginViewPage> {
       ),
     );
   }
-
-  AlertDialog connectionErrorDialog(String error) {
-    return AlertDialog(
-      title: Text('Connection failed'),
-      content: Text('$error'),
-      actions: [
-        IconButton(
-          color: Color(0xffff0e00),
-          onPressed: () {
-            Navigator.pop(context);
-          },
-          icon: Icon(Icons.close, color: Color(0xffffffff),)
-        ),
-      ],
-    );
-  }
 }
 
 
diff --git a/lib/views/RootCategoryViewPage.dart b/lib/views/RootCategoryViewPage.dart
@@ -90,24 +90,7 @@ class _RootCategoryViewPageState extends State<RootCategoryViewPage> with Single
                     child: SingleChildScrollView(
                       child: Column(
                         children: [
-                          GridView.builder(
-                            gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
-                              crossAxisCount: (MediaQuery.of(context).size.width/400).floor(),
-                              mainAxisSpacing: 10,
-                              crossAxisSpacing: 10,
-                              childAspectRatio: albumGridAspectRatio(context),
-                            ),
-                            padding: EdgeInsets.all(10),
-                            itemCount: albums.length,
-                            shrinkWrap: true,
-                            physics: NeverScrollableScrollPhysics(),
-                            itemBuilder: (BuildContext context, int index) {
-                              var album = albums[index];
-                              return AlbumListItem(album, isAdmin: widget.isAdmin, onClose: () {
-                                setState(() {});
-                              });
-                            },
-                          ),
+                          _albumGrid(albums),
                           Center(
                             child: Container(
                               padding: EdgeInsets.all(10),
@@ -144,4 +127,28 @@ class _RootCategoryViewPageState extends State<RootCategoryViewPage> with Single
       ) : Container(),
     );
   }
+
+  Widget _albumGrid(dynamic albums) {
+    int albumCrossAxisCount = MediaQuery.of(context).size.width <= Constants.ALBUM_MIN_WIDTH ? 1
+        : (MediaQuery.of(context).size.width/Constants.ALBUM_MIN_WIDTH).floor();
+
+    return GridView.builder(
+      gridDelegate: SliverGridDelegateWithFixedCrossAxisCount(
+        crossAxisCount: albumCrossAxisCount,
+        mainAxisSpacing: 10,
+        crossAxisSpacing: 10,
+        childAspectRatio: albumGridAspectRatio(context),
+      ),
+      padding: EdgeInsets.all(10),
+      itemCount: albums.length,
+      shrinkWrap: true,
+      physics: NeverScrollableScrollPhysics(),
+      itemBuilder: (BuildContext context, int index) {
+        var album = albums[index];
+        return AlbumListItem(album, isAdmin: widget.isAdmin, onClose: () {
+          setState(() {});
+        });
+      },
+    );
+  }
 }
diff --git a/lib/views/components/dialogs/confirm_dialogs.dart b/lib/views/components/dialogs/confirm_dialogs.dart
diff --git a/lib/views/components/list_item.dart b/lib/views/components/list_item.dart
