diff --git a/VESC Favicon.icns b/VESC Favicon.icns new file mode 100644 index 000000000..ae700110c Binary files /dev/null and b/VESC Favicon.icns differ diff --git a/VESC Favicon.iconset/icon_128x128.png b/VESC Favicon.iconset/icon_128x128.png new file mode 100644 index 000000000..f1dfacd11 Binary files /dev/null and b/VESC Favicon.iconset/icon_128x128.png differ diff --git a/VESC Favicon.iconset/icon_128x128@2x.png b/VESC Favicon.iconset/icon_128x128@2x.png new file mode 100644 index 000000000..6056fd107 Binary files /dev/null and b/VESC Favicon.iconset/icon_128x128@2x.png differ diff --git a/VESC Favicon.iconset/icon_16x16.png b/VESC Favicon.iconset/icon_16x16.png new file mode 100644 index 000000000..1aae2513c Binary files /dev/null and b/VESC Favicon.iconset/icon_16x16.png differ diff --git a/VESC Favicon.iconset/icon_16x16@2x.png b/VESC Favicon.iconset/icon_16x16@2x.png new file mode 100644 index 000000000..2e1fd6a32 Binary files /dev/null and b/VESC Favicon.iconset/icon_16x16@2x.png differ diff --git a/VESC Favicon.iconset/icon_256x256.png b/VESC Favicon.iconset/icon_256x256.png new file mode 100644 index 000000000..6056fd107 Binary files /dev/null and b/VESC Favicon.iconset/icon_256x256.png differ diff --git a/VESC Favicon.iconset/icon_256x256@2x.png b/VESC Favicon.iconset/icon_256x256@2x.png new file mode 100644 index 000000000..a600e37d8 Binary files /dev/null and b/VESC Favicon.iconset/icon_256x256@2x.png differ diff --git a/VESC Favicon.iconset/icon_32x32.png b/VESC Favicon.iconset/icon_32x32.png new file mode 100644 index 000000000..2e1fd6a32 Binary files /dev/null and b/VESC Favicon.iconset/icon_32x32.png differ diff --git a/VESC Favicon.iconset/icon_32x32@2x.png b/VESC Favicon.iconset/icon_32x32@2x.png new file mode 100644 index 000000000..3a071b5e2 Binary files /dev/null and b/VESC Favicon.iconset/icon_32x32@2x.png differ diff --git a/VESC Favicon.iconset/icon_512x512.png b/VESC Favicon.iconset/icon_512x512.png new file mode 100644 index 000000000..a600e37d8 Binary files /dev/null and b/VESC Favicon.iconset/icon_512x512.png differ diff --git a/VESC Favicon.iconset/icon_512x512@2x.png b/VESC Favicon.iconset/icon_512x512@2x.png new file mode 100644 index 000000000..bb254508c Binary files /dev/null and b/VESC Favicon.iconset/icon_512x512@2x.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/100.png b/ios/Images.xcassets/AppIcon.appiconset/100.png index f34d29541..19f18c916 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/100.png and b/ios/Images.xcassets/AppIcon.appiconset/100.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/102.png b/ios/Images.xcassets/AppIcon.appiconset/102.png new file mode 100644 index 000000000..135ac7ada Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/102.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/1024.png b/ios/Images.xcassets/AppIcon.appiconset/1024.png index ad630b9ca..f04e586e9 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/1024.png and b/ios/Images.xcassets/AppIcon.appiconset/1024.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/108.png b/ios/Images.xcassets/AppIcon.appiconset/108.png new file mode 100644 index 000000000..682d8469e Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/108.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/114.png b/ios/Images.xcassets/AppIcon.appiconset/114.png index 1361f07c6..3261078cf 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/114.png and b/ios/Images.xcassets/AppIcon.appiconset/114.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/120.png b/ios/Images.xcassets/AppIcon.appiconset/120.png index 0245b57f2..4ff9953e8 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/120.png and b/ios/Images.xcassets/AppIcon.appiconset/120.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/128.png b/ios/Images.xcassets/AppIcon.appiconset/128.png new file mode 100644 index 000000000..858eff0b2 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/128.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/144.png b/ios/Images.xcassets/AppIcon.appiconset/144.png index 2fe298fc2..728e41171 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/144.png and b/ios/Images.xcassets/AppIcon.appiconset/144.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/152.png b/ios/Images.xcassets/AppIcon.appiconset/152.png index a4477c6a4..67b62d1c7 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/152.png and b/ios/Images.xcassets/AppIcon.appiconset/152.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/16.png b/ios/Images.xcassets/AppIcon.appiconset/16.png new file mode 100644 index 000000000..8dcd714bd Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/16.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/167.png b/ios/Images.xcassets/AppIcon.appiconset/167.png index 69a59e040..68789637e 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/167.png and b/ios/Images.xcassets/AppIcon.appiconset/167.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/172.png b/ios/Images.xcassets/AppIcon.appiconset/172.png new file mode 100644 index 000000000..ab0c19c24 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/172.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/180.png b/ios/Images.xcassets/AppIcon.appiconset/180.png index 7bed355d1..a6ac2b554 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/180.png and b/ios/Images.xcassets/AppIcon.appiconset/180.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/196.png b/ios/Images.xcassets/AppIcon.appiconset/196.png new file mode 100644 index 000000000..c19934bea Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/196.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/20.png b/ios/Images.xcassets/AppIcon.appiconset/20.png index c5e573744..a5a1f76bb 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/20.png and b/ios/Images.xcassets/AppIcon.appiconset/20.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/216.png b/ios/Images.xcassets/AppIcon.appiconset/216.png new file mode 100644 index 000000000..dc63ae6c8 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/216.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/234.png b/ios/Images.xcassets/AppIcon.appiconset/234.png new file mode 100644 index 000000000..f04dca4af Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/234.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/256.png b/ios/Images.xcassets/AppIcon.appiconset/256.png new file mode 100644 index 000000000..0c979a817 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/256.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/258.png b/ios/Images.xcassets/AppIcon.appiconset/258.png new file mode 100644 index 000000000..031cc07fe Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/258.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/29.png b/ios/Images.xcassets/AppIcon.appiconset/29.png index 2324c68de..dc1599f94 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/29.png and b/ios/Images.xcassets/AppIcon.appiconset/29.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/32.png b/ios/Images.xcassets/AppIcon.appiconset/32.png new file mode 100644 index 000000000..83fb7d82e Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/32.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/40.png b/ios/Images.xcassets/AppIcon.appiconset/40.png index 2eb66250b..e1e9536e8 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/40.png and b/ios/Images.xcassets/AppIcon.appiconset/40.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/48.png b/ios/Images.xcassets/AppIcon.appiconset/48.png new file mode 100644 index 000000000..eb24e4a27 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/48.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/50.png b/ios/Images.xcassets/AppIcon.appiconset/50.png index 410a8ae17..87d71f563 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/50.png and b/ios/Images.xcassets/AppIcon.appiconset/50.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/512.png b/ios/Images.xcassets/AppIcon.appiconset/512.png new file mode 100644 index 000000000..cd4c10a3e Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/512.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/55.png b/ios/Images.xcassets/AppIcon.appiconset/55.png new file mode 100644 index 000000000..76ee670a6 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/55.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/57.png b/ios/Images.xcassets/AppIcon.appiconset/57.png index e8d1e6109..6581be511 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/57.png and b/ios/Images.xcassets/AppIcon.appiconset/57.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/58.png b/ios/Images.xcassets/AppIcon.appiconset/58.png index f0249703d..8dfc2e3e9 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/58.png and b/ios/Images.xcassets/AppIcon.appiconset/58.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/60.png b/ios/Images.xcassets/AppIcon.appiconset/60.png index 642be0912..0c716ec35 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/60.png and b/ios/Images.xcassets/AppIcon.appiconset/60.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/64.png b/ios/Images.xcassets/AppIcon.appiconset/64.png new file mode 100644 index 000000000..b08a15361 Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/64.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/66.png b/ios/Images.xcassets/AppIcon.appiconset/66.png new file mode 100644 index 000000000..ea32c201f Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/66.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/72.png b/ios/Images.xcassets/AppIcon.appiconset/72.png index e6dba0948..ddafebaab 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/72.png and b/ios/Images.xcassets/AppIcon.appiconset/72.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/76.png b/ios/Images.xcassets/AppIcon.appiconset/76.png index 35f781f3c..da8d26616 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/76.png and b/ios/Images.xcassets/AppIcon.appiconset/76.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/80.png b/ios/Images.xcassets/AppIcon.appiconset/80.png index c009ae2cd..2a1216c9c 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/80.png and b/ios/Images.xcassets/AppIcon.appiconset/80.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/87.png b/ios/Images.xcassets/AppIcon.appiconset/87.png index 3fabfab30..a8e590ced 100644 Binary files a/ios/Images.xcassets/AppIcon.appiconset/87.png and b/ios/Images.xcassets/AppIcon.appiconset/87.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/88.png b/ios/Images.xcassets/AppIcon.appiconset/88.png new file mode 100644 index 000000000..f6ad1006f Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/88.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/92.png b/ios/Images.xcassets/AppIcon.appiconset/92.png new file mode 100644 index 000000000..702d71eec Binary files /dev/null and b/ios/Images.xcassets/AppIcon.appiconset/92.png differ diff --git a/ios/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/Images.xcassets/AppIcon.appiconset/Contents.json index ad9ed1b38..1319290d4 100644 --- a/ios/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/ios/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,116 +1 @@ -{ - "images" : [ - { - "filename" : "40.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "60.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "20x20" - }, - { - "filename" : "58.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "87.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "29x29" - }, - { - "filename" : "80.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "120.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "40x40" - }, - { - "filename" : "120.png", - "idiom" : "iphone", - "scale" : "2x", - "size" : "60x60" - }, - { - "filename" : "180.png", - "idiom" : "iphone", - "scale" : "3x", - "size" : "60x60" - }, - { - "filename" : "20.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "20x20" - }, - { - "filename" : "40.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "20x20" - }, - { - "filename" : "29.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "29x29" - }, - { - "filename" : "58.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "29x29" - }, - { - "filename" : "40.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "40x40" - }, - { - "filename" : "80.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "40x40" - }, - { - "filename" : "76.png", - "idiom" : "ipad", - "scale" : "1x", - "size" : "76x76" - }, - { - "filename" : "152.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "76x76" - }, - { - "filename" : "167.png", - "idiom" : "ipad", - "scale" : "2x", - "size" : "83.5x83.5" - }, - { - "filename" : "1024.png", - "idiom" : "ios-marketing", - "scale" : "1x", - "size" : "1024x1024" - } - ], - "info" : { - "author" : "xcode", - "version" : 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":"102.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"51x51","expected-size":"102","role":"appLauncher"},{"idiom":"watch","filename":"108.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"49mm","scale":"2x","size":"54x54","expected-size":"108","role":"appLauncher"},{"idiom":"watch","filename":"92.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"41mm","scale":"2x","size":"46x46","expected-size":"92","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":"234.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"117x117","expected-size":"234","role":"quickLook"},{"idiom":"watch","filename":"258.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"49mm","scale":"2x","size":"129x129","expected-size":"258","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"},{"idiom":"watch","filename":"66.png","folder":"Assets.xcassets/AppIcon.appiconset/","subtype":"45mm","scale":"2x","size":"33x33","expected-size":"66","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 diff --git a/ios/Info.plist b/ios/Info.plist index 0a304ee86..1d252b9a7 100644 --- a/ios/Info.plist +++ b/ios/Info.plist @@ -11,17 +11,17 @@ CFBundleIdentifier com.vesc-project.vesc-tool CFBundleInfoDictionaryVersion - 6.05 + 6.06.2 CFBundleName VESC Tool CFBundlePackageType APPL CFBundleShortVersionString - 6.05 + 6.06.2 CFBundleSignature ???? CFBundleVersion - 6.05 + 6.06.2 ITSAppUsesNonExemptEncryption LSApplicationCategoryType diff --git a/ios/LaunchImage.png b/ios/LaunchImage.png index 65cd57503..0f1421c4d 100644 Binary files a/ios/LaunchImage.png and b/ios/LaunchImage.png differ diff --git a/macos/appIcon.icns b/macos/appIcon.icns index fe51948a3..51f6d0642 100644 Binary files a/macos/appIcon.icns and b/macos/appIcon.icns differ diff --git a/mobile/qtquickcontrols2.conf b/mobile/qtquickcontrols2.conf index a5a0f24d6..061352ff1 100644 --- a/mobile/qtquickcontrols2.conf +++ b/mobile/qtquickcontrols2.conf @@ -11,7 +11,7 @@ Theme=Light [Material] Theme=Light -Accent= "#0072B2" +Accent= "#F15922" ;Primary=BlueGray ;Background="#1D1D1D" ;Foreground=White diff --git a/mobile/qtquickcontrols2_dark.conf b/mobile/qtquickcontrols2_dark.conf index 1fc186a15..de3c6705a 100644 --- a/mobile/qtquickcontrols2_dark.conf +++ b/mobile/qtquickcontrols2_dark.conf @@ -12,7 +12,7 @@ Theme=Light [Material] Theme=Dark -Accent= "#00A1DD" +Accent= "#F15922" Palette\Shadow=#FF0000 Shadow= "#FF0000" diff --git a/pages/pagecananalyzer.cpp b/pages/pagecananalyzer.cpp index a7a3e9dab..99a5f2271 100644 --- a/pages/pagecananalyzer.cpp +++ b/pages/pagecananalyzer.cpp @@ -20,6 +20,7 @@ #include "pagecananalyzer.h" #include "ui_pagecananalyzer.h" #include "utility.h" +#include PageCanAnalyzer::PageCanAnalyzer(QWidget *parent) : QWidget(parent), diff --git a/vesc_tool.pro b/vesc_tool.pro index 3b5e2605a..7d8642dd0 100644 --- a/vesc_tool.pro +++ b/vesc_tool.pro @@ -50,7 +50,7 @@ android: { #CONFIG += build_mobile # Exclude built-in firmwares -#CONFIG += exclude_fw +# CONFIG += exclude_fw ios: { CONFIG += build_mobile @@ -138,6 +138,7 @@ android: QT += androidextras ios | macx: { TARGET = "VESC Tool" + CONFIG += sdk_no_version_check }else: { android:{ TARGET = "vesc_tool" @@ -334,7 +335,7 @@ DISTFILES += \ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android macx-clang:contains(QMAKE_HOST.arch, arm.*): { - QMAKE_APPLE_DEVICE_ARCHS=arm64 + QMAKE_APPLE_DEVICE_ARCHS=arm64 } macx { @@ -345,6 +346,7 @@ macx { QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_OBJECTIVE_CFLAGS_RELEASE = $$QMAKE_OBJECTIVE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO + QMAKE_APPLE_DEVICE_ARCHS = x86_64 arm64 } ios {