Remember image list pagination on back

Author: ReightI

lib/app.dart

@@ -23,6 +23,8 @@ import 'package:piwigo_ng/views/unknown_route_page.dart';
 import 'package:piwigo_ng/views/upload/upload_status_page.dart';
 import 'package:piwigo_ng/views/upload/upload_view_page.dart';
 
+import 'models/image_model.dart';
+
 class App extends StatelessWidget {
   const App({Key? key}) : super(key: key);
 
@@ -157,7 +159,7 @@ Route<dynamic> generateRoute(RouteSettings settings) {
         settings: settings,
       );
     case ImageViewPage.routeName:
-      return MaterialPageRoute(
+      return MaterialPageRoute<List<ImageModel>?>(
         builder: (_) => ImageViewPage(
           images: arguments['images'] ?? [],
           startId: arguments['startId'],

lib/views/album/album_view_page.dart

@@ -16,6 +16,7 @@ import 'package:piwigo_ng/services/upload_notifier.dart';
 import 'package:piwigo_ng/utils/album_actions.dart';
 import 'package:piwigo_ng/utils/image_actions.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
+import 'package:piwigo_ng/utils/settings.dart';
 import 'package:piwigo_ng/views/image/image_view_page.dart';
 import 'package:piwigo_ng/views/upload/upload_status_page.dart';
 import 'package:piwigo_ng/views/upload/upload_view_page.dart';
@@ -142,7 +143,14 @@ class _AlbumViewPageState extends State<AlbumViewPage>
           'startId': image.id,
           'album': _currentAlbum,
         },
-      ).whenComplete(() => _onRefresh());
+      ).then((images) {
+        if (images == null || images is! List<ImageModel>) return;
+        setState(() {
+          _imageList = images;
+          _page =
+              ((images.length - 1) / Settings.defaultElementPerPage).floor();
+        });
+      });
   void _onEditPhotos() => onEditPhotos(context, _selectedList).then((success) {
         if (success == true) {
           _selectedList.clear();

lib/views/image/image_favorites_page.dart

@@ -8,6 +8,7 @@ import 'package:piwigo_ng/models/image_model.dart';
 import 'package:piwigo_ng/services/preferences_service.dart';
 import 'package:piwigo_ng/utils/image_actions.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
+import 'package:piwigo_ng/utils/settings.dart';
 import 'package:piwigo_ng/views/image/image_view_page.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
@@ -109,7 +110,14 @@ class _ImageFavoritesPageState extends State<ImageFavoritesPage> {
             nbTotalImages: _nbImages,
           ),
         },
-      ).whenComplete(() => _onRefresh());
+      ).then((images) {
+        if (images == null || images is! List<ImageModel>) return;
+        setState(() {
+          _imageList = images;
+          _page =
+              ((images.length - 1) / Settings.defaultElementPerPage).floor();
+        });
+      });
   void _onEditPhotos() => onEditPhotos(context, _selectedList).then((success) {
         if (success == true) {
           _selectedList.clear();

lib/views/image/image_search_view_page.dart

@@ -10,6 +10,7 @@ import 'package:piwigo_ng/services/preferences_service.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/utils/settings.dart';
 import 'package:piwigo_ng/views/image/image_view_page.dart';
 import 'package:pull_to_refresh/pull_to_refresh.dart';
 
@@ -127,7 +128,14 @@ class _ImageSearchViewPageState extends State<ImageSearchViewPage> {
             nbTotalImages: _nbImages,
           ),
         },
-      ).whenComplete(() => _onRefresh());
+      ).then((images) {
+        if (images == null || images is! List<ImageModel>) return;
+        setState(() {
+          _searchList = images;
+          _page =
+              ((images.length - 1) / Settings.defaultElementPerPage).floor();
+        });
+      });
 
   void _onEditPhotos() => onEditPhotos(context, _selectedList).then((success) {
         if (success == true) {

lib/views/image/image_view_page.dart

@@ -20,6 +20,7 @@ import 'package:piwigo_ng/services/theme_provider.dart';
 import 'package:piwigo_ng/utils/image_actions.dart';
 import 'package:piwigo_ng/utils/localizations.dart';
 import 'package:piwigo_ng/utils/resources.dart';
+import 'package:piwigo_ng/utils/settings.dart';
 import 'package:piwigo_ng/views/image/video_player_page.dart';
 import 'package:provider/provider.dart';
 
@@ -79,6 +80,9 @@ class _ImageViewPageState extends State<ImageViewPage> {
   void initState() {
     _imageList = widget.images.sublist(0);
     _album = widget.album;
+    _imagePage =
+        ((_imageList.length - 1) / Settings.defaultElementPerPage).floor();
+
     final ImageModel? startImage =
         _imageList.firstWhere((image) => image.id == widget.startId);
     if (startImage != null) {
@@ -87,12 +91,15 @@ class _ImageViewPageState extends State<ImageViewPage> {
         _loadMoreImages();
       }
     }
+
     _pageController = PageController(initialPage: _page);
+
+    _loadCookies();
+
     SystemChrome.setSystemUIOverlayStyle(SystemUiOverlayStyle.light.copyWith(
       systemNavigationBarColor: Colors.black.withOpacity(0.1),
       statusBarColor: Colors.black.withOpacity(0.1),
     ));
-    _loadCookies();
     WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
       _getImagesInfo(_imageList);
     });
@@ -166,7 +173,8 @@ class _ImageViewPageState extends State<ImageViewPage> {
       });
       return false;
     }
-    return true;
+    Navigator.of(context).pop(_imageList);
+    return false;
   }
 
   /// Toggle overlay action (orientation was necessary, *see comments*).
@@ -190,7 +198,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
   /// Handle when
   Future<void> _onRemoveImage(ImageModel image) async {
     if (_imageList.length == 1) {
-      Navigator.of(context).pop();
+      Navigator.of(context).pop([]);
     }
     if (_imageList.length - 1 == _page) {
       await _pageController.previousPage(
@@ -291,7 +299,7 @@ class _ImageViewPageState extends State<ImageViewPage> {
             child: Row(
               children: [
                 IconButton(
-                  onPressed: () => Navigator.of(context).pop(),
+                  onPressed: () => Navigator.of(context).pop(_imageList),
                   icon: Icon(Icons.arrow_back),
                 ),
                 Expanded(