resolve merge conflicts

src/plugins/backgroundmode.ts

@@ -49,18 +49,18 @@ export class BackgroundMode {
   * Once the background mode has been disabled, the app will be paused when in background.
   */
   @Cordova()
-  static disable(): void { }
+  static disable(): Promise<any> { return; }
 
   /**
   * Checks if background mode is enabled or not.
-  * @returns {Promise<boolean>} returns a true of false if the background mode is enabled.
+  * @returns {Promise<boolean>} returns a promise that resolves with boolean that indicates if the background mode is enabled.
   */
   @Cordova()
   static isEnabled(): Promise<boolean> { return; }
 
   /**
   * Can be used to get the information if the background mode is active.
-  * @returns {Promise<boolean>} returns true or false if the background mode is active.
+  * @returns {Promise<boolean>} returns a promise that resolves with boolean that indicates if the background mode is active.
   */
   @Cordova()
   static isActive(): Promise<boolean> { return; }
@@ -73,7 +73,7 @@ export class BackgroundMode {
   @Cordova({
     platforms: ['Android']
   })
-  static setDefaults(options?: Configure): void { }
+  static setDefaults(options?: Configure): Promise<any> { return; }
 
   /**
   * Modify the displayed information.
@@ -83,7 +83,7 @@ export class BackgroundMode {
   @Cordova({
     platforms: ['Android']
   })
-  static configure(options?: Configure): void { }
+  static configure(options?: Configure): Promise<any> { return; }
 
   /**
   * Called when background mode is activated.

src/plugins/camera.ts

@@ -121,7 +121,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static DestinationType = {
+  static DestinationType = {
     /** Return base64 encoded string. DATA_URL can be very memory intensive and cause app crashes or out of memory errors. Use FILE_URI or NATIVE_URI if possible */
     DATA_URL: 0,
     /** Return file uri (content://media/external/images/media/2 for Android) */
@@ -134,7 +134,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static EncodingType = {
+  static EncodingType = {
     /** Return JPEG encoded image */
     JPEG: 0,
     /** Return PNG encoded image */
@@ -144,7 +144,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static MediaType = {
+  static MediaType = {
     /** Allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType */
     PICTURE: 0,
     /** Allow selection of video only, ONLY RETURNS URL */
@@ -157,7 +157,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static PictureSourceType = {
+  static PictureSourceType = {
     /** Choose image from picture library (same as SAVEDPHOTOALBUM for Android) */
     PHOTOLIBRARY: 0,
     /** Take picture from camera */
@@ -171,7 +171,7 @@ export class Camera {
    * Matches iOS UIPopoverArrowDirection constants to specify arrow location on popover.
    * @enum {number}
    */
-  public static PopoverArrowDirection = {
+  static PopoverArrowDirection = {
     ARROW_UP: 1,
     ARROW_DOWN: 2,
     ARROW_LEFT: 4,
@@ -183,7 +183,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static Direction = {
+  static Direction = {
     /** Use the back-facing camera */
     BACK: 0,
     /** Use the front-facing camera */

src/plugins/datepicker.ts

@@ -107,10 +107,6 @@ export interface DatePickerOptions {
  * @description
  * The DatePicker plugin allows the user to fetch date or time using native dialogs.
  *
- * Platforms supported: iOS, Android, Windows
- *
- * Requires Cordova plugin: `cordova-plugin-datepicker`. For more info, please see the [DatePicker plugin docs](https://github.com/VitaliiBlagodir/cordova-plugin-datepicker).
- *
  * @usage
  * ```typescript
  * import { DatePicker } from 'ionic-native';
@@ -131,7 +127,8 @@ export interface DatePickerOptions {
   pluginName: 'DatePicker',
   plugin: 'cordova-plugin-datepicker',
   pluginRef: 'datePicker',
-  repo: 'https://github.com/VitaliiBlagodir/cordova-plugin-datepicker'
+  repo: 'https://github.com/VitaliiBlagodir/cordova-plugin-datepicker',
+  platforms: ['Android', 'iOS', 'Windows']
 })
 export class DatePicker {
 

src/plugins/globalization.ts

@@ -93,14 +93,14 @@ export class Globalization {
 
   /**
    * Returns a number formatted as a string according to the client's user preferences.
-   * @param options
+   * @param number {Number} The number to convert
-   * @returns {Promise<{value: string}>}
+   * @param options {Object} Object with property `type` that can be set to: decimal, percent, or currency.
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 2
   })
-  static numberToString(options: { type: string }): Promise<{ value: string }> { return; }
+  static numberToString(number: number, options: { type: string }): Promise<{ value: string }> { return; }
 
   /**
    *