From 2ae821c4a853b6544464bce2d57e26efd7b8d888 Mon Sep 17 00:00:00 2001 From: maverickmishra Date: Wed, 13 Dec 2017 11:39:44 -0800 Subject: [PATCH] CB-13677: Remove deprecated platforms --- README.md | 11 +------ package.json | 16 ++-------- plugin.xml | 55 +--------------------------------- src/blackberry10/index.js | 30 ------------------- src/tizen/SplashScreenProxy.js | 43 -------------------------- src/ubuntu/splashscreen.cpp | 42 -------------------------- src/ubuntu/splashscreen.h | 52 -------------------------------- 7 files changed, 5 insertions(+), 244 deletions(-) delete mode 100644 src/blackberry10/index.js delete mode 100644 src/tizen/SplashScreenProxy.js delete mode 100644 src/ubuntu/splashscreen.cpp delete mode 100644 src/ubuntu/splashscreen.h diff --git a/README.md b/README.md index 86df319..49ff0ef 100644 --- a/README.md +++ b/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 --> - - - - - - ``` @@ -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 diff --git a/package.json b/package.json index 015aec5..9309f86 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,16 @@ { "name": "cordova-plugin-splashscreen", - "version": "4.1.1-dev", + "version": "5.0.0-dev", "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", diff --git a/plugin.xml b/plugin.xml index dc1f3ab..fb0fc0a 100644 --- a/plugin.xml +++ b/plugin.xml @@ -20,7 +20,7 @@ + version="5.0.0-dev"> Splashscreen Cordova Splashscreen Plugin Apache 2.0 @@ -49,23 +49,6 @@ - - - - - - - - - - - - - - - - - @@ -83,35 +66,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -119,13 +73,6 @@ - - - - - - - diff --git a/src/blackberry10/index.js b/src/blackberry10/index.js deleted file mode 100644 index c682506..0000000 --- a/src/blackberry10/index.js +++ /dev/null @@ -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); - } -}; diff --git a/src/tizen/SplashScreenProxy.js b/src/tizen/SplashScreenProxy.js deleted file mode 100644 index 06c0697..0000000 --- a/src/tizen/SplashScreenProxy.js +++ /dev/null @@ -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); - -})(); diff --git a/src/ubuntu/splashscreen.cpp b/src/ubuntu/splashscreen.cpp deleted file mode 100644 index 1c9ecac..0000000 --- a/src/ubuntu/splashscreen.cpp +++ /dev/null @@ -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 - -#include "splashscreen.h" -#include - -#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); -} diff --git a/src/ubuntu/splashscreen.h b/src/ubuntu/splashscreen.h deleted file mode 100644 index 1d437f8..0000000 --- a/src/ubuntu/splashscreen.h +++ /dev/null @@ -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 -#include - -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