flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-26 16:46:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Folders navigation

Browse Source 
Clicking on Folders in AppBar when inside a Folder wouldn't take you
back to the Folder Listing.
This commit is contained in:
Vishesh Handa
2019-12-22 15:38:04 +01:00
parent de369fe6d9
commit ce9a72676b
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
lib/widgets/app_drawer.dart
View File

@ -84,19 +84,38 @@ class AppDrawer extends StatelessWidget {
title: "Folders",
onTap: () {
var m = ModalRoute.of(context);
// FIXME: This is a terrible hack, I should figure out how to make
// transitions work with named routes
if (m.settings.name == null) {
Navigator.pop(context);
} else {
if (m.settings.name == '/') {
Navigator.pop(context);
Navigator.push(
context,
PageTransition(
type: PageTransitionType.fade,
child: FolderListingScreen(),
settings: const RouteSettings(name: '/folders'),
),
);
} else if (m.settings.name == '/folders') {
Navigator.pop(context);
} else {
// Check if '/folders' is a parent
var wasParent = false;
Navigator.popUntil(
context,
(route) {
wasParent = route.settings.name == '/folders';
return wasParent;
},
);
if (!wasParent) {
Navigator.push(
context,
PageTransition(
type: PageTransitionType.fade,
child: FolderListingScreen(),
settings: const RouteSettings(name: '/folders'),
),
);
}
}
},
selected: currentRoute == null,