Merge branch 'master' into v5

src/@ionic-native/plugins/action-sheet/index.ts

@@ -2,7 +2,6 @@ import { Injectable } from '@angular/core';
 import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface ActionSheetOptions {
-
   /**
    * The labels for the buttons. Uses the index x
    */
@@ -98,7 +97,6 @@ export interface ActionSheetOptions {
 })
 @Injectable()
 export class ActionSheet extends IonicNativePlugin {
-
   /**
    * Convenience property to select an Android theme value
    */
@@ -118,20 +116,22 @@ export class ActionSheet extends IonicNativePlugin {
 
   /**
    * Show a native ActionSheet component. See below for options.
-   * @param options {ActionSheetOptions} Options See table below
+   * @param {ActionSheetOptions} [options] Options See table below
    * @returns {Promise<any>} Returns a Promise that resolves with the index of the
    *   button pressed (1 based, so 1, 2, 3, etc.)
    */
   @Cordova()
-  show(options?: ActionSheetOptions): Promise<number> { return; }
+  show(options?: ActionSheetOptions): Promise<number> {
-
+    return;
+  }
 
   /**
-   * Progamtically hide the native ActionSheet
+   * Programmatically hide the native ActionSheet
+   * @param  {ActionSheetOptions} [options] Options See table below
    * @returns {Promise<any>} Returns a Promise that resolves when the actionsheet is closed
    */
   @Cordova()
-  hide(options?: any): Promise<any> {
+  hide(options?: ActionSheetOptions): Promise<any> {
     return;
   }
 }

src/@ionic-native/plugins/admob-free/index.ts

@@ -73,7 +73,7 @@ export interface AdMobFreeRewardVideoConfig {
 })
 export class AdMobFreeBanner extends IonicNativePlugin {
   /**
-   * Update config.
+   * Update config
    * @param options
    * @return {AdMobFreeBannerConfig}
    */
@@ -83,7 +83,7 @@ export class AdMobFreeBanner extends IonicNativePlugin {
   }
 
   /**
-   * Hide the banner.
+   * Hide the banner
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
@@ -92,7 +92,7 @@ export class AdMobFreeBanner extends IonicNativePlugin {
   }
 
   /**
-   * Create banner.
+   * Create banner
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
@@ -101,7 +101,7 @@ export class AdMobFreeBanner extends IonicNativePlugin {
   }
 
   /**
-   * Remove the banner.
+   * Remove the banner
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
@@ -110,7 +110,7 @@ export class AdMobFreeBanner extends IonicNativePlugin {
   }
 
   /**
-   * Show the banner.
+   * Show the banner
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
@@ -129,7 +129,7 @@ export class AdMobFreeBanner extends IonicNativePlugin {
 })
 export class AdMobFreeInterstitial extends IonicNativePlugin {
   /**
-   * Update config.
+   * Update config
    * @param options
    * @return {AdMobFreeInterstitialConfig}
    */
@@ -176,8 +176,8 @@ export class AdMobFreeInterstitial extends IonicNativePlugin {
 })
 export class AdMobFreeRewardVideo extends IonicNativePlugin {
   /**
-   * Update config.
+   * Update config
-   * @param options
+   * @param {AdMobFreeRewardVideoConfig} options Admob reward config
    * @return {AdMobFreeRewardVideoConfig}
    */
   @Cordova({ sync: true })

src/@ionic-native/plugins/admob-pro/index.ts

@@ -170,7 +170,7 @@ export class AdMobPro extends IonicNativePlugin {
 
   /**
    * Create a banner
-   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
+   * @param {string | AdMobOptions} adIdOrOptions Ad ID or Options
    * @returns {Promise<any>} Returns a Promise that resolves when the banner is created
    */
   @Cordova()
@@ -188,7 +188,7 @@ export class AdMobPro extends IonicNativePlugin {
 
   /**
    * Show banner at position
-   * @param position {number} Position. Use `AdMobPro.AD_POSITION` to set values.
+   * @param {number} position Position. Use `AdMobPro.AD_POSITION` to set values.
    */
   @Cordova({
     sync: true
@@ -197,8 +197,8 @@ export class AdMobPro extends IonicNativePlugin {
 
   /**
    * Show banner at custom position
-   * @param x {number} Offset from screen left.
+   * @param {number} x Offset from screen left.
-   * @param y {number} Offset from screen top.
+   * @param {number} y Offset from screen top.
    */
   @Cordova({
     sync: true
@@ -215,7 +215,7 @@ export class AdMobPro extends IonicNativePlugin {
 
   /**
    * Prepare interstitial banner
-   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
+   * @param {string | AdMobOptions} adIdOrOptions Ad ID or Options
    * @returns {Promise<any>} Returns a Promise that resolves when interstitial is prepared
    */
   @Cordova()
@@ -233,7 +233,7 @@ export class AdMobPro extends IonicNativePlugin {
 
   /**
    * Prepare a reward video ad
-   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
+   * @param {string | AdMobOptions} adIdOrOptions Ad ID or Options
    * @returns {Promise<any>} Returns a Promise that resolves when the ad is prepared
    */
   @Cordova()
@@ -251,7 +251,7 @@ export class AdMobPro extends IonicNativePlugin {
 
   /**
    * Sets the values for configuration and targeting
-   * @param options {AdMobOptions} Options
+   * @param {AdMobOptions} options Options
    * @returns {Promise<any>} Returns a Promise that resolves when the options have been set
    */
   @Cordova()

src/@ionic-native/plugins/alipay/index.ts

@@ -1,6 +1,5 @@
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface AlipayOrder {
   /**
@@ -100,7 +99,8 @@ export interface AlipayOrder {
   plugin: 'cordova-alipay-base',
   pluginRef: 'Alipay.Base',
   repo: 'https://github.com/xueron/cordova-alipay-base',
-  install: 'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
+  install:
+    'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
   installVariables: ['ALI_PID'],
   platforms: ['Android', 'iOS']
 })
@@ -108,7 +108,7 @@ export interface AlipayOrder {
 export class Alipay extends IonicNativePlugin {
   /**
    * Open Alipay to perform App pay
-   * @param order { AlipayOrder | string } alipay options
+   * @param { AlipayOrder | string } order alipay options
    * @returns {Promise<any>} Returns a Promise that resolves with the success return, or rejects with an error.
    */
   @Cordova()

src/@ionic-native/plugins/uptime/index.ts

@@ -15,8 +15,8 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
  * ...
  *
  * this.uptime.getUptime()
- *   .then((uptime: any) => console.log(uptime))
+ *   .then(uptime => console.log(uptime))
- *   .catch((error: any) => console.log(error));
+ *   .catch(error => console.log(error));
  *
  * ```
  */
@@ -25,9 +25,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-uptime',
   pluginRef: 'Uptime',
   repo: 'https://github.com/s1lviu/cordova-plugin-uptime',
-  install: '',
+  platforms: ['Android', 'iOS']
-  installVariables: [],
-  platforms: ['Android']
 })
 @Injectable()
 export class Uptime extends IonicNativePlugin {