ETM-Schurig/powersync-app
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #414: Fix the footer dropshadow

Browse Source
This commit is contained in:
Jenkins nymea 2020-08-30 17:23:14 +02:00
commit 241f594238
1 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
nymea-app/ui/MainPage.qml
View File

@ -266,16 +266,15 @@ Page {
readonly property bool shown: tabsRepeater.count > 1 || mainHeader.menuOpen || d.configOverlay readonly property bool shown: tabsRepeater.count > 1 || mainHeader.menuOpen || d.configOverlay
implicitHeight: shown ? 70 + (app.landscape ? -20 : 0) : 0 implicitHeight: shown ? 70 + (app.landscape ? -20 : 0) : 0
Behavior on implicitHeight { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }} Behavior on implicitHeight { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad }}
clip: true
TabBar { TabBar {
id: tabBar id: tabBar
anchors.fill: parent anchors { left: parent.left; top: parent.top; right: parent.right }
height: 70 + (app.landscape ? -20 : 0)
Material.elevation: 3 Material.elevation: 3
position: TabBar.Footer position: TabBar.Footer
visible: !mainHeader.menuOpen && !d.configOverlay opacity: (!mainHeader.menuOpen && !d.configOverlay) ? 1 : 0
opacity: d.configOverlay === null ? 1 : 0
Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } } Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } }
Repeater { Repeater {
@ -298,28 +297,37 @@ Page {
} }
} }
MainPageTabButton { TabBar {
anchors.fill: parent anchors.fill: tabBar
alignment: app.landscape ? Qt.Horizontal : Qt.Vertical Material.elevation: 3
text: d.configOverlay ? qsTr("Done") : qsTr("Configure") position: TabBar.Footer
iconSource: "../images/configure.svg"
opacity: visible ? 1 : 0 opacity: mainHeader.menuOpen || d.configOverlay ? 1 : 0
visible: mainHeader.menuOpen || d.configOverlay
Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } } Behavior on opacity { NumberAnimation { duration: 200; easing.type: Easing.InOutQuad } }
visible: opacity > 0
checked: false MainPageTabButton {
checkable: false height: tabBar.height
alignment: app.landscape ? Qt.Horizontal : Qt.Vertical
text: d.configOverlay ? qsTr("Done") : qsTr("Configure")
iconSource: "../images/configure.svg"
anchors.verticalCenter: parent.verticalCenter
onClicked: { checked: false
if (d.configOverlay) { checkable: false
d.configOverlay.destroy()
} else { onClicked: {
PlatformHelper.vibrate(PlatformHelper.HapticsFeedbackSelection) if (d.configOverlay) {
d.configOverlay = configComponent.createObject(contentContainer) d.configOverlay.destroy()
mainHeader.menuOpen = false; } else {
PlatformHelper.vibrate(PlatformHelper.HapticsFeedbackSelection)
d.configOverlay = configComponent.createObject(contentContainer)
mainHeader.menuOpen = false;
}
} }
} }
} }
} }
Component { Component {