CHANGELOG

@@ -1,52 +0,0 @@
-# Changelog
-All notable changes to this project will be documented in this file.
-
-The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
-and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
-
-## [1.1]
-### Added
-- connecting to and controlling a ScStw Basestation is now possible
-- creating profiles and saving times is now possible (only when connected to a ScStw Basestation)
-- dark mode
-### Changed
-- new, more modern style
-- new start tone which is compliant with the IFSC norm
-- new and improved codebase
-
-
-## [0.04] - 2018-08-11
-### Added
-- buzzer icon in the upper left corner indicating that the buzzer is connected
-### Fixed
-- start seqnece continues in a buggy way when cancel is being pressed while 'at your marks' or 'ready'
-- bug that made the start sequence freeze if a delay of zero or lower or a non valid number was set as delay
-### Changed
-- increased the size of the back buttons in settings / profiles dialog
-
-## [0.03 - BETA] - 2018-07-29
-### Added
-- cancel button during start sequence
-- new screen in landscape mode
-- buttons for settings and profiles
-- the screen stays on now
-- the volume csontrols control the media volume directly
-- settings dialog
-- capabilitie to connect to a Buzzer via Wifi
-- it is now possible to setup an automatic start sequence that spells the command
-'at your marks' and 'ready' with a customizable delay before them 
-### Fixed
-- bug that made a Button freeze when it was pressed and the screen rotated at the same time
-
-## [0.02] - 2018-07-18
-### Fixed
-- negative time when the stopping starts
-- removed delay between the end of the startton an the begin of the stopping
-### Changed
-- slowed down animations
-### Added
-- animation for the text "click start to start" between STOPPED and IDLE to
-  prevent it from getting out of the screen
-  
-## [0.01]
-### Initial Release

ScStwApp.pro

@@ -1,68 +1,8 @@
-QT += quick qml quickcontrols2 sql multimedia
+TEMPLATE = subdirs
+CONFIG += ordered
 
-android {
-    QT += androidextras
-}
-VERSION = 0.04
-DEFINES += APP_VERSION=$$VERSION
-CONFIG += c++11
+SUBDIRS += \
+           shared-libraries/ScStwClient \
+           ScStwApp
 
-# The following define makes your compiler emit warnings if you use
-# any feature of Qt which as been marked deprecated (the exact warnings
-# depend on your compiler). Please consult the documentation of the
-# deprecated API in order to know how to port your code away from it.
-DEFINES += QT_DEPRECATED_WARNINGS
-
-# You can also make your code fail to compile if you use deprecated APIs.
-# In order to do so, uncomment the following line.
-# You can also select to disable deprecated APIs only up to a certain version of Qt.
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
-
-TARGET = speedclimbing_stw
-
-SOURCES += \
-    sources/main.cpp \
-    sources/sqlstoragemodel.cpp \
-    sources/sqlprofilemodel.cpp \
-    sources/appsettings.cpp \
-    sources/baseconn.cpp \
-    sources/speedtimer.cpp \
-    sources/climbingrace.cpp \
-    sources/apptheme.cpp
-
-HEADERS += \
-    headers/sqlstoragemodel.h \
-    headers/sqlprofilemodel.h \
-    headers/appsettings.h \
-    headers/baseconn.h \
-    headers/speedtimer.h \
-    headers/climbingrace.h \
-    headers/apptheme.h
-
-RESOURCES += \
-             resources/shared/shared.qrc \
-             resources/qml/qml.qrc
-
-# Additional import path used to resolve QML modules in Qt Creator's code model
-QML_IMPORT_PATH =
-
-# Additional import path used to resolve QML modules just for Qt Quick Designer
-QML_DESIGNER_IMPORT_PATH =
-
-#Plugins
-QTPLUGIN += qtaudio_coreaudio
-
-# Default rules for deployment.
-qnx: target.path = /tmp/$${TARGET}/bin
-#else: unix:!android: target.path = /opt/$${TARGET}/bin
-else: unix:!android: target.path = /home/pi/$${TARGET}/bin
-!isEmpty(target.path): INSTALLS += target
-
-DISTFILES += \
-    android-sources/AndroidManifest.xml \
-    CHANGELOG \
-    android-sources/src/MainActivity.java
-
-android {
-    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
-}
+ScStwApp.file = ScStwSrc/ScStwApp.pro

ScStwSrc/ScStwApp.pro

@@ -0,0 +1,71 @@
+QT += quick qml quickcontrols2 sql multimedia
+
+android {
+    QT += androidextras
+}
+VERSION = 0.04
+DEFINES += APP_VERSION=$$VERSION
+CONFIG += c++11
+
+# The following define makes your compiler emit warnings if you use
+# any feature of Qt which as been marked deprecated (the exact warnings
+# depend on your compiler). Please consult the documentation of the
+# deprecated API in order to know how to port your code away from it.
+DEFINES += QT_DEPRECATED_WARNINGS
+
+# You can also make your code fail to compile if you use deprecated APIs.
+# In order to do so, uncomment the following line.
+# You can also select to disable deprecated APIs only up to a certain version of Qt.
+#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000    # disables all the APIs deprecated before Qt 6.0.0
+
+TARGET = speedclimbing_stw
+
+# include submodules
+include($$PWD/../shared-libraries/ScStwClient/ScStwClient.pri)
+
+SOURCES += \
+    sources/main.cpp \
+    sources/sqlstoragemodel.cpp \
+    sources/sqlprofilemodel.cpp \
+    sources/appsettings.cpp \
+    sources/baseconn.cpp \
+    sources/speedtimer.cpp \
+    sources/climbingrace.cpp \
+    sources/apptheme.cpp
+
+HEADERS += \
+    headers/sqlstoragemodel.h \
+    headers/sqlprofilemodel.h \
+    headers/appsettings.h \
+    headers/baseconn.h \
+    headers/speedtimer.h \
+    headers/climbingrace.h \
+    headers/apptheme.h
+
+RESOURCES += \
+             resources/shared/shared.qrc \
+             resources/qml/qml.qrc
+
+# Additional import path used to resolve QML modules in Qt Creator's code model
+QML_IMPORT_PATH =
+
+# Additional import path used to resolve QML modules just for Qt Quick Designer
+QML_DESIGNER_IMPORT_PATH =
+
+#Plugins
+QTPLUGIN += qtaudio_coreaudio
+
+# Default rules for deployment.
+qnx: target.path = /tmp/$${TARGET}/bin
+#else: unix:!android: target.path = /opt/$${TARGET}/bin
+else: unix:!android: target.path = /home/pi/$${TARGET}/bin
+!isEmpty(target.path): INSTALLS += target
+
+DISTFILES += \
+    android-sources/AndroidManifest.xml \
+    CHANGELOG \
+    android-sources/src/MainActivity.java
+
+android {
+    ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources
+}