CB-13826 Updated version and RELEASENOTES.md for release 5.0.2

CB-13750: Add build-tools-26.0.2 to travis

.travis.yml

@@ -48,6 +48,7 @@ matrix:
       components:
       - tools
       - extra-android-m2repository
+      - build-tools-26.0.2
   - env: PLATFORM=android-5.1
     os: linux
     language: android
@@ -56,6 +57,7 @@ matrix:
       components:
       - tools
       - extra-android-m2repository
+      - build-tools-26.0.2
   - env: PLATFORM=android-6.0
     os: linux
     language: android
@@ -64,6 +66,7 @@ matrix:
       components:
       - tools
       - extra-android-m2repository
+      - build-tools-26.0.2
   - env: PLATFORM=android-7.0
     os: linux
     language: android
@@ -72,6 +75,7 @@ matrix:
       components:
       - tools
       - extra-android-m2repository
+      - build-tools-26.0.2
 before_install:
 - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm
   && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm

README.md

@@ -41,11 +41,8 @@ Report issues with this plugin on the [Apache Cordova issue tracker][Apache Cord
 
 ## Supported Platforms
 
-- Amazon Fire OS
 - Android
-- BlackBerry 10
 - iOS
-- Windows Phone 7 and 8
 - Windows (`cordova-windows` version >= 4.4.0 is required)
 - Browser
 
@@ -353,12 +350,6 @@ projectRoot
     <splash src="res/screen/windows/splashscreenphone.png" width="1152" height="1920"/>
 </platform>-->
 
-<platform name="blackberry10">
-    <!-- Add a rim:splash element for each resolution and locale you wish -->
-    <!-- http://developer.blackberry.com/html5/documentation/rim_splash_element.html -->
-    <rim:splash src="res/screen/blackberry/splashscreen.png"/>
-</platform>
-
 <preference name="SplashScreenDelay" value="10000" />
 ```
 
@@ -499,7 +490,7 @@ navigator.splashscreen.hide();
 ```
 
 
-### BlackBerry 10, WP8, iOS Quirk
+### iOS Quirk
 
 The `config.xml` file's `AutoHideSplashScreen` setting must be
 `false`. To delay hiding the splash screen for two seconds, add a

RELEASENOTES.md

@@ -20,6 +20,16 @@
 -->
 # Release Notes
 
+### 5.0.2 (Jan 24, 2018)
+* [CB-13750](https://issues.apache.org/jira/browse/CB-13750) Add build-tools-26.0.2 to travis
+* [CB-13737](https://issues.apache.org/jira/browse/CB-13737) (iOS): fix Splash screen images for iPhone X
+
+### 5.0.1 (Dec 27, 2017)
+* [CB-13709](https://issues.apache.org/jira/browse/CB-13709) Fix to allow 5.0.0 version install (#144)
+
+### 5.0.0 (Dec 15, 2017)
+* [CB-13677](https://issues.apache.org/jira/browse/CB-13677) Remove deprecated platforms
+
 ### 4.1.0 (Nov 06, 2017)
 * [CB-13473](https://issues.apache.org/jira/browse/CB-13473) (CI) Removed **Browser** builds from AppVeyor
 * [CB-12011](https://issues.apache.org/jira/browse/CB-12011) (android) added the possibility to change the spinner color on **Android 5.0**+ apps

package.json

@@ -1,20 +1,16 @@
 {
   "name": "cordova-plugin-splashscreen",
-  "version": "4.1.0",
+  "version": "5.0.2",
   "description": "Cordova Splashscreen Plugin",
   "types": "./types/index.d.ts",
   "cordova": {
     "id": "cordova-plugin-splashscreen",
     "platforms": [
       "android",
-      "amazon-fireos",
       "ubuntu",
       "ios",
-      "blackberry10",
-      "wp8",
-      "windows8",
       "windows",
-      "tizen"
+      "browser"
     ]
   },
   "repository": {
@@ -29,14 +25,8 @@
     "splashscreen",
     "ecosystem:cordova",
     "cordova-android",
-    "cordova-amazon-fireos",
-    "cordova-ubuntu",
     "cordova-ios",
-    "cordova-blackberry10",
-    "cordova-wp8",
-    "cordova-windows8",
-    "cordova-windows",
-    "cordova-tizen"
+    "cordova-windows"
   ],
   "scripts": {
     "test": "npm run jshint",
@@ -51,7 +41,7 @@
         "cordova-android": ">=3.6.0",
         "cordova-windows": ">=4.4.0"
       },
-      "5.0.0": {
+      "6.0.0": {
         "cordova": ">100"
       }
     }

plugin.xml

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
            id="cordova-plugin-splashscreen"
-      version="4.1.0">
+      version="5.0.2">
     <name>Splashscreen</name>
     <description>Cordova Splashscreen Plugin</description>
     <license>Apache 2.0</license>
@@ -49,23 +49,6 @@
         <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
     </platform>
 
-    <!-- amazon-fireos -->
-    <platform name="amazon-fireos">
-        <config-file target="res/xml/config.xml" parent="/*">
-            <feature name="SplashScreen">
-            <param name="android-package" value="org.apache.cordova.splashscreen.SplashScreen"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/android/SplashScreen.java" target-dir="src/org/apache/cordova/splashscreen" />
-    </platform>
-
-    <!-- ubuntu -->
-    <platform name="ubuntu">
-        <header-file src="src/ubuntu/splashscreen.h" />
-        <source-file src="src/ubuntu/splashscreen.cpp" />
-    </platform>
-
     <!-- ios -->
     <platform name="ios">
         <config-file target="config.xml" parent="/*">
@@ -83,35 +66,6 @@
 	    <framework src="CoreGraphics.framework" />
     </platform>
 
-    <!-- blackberry10 -->
-    <platform name="blackberry10">
-        <source-file src="src/blackberry10/index.js" target-dir="SplashScreen" />
-        <config-file target="www/config.xml" parent="/widget">
-            <feature name="SplashScreen" value="SplashScreen"/>
-        </config-file>
-    </platform>
-
-    <!-- wp8 -->
-    <platform name="wp8">
-        <config-file target="config.xml" parent="/*">
-            <feature name="SplashScreen">
-                <param name="wp-package" value="SplashScreen"/>
-                <param name="onload" value="true"/>
-            </feature>
-        </config-file>
-
-        <source-file src="src/wp/SplashScreen.cs" />
-        <source-file src="src/wp/ResolutionHelper.cs" />
-
-    </platform>
-
-    <!-- windows8 -->
-    <platform name="windows8">
-        <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
-
     <!-- windows -->
     <platform name="windows">
         <js-module src="www/windows/SplashScreenProxy.js" name="SplashScreenProxy">
@@ -119,13 +73,6 @@
         </js-module>
     </platform>
 
-    <!-- tizen -->
-    <platform name="tizen">
-        <js-module src="src/tizen/SplashScreenProxy.js" name="SplashScreenProxy">
-            <runs />
-        </js-module>
-    </platform>
-
     <!-- browser -->
     <platform name="browser">
         <js-module src="src/browser/SplashScreenProxy.js" name="SplashScreenProxy">

src/blackberry10/index.js

@@ -1,30 +0,0 @@
-/*
- * Copyright 2013 Research In Motion Limited.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* global PluginResult */
-
-module.exports = {
-    show: function (success, fail, args, env) {
-        var result = new PluginResult(args, env);
-        result.error("Not supported on platform", false);
-    },
-
-    hide: function (success, fail, args, env) {
-        var result = new PluginResult(args, env);
-        window.qnx.webplatform.getApplication().windowVisible = true;
-        result.ok(undefined, false);
-    }
-};

src/ios/CDVSplashScreen.h

@@ -28,6 +28,7 @@ typedef struct {
     BOOL iPhone6;
     BOOL iPhone6Plus;
     BOOL retina;
+    BOOL iPhoneX;
     
 } CDV_iOSDevice;
 

src/ios/CDVSplashScreen.m

@@ -74,7 +74,7 @@
     // Determine whether rotation should be enabled for this device
     // Per iOS HIG, landscape is only supported on iPad and iPhone 6+
     CDV_iOSDevice device = [self getCurrentDevice];
-    BOOL autorotateValue = (device.iPad || device.iPhone6Plus) ?
+    BOOL autorotateValue = (device.iPad || device.iPhone6Plus || device.iPhoneX) ?
         [(CDVViewController *)self.viewController shouldAutorotateDefaultValue] :
         NO;
 
@@ -174,6 +174,7 @@
     // this is appropriate for detecting the runtime screen environment
     device.iPhone6 = (device.iPhone && limit == 667.0);
     device.iPhone6Plus = (device.iPhone && limit == 736.0);
+    device.iPhoneX  = (device.iPhone && limit == 812.0);
 
     return device;
 }
@@ -222,8 +223,12 @@
             imageName = [imageName stringByAppendingString:@"-700"];
         } else if(device.iPhone6) {
             imageName = [imageName stringByAppendingString:@"-800"];
-        } else if(device.iPhone6Plus) {
-            imageName = [imageName stringByAppendingString:@"-800"];
+        } else if(device.iPhone6Plus || device.iPhoneX ) {
+            if(device.iPhone6Plus) {
+                imageName = [imageName stringByAppendingString:@"-800"];
+            } else {
+                imageName = [imageName stringByAppendingString:@"-1100"];
+            }
             if (currentOrientation == UIInterfaceOrientationPortrait || currentOrientation == UIInterfaceOrientationPortraitUpsideDown)
             {
                 imageName = [imageName stringByAppendingString:@"-Portrait"];
@@ -239,7 +244,7 @@
     { // does not support landscape
         imageName = [imageName stringByAppendingString:@"-667h"];
     }
-    else if (device.iPhone6Plus)
+    else if (device.iPhone6Plus || device.iPhoneX)
     { // supports landscape
         if (isOrientationLocked)
         {
@@ -257,8 +262,11 @@
                     break;
             }
         }
-        imageName = [imageName stringByAppendingString:@"-736h"];
-
+        if (device.iPhoneX) {
+            imageName = [imageName stringByAppendingString:@"-2436h"];
+        } else {
+            imageName = [imageName stringByAppendingString:@"-736h"];
+        }
     }
     else if (device.iPad)
     {   // supports landscape
@@ -370,7 +378,7 @@
      * correctly.
      */
     CDV_iOSDevice device = [self getCurrentDevice];
-    if (UIInterfaceOrientationIsLandscape(orientation) && !device.iPhone6Plus && !device.iPad)
+    if (UIInterfaceOrientationIsLandscape(orientation) && !device.iPhone6Plus && !device.iPad && !device.iPhoneX)
     {
         imgTransform = CGAffineTransformMakeRotation(M_PI / 2);
         imgBounds.size = CGSizeMake(imgBounds.size.height, imgBounds.size.width);

src/tizen/SplashScreenProxy.js

@@ -1,43 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-( function() {
-
-var win = null;
-
-module.exports = {
-    show: function() {
-        if ( win === null ) {
-            win = window.open('splashscreen.html');
-        }
-    },
-
-    hide: function() {
-        if ( win !== null ) {
-            win.close();
-            win = null;
-        }
-    }
-};
-
-require("cordova/tizen/commandProxy").add("SplashScreen", module.exports);
-
-})();

src/ubuntu/splashscreen.cpp

@@ -1,42 +0,0 @@
-/*
- *
- * Copyright 2013 Canonical Ltd.
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-#include <QQuickItem>
-
-#include "splashscreen.h"
-#include <cordova.h>
-
-#define SPLASHSCREEN_STATE_NAME "splashscreen"
-
-Splashscreen::Splashscreen(Cordova *cordova): CPlugin(cordova) {
-}
-
-void Splashscreen::show(int, int) {
-    m_cordova->rootObject()->setProperty("splashscreenPath", m_cordova->getSplashscreenPath());
-
-    m_cordova->pushViewState(SPLASHSCREEN_STATE_NAME);
-}
-
-void Splashscreen::hide(int, int) {
-    m_cordova->popViewState(SPLASHSCREEN_STATE_NAME);
-}

src/ubuntu/splashscreen.h

@@ -1,52 +0,0 @@
-/*
- *
- * Copyright 2013 Canonical Ltd.
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
-*/
-
-#ifndef SPLASHSCREEN_H
-#define SPLASHSCREEN_H
-
-#include <QtCore>
-#include <cplugin.h>
-
-class Splashscreen: public CPlugin {
-    Q_OBJECT
-public:
-    explicit Splashscreen(Cordova *cordova);
-
-    virtual const QString fullName() override {
-        return Splashscreen::fullID();
-    }
-
-    virtual const QString shortName() override {
-        return "SplashScreen";
-    }
-
-    static const QString fullID() {
-        return "SplashScreen";
-    }
-
-public slots:
-    void show(int, int);
-    void hide(int, int);
-};
-
-#endif // SPLASHSCREEN_H

tests/plugin.xml

@@ -20,7 +20,7 @@
 
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
     id="cordova-plugin-splashscreen-tests"
-    version="4.1.0">
+    version="5.0.2">
     <name>Cordova Splashscreen Plugin Tests</name>
     <license>Apache 2.0</license>