Merge branch 'master' into readme

# Conflicts: # demo/app/home/device-list/device-list-view-model.ts
GeoTecINIT · Aug 2, 2022 · 4fb2c2d · 4fb2c2d
2 parents b6ed1b9 + e9a9c8b
commit 4fb2c2d
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 145 deletions.
diff --git a/demo/app/home/device-list/device-list-view-model.ts b/demo/app/home/device-list/device-list-view-model.ts
@@ -1,8 +1,8 @@
 import { Observable } from "@nativescript/core";
 import { getLogger } from "~/home/logger/logger-view-model";
 import { getNodeDiscoverer } from "nativescript-wearos-sensors/node";
-import { getPlainMessageClient } from "../../../../src/internal/communication/plain-message";
-import { getCollectorManager } from "nativescript-wearos-sensors/internal/collection";
+import { getPlainMessageClient } from "nativescript-wearos-sensors/plain-message";
+import { getCollectorManager } from "nativescript-wearos-sensors/collection";
 import { getStore } from "~/home/store";
 
 export class DeviceListViewModel extends Observable {

diff --git a/demo/app/tests/internal/capability-discoverer.android.spec.ts b/demo/app/tests/internal/capability-discoverer.android.spec.ts
diff --git a/src/internal/capability-discoverer.android.ts b/src/internal/capability-discoverer.android.ts
diff --git a/src/listeners/index.ts b/src/listeners/index.ts
@@ -0,0 +1,3 @@
+import { ListenerFilter as LF } from "../internal/sensor-listener-manager";
+export { SensorListener } from "../internal/sensor-listener-manager";
+export type ListenerFilter = LF;
diff --git a/src/wearos-sensors.android.ts b/src/wearos-sensors.android.ts
@@ -1,4 +1,4 @@
-import { Common, defaultConfig, WearosSensorsConfig } from './wearos-sensors.common';
+import { allSensors, Common, defaultConfig, WearosSensorsConfig } from './wearos-sensors.common';
 
 import { getCapabilityAdvertiserResultService } from "./internal/communication/capabilities/android/capability-advertiser-result-service.android";
 import { getResultMessagingService } from "./internal/communication/messaging/android/messaging-result-service.android";
@@ -24,9 +24,13 @@ class WearosSensors extends Common {
     public async init(config: WearosSensorsConfig = defaultConfig): Promise<void> {
         this.wireUpCapabilityAdvertiser();
 
-        setEnabledSensors(config.sensors);
-        if (config.sensors && config.sensors.length > 0) {
-            this.wireUpSensorComponents(config.sensors);
+        const sensors = config.sensors
+            ? config.sensors
+            : allSensors;
+
+        setEnabledSensors(sensors);
+        if (sensors.length > 0) {
+            this.wireUpSensorComponents(sensors);
         }
 
         if (!config.disableWearCommands) {