From bcd6179e20db1152de29fedd00fc8822b3f152f6 Mon Sep 17 00:00:00 2001 From: nymea Date: Wed, 18 Jul 2018 21:24:18 +0200 Subject: [PATCH] switch iOS AppIcons to an xcassets bundle --- config.pri | 1 - nymea-app.pro | 1 + nymea-app/nymea-app.pro | 1 + .../AppIcon.appiconset}/AppIcon1024x1024.png | Bin .../AppIcon.appiconset}/AppIcon167x167.png | Bin .../AppIcon.appiconset}/AppIcon20x20.png | Bin .../AppIcon.appiconset}/AppIcon20x20@2x.png | Bin .../AppIcon.appiconset}/AppIcon20x20@3x.png | Bin .../AppIcon.appiconset}/AppIcon29x29.png | Bin .../AppIcon.appiconset}/AppIcon29x29@2x.png | Bin .../AppIcon.appiconset}/AppIcon29x29@3x.png | Bin .../AppIcon.appiconset}/AppIcon40x40.png | Bin .../AppIcon.appiconset}/AppIcon40x40@2x.png | Bin .../AppIcon.appiconset}/AppIcon40x40@3x.png | Bin .../AppIcon.appiconset}/AppIcon60x60@2x.png | Bin .../AppIcon.appiconset}/AppIcon60x60@3x.png | Bin .../AppIcon.appiconset}/AppIcon76x76.png | Bin .../AppIcon.appiconset}/AppIcon76x76@2x.png | Bin .../AppIcon.appiconset/Contents.json | 116 ++++++++++++++++++ packaging/ios/AppIcons.xcassets/Contents.json | 6 + packaging/ios/Info.plist.in | 26 +--- packaging/ios/exportappicons.sh | 4 +- 22 files changed, 127 insertions(+), 28 deletions(-) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon1024x1024.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon167x167.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon20x20.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon20x20@2x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon20x20@3x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon29x29.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon29x29@2x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon29x29@3x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon40x40.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon40x40@2x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon40x40@3x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon60x60@2x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon60x60@3x.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon76x76.png (100%) rename packaging/ios/{ => AppIcons.xcassets/AppIcon.appiconset}/AppIcon76x76@2x.png (100%) create mode 100644 packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json create mode 100644 packaging/ios/AppIcons.xcassets/Contents.json diff --git a/config.pri b/config.pri index dc183355..9d0cae52 100644 --- a/config.pri +++ b/config.pri @@ -8,7 +8,6 @@ top_builddir=$$shadowed($$PWD) VERSION_INFO=$$cat(version.txt) APP_VERSION=$$member(VERSION_INFO, 0) APP_REVISION=$$member(VERSION_INFO, 1) -message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})") DEFINES+=APP_VERSION=\\\"$${APP_VERSION}\\\" android:QMAKE_POST_LINK += cp $$top_srcdir/version.txt $$top_builddir/ diff --git a/nymea-app.pro b/nymea-app.pro index 9aa7a232..cdb96d64 100644 --- a/nymea-app.pro +++ b/nymea-app.pro @@ -1,4 +1,5 @@ include(config.pri) +message("APP_VERSION: $${APP_VERSION} ($${APP_REVISION})") TEMPLATE=subdirs diff --git a/nymea-app/nymea-app.pro b/nymea-app/nymea-app.pro index ce539406..0ca0762f 100644 --- a/nymea-app/nymea-app.pro +++ b/nymea-app/nymea-app.pro @@ -69,6 +69,7 @@ ios: { QMAKE_BUNDLE = nymeaApp # Configure generated xcode project to have our bundle id xcode_product_bundle_identifier_setting.value = $${QMAKE_TARGET_BUNDLE_PREFIX}.$${QMAKE_BUNDLE} + QMAKE_ASSET_CATALOGS += ../packaging/ios/AppIcons.xcassets plist.input = ../packaging/ios/Info.plist.in plist.output = $$OUT_PWD/Info.plist QMAKE_SUBSTITUTES += plist diff --git a/packaging/ios/AppIcon1024x1024.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon1024x1024.png similarity index 100% rename from packaging/ios/AppIcon1024x1024.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon1024x1024.png diff --git a/packaging/ios/AppIcon167x167.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png similarity index 100% rename from packaging/ios/AppIcon167x167.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon167x167.png diff --git a/packaging/ios/AppIcon20x20.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20.png similarity index 100% rename from packaging/ios/AppIcon20x20.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20.png diff --git a/packaging/ios/AppIcon20x20@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png similarity index 100% rename from packaging/ios/AppIcon20x20@2x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@2x.png diff --git a/packaging/ios/AppIcon20x20@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png similarity index 100% rename from packaging/ios/AppIcon20x20@3x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon20x20@3x.png diff --git a/packaging/ios/AppIcon29x29.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29.png similarity index 100% rename from packaging/ios/AppIcon29x29.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29.png diff --git a/packaging/ios/AppIcon29x29@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png similarity index 100% rename from packaging/ios/AppIcon29x29@2x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png diff --git a/packaging/ios/AppIcon29x29@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png similarity index 100% rename from packaging/ios/AppIcon29x29@3x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon29x29@3x.png diff --git a/packaging/ios/AppIcon40x40.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40.png similarity index 100% rename from packaging/ios/AppIcon40x40.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40.png diff --git a/packaging/ios/AppIcon40x40@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png similarity index 100% rename from packaging/ios/AppIcon40x40@2x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png diff --git a/packaging/ios/AppIcon40x40@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png similarity index 100% rename from packaging/ios/AppIcon40x40@3x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon40x40@3x.png diff --git a/packaging/ios/AppIcon60x60@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png similarity index 100% rename from packaging/ios/AppIcon60x60@2x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png diff --git a/packaging/ios/AppIcon60x60@3x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png similarity index 100% rename from packaging/ios/AppIcon60x60@3x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon60x60@3x.png diff --git a/packaging/ios/AppIcon76x76.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76.png similarity index 100% rename from packaging/ios/AppIcon76x76.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76.png diff --git a/packaging/ios/AppIcon76x76@2x.png b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png similarity index 100% rename from packaging/ios/AppIcon76x76@2x.png rename to packaging/ios/AppIcons.xcassets/AppIcon.appiconset/AppIcon76x76@2x.png diff --git a/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..05946256 --- /dev/null +++ b/packaging/ios/AppIcons.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,116 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon20x20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "AppIcon29x29.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "AppIcon29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon40x40.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon76x76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "AppIcon167x167.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "AppIcon1024x1024.png", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/packaging/ios/AppIcons.xcassets/Contents.json b/packaging/ios/AppIcons.xcassets/Contents.json new file mode 100644 index 00000000..da4a164c --- /dev/null +++ b/packaging/ios/AppIcons.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 73c0290a..31878275 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -8,30 +8,6 @@ nymea-app CFBundleGetInfoString Created by Qt/QMake - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon1024x1024.png - AppIcon20x20.png - AppIcon20x20@2x.png - AppIcon20x20@3x.png - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon29x29@3x.png - AppIcon40x40.png - AppIcon40x40@2x.png - AppIcon40x40@3x.png - AppIcon60x60@2x.png - AppIcon60x60@3x.png - AppIcon76x76.png - AppIcon167x167.png - AppIcon76x76@2x.png - - - CFBundleIdentifier io.guh.nymeaApp CFBundleName @@ -43,7 +19,7 @@ CFBundleSignature ${QMAKE_PKGINFO_TYPEINFO} CFBundleVersion - 1 + 2 LSRequiresIPhoneOS MinimumOSVersion diff --git a/packaging/ios/exportappicons.sh b/packaging/ios/exportappicons.sh index fee7c83a..f47f3f1a 100755 --- a/packaging/ios/exportappicons.sh +++ b/packaging/ios/exportappicons.sh @@ -7,9 +7,9 @@ function exportImage() { if [ ${scaleFactor} -ne 1 ]; then finalSize=$((size * scaleFactor)) echo final size is ${finalSize} - inkscape AppIcon.svg -e AppIcon${size}x${size}@${scaleFactor}x.png -C -w $finalSize -h $finalSize + inkscape AppIcon.svg -e AppIcons.xcassets/AppIcon.appiconset/AppIcon${size}x${size}@${scaleFactor}x.png -C -w $finalSize -h $finalSize else - inkscape AppIcon.svg -e AppIcon${size}x${size}.png -C -w ${size} -h ${size} + inkscape AppIcon.svg -e AppIcons.xcassets/AppIcon.appiconset/AppIcon${size}x${size}.png -C -w ${size} -h ${size} fi }