diff options
34 files changed, 125 insertions, 43 deletions
diff --git a/icons/AppIcon167x167~ipad.png b/icons/AppIcon167x167~ipad.png Binary files differdeleted file mode 100644 index 965b5a32c..000000000 --- a/icons/AppIcon167x167~ipad.png +++ /dev/null diff --git a/icons/AppIcon29x29@2x~ipad.png b/icons/AppIcon29x29@2x~ipad.png Binary files differdeleted file mode 100644 index 176ae7060..000000000 --- a/icons/AppIcon29x29@2x~ipad.png +++ /dev/null diff --git a/icons/AppIcon29x29~ipad.png b/icons/AppIcon29x29~ipad.png Binary files differdeleted file mode 100644 index 8be008661..000000000 --- a/icons/AppIcon29x29~ipad.png +++ /dev/null diff --git a/icons/AppIcon40x40.png b/icons/AppIcon40x40.png Binary files differdeleted file mode 100644 index 4fd1cc0f6..000000000 --- a/icons/AppIcon40x40.png +++ /dev/null diff --git a/icons/AppIcon40x40@2x~ipad.png b/icons/AppIcon40x40@2x~ipad.png Binary files differdeleted file mode 100644 index 17d41ceb0..000000000 --- a/icons/AppIcon40x40@2x~ipad.png +++ /dev/null diff --git a/icons/AppIcon50x50@2x~ipad.png b/icons/AppIcon50x50@2x~ipad.png Binary files differdeleted file mode 100644 index 428ef7c10..000000000 --- a/icons/AppIcon50x50@2x~ipad.png +++ /dev/null diff --git a/icons/AppIcon50x50~ipad.png b/icons/AppIcon50x50~ipad.png Binary files differdeleted file mode 100644 index b6ecc6900..000000000 --- a/icons/AppIcon50x50~ipad.png +++ /dev/null diff --git a/icons/AppIcon57x57.png b/icons/AppIcon57x57.png Binary files differdeleted file mode 100644 index 947783ace..000000000 --- a/icons/AppIcon57x57.png +++ /dev/null diff --git a/icons/AppIcon57x57@2x.png b/icons/AppIcon57x57@2x.png Binary files differdeleted file mode 100644 index 6e7c42869..000000000 --- a/icons/AppIcon57x57@2x.png +++ /dev/null diff --git a/icons/AppIcon72x72@2x~ipad.png b/icons/AppIcon72x72@2x~ipad.png Binary files differdeleted file mode 100644 index 352e526e8..000000000 --- a/icons/AppIcon72x72@2x~ipad.png +++ /dev/null diff --git a/icons/AppIcon72x72~ipad.png b/icons/AppIcon72x72~ipad.png Binary files differdeleted file mode 100644 index f05920bb2..000000000 --- a/icons/AppIcon72x72~ipad.png +++ /dev/null diff --git a/icons/AppIcon76x76@2x~ipad.png b/icons/AppIcon76x76@2x~ipad.png Binary files differdeleted file mode 100644 index 513a27d9d..000000000 --- a/icons/AppIcon76x76@2x~ipad.png +++ /dev/null diff --git a/icons/AppIcon76x76~ipad.png b/icons/AppIcon76x76~ipad.png Binary files differdeleted file mode 100644 index 2ae9fa6de..000000000 --- a/icons/AppIcon76x76~ipad.png +++ /dev/null diff --git a/icons/iTunesArtwork.png b/icons/iTunesArtwork.png Binary files differnew file mode 100644 index 000000000..a7bfc1f71 --- /dev/null +++ b/icons/iTunesArtwork.png diff --git a/icons/iTunesArtwork@2x.png b/icons/iTunesArtwork@2x.png Binary files differnew file mode 100644 index 000000000..5e8de8a8d --- /dev/null +++ b/icons/iTunesArtwork@2x.png 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 @@ <string>Subsurface-mobile</string> <key>CFBundleGetInfoString</key> <string>Created by Qt/QMake</string> - <key>CFBundleIcons</key> - <dict> - <key>CFBundlePrimaryIcon</key> - <dict> - <key>CFBundleIconFiles</key> - <array> - <string>AppIcon29x29.png</string> - <string>AppIcon29x29@2x.png</string> - <string>AppIcon40x40@2x.png</string> - <string>AppIcon57x57.png</string> - <string>AppIcon57x57@2x.png</string> - <string>AppIcon60x60@2x.png</string> - </array> - </dict> - </dict> - <key>CFBundleIcons~ipad</key> - <dict> - <key>CFBundlePrimaryIcon</key> - <dict> - <key>CFBundleIconFiles</key> - <array> - <string>AppIcon29x29.png</string> - <string>AppIcon29x29@2x.png</string> - <string>AppIcon40x40@2x.png</string> - <string>AppIcon57x57.png</string> - <string>AppIcon57x57@2x.png</string> - <string>AppIcon60x60@2x.png</string> - <string>AppIcon29x29~ipad.png</string> - <string>AppIcon29x29@2x~ipad.png</string> - <string>AppIcon40x40~ipad.png</string> - <string>AppIcon40x40@2x~ipad.png</string> - <string>AppIcon50x50~ipad.png</string> - <string>AppIcon50x50@2x~ipad.png</string> - <string>AppIcon72x72~ipad.png</string> - <string>AppIcon72x72@2x~ipad.png</string> - <string>AppIcon76x76~ipad.png</string> - <string>AppIcon76x76@2x~ipad.png</string> - <string>AppIcon167x167~ipad.png</string> - </array> - </dict> - </dict> + <key>CFBundleIconName</key> + <string>AppIcon</string> <key>CFBundleIdentifier</key> <string>org.subsurface-divelog.subsurface-mobile</string> <key>CFBundleName</key> 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 Binary files differnew file mode 100644 index 000000000..f021e6616 --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20.png 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 Binary files differnew file mode 100644 index 000000000..1c280725b --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x-1.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x.png Binary files differnew file mode 100644 index 000000000..1c280725b --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@2x.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@3x.png Binary files differnew file mode 100644 index 000000000..d35fa7c6f --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-20@3x.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-29@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-29@3x.png Binary files differnew file mode 100644 index 000000000..09c052bf1 --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-29@3x.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-40@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-40@3x.png Binary files differnew file mode 100644 index 000000000..12a18401a --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-40@3x.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-60@3x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-60@3x.png Binary files differnew file mode 100644 index 000000000..1ed925d43 --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-60@3x.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png Binary files differnew file mode 100644 index 000000000..370d85a11 --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76.png diff --git a/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76@2x.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76@2x.png Binary files differnew file mode 100644 index 000000000..282952713 --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-76@2x.png 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 Binary files differnew file mode 100644 index 000000000..900d1a16c --- /dev/null +++ b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon-83.5@2x.png diff --git a/icons/AppIcon29x29.png b/packaging/ios/storeIcon.xcassets/AppIcon.appiconset/AppIcon29x29.png Binary files differindex 8be008661..8be008661 100644 --- a/icons/AppIcon29x29.png +++ b/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 Binary files differindex 176ae7060..176ae7060 100644 --- a/icons/AppIcon29x29@2x.png +++ b/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 Binary files differindex 17d41ceb0..17d41ceb0 100644 --- a/icons/AppIcon40x40@2x.png +++ b/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 Binary files differindex 4fd1cc0f6..4fd1cc0f6 100644 --- a/icons/AppIcon40x40~ipad.png +++ b/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 Binary files differindex 24fd62d83..24fd62d83 100644 --- a/icons/AppIcon60x60@2x.png +++ b/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 |
