diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json index e81e18a4e5..5ca51e928d 100644 --- a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/AppIcon.appiconset/Contents.json @@ -12,12 +12,24 @@ "filename": "Icon-Small@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "29x29", + "filename": "Icon-Small@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "40x40", "filename": "Icon-Spotlight-40@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "40x40", + "filename": "Icon-Spotlight-40@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "57x57", diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json index 25a14788e7..235448f31e 100644 --- a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -5,42 +5,49 @@ "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-2x.png" }, { - "orientation": "landscape", + "orientation": "portrait", "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-retina4.png", + "subtype": "retina4" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-portrait-1x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-landscape-1x.png" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-portrait-2x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-landscape-2x.png" } ], "info": { diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png new file mode 100644 index 0000000000..b8a0025f63 Binary files /dev/null and b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png differ diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png new file mode 100644 index 0000000000..817cdf8057 Binary files /dev/null and b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png differ diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png new file mode 100644 index 0000000000..f3685597a1 Binary files /dev/null and b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png differ diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png new file mode 100644 index 0000000000..5447ddfc5b Binary files /dev/null and b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png differ diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png new file mode 100644 index 0000000000..efe9e82a32 Binary files /dev/null and b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png differ diff --git a/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png new file mode 100644 index 0000000000..d0e3261440 Binary files /dev/null and b/examples/AnimationAppExample/Builds/iOS/AnimationAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png differ diff --git a/examples/AnimationAppExample/Builds/iOS/Info.plist b/examples/AnimationAppExample/Builds/iOS/Info.plist index ea466c6b91..bb8a3979d6 100644 --- a/examples/AnimationAppExample/Builds/iOS/Info.plist +++ b/examples/AnimationAppExample/Builds/iOS/Info.plist @@ -9,8 +9,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - CFBundleIdentifier com.yourcompany.AnimationAppExample CFBundleName @@ -27,6 +25,8 @@ NSHighResolutionCapable + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json index e81e18a4e5..5ca51e928d 100644 --- a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/AppIcon.appiconset/Contents.json @@ -12,12 +12,24 @@ "filename": "Icon-Small@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "29x29", + "filename": "Icon-Small@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "40x40", "filename": "Icon-Spotlight-40@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "40x40", + "filename": "Icon-Spotlight-40@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "57x57", diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json index 25a14788e7..235448f31e 100644 --- a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -5,42 +5,49 @@ "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-2x.png" }, { - "orientation": "landscape", + "orientation": "portrait", "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-retina4.png", + "subtype": "retina4" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-portrait-1x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-landscape-1x.png" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-portrait-2x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-landscape-2x.png" } ], "info": { diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png new file mode 100644 index 0000000000..b8a0025f63 Binary files /dev/null and b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png differ diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png new file mode 100644 index 0000000000..817cdf8057 Binary files /dev/null and b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png differ diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png new file mode 100644 index 0000000000..f3685597a1 Binary files /dev/null and b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png differ diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png new file mode 100644 index 0000000000..5447ddfc5b Binary files /dev/null and b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png differ diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png new file mode 100644 index 0000000000..efe9e82a32 Binary files /dev/null and b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png differ diff --git a/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png new file mode 100644 index 0000000000..d0e3261440 Binary files /dev/null and b/examples/AudioAppExample/Builds/iOS/AudioAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png differ diff --git a/examples/AudioAppExample/Builds/iOS/Info.plist b/examples/AudioAppExample/Builds/iOS/Info.plist index dec625021b..995e2c085f 100644 --- a/examples/AudioAppExample/Builds/iOS/Info.plist +++ b/examples/AudioAppExample/Builds/iOS/Info.plist @@ -9,8 +9,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - CFBundleIdentifier com.yourcompany.AudioAppExample CFBundleName @@ -27,6 +25,8 @@ NSHighResolutionCapable + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/examples/Demo/Builds/Android/build.xml b/examples/Demo/Builds/Android/build.xml index 97a27f2bbd..125d223b5a 100644 --- a/examples/Demo/Builds/Android/build.xml +++ b/examples/Demo/Builds/Android/build.xml @@ -21,7 +21,7 @@ - + diff --git a/examples/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java b/examples/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java index bf7f5e6cbc..751d5603d1 100644 --- a/examples/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java +++ b/examples/Demo/Builds/Android/src/com/juce/jucedemo/JuceDemo.java @@ -661,7 +661,7 @@ public class JuceDemo extends Activity } catch (IOException e) { - if (connection.getResponseCode() < org.apache.http.HttpStatus.SC_BAD_REQUEST) + if (connection.getResponseCode() < 400) throw e; } finally @@ -669,7 +669,7 @@ public class JuceDemo extends Activity statusCode[0] = connection.getResponseCode(); } - if (statusCode[0] >= org.apache.http.HttpStatus.SC_BAD_REQUEST) + if (statusCode[0] >= 400) inputStream = connection.getErrorStream(); else inputStream = connection.getInputStream(); diff --git a/examples/Demo/Builds/iOS/Info.plist b/examples/Demo/Builds/iOS/Info.plist index 1654416b9d..b6f4a27306 100644 --- a/examples/Demo/Builds/iOS/Info.plist +++ b/examples/Demo/Builds/iOS/Info.plist @@ -9,8 +9,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - Icon.icns CFBundleIdentifier com.yourcompany.JuceDemo CFBundleName @@ -27,6 +25,8 @@ NSHighResolutionCapable + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json index e81e18a4e5..5ca51e928d 100644 --- a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Contents.json @@ -12,12 +12,24 @@ "filename": "Icon-Small@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "29x29", + "filename": "Icon-Small@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "40x40", "filename": "Icon-Spotlight-40@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "40x40", + "filename": "Icon-Spotlight-40@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "57x57", diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png new file mode 100644 index 0000000000..c5293dc2d6 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Small@3x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png new file mode 100644 index 0000000000..4ae1ef4961 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/AppIcon.appiconset/Icon-Spotlight-40@3x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json index 25a14788e7..235448f31e 100644 --- a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -5,42 +5,49 @@ "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-2x.png" }, { - "orientation": "landscape", + "orientation": "portrait", "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-retina4.png", + "subtype": "retina4" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-portrait-1x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-landscape-1x.png" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-portrait-2x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-landscape-2x.png" } ], "info": { diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png new file mode 100644 index 0000000000..b8a0025f63 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png new file mode 100644 index 0000000000..817cdf8057 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png new file mode 100644 index 0000000000..f3685597a1 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png new file mode 100644 index 0000000000..5447ddfc5b Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png new file mode 100644 index 0000000000..efe9e82a32 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png differ diff --git a/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png new file mode 100644 index 0000000000..d0e3261440 Binary files /dev/null and b/examples/Demo/Builds/iOS/JuceDemo/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png differ diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json index e81e18a4e5..5ca51e928d 100644 --- a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/AppIcon.appiconset/Contents.json @@ -12,12 +12,24 @@ "filename": "Icon-Small@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "29x29", + "filename": "Icon-Small@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "40x40", "filename": "Icon-Spotlight-40@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "40x40", + "filename": "Icon-Spotlight-40@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "57x57", diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json index 25a14788e7..235448f31e 100644 --- a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -5,42 +5,49 @@ "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-2x.png" }, { - "orientation": "landscape", + "orientation": "portrait", "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-retina4.png", + "subtype": "retina4" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-portrait-1x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-landscape-1x.png" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-portrait-2x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-landscape-2x.png" } ], "info": { diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png new file mode 100644 index 0000000000..b8a0025f63 Binary files /dev/null and b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png differ diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png new file mode 100644 index 0000000000..817cdf8057 Binary files /dev/null and b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png differ diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png new file mode 100644 index 0000000000..f3685597a1 Binary files /dev/null and b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png differ diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png new file mode 100644 index 0000000000..5447ddfc5b Binary files /dev/null and b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png differ diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png new file mode 100644 index 0000000000..efe9e82a32 Binary files /dev/null and b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png differ diff --git a/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png new file mode 100644 index 0000000000..d0e3261440 Binary files /dev/null and b/examples/HelloWorld/Builds/iOS/HelloWorld/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png differ diff --git a/examples/HelloWorld/Builds/iOS/Info.plist b/examples/HelloWorld/Builds/iOS/Info.plist index 4b784db82d..abba5d3a89 100644 --- a/examples/HelloWorld/Builds/iOS/Info.plist +++ b/examples/HelloWorld/Builds/iOS/Info.plist @@ -9,8 +9,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - CFBundleIdentifier com.roli.jucehelloworld CFBundleName @@ -27,6 +25,8 @@ ROLI Ltd. NSHighResolutionCapable + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/examples/OpenGLAppExample/Builds/iOS/Info.plist b/examples/OpenGLAppExample/Builds/iOS/Info.plist index 2833744539..84ebf00a90 100644 --- a/examples/OpenGLAppExample/Builds/iOS/Info.plist +++ b/examples/OpenGLAppExample/Builds/iOS/Info.plist @@ -9,8 +9,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - CFBundleIdentifier com.yourcompany.OpenGLAppExample CFBundleName @@ -27,6 +25,8 @@ NSHighResolutionCapable + UIRequiresFullScreen + UISupportedInterfaceOrientations UIInterfaceOrientationPortrait diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json index e81e18a4e5..5ca51e928d 100644 --- a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/AppIcon.appiconset/Contents.json @@ -12,12 +12,24 @@ "filename": "Icon-Small@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "29x29", + "filename": "Icon-Small@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "40x40", "filename": "Icon-Spotlight-40@2x.png", "scale": "2x" }, + { + "idiom": "iphone", + "size": "40x40", + "filename": "Icon-Spotlight-40@3x.png", + "scale": "3x" + }, { "idiom": "iphone", "size": "57x57", diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json index 25a14788e7..235448f31e 100644 --- a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json +++ b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/Contents.json @@ -5,42 +5,49 @@ "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-2x.png" }, { - "orientation": "landscape", + "orientation": "portrait", "idiom": "iphone", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-iphone-retina4.png", + "subtype": "retina4" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-portrait-1x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "1x" + "scale": "1x", + "filename": "LaunchImage-ipad-landscape-1x.png" }, { "orientation": "portrait", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-portrait-2x.png" }, { "orientation": "landscape", "idiom": "ipad", "extent": "full-screen", "minimum-system-version": "7.0", - "scale": "2x" + "scale": "2x", + "filename": "LaunchImage-ipad-landscape-2x.png" } ], "info": { diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png new file mode 100644 index 0000000000..b8a0025f63 Binary files /dev/null and b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-1x.png differ diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png new file mode 100644 index 0000000000..817cdf8057 Binary files /dev/null and b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-landscape-2x.png differ diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png new file mode 100644 index 0000000000..f3685597a1 Binary files /dev/null and b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-1x.png differ diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png new file mode 100644 index 0000000000..5447ddfc5b Binary files /dev/null and b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-ipad-portrait-2x.png differ diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png new file mode 100644 index 0000000000..efe9e82a32 Binary files /dev/null and b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-2x.png differ diff --git a/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png new file mode 100644 index 0000000000..d0e3261440 Binary files /dev/null and b/examples/OpenGLAppExample/Builds/iOS/OpenGLAppExample/Images.xcassets/LaunchImage.launchimage/LaunchImage-iphone-retina4.png differ