You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ja...@apache.org on 2019/05/03 23:26:12 UTC
[cordova-plugin-splashscreen] branch janpio-fix_windows updated
(b1fc4a9 -> aa71f28)
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a change to branch janpio-fix_windows
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-splashscreen.git.
from b1fc4a9 move windows splashscreenproxy to correct location
new f7a94fb remove deprecated wp platform implementation
new aa71f28 fix unrelated plugin.xml and package.json stuff
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
package.json | 4 +-
plugin.xml | 4 +-
src/wp/ResolutionHelper.cs | 39 -------
src/wp/SplashScreen.cs | 255 ---------------------------------------------
4 files changed, 4 insertions(+), 298 deletions(-)
delete mode 100644 src/wp/ResolutionHelper.cs
delete mode 100644 src/wp/SplashScreen.cs
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-plugin-splashscreen] 01/02: remove deprecated wp platform
implementation
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-fix_windows
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-splashscreen.git
commit f7a94fb0d40e44e28c10e309544edae827df724c
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat May 4 01:25:41 2019 +0200
remove deprecated wp platform implementation
---
src/wp/ResolutionHelper.cs | 39 -------
src/wp/SplashScreen.cs | 255 ---------------------------------------------
2 files changed, 294 deletions(-)
diff --git a/src/wp/ResolutionHelper.cs b/src/wp/ResolutionHelper.cs
deleted file mode 100644
index 050c392..0000000
--- a/src/wp/ResolutionHelper.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- 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.
-*/
-
-using Microsoft.Phone.Info;
-using System;
-using System.Windows;
-
-namespace WPCordovaClassLib.Cordova.Commands
-{
- public enum Resolutions { WVGA, WXGA, HD };
-
- public static class ResolutionHelper
- {
- public static Resolutions CurrentResolution
- {
- get
- {
- switch (Application.Current.Host.Content.ScaleFactor)
- {
- case 100: return Resolutions.WVGA;
- case 160: return Resolutions.WXGA;
- case 150: return Resolutions.HD;
- }
- throw new InvalidOperationException("Unknown resolution");
- }
- }
- }
-}
\ No newline at end of file
diff --git a/src/wp/SplashScreen.cs b/src/wp/SplashScreen.cs
deleted file mode 100644
index c56d4ad..0000000
--- a/src/wp/SplashScreen.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- 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.
-*/
-
-using System;
-using System.Net;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Ink;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Animation;
-using System.Windows.Shapes;
-using Microsoft.Phone.Info;
-using System.Windows.Controls.Primitives;
-using System.Diagnostics;
-using System.Windows.Media.Imaging;
-using System.Windows.Resources;
-using System.IO;
-using System.Xml.Linq;
-using System.Linq;
-using System.Windows.Threading;
-
-namespace WPCordovaClassLib.Cordova.Commands
-{
- /// <summary>
- /// Listens for changes to the state of the battery on the device.
- /// Currently only the "isPlugged" parameter available via native APIs.
- /// </summary>
- public class SplashScreen : BaseCommand
- {
- private Popup popup;
-
- // Time until we dismiss the splashscreen
- private int prefDelay = 3000;
-
- // Whether we hide it by default
- private bool prefAutoHide = true;
-
- // Path to image to use
- private string prefImagePath = "SplashScreenImage.jpg";
-
- // static because autodismiss is only ever applied once, at app launch
- // subsequent page loads should not cause the SplashScreen to be shown.
- private static bool WasShown = false;
-
- public SplashScreen()
- {
- LoadConfigPrefs();
-
- Image SplashScreen = new Image()
- {
- Height = Application.Current.Host.Content.ActualHeight,
- Width = Application.Current.Host.Content.ActualWidth,
- Stretch = Stretch.Fill
- };
-
- var imageResource = GetSplashScreenImageResource();
- if (imageResource != null)
- {
- BitmapImage splash_image = new BitmapImage();
- splash_image.SetSource(imageResource.Stream);
- SplashScreen.Source = splash_image;
- }
-
- // Instansiate the popup and set the Child property of Popup to SplashScreen
- popup = new Popup() { IsOpen = false,
- Child = SplashScreen,
- HorizontalAlignment = HorizontalAlignment.Stretch,
- VerticalAlignment = VerticalAlignment.Center
-
- };
- }
-
- public override void OnInit()
- {
- // we only want to autoload on the first page load.
- // but OnInit is called for every page load.
- if (!SplashScreen.WasShown)
- {
- SplashScreen.WasShown = true;
- show();
- }
- }
-
- private void LoadConfigPrefs()
- {
- StreamResourceInfo streamInfo = Application.GetResourceStream(new Uri("config.xml", UriKind.Relative));
- if (streamInfo != null)
- {
- using (StreamReader sr = new StreamReader(streamInfo.Stream))
- {
- //This will Read Keys Collection for the xml file
- XDocument configFile = XDocument.Parse(sr.ReadToEnd());
-
- string configAutoHide = configFile.Descendants()
- .Where(x => x.Name.LocalName == "preference")
- .Where(x => (string)x.Attribute("name") == "AutoHideSplashScreen")
- .Select(x => (string)x.Attribute("value"))
- .FirstOrDefault();
-
- bool bVal;
- prefAutoHide = bool.TryParse(configAutoHide, out bVal) ? bVal : prefAutoHide;
-
- string configDelay = configFile.Descendants()
- .Where(x => x.Name.LocalName == "preference")
- .Where(x => (string)x.Attribute("name") == "SplashScreenDelay")
- .Select(x => (string)x.Attribute("value"))
- .FirstOrDefault();
- int nVal;
- prefDelay = int.TryParse(configDelay, out nVal) ? nVal : prefDelay;
-
- string configImage = configFile.Descendants()
- .Where(x => x.Name.LocalName == "preference")
- .Where(x => (string)x.Attribute("name") == "SplashScreen")
- .Select(x => (string)x.Attribute("value"))
- .FirstOrDefault();
-
- if (!String.IsNullOrEmpty(configImage))
- {
- prefImagePath = configImage;
- }
- }
- }
- }
-
- private StreamResourceInfo GetSplashScreenImageResource()
- {
- // Get the base filename for the splash screen images
- string imageName = System.IO.Path.GetFileNameWithoutExtension(prefImagePath);
- Uri imageUri = null;
- StreamResourceInfo imageResource = null;
-
- // First, try to get a resolution-specific splashscreen
- try
- {
- // Determine the device's resolution
- switch (ResolutionHelper.CurrentResolution)
- {
- case Resolutions.HD:
- imageUri = new Uri(imageName + ".screen-720p.jpg", UriKind.Relative);
- break;
-
- case Resolutions.WVGA:
- imageUri = new Uri(imageName + ".screen-WVGA.jpg", UriKind.Relative);
- break;
-
- case Resolutions.WXGA:
- default:
- imageUri = new Uri(imageName + ".screen-WXGA.jpg", UriKind.Relative);
- break;
- }
-
- imageResource = Application.GetResourceStream(imageUri);
- }
- catch (Exception)
- {
- // It's OK if we didn't get a resolution-specific image
- }
-
- // Fallback to the default image name without decoration
- if (imageResource == null)
- {
- imageUri = new Uri(prefImagePath, UriKind.Relative);
- imageResource = Application.GetResourceStream(imageUri);
- }
-
- if (imageUri != null) Debug.WriteLine("INFO :: SplashScreen: using image {0}", imageUri.OriginalString);
-
- return imageResource;
- }
-
- public void show(string options = null)
- {
- Deployment.Current.Dispatcher.BeginInvoke(() =>
- {
- if (!popup.IsOpen)
- {
- popup.Child.Opacity = 0;
-
- Storyboard story = new Storyboard();
- DoubleAnimation animation = new DoubleAnimation()
- {
- From = 0.0,
- To = 1.0,
- Duration = new Duration(TimeSpan.FromSeconds(0.2))
- };
-
- Storyboard.SetTarget(animation, popup.Child);
- Storyboard.SetTargetProperty(animation, new PropertyPath("Opacity"));
- story.Children.Add(animation);
-
- story.Begin();
-
- popup.IsOpen = true;
-
- if (prefAutoHide)
- {
- StartAutoHideTimer();
- }
- }
- });
- }
-
- public void hide(string options = null)
- {
- Deployment.Current.Dispatcher.BeginInvoke(() =>
- {
- if (popup.IsOpen)
- {
- popup.Child.Opacity = 1.0;
-
- Storyboard story = new Storyboard();
- DoubleAnimation animation = new DoubleAnimation()
- {
- From = 1.0,
- To = 0.0,
- Duration = new Duration(TimeSpan.FromSeconds(0.4))
- };
-
- Storyboard.SetTarget(animation, popup.Child);
- Storyboard.SetTargetProperty(animation, new PropertyPath("Opacity"));
- story.Children.Add(animation);
- story.Completed += (object sender, EventArgs e) =>
- {
- popup.IsOpen = false;
- };
- story.Begin();
- }
- });
- }
-
- private void StartAutoHideTimer()
- {
- var timer = new DispatcherTimer() { Interval = TimeSpan.FromMilliseconds(prefDelay) };
- timer.Tick += (object sender, EventArgs e) =>
- {
- hide();
- timer.Stop();
- };
- timer.Start();
- }
- }
-}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org
[cordova-plugin-splashscreen] 02/02: fix unrelated plugin.xml and
package.json stuff
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
janpio pushed a commit to branch janpio-fix_windows
in repository https://gitbox.apache.org/repos/asf/cordova-plugin-splashscreen.git
commit aa71f286e715e58b249b5c54308cefb449d868bc
Author: Jan Piotrowski <pi...@gmail.com>
AuthorDate: Sat May 4 01:26:01 2019 +0200
fix unrelated plugin.xml and package.json stuff
---
package.json | 4 ++--
plugin.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/package.json b/package.json
index 4b79af8..53dec36 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,6 @@
"id": "cordova-plugin-splashscreen",
"platforms": [
"android",
- "ubuntu",
"ios",
"windows",
"browser"
@@ -21,7 +20,8 @@
"ecosystem:cordova",
"cordova-android",
"cordova-ios",
- "cordova-windows"
+ "cordova-windows",
+ "cordova-browser"
],
"scripts": {
"test": "npm run jshint",
diff --git a/plugin.xml b/plugin.xml
index a25821e..885cc5f 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -25,8 +25,8 @@
<description>Cordova Splashscreen Plugin</description>
<license>Apache 2.0</license>
<keywords>cordova,splashscreen</keywords>
- <repo>https://git-wip-us.apache.org/repos/asf/cordova-plugin-splashscreen.git</repo>
- <issue>https://issues.apache.org/jira/browse/CB/component/12320653</issue>
+ <repo>https://github.com/apache/cordova-plugin-splashscreen</repo>
+ <issue>https://github.com/apache/cordova-plugin-splashscreen/issues</issue>
<engines>
<engine name="cordova-android" version=">=3.6.0" /><!-- Requires CordovaPlugin.preferences -->
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org