Commit afd571a3 authored by Camilo Higuita's avatar Camilo Higuita

fixes for android build

parent b3cb0bb0
breeze-icons @ a54611fa
Subproject commit a4bc2e5f38de971aef396655e6c122ec2a8aaeac
Subproject commit a54611fafe2c47d2f2ff2bbe21dbcf234a855ec2
kirigami @ 70c025ef
Subproject commit afd05a512f7ef820763aa45411a20fa3781a808e
Subproject commit 70c025ef6f6dc63c85180867f70f5e00ba5a8dba
# includes openssl libs onto android build
android {
ANDROID_EXTRA_LIBS += $$PWD/library/openssl/prebuilt/armeabi-v7a/libcrypto.so
ANDROID_EXTRA_LIBS += $$PWD/library/openssl/prebuilt/armeabi-v7a/libssl.so
ANDROID_EXTRA_LIBS += $$PWD/3rdparty/openssl/lib/libcrypto.so
ANDROID_EXTRA_LIBS += $$PWD/3rdparty/openssl/lib/libssl.so
}
......@@ -16,7 +16,9 @@ DISTFILES += \
$$PWD/src/NotificationClient.java \
$$PWD/src/MyService.java
RESOURCES += android.qrc/
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/
}
RESOURCES += \
$$PWD/android.qrc
<RCC>
<qresource prefix="/">
<file>qtquickcontrols2.conf</file>
</qresource>
</RCC>
; This file can be edited to change the style of the application
; Read "Qt Quick Controls 2 Configuration File" for details:
; http://doc.qt.io/qt-5/qtquickcontrols2-configuration.html
[Controls]
Style=Material
[Universal]
Theme=Light
;Accent=Steel
[Material]
Theme=Light
;Accent=#E91E63
;Primary=#31363b
;Foreground=#FFFFFF
;Background=#31363b
......@@ -9,6 +9,7 @@
#include <QQuickStyle>
#include <QStyleHints>
#include "services/local/linking.h"
#ifdef Q_OS_ANDROID
#include "./3rdparty/kirigami/src/kirigamiplugin.h"
#include <QtWebView/QtWebView>
......
......@@ -267,15 +267,22 @@ Kirigami.ApplicationWindow {
}
}
footer: Item {
footer: ToolBar {
id: playbackControls
position: ToolBar.Footer
height: visible ? headerHeight : 0
width: root.width
visible: true
focus: true
leftPadding: 0
rightPadding: 0
FastBlur {
anchors.fill: parent
width: parent.width
height: parent.height-1
y:1
source: mainPlaylist.artwork
radius: 100
transparentBorder: false
......@@ -286,7 +293,7 @@ Kirigami.ApplicationWindow {
Rectangle {
id: footerBg
anchors.fill: parent
color: darkDarkColor
color: darkBaseColor
opacity: opacityLevel
z: -999
......@@ -296,8 +303,8 @@ Kirigami.ApplicationWindow {
target: footerBg
property: "color"
easing.type: Easing.InOutQuad
from: darkBaseColor
to: darkDarkColor
from: "black"
to: darkBaseColor
duration: 500
}
}
......@@ -376,7 +383,7 @@ Kirigami.ApplicationWindow {
height: miniArtSize + 4
width: miniArtSize + 4
color: darkDarkColor
color: darkForegroundColor
opacity: opacityLevel
z: -999
......
......@@ -6,6 +6,7 @@ QT += network
QT += xml
QT += qml
QT += quickcontrols2
QT += widgets
TARGET = vvave
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment