Release 1.0.0
This commit is contained in:
parent
679d072385
commit
50af1fa4a8
8 changed files with 150 additions and 6 deletions
17
ScStwApp.pro
17
ScStwApp.pro
|
@ -3,8 +3,15 @@ QT += quick qml quickcontrols2 sql multimedia
|
||||||
android {
|
android {
|
||||||
QT += androidextras
|
QT += androidextras
|
||||||
}
|
}
|
||||||
VERSION = 0.04
|
|
||||||
DEFINES += APP_VERSION=$$VERSION
|
VERSION = 1.0.0
|
||||||
|
QMAKE_TARGET_PRODUCT = "ScStwApp"
|
||||||
|
QMAKE_TARGET_COMPANY = "Itsblue Development"
|
||||||
|
QMAKE_TARGET_COPYRIGHT = "Copyright (c) by Itsblue Development"
|
||||||
|
|
||||||
|
# Add to define
|
||||||
|
DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
|
||||||
|
|
||||||
CONFIG += c++11
|
CONFIG += c++11
|
||||||
|
|
||||||
# The following define makes your compiler emit warnings if you use
|
# The following define makes your compiler emit warnings if you use
|
||||||
|
@ -66,5 +73,9 @@ DISTFILES += \
|
||||||
|
|
||||||
android {
|
android {
|
||||||
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
|
||||||
ANDROID_ABIS = armeabi-v7a arm64-v8a
|
ANDROID_VERSION_CODE = 15
|
||||||
|
ANDROID_VERSION_NAME = $${VERSION}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# This has to be the last line in the file
|
||||||
|
ANDROID_ABIS = armeabi-v7a arm64-v8a
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<manifest package="com.itsblue.speedclimbing_stwtest" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
|
<manifest package="com.itsblue.speedclimbing_stopwatch" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="-- %%INSERT_VERSION_NAME%% --" android:versionCode="-- %%INSERT_VERSION_CODE%% --" android:installLocation="auto">
|
||||||
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
|
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
|
||||||
Remove the comment if you do not require these default permissions. -->
|
Remove the comment if you do not require these default permissions. -->
|
||||||
<!-- %%INSERT_PERMISSIONS -->
|
|
||||||
|
|
||||||
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
|
<!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
|
||||||
Remove the comment if you do not require these default features. -->
|
Remove the comment if you do not require these default features. -->
|
||||||
|
@ -71,6 +71,7 @@
|
||||||
</activity>
|
</activity>
|
||||||
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
|
<!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
|
||||||
</application>
|
</application>
|
||||||
|
|
||||||
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
|
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28"/>
|
||||||
|
<uses-permission android:name="android.permission.INTERNET"/>
|
||||||
|
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||||
</manifest>
|
</manifest>
|
||||||
|
|
|
@ -74,4 +74,8 @@ android {
|
||||||
minSdkVersion = qtMinSdkVersion
|
minSdkVersion = qtMinSdkVersion
|
||||||
targetSdkVersion = 29
|
targetSdkVersion = 29
|
||||||
}
|
}
|
||||||
|
|
||||||
|
lintOptions {
|
||||||
|
checkReleaseBuilds false
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
103
resources/qml/SettingsDialog/SettingsAboutPage.qml
Normal file
103
resources/qml/SettingsDialog/SettingsAboutPage.qml
Normal file
|
@ -0,0 +1,103 @@
|
||||||
|
import QtQuick 2.9
|
||||||
|
import QtMultimedia 5.8
|
||||||
|
import QtQuick.Window 2.2
|
||||||
|
import QtQuick.Controls 2.2
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
import QtGraphicalEffects 1.0
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
|
||||||
|
import de.itsblue.ScStw 2.0
|
||||||
|
import de.itsblue.ScStw.Styling 2.0
|
||||||
|
import de.itsblue.ScStw.Styling.Components 1.0
|
||||||
|
import de.itsblue.ScStwApp 2.0
|
||||||
|
|
||||||
|
import "../components"
|
||||||
|
|
||||||
|
Column {
|
||||||
|
id: control
|
||||||
|
|
||||||
|
spacing: parentObj.delegateHeight * 0.2
|
||||||
|
|
||||||
|
property string title: "about"
|
||||||
|
property var parentObj
|
||||||
|
|
||||||
|
function updateSetting(key, val, del){
|
||||||
|
del.busy = true
|
||||||
|
scStwAppSettings.writeSetting(key, val, ScStwSettings.KeyLevel)
|
||||||
|
del.busy = false
|
||||||
|
}
|
||||||
|
|
||||||
|
function loadSetting(key, del){
|
||||||
|
return scStwAppSettings.readSetting(key, ScStwSettings.KeyLevel)
|
||||||
|
}
|
||||||
|
|
||||||
|
Label {
|
||||||
|
id: headerLabel
|
||||||
|
|
||||||
|
width: parent.width
|
||||||
|
height: parentObj.delegateHeight * 0.8
|
||||||
|
|
||||||
|
visible: true
|
||||||
|
|
||||||
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
||||||
|
fontSizeMode: Text.Fit
|
||||||
|
font.pixelSize: height
|
||||||
|
|
||||||
|
minimumPixelSize: 1
|
||||||
|
|
||||||
|
color: appTheme.theme.colors.text
|
||||||
|
|
||||||
|
text: "ScStwApp"
|
||||||
|
}
|
||||||
|
|
||||||
|
Label {
|
||||||
|
width: parent.width * 1
|
||||||
|
height: parentObj.delegateHeight * 0.8
|
||||||
|
|
||||||
|
|
||||||
|
verticalAlignment: Text.AlignTop
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
||||||
|
fontSizeMode: Text.Fit
|
||||||
|
font.pixelSize: height
|
||||||
|
|
||||||
|
minimumPixelSize: 1
|
||||||
|
|
||||||
|
color: appTheme.theme.colors.line
|
||||||
|
|
||||||
|
text: "V" + APP_VERSION + "<br>By <a href=\"https://itsblue.de\">Itsblue Development</a>"
|
||||||
|
|
||||||
|
onLinkActivated: {
|
||||||
|
Qt.openUrlExternally(link)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Label {
|
||||||
|
width: parent.width * 1
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
|
||||||
|
verticalAlignment: Text.AlignTop
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
|
|
||||||
|
fontSizeMode: Text.Fit
|
||||||
|
font.pixelSize: height
|
||||||
|
|
||||||
|
minimumPixelSize: 1
|
||||||
|
|
||||||
|
color: appTheme.theme.colors.line
|
||||||
|
|
||||||
|
text: " This app was built using the <a href='https://qt.io'>Qt Framework</a><br>
|
||||||
|
licensed under the <a href='https://www.gnu.org/licenses/lgpl-3.0.en.html'>GNU lgplV3 license</a>.<br><br>
|
||||||
|
|
||||||
|
This app is open source and licensed<br>under the <a href='https://www.gnu.org/licenses/agpl-3.0.en.html'>GNU agplV3 license</a>,<br>
|
||||||
|
the source code can be found <a href='https://itsblue.dev/ScStw/app/'>here</a>."
|
||||||
|
|
||||||
|
onLinkActivated: {
|
||||||
|
Qt.openUrlExternally(link)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -35,6 +35,14 @@ StackView {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Component {
|
||||||
|
id: about
|
||||||
|
|
||||||
|
SettingsAboutPage {
|
||||||
|
parentObj: control
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*-----Page to connect to the base station -----*/
|
/*-----Page to connect to the base station -----*/
|
||||||
Component {
|
Component {
|
||||||
id: connect
|
id: connect
|
||||||
|
|
|
@ -47,6 +47,19 @@ Column {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*----About the app----*/
|
||||||
|
NextPageDelegate {
|
||||||
|
id: about_del
|
||||||
|
|
||||||
|
height: parentObj.delegateHeight
|
||||||
|
|
||||||
|
text: qsTr("about this app")
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
parentObj.push(about)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*----Style Settings----*/
|
/*----Style Settings----*/
|
||||||
SmoothSwitchDelegate {
|
SmoothSwitchDelegate {
|
||||||
id: styleDel
|
id: styleDel
|
||||||
|
|
|
@ -30,5 +30,6 @@
|
||||||
<file>components/BatteryIndicator.qml</file>
|
<file>components/BatteryIndicator.qml</file>
|
||||||
<file>components/ExtensionOverview.qml</file>
|
<file>components/ExtensionOverview.qml</file>
|
||||||
<file>SettingsDialog/SettingsBaseStationSettingsPage.qml</file>
|
<file>SettingsDialog/SettingsBaseStationSettingsPage.qml</file>
|
||||||
|
<file>SettingsDialog/SettingsAboutPage.qml</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
|
|
@ -69,6 +69,9 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
QQmlApplicationEngine engine;
|
QQmlApplicationEngine engine;
|
||||||
|
|
||||||
|
// pass app version to qml
|
||||||
|
engine.rootContext()->setContextProperty("APP_VERSION", APP_VERSION);
|
||||||
|
|
||||||
ScStwLibraries::init();
|
ScStwLibraries::init();
|
||||||
ScStwLibraries::initStyling(&engine);
|
ScStwLibraries::initStyling(&engine);
|
||||||
|
|
||||||
|
|
Reference in a new issue