splash pane now has new cwtch font logo and animated knot
the build was successful
Details
the build was successful
Details
This commit is contained in:
parent
aadcb0d7c6
commit
454d10e28c
|
@ -110,7 +110,7 @@
|
|||
|
||||
</application>
|
||||
|
||||
<uses-sdk android:minSdkVersion="21" /><!-- android:targetSdkVersion="26"/> -->
|
||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29"/> -->
|
||||
<supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
|
|
|
@ -12,7 +12,6 @@ import (
|
|||
"git.openprivacy.ca/openprivacy/log"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts bool) {
|
||||
|
@ -24,7 +23,6 @@ func App(gcd *ui.GrandCentralDispatcher, subscribed chan bool, reloadingAccounts
|
|||
the.AppBus.Subscribe(event.ReloadDone, q)
|
||||
subscribed <- true
|
||||
|
||||
time.Sleep(5 * time.Second)
|
||||
gcd.Loaded()
|
||||
|
||||
for {
|
||||
|
|
1
qml.qrc
1
qml.qrc
|
@ -27,6 +27,7 @@
|
|||
<file>i18n/translation_pt.qm</file>
|
||||
<file>qml/images/cwtch_logo.png</file>
|
||||
<file>qml/images/cwtch_title.png</file>
|
||||
<file>qml/images/Open_Privacy_Logo_lightoutline.png</file>
|
||||
<file>qml/images/knot_animated.gif</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
Binary file not shown.
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
Before Width: | Height: | Size: 845 KiB After Width: | Height: | Size: 859 KiB |
|
@ -13,15 +13,6 @@ Item {
|
|||
id: sp
|
||||
property bool running
|
||||
|
||||
Image {
|
||||
id: splashImage
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
//anchors.verticalCenter: parent.verticalCenter
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 200
|
||||
|
||||
source: "qrc:/qml/images/cwtch_title.png"
|
||||
}
|
||||
|
||||
AnimatedImage {
|
||||
id: aniKnot
|
||||
|
@ -29,38 +20,42 @@ Item {
|
|||
source: "qrc:/qml/images/knot_animated.gif"
|
||||
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: splashImage.bottom
|
||||
anchors.topMargin: 20 * gcd.themeScale
|
||||
anchors.top: parent.top
|
||||
anchors.topMargin: 100 * gcd.themeScale
|
||||
|
||||
width: 250
|
||||
height: 250
|
||||
width: 200
|
||||
height: 200
|
||||
}
|
||||
|
||||
Opaque.ScalingLabel {
|
||||
Image {
|
||||
id: splashImage
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: aniKnot.bottom
|
||||
anchors.topMargin: 30 * gcd.themeScale
|
||||
anchors.topMargin: 20 * gcd.themeScale
|
||||
|
||||
source: "qrc:/qml/images/cwtch_title.png"
|
||||
}
|
||||
|
||||
|
||||
Opaque.ScalingLabel {
|
||||
id: loadingLabel
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: splashImage.bottom
|
||||
anchors.topMargin: 10 * gcd.themeScale
|
||||
|
||||
//: Loading tor...
|
||||
text: qsTr("loading-tor")
|
||||
|
||||
size: Theme.primaryTextSize
|
||||
size: Theme.secondaryTextSize
|
||||
color: Theme.mainTextColor
|
||||
}
|
||||
|
||||
|
||||
/*ProgressBar {
|
||||
id: progressBar
|
||||
Image {
|
||||
id: opImage
|
||||
anchors.horizontalCenter: parent.horizontalCenter
|
||||
anchors.top: splashImage.bottom
|
||||
anchors.topMargin: 10
|
||||
width: splashImage.width
|
||||
anchors.bottom: parent.bottom
|
||||
anchors.bottomMargin: 20 * gcd.themeScale
|
||||
|
||||
indeterminate: true
|
||||
visible: sp.running
|
||||
|
||||
style: ProgressBarStyle {
|
||||
progress: CwtchProgress { running: sp.running }
|
||||
}
|
||||
}*/
|
||||
source: "qrc:/qml/images/Open_Privacy_Logo_lightoutline.png"
|
||||
}
|
||||
}
|
||||
|
|
Reference in New Issue