diff --git a/.gitignore b/.gitignore index 6df9758..00762ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.pro.user* +*.DS_Store diff --git a/blueROCK.pro b/blueROCK.pro index 5477919..e69c9c3 100644 --- a/blueROCK.pro +++ b/blueROCK.pro @@ -1,11 +1,18 @@ QT += quick qml quickcontrols2 purchasing widgets CONFIG += c++11 +VERSION = 0.04 + android { QT += androidextras ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android-sources } +ios { + QMAKE_ASSET_CATALOGS += resources/shared/Assets.xcassets + xcode_product_bundle_identifier_setting.value = "de.itsblue.bluerock" +} + # The following define makes your compiler emit warnings if you use # any Qt feature that has been marked deprecated (the exact warnings # depend on your compiler). Refer to the documentation for the diff --git a/resources/qml/Components/FancyBusyIndicator.qml b/resources/qml/Components/FancyBusyIndicator.qml index b555bf1..569e0e1 100644 --- a/resources/qml/Components/FancyBusyIndicator.qml +++ b/resources/qml/Components/FancyBusyIndicator.qml @@ -18,7 +18,7 @@ import QtQuick 2.3 import QtQuick.Controls 2.4 -import QtQuick.Controls.Styles 1.2 +//import QtQuick.Controls.Styles 1.4 BusyIndicator { id: control diff --git a/resources/qml/Widgets/ResultWidget.qml b/resources/qml/Widgets/ResultWidget.qml index c412350..4139e81 100644 --- a/resources/qml/Widgets/ResultWidget.qml +++ b/resources/qml/Widgets/ResultWidget.qml @@ -21,9 +21,9 @@ import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import QtGraphicalEffects 1.0 import QtQuick.Controls.Material 2.3 - import QtLocation 5.13 + //import QtLocation 5.13 - import QtPurchasing 1.13 + import QtPurchasing 1.12 import "../Components" diff --git a/resources/qml/main.qml b/resources/qml/main.qml index d6c986d..fb2902a 100644 --- a/resources/qml/main.qml +++ b/resources/qml/main.qml @@ -20,7 +20,7 @@ import QtQuick 2.9 import QtQuick.Window 2.2 import QtQuick.Controls 2.4 import QtQuick.Layouts 1.3 -import QtPurchasing 1.13 +import QtPurchasing 1.12 import com.itsblue.digitalRockRanking 1.0 diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/100.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/100.png new file mode 100755 index 0000000..c54812f Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/100.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/1024.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/1024.png new file mode 100755 index 0000000..2e01791 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/1024.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/114.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/114.png new file mode 100755 index 0000000..e7d0a32 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/114.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/120.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/120.png new file mode 100755 index 0000000..ed03d23 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/120.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/144.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/144.png new file mode 100755 index 0000000..df3884a Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/144.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/152.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/152.png new file mode 100755 index 0000000..5c1817b Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/152.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/167.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/167.png new file mode 100755 index 0000000..65dc571 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/167.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/180.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/180.png new file mode 100755 index 0000000..a1d25fc Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/180.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/20.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/20.png new file mode 100755 index 0000000..d75bba6 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/20.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/29.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/29.png new file mode 100755 index 0000000..03828e7 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/29.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/40.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/40.png new file mode 100755 index 0000000..7e0a82d Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/40.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/50.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/50.png new file mode 100755 index 0000000..90e8fb2 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/50.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/57.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/57.png new file mode 100755 index 0000000..4391225 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/57.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/58.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/58.png new file mode 100755 index 0000000..c17230e Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/58.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/60.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/60.png new file mode 100755 index 0000000..cf2de9f Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/60.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/72.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/72.png new file mode 100755 index 0000000..2b2f658 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/72.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/76.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/76.png new file mode 100755 index 0000000..bf58ae3 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/76.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/80.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/80.png new file mode 100755 index 0000000..7d08eb7 Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/80.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/87.png b/resources/shared/Assets.xcassets/AppIcon.appiconset/87.png new file mode 100755 index 0000000..e028a9e Binary files /dev/null and b/resources/shared/Assets.xcassets/AppIcon.appiconset/87.png differ diff --git a/resources/shared/Assets.xcassets/AppIcon.appiconset/Contents.json b/resources/shared/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100755 index 0000000..65b74d7 --- /dev/null +++ b/resources/shared/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"}]} \ No newline at end of file diff --git a/resources/shared/Assets.xcassets/Contents.json b/resources/shared/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/resources/shared/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file