diff --git a/.gitignore b/.gitignore index 6df9758..00762ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pro.user* +*.DS_Store diff --git a/SpeedClimbingReactionTrainer.pro b/SpeedClimbingReactionTrainer.pro index acca1b6..61f5ec1 100644 --- a/SpeedClimbingReactionTrainer.pro +++ b/SpeedClimbingReactionTrainer.pro @@ -1,4 +1,4 @@ -QT += quick qml quickcontrols2 +QT += quick qml quickcontrols2 multimedia android { QT += androidextras @@ -44,6 +44,12 @@ android { ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources } +ios { + QMAKE_IOS_DEPLOYMENT_TARGET=9.0 + QMAKE_ASSET_CATALOGS += shared/graphics/Assets.xcassets + xcode_product_bundle_identifier_setting.value = "de.itsblue.scrt" +} + DISTFILES += \ android-sources/AndroidManifest.xml diff --git a/qml/Components/FancyButton.qml b/qml/Components/FancyButton.qml index e4f3f2f..938568f 100644 --- a/qml/Components/FancyButton.qml +++ b/qml/Components/FancyButton.qml @@ -17,7 +17,7 @@ */ import QtQuick 2.9 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.0 import QtGraphicalEffects 1.0 Button { diff --git a/qml/main.qml b/qml/main.qml index 4be7fb2..ee96ede 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -18,10 +18,9 @@ import QtQuick 2.9 import QtQuick.Window 2.2 -import QtQuick.Controls 2.4 +import QtQuick.Controls 2.0 import QtMultimedia 5.4 import QtGraphicalEffects 1.0 -import QtQuick.Controls.Styles 1.4 import com.itsblue.SpeedClimbingStartTrainer 2.0 diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/100.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/100.png new file mode 100644 index 0000000..e667b94 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/1024.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100644 index 0000000..aaae200 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/114.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100644 index 0000000..1fca658 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/120.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100644 index 0000000..9b6ca22 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/128.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/128.png new file mode 100644 index 0000000..e82100b Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/128.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/144.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/144.png new file mode 100644 index 0000000..bde25e4 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/152.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/152.png new file mode 100644 index 0000000..142b356 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/16.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/16.png new file mode 100644 index 0000000..cc7719c Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/16.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/167.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/167.png new file mode 100644 index 0000000..768ea12 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/172.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/172.png new file mode 100644 index 0000000..65495ec Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/172.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/180.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100644 index 0000000..eb4dd4b Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/196.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/196.png new file mode 100644 index 0000000..9395c4f Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/196.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/20.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/20.png new file mode 100644 index 0000000..2e58944 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/216.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/216.png new file mode 100644 index 0000000..d58b79e Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/216.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/256.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/256.png new file mode 100644 index 0000000..d240636 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/256.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/29.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100644 index 0000000..b2d0c00 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/32.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/32.png new file mode 100644 index 0000000..8662a10 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/32.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/40.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100644 index 0000000..d091acc Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/48.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/48.png new file mode 100644 index 0000000..e3f425d Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/48.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/50.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/50.png new file mode 100644 index 0000000..18385b4 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/512.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/512.png new file mode 100644 index 0000000..ca1f992 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/512.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/55.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/55.png new file mode 100644 index 0000000..294c620 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/55.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/57.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100644 index 0000000..e8c9402 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/58.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100644 index 0000000..5f51158 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/60.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100644 index 0000000..adf3162 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/64.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/64.png new file mode 100644 index 0000000..85563ba Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/64.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/72.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/72.png new file mode 100644 index 0000000..21e63e8 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/76.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/76.png new file mode 100644 index 0000000..ac35647 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/80.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100644 index 0000000..bb85511 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/87.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100644 index 0000000..8260467 Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/88.png b/shared/graphics/Assets.xcassets/AppIcon.appiconset/88.png new file mode 100644 index 0000000..78591de Binary files /dev/null and b/shared/graphics/Assets.xcassets/AppIcon.appiconset/88.png differ diff --git a/shared/graphics/Assets.xcassets/AppIcon.appiconset/Contents.json b/shared/graphics/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..e138c0b --- /dev/null +++ b/shared/graphics/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1 @@ +{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"idiom":"watch","filename":"172.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"86x86","expected-size":"172","role":"quickLook"},{"idiom":"watch","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"40x40","expected-size":"80","role":"appLauncher"},{"idiom":"watch","filename":"88.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"40mm","scale":"2x","size":"44x44","expected-size":"88","role":"appLauncher"},{"idiom":"watch","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"50x50","expected-size":"100","role":"appLauncher"},{"idiom":"watch","filename":"196.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"98x98","expected-size":"196","role":"quickLook"},{"idiom":"watch","filename":"216.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"44mm","scale":"2x","size":"108x108","expected-size":"216","role":"quickLook"},{"idiom":"watch","filename":"48.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"38mm","scale":"2x","size":"24x24","expected-size":"48","role":"notificationCenter"},{"idiom":"watch","filename":"55.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"42mm","scale":"2x","size":"27.5x27.5","expected-size":"55","role":"notificationCenter"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"3x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch","role":"companionSettings","scale":"2x"},{"size":"1024x1024","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"watch-marketing","scale":"1x"},{"size":"128x128","expected-size":"128","filename":"128.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"256x256","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"128x128","expected-size":"256","filename":"256.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"256x256","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"512x512","expected-size":"512","filename":"512.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"16","filename":"16.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"1x"},{"size":"16x16","expected-size":"32","filename":"32.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"32x32","expected-size":"64","filename":"64.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"},{"size":"512x512","expected-size":"1024","filename":"1024.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"mac","scale":"2x"}]} \ No newline at end of file