Fabio/aves
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

bugfix: make sure System UI is visible when navigating to filtered collection from Info

Browse source
This commit is contained in:
Thibault Deckers 2020-04-14 10:01:19 +09:00
parent 53dfe85e07
commit 7580988747
2 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
lib/widgets/fullscreen/fullscreen_body.dart
View file

@ -2,9 +2,11 @@ import 'dart:io';
import 'dart:math'; import 'dart:math';
import 'package:aves/model/collection_lens.dart'; import 'package:aves/model/collection_lens.dart';
import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/image_entry.dart'; import 'package:aves/model/image_entry.dart';
import 'package:aves/utils/change_notifier.dart'; import 'package:aves/utils/change_notifier.dart';
import 'package:aves/utils/constants.dart'; import 'package:aves/utils/constants.dart';
import 'package:aves/widgets/album/collection_page.dart';
import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart'; import 'package:aves/widgets/common/image_providers/thumbnail_provider.dart';
import 'package:aves/widgets/common/image_providers/uri_image_provider.dart'; import 'package:aves/widgets/common/image_providers/uri_image_provider.dart';
import 'package:aves/widgets/fullscreen/fullscreen_action_delegate.dart'; import 'package:aves/widgets/fullscreen/fullscreen_action_delegate.dart';
@ -207,22 +209,28 @@ class FullscreenBodyState extends State<FullscreenBody> with SingleTickerProvide
_onLeave(); _onLeave();
return SynchronousFuture(true); return SynchronousFuture(true);
}, },
child: Stack( child: NotificationListener(
children: [ onNotification: (notification) {
FullscreenVerticalPageView( if (notification is FilterNotification) _goToCollection(notification.filter);
collection: collection, return false;
entry: _entry, },
videoControllers: _videoControllers, child: Stack(
verticalPager: _verticalPager, children: [
horizontalPager: _horizontalPager, FullscreenVerticalPageView(
onVerticalPageChanged: _onVerticalPageChanged, collection: collection,
onHorizontalPageChanged: _onHorizontalPageChanged, entry: _entry,
onImageTap: () => _overlayVisible.value = !_overlayVisible.value, videoControllers: _videoControllers,
onImagePageRequested: () => _goToVerticalPage(imagePage), verticalPager: _verticalPager,
), horizontalPager: _horizontalPager,
topOverlay, onVerticalPageChanged: _onVerticalPageChanged,
bottomOverlay, onHorizontalPageChanged: _onHorizontalPageChanged,
], onImageTap: () => _overlayVisible.value = !_overlayVisible.value,
onImagePageRequested: () => _goToVerticalPage(imagePage),
),
topOverlay,
bottomOverlay,
],
),
), ),
); );
} }
@ -231,6 +239,17 @@ class FullscreenBodyState extends State<FullscreenBody> with SingleTickerProvide
_verticalScrollNotifier.notifyListeners(); _verticalScrollNotifier.notifyListeners();
} }
void _goToCollection(CollectionFilter filter) {
_showSystemUI();
Navigator.pushAndRemoveUntil(
context,
MaterialPageRoute(
builder: (context) => CollectionPage(collection.derive(filter)),
),
(route) => false,
);
}
Future<void> _goToVerticalPage(int page) { Future<void> _goToVerticalPage(int page) {
return _verticalPager.animateToPage( return _verticalPager.animateToPage(
page, page,
@ -275,9 +294,9 @@ class FullscreenBodyState extends State<FullscreenBody> with SingleTickerProvide
// system UI // system UI
void _showSystemUI() => SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values); static void _showSystemUI() => SystemChrome.setEnabledSystemUIOverlays(SystemUiOverlay.values);
void _hideSystemUI() => SystemChrome.setEnabledSystemUIOverlays([]); static void _hideSystemUI() => SystemChrome.setEnabledSystemUIOverlays([]);
// overlay // overlay

15
lib/widgets/fullscreen/info/info_page.dart
View file

@ -1,7 +1,6 @@
import 'package:aves/model/collection_lens.dart'; import 'package:aves/model/collection_lens.dart';
import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/filters/filters.dart';
import 'package:aves/model/image_entry.dart'; import 'package:aves/model/image_entry.dart';
import 'package:aves/widgets/album/collection_page.dart';
import 'package:aves/widgets/common/aves_filter_chip.dart'; import 'package:aves/widgets/common/aves_filter_chip.dart';
import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart'; import 'package:aves/widgets/common/data_providers/media_query_data_provider.dart';
import 'package:aves/widgets/fullscreen/info/basic_section.dart'; import 'package:aves/widgets/fullscreen/info/basic_section.dart';
@ -155,13 +154,7 @@ class InfoPageState extends State<InfoPage> {
void _goToCollection(CollectionFilter filter) { void _goToCollection(CollectionFilter filter) {
if (collection == null) return; if (collection == null) return;
Navigator.pushAndRemoveUntil( FilterNotification(filter).dispatch(context);
context,
MaterialPageRoute(
builder: (context) => CollectionPage(collection.derive(filter)),
),
(route) => false,
);
} }
} }
@ -228,3 +221,9 @@ class InfoRowGroup extends StatelessWidget {
} }
class BackUpNotification extends Notification {} class BackUpNotification extends Notification {}
class FilterNotification extends Notification {
final CollectionFilter filter;
const FilterNotification(this.filter);
}