Compare commits

..

1 commit

Author SHA1 Message Date
17e278cd53 Update '.drone.yml'
All checks were successful
continuous-integration/drone/push Build is passing
2022-08-01 22:51:39 +02:00
6 changed files with 10 additions and 48 deletions

View file

@ -15,7 +15,9 @@ steps:
- name: publish package - name: publish package
image: alpine/curl image: alpine/curl
commands: commands:
- env - ls -l outputs
- ls -l outputs/apk
- ls -l outputs/apk/debug
- "curl --fail --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/ScStw/generic/app/0.0.0-preview-${DRONE_COMMIT_SHA}/ScStwApp.apk" - "curl --fail --user $GITEA_USER:$GITEA_TOKEN --upload-file outputs/apk/debug/android-build-debug.apk https://itsblue.dev/api/packages/ScStw/generic/app/0.0.0-preview-${DRONE_COMMIT_SHA}/ScStwApp.apk"
environment: environment:
GITEA_USER: GITEA_USER:

View file

@ -1,5 +1,5 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<manifest package="com.itsblue.speedclimbing_stopwatch_test" 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. -->

View file

@ -16,8 +16,7 @@ public:
enum AppInternalSetting { enum AppInternalSetting {
InvalidSetting = -1, InvalidSetting = -1,
AppThemeSetting, AppThemeSetting,
BaseStationIpSetting, BaseStationIpSetting
KeyboardControlSetting
}; };
Q_ENUM(AppInternalSetting) Q_ENUM(AppInternalSetting)
@ -40,8 +39,7 @@ public:
static QVariant::Type keyToType(int key) { static QVariant::Type keyToType(int key) {
QMap<AppInternalSetting, QVariant::Type> types = { QMap<AppInternalSetting, QVariant::Type> types = {
{AppThemeSetting, QVariant::String}, {AppThemeSetting, QVariant::String},
{BaseStationIpSetting, QVariant::String}, {BaseStationIpSetting, QVariant::String}
{KeyboardControlSetting, QVariant::Bool}
}; };
if(types.contains(AppInternalSetting(key))) if(types.contains(AppInternalSetting(key)))

View file

@ -74,19 +74,4 @@ Column {
appTheme.setting.setValue(checked ? "Dark":"Light") appTheme.setting.setValue(checked ? "Dark":"Light")
} }
} }
/*----Style Settings----*/
SmoothSwitchDelegate {
id: keyboardDel
text: qsTr("keyboard control")
width: parent.width
height: parentObj.delegateHeight
checked: scStwAppSettings.readSetting(ScStwAppSettings.KeyboardControlSetting)
onCheckedChanged: {
scStwAppSettings.writeSetting(ScStwAppSettings.KeyboardControlSetting, checked)
}
}
} }

View file

@ -47,21 +47,6 @@ ApplicationWindow {
state: scStwRemoteRace.state state: scStwRemoteRace.state
Keys.onPressed: {
if (!scStwAppSettings.readSetting(ScStwAppSettings.KeyboardControlSetting) || scStwRemoteRace.state !== ScStwRace.RUNNING) {
return
}
if(event.key === Qt.Key_A) {
defaultTimerA.stop()
}
if(event.key === Qt.Key_L) {
defaultTimerB.stop()
}
}
Rectangle { Rectangle {
id: backgroundRect id: backgroundRect
anchors.fill: parent anchors.fill: parent
@ -92,14 +77,7 @@ ApplicationWindow {
} }
ScStwTimer { ScStwTimer {
id: defaultTimerA id: defaultTimer
letter: "A"
}
ScStwTimer {
id: defaultTimerB
letter: "B"
} }
ScStwRemoteRace { ScStwRemoteRace {
@ -110,8 +88,7 @@ ApplicationWindow {
scStwClient: scStwClient scStwClient: scStwClient
Component.onCompleted: { Component.onCompleted: {
scStwRemoteRace.addTimer(defaultTimerA) scStwRemoteRace.addTimer(defaultTimer)
scStwRemoteRace.addTimer(defaultTimerB)
} }
onStateChanged: { onStateChanged: {
@ -233,7 +210,7 @@ ApplicationWindow {
PropertyChanges { PropertyChanges {
target: topToolBar target: topToolBar
sizeMode: scStwAppSettings.readSetting(ScStwAppSettings.KeyboardControlSetting) ? "large":"medium" sizeMode: "medium"
} }
PropertyChanges { PropertyChanges {

@ -1 +1 @@
Subproject commit 206d55f301da6fbbb7c8ae3932349cb2bbc57efb Subproject commit 0f269a76370d84c8d1f43a7298a59b6fac1c6980