Testing android
Simon Stürz
parent
fd11f30f01
commit
2396469794
|
|
@ -1,9 +1,11 @@
|
|||
[submodule "QtZeroConf"]
|
||||
path = QtZeroConf
|
||||
url = https://github.com/jbagg/QtZeroConf.git
|
||||
url = https://github.com/nymea/QtZeroConf.git
|
||||
branch = main
|
||||
[submodule "nymea-remoteproxy"]
|
||||
path = nymea-remoteproxy
|
||||
url = https://github.com/guh/nymea-remoteproxy.git
|
||||
branch = master
|
||||
[submodule "android_openssl"]
|
||||
path = 3rdParty/android/android_openssl
|
||||
url = https://github.com/KDAB/android_openssl.git
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 4a2e197517dd5a0c7fc18c257182d48cfe82a088
|
||||
Subproject commit d2a2c5c70a75ac26e31085c8d3ce2578426b14aa
|
||||
|
|
@ -245,7 +245,7 @@ int main(int argc, char *argv[])
|
|||
|
||||
application.setWindowIcon(QIcon(QString(":/styles/%1/logo.svg").arg(styleController.currentStyle())));
|
||||
|
||||
engine->load(QUrl(QLatin1String("qrc:/ui/Nymea.qml")));
|
||||
engine->load(QUrl(QLatin1String("qrc:/ui/utils/TestMain.qml")));
|
||||
|
||||
return application.exec();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -110,7 +110,6 @@ android {
|
|||
DISTFILES += \
|
||||
$$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml \
|
||||
$$ANDROID_PACKAGE_SOURCE_DIR/google-services.json \
|
||||
$$ANDROID_PACKAGE_SOURCE_DIR/gradle/wrapper/gradle-wrapper.jar \
|
||||
$$ANDROID_PACKAGE_SOURCE_DIR/gradlew \
|
||||
$$ANDROID_PACKAGE_SOURCE_DIR/res/values/libs.xml \
|
||||
$$ANDROID_PACKAGE_SOURCE_DIR/res/values/styles.xml \
|
||||
|
|
|
|||
|
|
@ -324,5 +324,6 @@
|
|||
<file>ui/shaders/coloricon.frag.qsb</file>
|
||||
<file>ui/shaders/brightnesscircle.frag.qsb</file>
|
||||
<file>ui/shaders/colorizedimage.frag.qsb</file>
|
||||
<file>ui/utils/TestMain.qml</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
|
|
@ -35,6 +35,7 @@ import QtQuick.Layouts
|
|||
import QtCore
|
||||
import Qt.labs.folderlistmodel
|
||||
import QtQuick.Window
|
||||
|
||||
import Nymea
|
||||
import NymeaApp.Utils
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,51 @@
|
|||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
*
|
||||
* Copyright 2013 - 2020, nymea GmbH
|
||||
* Contact: contact@nymea.io
|
||||
*
|
||||
* This file is part of nymea.
|
||||
* This project including source code and documentation is protected by
|
||||
* copyright law, and remains the property of nymea GmbH. All rights, including
|
||||
* reproduction, publication, editing and translation, are reserved. The use of
|
||||
* this project is subject to the terms of a license agreement to be concluded
|
||||
* with nymea GmbH in accordance with the terms of use of nymea GmbH, available
|
||||
* under https://nymea.io/license
|
||||
*
|
||||
* GNU General Public License Usage
|
||||
* Alternatively, this project may be redistributed and/or modified under the
|
||||
* terms of the GNU General Public License as published by the Free Software
|
||||
* Foundation, GNU version 3. This project is distributed in the hope that it
|
||||
* will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
|
||||
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
|
||||
* Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along with
|
||||
* this project. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
* For any further details and any questions please contact us under
|
||||
* contact@nymea.io or see our FAQ/Licensing Information on
|
||||
* https://nymea.io/license/faq
|
||||
*
|
||||
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
|
||||
|
||||
import QtQuick.Controls.Material
|
||||
import QtQuick.Controls
|
||||
import QtQuick
|
||||
import QtQuick.Layouts
|
||||
import QtCore
|
||||
import Qt.labs.folderlistmodel
|
||||
import QtQuick.Window
|
||||
|
||||
import Nymea
|
||||
import NymeaApp.Utils
|
||||
|
||||
ApplicationWindow {
|
||||
id: app
|
||||
visible: true
|
||||
|
||||
Label {
|
||||
anchors.centerIn: parent
|
||||
text: "Yeah..well"
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -4,28 +4,8 @@
|
|||
android:versionName="1.0"
|
||||
android:installLocation="auto">
|
||||
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
<uses-permission android:name="android.permission.NFC" />
|
||||
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
|
||||
|
||||
<!-- Declare Bluetooth feature (LE optional: set required="true" if you *require* BLE) -->
|
||||
<uses-feature android:name="android.hardware.bluetooth" android:required="false" />
|
||||
<uses-feature android:name="android.hardware.bluetooth_le" android:required="false" />
|
||||
|
||||
<!-- Android 12+ runtime permissions -->
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
|
||||
|
||||
<!-- Pre‑Android 12 (API ≤ 30) legacy permissions -->
|
||||
<uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30" />
|
||||
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30" />
|
||||
|
||||
<!-- Location is needed for BLE scanning prior to Android 12 -->
|
||||
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30" />
|
||||
<!-- %%INSERT_PERMISSIONS -->
|
||||
<!-- %%INSERT_FEATURES -->
|
||||
|
||||
<supports-screens
|
||||
android:anyDensity="true"
|
||||
|
|
@ -73,6 +53,24 @@
|
|||
android:value="" />
|
||||
</activity>
|
||||
|
||||
<activity android:name="org.qtproject.qt.android.bindings.QtActivity"
|
||||
android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
|
||||
android:launchMode="singleTop"
|
||||
android:screenOrientation="unspecified"
|
||||
android:exported="true"
|
||||
android:label="">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
<meta-data android:name="android.app.lib_name" android:value="-- %%INSERT_APP_LIB_NAME%% --"/>
|
||||
<meta-data android:name="android.app.arguments" android:value="-- %%INSERT_APP_ARGUMENTS%% --"/>
|
||||
</activity>
|
||||
|
||||
<provider android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.qtprovider" android:exported="false" android:grantUriPermissions="true">
|
||||
<meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/qtprovider_paths"/>
|
||||
</provider>
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="${applicationId}.qtprovider"
|
||||
|
|
@ -96,7 +94,7 @@
|
|||
</intent-filter>
|
||||
</service>
|
||||
|
||||
<!--
|
||||
|
||||
<provider
|
||||
android:name="androidx.core.content.FileProvider"
|
||||
android:authorities="io.guh.nymeaapp.fileprovider"
|
||||
|
|
@ -105,7 +103,9 @@
|
|||
<meta-data
|
||||
android:name="android.support.FILE_PROVIDER_PATHS"
|
||||
android:resource="@xml/file_paths" />
|
||||
</provider>-->
|
||||
</provider>
|
||||
|
||||
</application>
|
||||
<uses-permission android:name="android.permission.ACCESS_CHECKIN_PROPERTIES"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
</manifest>
|
||||
|
|
|
|||
Loading…
Reference in New Issue