diff --git a/icons/AppIcon167x167~ipad.png b/icons/AppIcon167x167~ipad.png deleted file mode 100644 index 965b5a32c..000000000 Binary files a/icons/AppIcon167x167~ipad.png and /dev/null differ diff --git a/icons/AppIcon29x29@2x~ipad.png b/icons/AppIcon29x29@2x~ipad.png deleted file mode 100644 index 176ae7060..000000000 Binary files a/icons/AppIcon29x29@2x~ipad.png and /dev/null differ diff --git a/icons/AppIcon29x29~ipad.png b/icons/AppIcon29x29~ipad.png deleted file mode 100644 index 8be008661..000000000 Binary files a/icons/AppIcon29x29~ipad.png and /dev/null differ diff --git a/icons/AppIcon40x40.png b/icons/AppIcon40x40.png deleted file mode 100644 index 4fd1cc0f6..000000000 Binary files a/icons/AppIcon40x40.png and /dev/null differ diff --git a/icons/AppIcon40x40@2x~ipad.png b/icons/AppIcon40x40@2x~ipad.png deleted file mode 100644 index 17d41ceb0..000000000 Binary files a/icons/AppIcon40x40@2x~ipad.png and /dev/null differ diff --git a/icons/AppIcon50x50@2x~ipad.png b/icons/AppIcon50x50@2x~ipad.png deleted file mode 100644 index 428ef7c10..000000000 Binary files a/icons/AppIcon50x50@2x~ipad.png and /dev/null differ diff --git a/icons/AppIcon50x50~ipad.png b/icons/AppIcon50x50~ipad.png deleted file mode 100644 index b6ecc6900..000000000 Binary files a/icons/AppIcon50x50~ipad.png and /dev/null differ diff --git a/icons/AppIcon57x57.png b/icons/AppIcon57x57.png deleted file mode 100644 index 947783ace..000000000 Binary files a/icons/AppIcon57x57.png and /dev/null differ diff --git a/icons/AppIcon57x57@2x.png b/icons/AppIcon57x57@2x.png deleted file mode 100644 index 6e7c42869..000000000 Binary files a/icons/AppIcon57x57@2x.png and /dev/null differ diff --git a/icons/AppIcon72x72@2x~ipad.png b/icons/AppIcon72x72@2x~ipad.png deleted file mode 100644 index 352e526e8..000000000 Binary files a/icons/AppIcon72x72@2x~ipad.png and /dev/null differ diff --git a/icons/AppIcon72x72~ipad.png b/icons/AppIcon72x72~ipad.png deleted file mode 100644 index f05920bb2..000000000 Binary files a/icons/AppIcon72x72~ipad.png and /dev/null differ diff --git a/icons/AppIcon76x76@2x~ipad.png b/icons/AppIcon76x76@2x~ipad.png deleted file mode 100644 index 513a27d9d..000000000 Binary files a/icons/AppIcon76x76@2x~ipad.png and /dev/null differ diff --git a/icons/AppIcon76x76~ipad.png b/icons/AppIcon76x76~ipad.png deleted file mode 100644 index 2ae9fa6de..000000000 Binary files a/icons/AppIcon76x76~ipad.png and /dev/null differ diff --git a/icons/iTunesArtwork.png b/icons/iTunesArtwork.png new file mode 100644 index 000000000..a7bfc1f71 Binary files /dev/null and b/icons/iTunesArtwork.png differ diff --git a/icons/iTunesArtwork@2x.png b/icons/iTunesArtwork@2x.png new file mode 100644 index 000000000..5e8de8a8d Binary files /dev/null and b/icons/iTunesArtwork@2x.png differ diff --git a/packaging/ios/Info.plist.in b/packaging/ios/Info.plist.in index 80bb5a5d4..37aa1ea5a 100644 --- a/packaging/ios/Info.plist.in +++ b/packaging/ios/Info.plist.in @@ -8,47 +8,8 @@ Subsurface-mobile CFBundleGetInfoString Created by Qt/QMake - CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon57x57.png - AppIcon57x57@2x.png - AppIcon60x60@2x.png - - - - CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - AppIcon29x29.png - AppIcon29x29@2x.png - AppIcon40x40@2x.png - AppIcon57x57.png - AppIcon57x57@2x.png - AppIcon60x60@2x.png - AppIcon29x29~ipad.png - AppIcon29x29@2x~ipad.png - AppIcon40x40~ipad.png - AppIcon40x40@2x~ipad.png - AppIcon50x50~ipad.png - AppIcon50x50@2x~ipad.png - AppIcon72x72~ipad.png - AppIcon72x72@2x~ipad.png - AppIcon76x76~ipad.png - AppIcon76x76@2x~ipad.png - AppIcon167x167~ipad.png - - - + CFBundleIconName + AppIcon CFBundleIdentifier org.subsurface-divelog.subsurface-mobile CFBundleName diff --git a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro index 11d935216..1ed507cc4 100644 --- a/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro +++ b/packaging/ios/Subsurface-mobile/Subsurface-mobile.pro @@ -243,8 +243,8 @@ include(deployment.pri) include(../../../mobile-widgets/qml/kirigami/kirigami.pri) ios { - ios_icon.files = $$files(../../../icons/AppIcon*.png) + QMAKE_ASSET_CATALOGS += ../storeIcon.xcassets app_launch_images.files = ../SubsurfaceMobileLaunch.xib $$files(../SubsurfaceMobileLaunchImage*.png) - QMAKE_BUNDLE_DATA += app_launch_images ios_icon + QMAKE_BUNDLE_DATA += app_launch_images QMAKE_INFO_PLIST = ../Info.plist } diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20.png new file mode 100644 index 000000000..f021e6616 Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x-1.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x-1.png new file mode 100644 index 000000000..1c280725b Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x-1.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x.png new file mode 100644 index 000000000..1c280725b Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@3x.png new file mode 100644 index 000000000..d35fa7c6f Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@3x.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-29@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-29@3x.png new file mode 100644 index 000000000..09c052bf1 Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-29@3x.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-40@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-40@3x.png new file mode 100644 index 000000000..12a18401a Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-40@3x.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-60@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-60@3x.png new file mode 100644 index 000000000..1ed925d43 Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-60@3x.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png new file mode 100644 index 000000000..370d85a11 Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76@2x.png new file mode 100644 index 000000000..282952713 Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76@2x.png differ diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png new file mode 100644 index 000000000..900d1a16c Binary files /dev/null and b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png differ diff --git a/icons/AppIcon29x29.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon29x29.png similarity index 100% rename from icons/AppIcon29x29.png rename to packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon29x29.png diff --git a/icons/AppIcon29x29@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png similarity index 100% rename from icons/AppIcon29x29@2x.png rename to packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon29x29@2x.png diff --git a/icons/AppIcon40x40@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png similarity index 100% rename from icons/AppIcon40x40@2x.png rename to packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon40x40@2x.png diff --git a/icons/AppIcon40x40~ipad.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png similarity index 100% rename from icons/AppIcon40x40~ipad.png rename to packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon40x40~ipad.png diff --git a/icons/AppIcon60x60@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png similarity index 100% rename from icons/AppIcon60x60@2x.png rename to packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon60x60@2x.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 000000000..b5d8cd7bf --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,115 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon-20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "AppIcon-20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "AppIcon-29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "AppIcon-40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "AppIcon-60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon-20.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "AppIcon-20@2x-1.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~ipad.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "AppIcon40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "AppIcon-76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "AppIcon-83.5@2x.png", + "scale" : "2x" + }, + { + "idiom" : "ios-marketing", + "size" : "1024x1024", + "scale" : "1x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/packaging/ios/storeIcon.xcassets/Contents.json b/packaging/ios/storeIcon.xcassets/Contents.json new file mode 100644 index 000000000..da4a164c9 --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file