diff --git a/fannyapp.pro b/fannyapp.pro index ebf0d42..815c7ec 100644 --- a/fannyapp.pro +++ b/fannyapp.pro @@ -62,6 +62,10 @@ win { LIBS += "$$PWD/windows-libs/ssleay32.dll" } +ios { + QMAKE_ASSET_CATALOGS += shared/Assets.xcassets +} + DISTFILES += \ favicon.png \ android-sources/AndroidManifest.xml \ diff --git a/shared/Assets.xcassets/AppIcon.appiconset/Contents.json b/shared/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..b12a854 --- /dev/null +++ b/shared/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,128 @@ +{ + "images" : [ + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "20x20", + "idiom" : "iphone", + "filename" : "Icon-App-20x20@3x.png", + "scale" : "3x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-App-29x29@3x.png", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-App-40x40@3x.png", + "scale" : "3x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-App-60x60@3x.png", + "scale" : "3x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@1x.png", + "scale" : "1x" + }, + { + "size" : "20x20", + "idiom" : "ipad", + "filename" : "Icon-App-20x20@2x.png", + "scale" : "2x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@1x.png", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-App-29x29@2x.png", + "scale" : "2x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@1x.png", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-App-40x40@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@1x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + }, + { + "size" : "83.5x83.5", + "idiom" : "ipad", + "filename" : "Icon-App-83.5x83.5@2x.png", + "scale" : "2x" + }, + { + "size" : "1024x1024", + "idiom" : "ios-marketing", + "filename" : "ItunesArtwork@2x.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "iphone", + "filename" : "Icon-App-76x76@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-20x20@1x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-20x20@1x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-20x20@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-20x20@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-20x20@3x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-20x20@3x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-29x29@1x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-29x29@1x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-29x29@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-29x29@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-29x29@3x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-29x29@3x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-40x40@1x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-40x40@1x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-40x40@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-40x40@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-40x40@3x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-40x40@3x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-60x60@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-60x60@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-60x60@3x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-60x60@3x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-76x76@1x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-76x76@1x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-76x76@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-76x76@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png diff --git a/shared/graphics/ios/AppIcon.appiconset/ItunesArtwork@2x.png b/shared/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png similarity index 100% rename from shared/graphics/ios/AppIcon.appiconset/ItunesArtwork@2x.png rename to shared/Assets.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png diff --git a/shared/Assets.xcassets/Contents.json b/shared/Assets.xcassets/Contents.json new file mode 100644 index 0000000..da4a164 --- /dev/null +++ b/shared/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/shared/graphics/ios/AppIcon.appiconset/Contents.json b/shared/graphics/ios/AppIcon.appiconset/Contents.json deleted file mode 100755 index 99f7a0c..0000000 --- a/shared/graphics/ios/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "images":[ - { - "idiom":"iphone", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"iphone", - "size":"20x20", - "scale":"3x", - "filename":"Icon-App-20x20@3x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"iphone", - "size":"29x29", - "scale":"3x", - "filename":"Icon-App-29x29@3x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"iphone", - "size":"40x40", - "scale":"3x", - "filename":"Icon-App-40x40@3x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"2x", - "filename":"Icon-App-60x60@2x.png" - }, - { - "idiom":"iphone", - "size":"60x60", - "scale":"3x", - "filename":"Icon-App-60x60@3x.png" - }, - { - "idiom":"iphone", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"1x", - "filename":"Icon-App-20x20@1x.png" - }, - { - "idiom":"ipad", - "size":"20x20", - "scale":"2x", - "filename":"Icon-App-20x20@2x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"1x", - "filename":"Icon-App-29x29@1x.png" - }, - { - "idiom":"ipad", - "size":"29x29", - "scale":"2x", - "filename":"Icon-App-29x29@2x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"1x", - "filename":"Icon-App-40x40@1x.png" - }, - { - "idiom":"ipad", - "size":"40x40", - "scale":"2x", - "filename":"Icon-App-40x40@2x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"1x", - "filename":"Icon-App-76x76@1x.png" - }, - { - "idiom":"ipad", - "size":"76x76", - "scale":"2x", - "filename":"Icon-App-76x76@2x.png" - }, - { - "idiom":"ipad", - "size":"83.5x83.5", - "scale":"2x", - "filename":"Icon-App-83.5x83.5@2x.png" - }, - { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "scale" : "1x", - "filename" : "ItunesArtwork@2x.png" - } - ], - "info":{ - "version":1, - "author":"makeappicon" - } -} diff --git a/shared/graphics/ios/iTunesArtwork@1x.png b/shared/graphics/ios/iTunesArtwork@1x.png deleted file mode 100644 index 222e2dd..0000000 Binary files a/shared/graphics/ios/iTunesArtwork@1x.png and /dev/null differ diff --git a/shared/graphics/ios/iTunesArtwork@2x.png b/shared/graphics/ios/iTunesArtwork@2x.png deleted file mode 100644 index f1ec987..0000000 Binary files a/shared/graphics/ios/iTunesArtwork@2x.png and /dev/null differ diff --git a/shared/graphics/ios/iTunesArtwork@3x.png b/shared/graphics/ios/iTunesArtwork@3x.png deleted file mode 100644 index 651a2a2..0000000 Binary files a/shared/graphics/ios/iTunesArtwork@3x.png and /dev/null differ