From 93080f129d3092a8d1c78d43469aeef1f3e2a899 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 9 Mar 2020 10:43:22 -0700 Subject: mobile UI: add consistent way to show a page And have the existing shortcut functions use that helper. Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/main.qml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'mobile-widgets') diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml index ed56f8ec6..2f16041c3 100644 --- a/mobile-widgets/qml/main.qml +++ b/mobile-widgets/qml/main.qml @@ -76,30 +76,31 @@ Kirigami.ApplicationWindow { diveList.scrollToTop() } - function showMap() { + function showPage(page) { if (globalDrawer.drawerOpen) globalDrawer.close() - var i=pageIndex(mapPage) + var i=pageIndex(page) if (i === -1) - pageStack.push(mapPage) + pageStack.push(page) else pageStack.currentIndex = i + manager.appendTextToLog("switched to page " + page.title) + } + + function showMap() { + showPage(mapPage) } function showDiveList() { - if (globalDrawer.drawerOpen) - globalDrawer.close() - var i=pageIndex(diveList) - if (i === -1) - pageStack.push(diveList) - else - pageStack.currentIndex = i + showPage(diveList) } function pageIndex(pageToFind) { - for (var i = 0; i < pageStack.contentItem.contentChildren.length; i++) { - if (pageStack.contentItem.contentChildren[i] === pageToFind) - return i + if (pageStack.contentItem !== null) { + for (var i = 0; i < pageStack.contentItem.contentChildren.length; i++) { + if (pageStack.contentItem.contentChildren[i] === pageToFind) + return i + } } return -1 } -- cgit v1.2.3-70-g09d2