diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Contents.json b/Share/Images.xcassets/AppIcon-2.appiconset/Contents.json new file mode 100644 index 000000000..ff396bb02 --- /dev/null +++ b/Share/Images.xcassets/AppIcon-2.appiconset/Contents.json @@ -0,0 +1,139 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "iphone", + "filename" : "Icon-Small@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, + { + "size" : "40x40", + "idiom" : "iphone", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon.png", + "scale" : "1x" + }, + { + "size" : "57x57", + "idiom" : "iphone", + "filename" : "Icon@2x.png", + "scale" : "2x" + }, + { + "size" : "60x60", + "idiom" : "iphone", + "filename" : "Icon-60@2x.png", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "60x60", + "scale" : "3x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "29x29", + "scale" : "1x" + }, + { + "size" : "29x29", + "idiom" : "ipad", + "filename" : "Icon-Small@2x.png", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "40x40", + "scale" : "1x" + }, + { + "size" : "40x40", + "idiom" : "ipad", + "filename" : "Icon-40@2x.png", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "50x50", + "scale" : "2x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "Icon-72.png", + "scale" : "1x" + }, + { + "size" : "72x72", + "idiom" : "ipad", + "filename" : "Icon-72@2x.png", + "scale" : "2x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76.png", + "scale" : "1x" + }, + { + "size" : "76x76", + "idiom" : "ipad", + "filename" : "Icon-76@2x.png", + "scale" : "2x" + }, + { + "idiom" : "ipad", + "size" : "83.5x83.5", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-40@2x.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-40@2x.png new file mode 100644 index 000000000..521bbd8d2 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-40@2x.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-60@2x.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-60@2x.png new file mode 100644 index 000000000..877b946d6 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-60@2x.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-72.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-72.png new file mode 100644 index 000000000..dbad468e9 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-72.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-72@2x.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-72@2x.png new file mode 100644 index 000000000..1bba55df3 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-72@2x.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-76.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-76.png new file mode 100644 index 000000000..69c2c7541 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-76.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-76@2x.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-76@2x.png new file mode 100644 index 000000000..9dffd5561 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-76@2x.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon-Small@2x.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-Small@2x.png new file mode 100644 index 000000000..9b5e904e4 Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon-Small@2x.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon.png new file mode 100644 index 000000000..8e95d599f Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon.png differ diff --git a/Share/Images.xcassets/AppIcon-2.appiconset/Icon@2x.png b/Share/Images.xcassets/AppIcon-2.appiconset/Icon@2x.png new file mode 100644 index 000000000..f409db47f Binary files /dev/null and b/Share/Images.xcassets/AppIcon-2.appiconset/Icon@2x.png differ diff --git a/Share/Images.xcassets/AppIcon.appiconset/Contents.json b/Share/Images.xcassets/AppIcon.appiconset/Contents.json index 43eb97625..ea3b6e27d 100644 --- a/Share/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/Share/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,17 +1,37 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", "filename" : "Icon-Small@2x.png", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "29x29", + "scale" : "3x" + }, { "size" : "40x40", "idiom" : "iphone", "filename" : "Icon-40@2x.png", "scale" : "2x" }, + { + "idiom" : "iphone", + "size" : "40x40", + "scale" : "3x" + }, { "size" : "60x60", "idiom" : "iphone", diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/Contents.json b/Share/Images.xcassets/LaunchImage-2.launchimage/Contents.json new file mode 100644 index 000000000..4c59a6c0c --- /dev/null +++ b/Share/Images.xcassets/LaunchImage-2.launchimage/Contents.json @@ -0,0 +1,97 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "1x", + "orientation" : "portrait" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "iPad-Portrait.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "iPad-Portrait@2x.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "iPad-Landscape.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "iPad-Landscape@2x.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png b/Share/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png new file mode 100644 index 000000000..cb08af968 Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-2.launchimage/Default-568h@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png b/Share/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png new file mode 100644 index 000000000..c364d1f7e Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-2.launchimage/Default@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Landscape.png b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Landscape.png new file mode 100644 index 000000000..5eb0b5926 Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Landscape.png differ diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Landscape@2x.png b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Landscape@2x.png new file mode 100644 index 000000000..b3e3632ec Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Landscape@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Portrait.png b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Portrait.png new file mode 100644 index 000000000..f160c528b Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Portrait.png differ diff --git a/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Portrait@2x.png b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Portrait@2x.png new file mode 100644 index 000000000..5731e966a Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-2.launchimage/iPad-Portrait@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/Contents.json b/Share/Images.xcassets/LaunchImage-3.launchimage/Contents.json new file mode 100644 index 000000000..4c59a6c0c --- /dev/null +++ b/Share/Images.xcassets/LaunchImage-3.launchimage/Contents.json @@ -0,0 +1,97 @@ +{ + "images" : [ + { + "idiom" : "iphone", + "scale" : "1x", + "orientation" : "portrait" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default@2x.png", + "minimum-system-version" : "7.0", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "iphone", + "filename" : "Default-568h@2x.png", + "minimum-system-version" : "7.0", + "subtype" : "retina4", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "extent" : "to-status-bar", + "scale" : "2x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "iPad-Portrait.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "portrait", + "idiom" : "ipad", + "filename" : "iPad-Portrait@2x.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "iPad-Landscape.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "1x" + }, + { + "orientation" : "landscape", + "idiom" : "ipad", + "filename" : "iPad-Landscape@2x.png", + "minimum-system-version" : "7.0", + "extent" : "full-screen", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/Default-568h@2x.png b/Share/Images.xcassets/LaunchImage-3.launchimage/Default-568h@2x.png new file mode 100644 index 000000000..cb08af968 Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-3.launchimage/Default-568h@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/Default@2x.png b/Share/Images.xcassets/LaunchImage-3.launchimage/Default@2x.png new file mode 100644 index 000000000..c364d1f7e Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-3.launchimage/Default@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Landscape.png b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Landscape.png new file mode 100644 index 000000000..5eb0b5926 Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Landscape.png differ diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Landscape@2x.png b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Landscape@2x.png new file mode 100644 index 000000000..b3e3632ec Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Landscape@2x.png differ diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Portrait.png b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Portrait.png new file mode 100644 index 000000000..f160c528b Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Portrait.png differ diff --git a/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Portrait@2x.png b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Portrait@2x.png new file mode 100644 index 000000000..5731e966a Binary files /dev/null and b/Share/Images.xcassets/LaunchImage-3.launchimage/iPad-Portrait@2x.png differ diff --git a/Telegraph.xcodeproj/project.pbxproj b/Telegraph.xcodeproj/project.pbxproj index 863113327..32f1f0fa0 100644 --- a/Telegraph.xcodeproj/project.pbxproj +++ b/Telegraph.xcodeproj/project.pbxproj @@ -22583,6 +22583,8 @@ baseConfigurationReference = 93EFBF0E173DC6DA00F7B89E /* Config.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-3"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libstdc++"; CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; @@ -22662,6 +22664,8 @@ baseConfigurationReference = 93EFBF0E173DC6DA00F7B89E /* Config.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = "AppIcon-2"; + ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = "LaunchImage-3"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libstdc++"; CLANG_WARN_OBJC_IMPLICIT_ATOMIC_PROPERTIES = YES; diff --git a/Telegraph/Telegraph-Info.plist b/Telegraph/Telegraph-Info.plist index 89d7f24c9..a921df48b 100644 --- a/Telegraph/Telegraph-Info.plist +++ b/Telegraph/Telegraph-Info.plist @@ -29,39 +29,9 @@ Icon.png CFBundleIcons - - CFBundlePrimaryIcon - - CFBundleIconFiles - - Icon-Small - Icon-40 - Icon-60@2x.png - Icon@2x.png - Icon.png - - UIPrerenderedIcon - - - + CFBundleIcons~ipad - - CFBundlePrimaryIcon - - CFBundleIconFiles - - Icon-72 - Icon-76 - Icon-Small - Icon-40 - Icon-60@2x.png - Icon@2x.png - Icon.png - - UIPrerenderedIcon - - - + CFBundleIdentifier $(TELEGRAPH_BUNDLE_ID) CFBundleInfoDictionaryVersion @@ -146,29 +116,6 @@ UIFileSharingEnabled - UILaunchImages~ipad - - - UILaunchImageMinimumOSVersion - 7.0 - UILaunchImageName - iPad-Portrait - UILaunchImageOrientation - Portrait - UILaunchImageSize - {768, 1024} - - - UILaunchImageMinimumOSVersion - 7.0 - UILaunchImageName - iPad-Landscape - UILaunchImageOrientation - Landscape - UILaunchImageSize - {768, 1024} - - UILaunchStoryboardName LaunchScreen UIPrerenderedIcon