From 1fc86fbaf3127e8aa912960c3b51cac3391e33c0 Mon Sep 17 00:00:00 2001 From: Akshay Nair Date: Thu, 4 Jun 2020 10:05:10 +0530 Subject: Disables back button --- TODO.md | 4 +++- lib/main.dart | 31 +++++++++++++++++-------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/TODO.md b/TODO.md index b87bcc9..9f50e17 100644 --- a/TODO.md +++ b/TODO.md @@ -5,10 +5,12 @@ - [X] Transision between pages between pages - [X] Find a way to preload both pages and stop from "loading" - [X] Dark/List themes + - [ ] Add icons in context menu ## Issues - - [ ] Fix scroll/fling conflict (snap) - [ ] Fix uninstall action issue + - [ ] Fix scroll/fling conflict (snap) + - [X] Disable back button - [X] Fix build issue ## HomePage diff --git a/lib/main.dart b/lib/main.dart index 25ea6ee..2f5c415 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -119,20 +119,23 @@ class MyAppState extends StreamState { darkTheme: getDarkTheme(), themeMode: config.value.isDarkMode() ? ThemeMode.dark : ThemeMode.light, home: Scaffold( - body: PageView( - controller: PageController(keepPage: true), - children: [ - HomeView( - dateTime: dateTime.value, - favoriteApps: favoriteApps.value, - openApp: openApp, - openOptionsMenu: openOptionsMenu, - ), - AppsView( - openApp: openApp, - openOptionsMenu: openOptionsMenu, - ), - ], + body: WillPopScope( + onWillPop: () => Future.value(false), + child: PageView( + controller: PageController(keepPage: true), + children: [ + HomeView( + dateTime: dateTime.value, + favoriteApps: favoriteApps.value, + openApp: openApp, + openOptionsMenu: openOptionsMenu, + ), + AppsView( + openApp: openApp, + openOptionsMenu: openOptionsMenu, + ), + ], + ), ), ), ); -- cgit v1.3.1