qml: remove qml splash, update python-for-android with splash support.
main.qml now shows black cover that fades out when app is ready.
This commit is contained in:
@@ -179,7 +179,7 @@ RUN cd /opt \
|
|||||||
&& git remote add accumulator https://github.com/accumulator/python-for-android \
|
&& git remote add accumulator https://github.com/accumulator/python-for-android \
|
||||||
&& git fetch --all \
|
&& git fetch --all \
|
||||||
# commit: from branch accumulator/electrum_20210421d
|
# commit: from branch accumulator/electrum_20210421d
|
||||||
&& git checkout "fb8f6fc44ef7465500c534186b0aba2a5e4ddc15^{commit}" \
|
&& git checkout "e1111e82b7321d8e555bf67951525bb2381de789^{commit}" \
|
||||||
&& python3 -m pip install --no-build-isolation --no-dependencies --user -e .
|
&& python3 -m pip install --no-build-isolation --no-dependencies --user -e .
|
||||||
|
|
||||||
# build env vars
|
# build env vars
|
||||||
|
|||||||
@@ -1,16 +0,0 @@
|
|||||||
import QtQuick 2.0
|
|
||||||
|
|
||||||
Item {
|
|
||||||
property bool toolbar: false
|
|
||||||
|
|
||||||
Rectangle {
|
|
||||||
anchors.fill: parent
|
|
||||||
color: '#111144'
|
|
||||||
}
|
|
||||||
|
|
||||||
Image {
|
|
||||||
anchors.horizontalCenter: parent.horizontalCenter
|
|
||||||
anchors.verticalCenter: parent.verticalCenter
|
|
||||||
source: "../../icons/electrum.png"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,7 +11,8 @@ import "controls"
|
|||||||
ApplicationWindow
|
ApplicationWindow
|
||||||
{
|
{
|
||||||
id: app
|
id: app
|
||||||
visible: true
|
|
||||||
|
visible: false // initial value
|
||||||
|
|
||||||
// dimensions ignored on android
|
// dimensions ignored on android
|
||||||
width: 480
|
width: 480
|
||||||
@@ -148,22 +149,27 @@ ApplicationWindow
|
|||||||
}
|
}
|
||||||
|
|
||||||
Timer {
|
Timer {
|
||||||
id: splashTimer
|
id: coverTimer
|
||||||
interval: 10
|
interval: 10
|
||||||
onTriggered: {
|
onTriggered: {
|
||||||
splash.opacity = 0
|
app.visible = true
|
||||||
|
cover.opacity = 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Splash {
|
Rectangle {
|
||||||
id: splash
|
id: cover
|
||||||
anchors.top: header.top
|
parent: Overlay.overlay
|
||||||
anchors.bottom: app.contentItem.bottom
|
anchors.fill: parent
|
||||||
width: app.width
|
|
||||||
z: 1000
|
z: 1000
|
||||||
|
color: 'black'
|
||||||
|
|
||||||
Behavior on opacity {
|
Behavior on opacity {
|
||||||
NumberAnimation { duration: 300 }
|
NumberAnimation {
|
||||||
|
duration: 2000
|
||||||
|
easing.type: Easing.OutQuad;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -239,7 +245,7 @@ ApplicationWindow
|
|||||||
}
|
}
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
splashTimer.start()
|
coverTimer.start()
|
||||||
|
|
||||||
if (!Config.autoConnectDefined) {
|
if (!Config.autoConnectDefined) {
|
||||||
var dialog = serverConnectWizard.createObject(app)
|
var dialog = serverConnectWizard.createObject(app)
|
||||||
|
|||||||
Reference in New Issue
Block a user