EventSubscription interface

lib/src/adapters/NativeEventsReceiver.ts

@@ -1,4 +1,8 @@
-import { NativeModules, NativeEventEmitter, EmitterSubscription } from 'react-native';
+import { NativeModules, NativeEventEmitter } from 'react-native';
+
+export interface EventSubscription {
+  remove();
+}
 
 export class NativeEventsReceiver {
   private emitter: NativeEventEmitter;
@@ -6,19 +10,19 @@ export class NativeEventsReceiver {
     this.emitter = new NativeEventEmitter(NativeModules.RNNEventEmitter);
   }
 
-  registerAppLaunched(callback): EmitterSubscription {
+  registerAppLaunched(callback): EventSubscription {
     return this.emitter.addListener('RNN.appLaunched', callback);
   }
 
-  registerComponentDidAppear(callback): EmitterSubscription {
+  registerComponentDidAppear(callback): EventSubscription {
     return this.emitter.addListener('RNN.componentDidAppear', callback);
   }
 
-  registerComponentDidDisappear(callback): EmitterSubscription {
+  registerComponentDidDisappear(callback): EventSubscription {
     return this.emitter.addListener('RNN.componentDidDisappear', callback);
   }
 
-  registerInteraction(callback): EmitterSubscription {
+  registerInteraction(callback): EventSubscription {
     return this.emitter.addListener('RNN.interaction', callback);
   }
 }

lib/src/commands/OptionsProcessor.ts

@@ -9,8 +9,8 @@ export class OptionsProcessor {
     _.forEach(options, (value, key) => {
       if (!value) { return; }
 
-      this.processColors(key, value, options);
-      this.processImages(key, value, options);
+      this.processColor(key, value, options);
+      this.processImage(key, value, options);
       this.processButtonsPassProps(key, value);
 
       if (_.isObject(value) || _.isArray(value)) {
@@ -19,13 +19,13 @@ export class OptionsProcessor {
     });
   }
 
-  private processColors(key, value, options) {
+  private processColor(key, value, options) {
     if (_.isEqual(key, 'color') || _.endsWith(key, 'Color')) {
       options[key] = processColor(value);
     }
   }
 
-  private processImages(key, value, options) {
+  private processImage(key, value, options) {
     if (_.isEqual(key, 'icon') || _.isEqual(key, 'image') || _.endsWith(key, 'Icon') || _.endsWith(key, 'Image')) {
       options[key] = resolveAssetSource(value);
     }

lib/src/events/EventsRegistry.ts

@@ -1,4 +1,4 @@
-import { EventSubscription } from 'react-native';
+import { EventSubscription } from '../adapters/NativeEventsReceiver';
 
 export class EventsRegistry {
   private nativeEventsReceiver;

playground/src/app.js

@@ -22,7 +22,7 @@ if (Platform.OS === 'android') {
 
 function start() {
   registerScreens();
-  Navigation.events().onAppLaunched(() => {
+  Navigation.events().appLaunched(() => {
     Navigation.setDefaultOptions({
       _animations: {
         push: {