Merge branch 'master' of github.com:ionic-team/ionic-native

This commit is contained in:
Ibby Hadeed 2017-07-03 07:13:26 -04:00
commit 5072c99938
No known key found for this signature in database
GPG Key ID: FAFF5A8210728800

View File

@ -58,38 +58,53 @@ export interface MusicControlsOptions {
* *
* this.musicControls.subscribe().subscribe(action => { * this.musicControls.subscribe().subscribe(action => {
* *
* switch(action) { * function events(action) {
* case 'music-controls-next': * const message = JSON.parse(action).message;
* // Do something * switch(message) {
* break; * case 'music-controls-next':
* case 'music-controls-previous': * // Do something
* // Do something * break;
* break; * case 'music-controls-previous':
* case 'music-controls-pause': * // Do something
* // Do something * break;
* break; * case 'music-controls-pause':
* case 'music-controls-play': * // Do something
* // Do something * break;
* break; * case 'music-controls-play':
* case 'music-controls-destroy': * // Do something
* break;
* case 'music-controls-destroy':
* // Do something
* break;
*
* // External controls (iOS only)
* case 'music-controls-toggle-play-pause' :
* // Do something
* break;
* case 'music-controls-seek-to':
* const seekToInSeconds = JSON.parse(action).position;
* MusicControls.updateElapsed({
* elapsed: seekToInSeconds,
* isPlaying: true
* });
* // Do something * // Do something
* break; * break;
* *
* // Headset events (Android only) * // Headset events (Android only)
* case 'music-controls-media-button' : * // All media button events are listed below
* // Do something * case 'music-controls-media-button' :
* break; * // Do something
* case 'music-controls-headset-unplugged': * break;
* // Do something * case 'music-controls-headset-unplugged':
* break; * // Do something
* case 'music-controls-headset-plugged': * break;
* // Do something * case 'music-controls-headset-plugged':
* break; * // Do something
* default: * break;
* break; * default:
* } * break;
* * }
* }); * }
* *
* this.musicControls.listen(); // activates the observable above * this.musicControls.listen(); // activates the observable above
* *
@ -147,6 +162,15 @@ export class MusicControls extends IonicNativePlugin {
@Cordova() @Cordova()
updateIsPlaying(isPlaying: boolean): void { } updateIsPlaying(isPlaying: boolean): void { }
/**
* Update elapsed time, optionally toggle play/pause:
* @param args {elapsed: string, isPlaying: boolean}
*/
@Cordova({
platforms: ['iOS']
})
updateElapsed(args: object): void { }
/** /**
* Toggle dismissable: * Toggle dismissable:
* @param dismissable {boolean} * @param dismissable {boolean}