From 11810d5d0677ea1845ac4272c8578010132a8e1e Mon Sep 17 00:00:00 2001 From: jan Iversen Date: Sat, 21 Dec 2019 22:26:06 +0100 Subject: [PATCH] mobile UI/login: remove startpage dependency in divelist DiveList should not depend on StartPage, so remove references to startPage. Signed-off-by: Jan Iversen Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveList.qml | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml index 7b441b521..52861443a 100644 --- a/mobile-widgets/qml/DiveList.qml +++ b/mobile-widgets/qml/DiveList.qml @@ -499,8 +499,6 @@ Kirigami.ScrollablePage { ListView { id: diveListView anchors.fill: parent - opacity: 1.0 - startPage.opacity - visible: opacity > 0 model: diveListModel currentIndex: -1 delegate: diveDelegate @@ -571,18 +569,11 @@ Kirigami.ScrollablePage { } onBackRequested: { - if (startPage.visible && diveListView.count > 0 && - prefs.credentialStatus !== CloudStatus.CS_INCORRECT_USER_PASSWD) { - prefs.credentialStatus = oldStatus - event.accepted = true; - } - if (!startPage.visible) { - if (Qt.platform.os != "ios") { - manager.quit() - } - // let's make sure Kirigami doesn't quit on our behalf - event.accepted = true - } + if (Qt.platform.os != "ios") + manager.quit() + + // let's make sure Kirigami doesn't quit on our behalf + event.accepted = true } function setCurrentDiveListIndex(idx, noScroll) {