Merge branch 'master' into v5

This commit is contained in:
Daniel 2018-04-15 12:15:08 +02:00
commit 213d77ffda
4 changed files with 49 additions and 20 deletions

View File

@ -48,9 +48,7 @@ export class CallNumber extends IonicNativePlugin {
* Check if call feature is available
* @return {Promise<any>}
*/
@Cordova({
callbackOrder: 'reverse'
})
@Cordova()
isCallSupported(): Promise<any> {
return;
}

View File

@ -3,7 +3,6 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
import { Observable } from 'rxjs';
/**
* @beta
* @name Firebase
* @description
* This plugin brings push notifications, analytics, event tracking, crash reporting and more from Google Firebase to your Cordova project! Android and iOS supported (including iOS 10).
@ -36,10 +35,10 @@ import { Observable } from 'rxjs';
export class Firebase extends IonicNativePlugin {
/**
* Get the device token
* @return {Promise<any>}
* @return {Promise<null | string>} Note that token will be null if it has not been established yet
*/
@Cordova()
getToken(): Promise<any> {
getToken(): Promise<null | string> {
return;
}
@ -270,6 +269,44 @@ export class Firebase extends IonicNativePlugin {
return;
}
/**
* Start a trace.
* @param {string} trace Trace name
*/
@Cordova()
startTrace(trace: string): Promise<any> {
return;
}
/**
* To count the performance-related events that occur in your app (such as cache hits or retries), add a line of code
* similar to the following whenever the event occurs, using a string other than retry to name that event if you are
* counting a different type of event:
* @param {string} trace Trace name
* @param {string} counter Counter
*/
@Cordova()
incrementCounter(trace: string, counter: string): Promise<any> {
return;
}
/**
* Stop the trace
* @param {string} trace Trace name
*/
@Cordova()
stopTrace(trace: string): void {}
/**
* Allows the user to enable/disable analytics collection
* @param {boolean} enabled value to set collection
* @returns {Promise<any>}
*/
@Cordova()
setAnalyticsCollectionEnabled(enabled: boolean): Promise<any> {
return;
}
/**
* Sends an SMS to the user with the SMS verification code and returns the Verification ID required to sign in using phone authentication
* @param {string} phoneNumber
@ -299,14 +336,4 @@ export class Firebase extends IonicNativePlugin {
): Promise<any> {
return;
}
/**
* Allows the user to enable/disable analytics collection
* @param {boolean} enabled value to set collection
* @returns {Promise<any>}
*/
@Cordova()
setAnalyticsCollectionEnabled(enabled: boolean): Promise<any> {
return;
}
}

View File

@ -55,7 +55,9 @@ export interface InAppBrowserOptions {
transitionstyle?: 'fliphorizontal' | 'crossdissolve' | 'coververtical';
/** (iOS Only) Set to top or bottom (default is bottom). Causes the toolbar to be at the top or bottom of the window. */
toolbarposition?: 'top' | 'bottom';
/* (Windows only) Set to yes to create the browser control without a border around it.
/** (iOS Only) Set to yes or no to change the visibility of the loading indicator (defaults to no). */
hidespinner?: 'yes' | 'no';
/** (Windows only) Set to yes to create the browser control without a border around it.
* Please note that if location=no is also specified, there will be no control presented to user to close IAB window. */
fullscreen?: 'yes';

View File

@ -4,17 +4,18 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
/**
* @name Uptime
* @description
* This plugin return the device uptime, without sleep time.
* This plugin provides the time spent in milliseconds since boot (uptime).
*
* @usage
* ```typescript
* ionic cordova plugin add cordova-plugin-uptime
* import { Uptime } from '@ionic-native/uptime';
*
* constructor(private uptime: Uptime) { }
*
* ...
*
* this.uptime.getUptime()
* this.uptime.getUptime(includeDeepSleep)
* .then(uptime => console.log(uptime))
* .catch(error => console.log(error));
*
@ -31,10 +32,11 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
export class Uptime extends IonicNativePlugin {
/**
* This function return system uptime
* @param {boolean} includeDeepSleep Set to true to include system deep sleep
* @return {Promise<string>} Returns a promise that return the uptime in milliseconds
*/
@Cordova()
getUptime(): Promise<string> {
getUptime(includeDeepSleep: boolean): Promise<string> {
return;
}
}