Merge pull request #194 from Piwigo/feature/back_button_not_working

Resolve #193 "pop scope not working"

Author: remi-martin

lib/views/album/album_page.dart

@@ -198,17 +198,20 @@ class _AlbumPageState extends State<AlbumPage> {
   }
 
   void _onWillPop(bool pop) {
+    if (pop) return;
     if (_selectedList.isNotEmpty) {
       setState(() {
         _selectedList.clear();
       });
+    } else {
+      Navigator.of(context).pop();
     }
   }
 
   @override
   Widget build(BuildContext context) {
     return PopScope(
-      canPop: _selectedList.isEmpty,
+      canPop: false,
       onPopInvoked: _onWillPop,
       child: Scaffold(
         body: SafeArea(

lib/views/image/image_favorites_page.dart

@@ -61,10 +61,13 @@ class _ImageFavoritesPageState extends State<ImageFavoritesPage> {
   bool get _hasNonFavorites => _selectedList.where((image) => !image.favorite).isNotEmpty;
 
   void _onWillPop(bool pop) async {
+    if (pop) return;
     if (_selectedList.isNotEmpty) {
       setState(() {
         _selectedList.clear();
       });
+    } else {
+      Navigator.of(context).pop();
     }
   }
 
@@ -141,7 +144,7 @@ class _ImageFavoritesPageState extends State<ImageFavoritesPage> {
   @override
   Widget build(BuildContext context) {
     return PopScope(
-      canPop: _selectedList.isEmpty,
+      canPop: false,
       onPopInvoked: _onWillPop,
       child: Scaffold(
         body: SafeArea(

lib/views/image/image_page.dart

@@ -178,6 +178,7 @@ class _ImagePageState extends State<ImagePage> {
   /// * If overlay is hidden, show it.
   /// * Otherwise, close the page.
   void _onWillPop(bool pop) {
+    if (pop) return;
     if (!_showOverlay) {
       setState(() {
         _showOverlay = true;
@@ -282,7 +283,7 @@ class _ImagePageState extends State<ImagePage> {
   @override
   Widget build(BuildContext context) {
     return PopScope(
-      canPop: !_showOverlay,
+      canPop: false,
       onPopInvoked: _onWillPop,
       child: Scaffold(
         backgroundColor: Colors.black,

lib/views/image/image_search_page.dart

@@ -64,10 +64,13 @@ class _ImageSearchPageState extends State<ImageSearchPage> {
   bool get _hasNonFavorites => _selectedList.where((image) => !image.favorite).isNotEmpty;
 
   void _onWillPop(bool pop) {
+    if (pop) return;
     if (_selectedList.isNotEmpty) {
       setState(() {
         _selectedList.clear();
       });
+    } else {
+      Navigator.of(context).pop();
     }
   }
 
@@ -148,7 +151,7 @@ class _ImageSearchPageState extends State<ImageSearchPage> {
   @override
   Widget build(BuildContext context) {
     return PopScope(
-      canPop: _selectedList.isEmpty,
+      canPop: false,
       onPopInvoked: _onWillPop,
       child: Scaffold(
         body: SafeArea(

lib/views/image/image_tags_page.dart

@@ -63,10 +63,13 @@ class _ImageTagsPageState extends State<ImageTagsPage> {
   bool get _hasNonFavorites => _selectedList.where((image) => !image.favorite).isNotEmpty;
 
   void _onWillPop(bool pop) {
+    if (pop) return null;
     if (_selectedList.isNotEmpty) {
       setState(() {
         _selectedList.clear();
       });
+    } else {
+      Navigator.of(context).pop();
     }
   }
 
@@ -143,7 +146,7 @@ class _ImageTagsPageState extends State<ImageTagsPage> {
   @override
   Widget build(BuildContext context) {
     return PopScope(
-      canPop: _selectedList.isEmpty,
+      canPop: false,
       onPopInvoked: _onWillPop,
       child: Scaffold(
         body: SafeArea(