From 7d6cd82688c90e18b387de727a2ab1ee8397a416 Mon Sep 17 00:00:00 2001
From: Miguel Matey Sanz <al341802@uji.es>
Date: Mon, 29 Jan 2024 10:37:03 +0100
Subject: [PATCH 1/6] feat(demo): add commands for remote and local collection

---
 .../command/CollectionCommand.java            |  8 +++++
 .../command/LocalCollectionCommand.java       | 34 +++++++++++++++++++
 .../command/RemoteCollectionCommand.java      | 30 ++++++++++++++++
 3 files changed, 72 insertions(+)
 create mode 100644 app/src/main/java/es/uji/geotec/wearossensorsdemo/command/CollectionCommand.java
 create mode 100644 app/src/main/java/es/uji/geotec/wearossensorsdemo/command/LocalCollectionCommand.java
 create mode 100644 app/src/main/java/es/uji/geotec/wearossensorsdemo/command/RemoteCollectionCommand.java

diff --git a/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/CollectionCommand.java b/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/CollectionCommand.java
new file mode 100644
index 0000000..5583f44
--- /dev/null
+++ b/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/CollectionCommand.java
@@ -0,0 +1,8 @@
+package es.uji.geotec.wearossensorsdemo.command;
+
+import es.uji.geotec.wearossensors.sensor.WearSensor;
+
+public interface CollectionCommand {
+    void executeStart(WearSensor sensor);
+    void executeStop(WearSensor sensor);
+}
diff --git a/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/LocalCollectionCommand.java b/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/LocalCollectionCommand.java
new file mode 100644
index 0000000..5d819bb
--- /dev/null
+++ b/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/LocalCollectionCommand.java
@@ -0,0 +1,34 @@
+package es.uji.geotec.wearossensorsdemo.command;
+
+import android.content.Context;
+import android.util.Log;
+
+import es.uji.geotec.backgroundsensors.collection.CollectionConfiguration;
+import es.uji.geotec.backgroundsensors.service.manager.ServiceManager;
+import es.uji.geotec.wearossensors.sensor.WearSensor;
+import es.uji.geotec.wearossensors.services.WearSensorRecordingService;
+
+public class LocalCollectionCommand implements CollectionCommand {
+
+    private ServiceManager serviceManager;
+
+    public LocalCollectionCommand(Context context) {
+        this.serviceManager = new ServiceManager(context, WearSensorRecordingService.class);
+    }
+    @Override
+    public void executeStart(WearSensor sensor) {
+        CollectionConfiguration config = new CollectionConfiguration(
+                sensor,
+                android.hardware.SensorManager.SENSOR_DELAY_GAME,
+                sensor == WearSensor.HEART_RATE || sensor == WearSensor.LOCATION ? 1 : 50
+        );
+        this.serviceManager.startCollection(config, records -> {
+            Log.d("LOCAL COLLECTION", sensor.toString()+ " records: " + records.toString());
+        });
+    }
+
+    @Override
+    public void executeStop(WearSensor sensor) {
+        this.serviceManager.stopCollection(sensor);
+    }
+}
diff --git a/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/RemoteCollectionCommand.java b/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/RemoteCollectionCommand.java
new file mode 100644
index 0000000..5679e72
--- /dev/null
+++ b/app/src/main/java/es/uji/geotec/wearossensorsdemo/command/RemoteCollectionCommand.java
@@ -0,0 +1,30 @@
+package es.uji.geotec.wearossensorsdemo.command;
+
+import android.content.Context;
+
+import es.uji.geotec.backgroundsensors.collection.CollectionConfiguration;
+import es.uji.geotec.wearossensors.command.CommandClient;
+import es.uji.geotec.wearossensors.sensor.WearSensor;
+
+public class RemoteCollectionCommand implements CollectionCommand {
+
+    private CommandClient commandClient;
+
+    public RemoteCollectionCommand(Context context) {
+        this.commandClient = new CommandClient(context);
+    }
+    @Override
+    public void executeStart(WearSensor sensor) {
+        CollectionConfiguration config = new CollectionConfiguration(
+                sensor,
+                android.hardware.SensorManager.SENSOR_DELAY_GAME,
+                sensor == WearSensor.HEART_RATE || sensor == WearSensor.LOCATION ? 1 : 50
+        );
+        this.commandClient.sendStartCommand(config);
+    }
+
+    @Override
+    public void executeStop(WearSensor sensor) {
+        this.commandClient.sendStopCommand(sensor);
+    }
+}

From 54208ee10e849bdd844d430b5c60f76d85ae53f1 Mon Sep 17 00:00:00 2001
From: Miguel Matey Sanz <al341802@uji.es>
Date: Mon, 29 Jan 2024 10:38:07 +0100
Subject: [PATCH 2/6] ui(demo): update ui to add radios for data collection
 destination selection

---
 app/src/main/res/layout/activity_main.xml | 138 +++++++++++++---------
 app/src/main/res/values/strings.xml       |  13 +-
 2 files changed, 91 insertions(+), 60 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f9ac49a..3a78be2 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -6,71 +6,101 @@
     android:background="@color/dark_grey"
     tools:context=".MainActivity"
     tools:deviceIds="wear">
-    <requestFocus/>
-            <LinearLayout
-                android:id="@+id/linear_layout"
+
+    <requestFocus />
+        <LinearLayout
+            android:id="@+id/linear_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:orientation="vertical"
+            android:padding="10dp"
+            >
+
+            <TextView
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal|top"
+                android:layout_marginBottom="10dp"
+                android:text="@string/app_name"
+                android:textSize="18sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/select_collection_dest"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:orientation="vertical">
+                android:text="@string/select_collection_destination_txt" />
 
-                <TextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal|top"
-                    android:layout_marginBottom="10dp"
-                    android:text="@string/app_name"
-                    android:textSize="18sp"
-                    android:textStyle="bold" />
+            <RadioGroup
+                android:id="@+id/destination_collection"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:checkedButton="@id/local_collection">
 
-                <TextView
-                    android:id="@+id/info_command_single"
+                <RadioButton
+                    android:id="@+id/local_collection"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:justificationMode="inter_word"
-                    android:text='@string/info_command_single_txt' />
+                    android:onClick="onDestinationButtonClicked"
+                    android:text="@string/local_radio" />
 
-                <Spinner
-                    android:id="@+id/sensor_spinner"
+                <RadioButton
+                    android:id="@+id/remote_collection"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp"
-                    android:spinnerMode="dropdown" />
+                    android:onClick="onDestinationButtonClicked"
+                    android:text="@string/remote_radio" />
+            </RadioGroup>
 
-                <Button
-                    android:id="@+id/start_single_command"
-                    style="@style/Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:onClick="onStartSingleCommandTap"
-                    android:text="@string/start_btn" />
+            <TextView
+                android:id="@+id/info_command_single"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:justificationMode="inter_word"
+                android:text='@string/info_command_single_txt' />
 
-                <Button
-                    android:id="@+id/stop_single_command"
-                    style="@style/Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:onClick="onStopSingleCommandTap"
-                    android:visibility="gone"
-                    android:text="@string/stop_btn" />
+            <Spinner
+                android:id="@+id/sensor_spinner"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:spinnerMode="dropdown" />
 
-                <TextView
-                    android:id="@+id/info_free_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:justificationMode="inter_word"
-                    android:text="@string/info_free_txt" />
+            <Button
+                android:id="@+id/start_single_command"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onStartSingleCommandTap"
+                android:text="@string/start_btn" />
 
-                <Button
-                    android:id="@+id/send_free_message"
-                    style="@style/Widget.AppCompat.Button.Colored"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_margin="10dp"
-                    android:onClick="onSendFreeMessageTap"
-                    android:text="@string/send_free_btn" />
-            </LinearLayout>
+            <Button
+                android:id="@+id/stop_single_command"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:onClick="onStopSingleCommandTap"
+                android:text="@string/stop_btn"
+                android:visibility="gone" />
+
+            <TextView
+                android:id="@+id/info_free_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:justificationMode="inter_word"
+                android:text="@string/info_free_txt" />
+
+            <Button
+                android:id="@+id/send_free_message"
+                style="@style/Widget.AppCompat.Button.Colored"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_margin="10dp"
+                android:onClick="onSendFreeMessageTap"
+                android:text="@string/send_free_btn" />
+        </LinearLayout>
 </ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index eebf45b..c5fe342 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,11 +1,12 @@
 <resources>
     <string name="app_name">WearOS Sensors</string>
-    <!--
-    This string is used for square devices and overridden by hello_world in
-    values-round/strings.xml for round devices.
-    -->
-    <string name="hello_world">Hello Square World!</string>
-    <string name="info_command_single_txt">Tap START/STOP to instruct the smartphone to request/cancel updates for the selected sensor</string>
+
+    <string name="select_collection_destination_txt">Select where you want to receive the collected data:</string>
+    <string name="local_radio">Smartwatch</string>
+    <string name="remote_radio">Smartphone</string>
+
+
+    <string name="info_command_single_txt">Tap START/STOP to start the data collection for the selected sensor</string>
     <string name="start_btn">Start</string>
     <string name="stop_btn">Stop</string>
     <string name="info_free_txt">You can also send and receive custom messages to/from the smartphone. Tap \"SEND TEST\" to send a message to the smartphone</string>

From dc182f7876fb55644aeb0877da23dd4e394db197 Mon Sep 17 00:00:00 2001
From: Miguel Matey Sanz <al341802@uji.es>
Date: Mon, 29 Jan 2024 10:38:54 +0100
Subject: [PATCH 3/6] refactor(demo): use commands

---
 .../wearossensorsdemo/MainActivity.java       | 41 +++++++++++++------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/es/uji/geotec/wearossensorsdemo/MainActivity.java b/app/src/main/java/es/uji/geotec/wearossensorsdemo/MainActivity.java
index c817777..e717637 100644
--- a/app/src/main/java/es/uji/geotec/wearossensorsdemo/MainActivity.java
+++ b/app/src/main/java/es/uji/geotec/wearossensorsdemo/MainActivity.java
@@ -9,24 +9,27 @@
 import android.widget.ArrayAdapter;
 import android.widget.Button;
 import android.widget.LinearLayout;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Spinner;
 
-import es.uji.geotec.backgroundsensors.collection.CollectionConfiguration;
 import es.uji.geotec.backgroundsensors.sensor.Sensor;
 import es.uji.geotec.backgroundsensors.sensor.SensorManager;
-import es.uji.geotec.wearossensors.command.CommandClient;
 import es.uji.geotec.wearossensors.plainmessage.PlainMessage;
 import es.uji.geotec.wearossensors.plainmessage.PlainMessageClient;
 import es.uji.geotec.wearossensors.permissions.PermissionsManager;
 import es.uji.geotec.wearossensors.sensor.WearSensor;
+import es.uji.geotec.wearossensorsdemo.command.CollectionCommand;
+import es.uji.geotec.wearossensorsdemo.command.LocalCollectionCommand;
+import es.uji.geotec.wearossensorsdemo.command.RemoteCollectionCommand;
 
 public class MainActivity extends Activity {
 
     private LinearLayout linearLayout;
+    private RadioGroup destinationRadio;
     private Button  startSingle, stopSingle;
     private Spinner sensorSpinner;
-
-    private CommandClient commandClient;
+    private CollectionCommand command;
     private PlainMessageClient messageClient;
 
     @Override
@@ -38,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setupButtons();
         setupSpinner();
 
-        commandClient = new CommandClient(this);
+        command = new LocalCollectionCommand(this);
         messageClient = new PlainMessageClient(this);
         messageClient.registerListener(message -> {
             Log.d("MainActivity", "received " + message);
@@ -56,6 +59,20 @@ protected void onCreate(Bundle savedInstanceState) {
         }
     }
 
+    public void onDestinationButtonClicked(View view) {
+        boolean checked = ((RadioButton) view).isChecked();
+        if (!checked) return;
+
+        switch(view.getId()) {
+            case R.id.local_collection:
+                this.command = new LocalCollectionCommand(this);
+                break;
+            case R.id.remote_collection:
+                this.command = new RemoteCollectionCommand(this);
+                break;
+        }
+    }
+
     public void onStartSingleCommandTap(View view) {
         WearSensor selectedSensor = (WearSensor) sensorSpinner.getSelectedItem();
         boolean requested = PermissionsManager.launchPermissionsRequestIfNeeded(this, selectedSensor.getRequiredPermissions());
@@ -63,21 +80,18 @@ public void onStartSingleCommandTap(View view) {
 
         toggleVisibility(stopSingle, startSingle);
         sensorSpinner.setEnabled(false);
+        destinationRadio.setEnabled(false);
 
-        CollectionConfiguration config = new CollectionConfiguration(
-                selectedSensor,
-                android.hardware.SensorManager.SENSOR_DELAY_GAME,
-                selectedSensor == WearSensor.HEART_RATE || selectedSensor == WearSensor.LOCATION ? 1 : 50
-        );
-        commandClient.sendStartCommand(config);
+        command.executeStart(selectedSensor);
     }
 
     public void onStopSingleCommandTap(View view) {
         toggleVisibility(startSingle, stopSingle);
-        Sensor selectedSensor = (Sensor) sensorSpinner.getSelectedItem();
         sensorSpinner.setEnabled(true);
+        destinationRadio.setEnabled(true);
 
-        commandClient.sendStopCommand(selectedSensor);
+        WearSensor selectedSensor = (WearSensor) sensorSpinner.getSelectedItem();
+        command.executeStop(selectedSensor);
     }
 
     public void onSendFreeMessageTap(View view) {
@@ -96,6 +110,7 @@ private void setupLayout() {
     private void setupButtons() {
         startSingle = findViewById(R.id.start_single_command);
         stopSingle = findViewById(R.id.stop_single_command);
+        destinationRadio = findViewById(R.id.destination_collection);
     }
 
     private void setupSpinner() {

From 9cf33b0b50bdb2d44a34f1cb089fe368f38e9578 Mon Sep 17 00:00:00 2001
From: Miguel Matey Sanz <al341802@uji.es>
Date: Mon, 29 Jan 2024 10:39:11 +0100
Subject: [PATCH 4/6] chore(demo): update deps

---
 app/build.gradle | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 89e97d1..5adaf05 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -37,8 +37,7 @@ dependencies {
     implementation 'com.google.android.support:wearable:2.8.1'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.1'
-    implementation 'androidx.wear:wear:1.0.0'
+    implementation 'androidx.wear:wear:1.3.0'
     implementation project(path: ':wearossensors')
     compileOnly 'com.google.android.wearable:wearable:2.8.1'
 }
\ No newline at end of file

From f7659953b3dd8a5b326fbb7a06343a5f6843ef29 Mon Sep 17 00:00:00 2001
From: Miguel Matey Sanz <al341802@uji.es>
Date: Mon, 29 Jan 2024 12:31:33 +0100
Subject: [PATCH 5/6] docs: update readme

---
 README.md | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 53 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7ffcac4..f5d599e 100644
--- a/README.md
+++ b/README.md
@@ -182,9 +182,58 @@ public class MainActivity extends Activity {
 ```
 
 #### Start/stop data collection from smartphone
-The library fully handles this for you. You have to do nothing!
+The library fully handles this for you. You can start and stop the data collection from the smartphone
+and receive the collected data. You have to do nothing!
 
 #### Start/stop data collection from smartwatch
+When starting the data collection from the smartwatch, you can chose where the collected data will be
+delivered: to the smartwatch itself or to the paired smartphone.
+
+##### Obtain the data in the smartwatch
+You can use the [`ServiceManager`](#servicemanager) provided by _Background Sensors_ to start and stop
+the data collection and receive the data in the device: 
+
+```java
+public class MainActivity extends Activity {
+    // ...
+    private CommandClient commandClient;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        // ...
+        sensorManager = new SensorManager(context);
+        serviceManager = new ServiceManager(this, WearSensorRecordingService.class);
+    }
+    
+    public void setupUI() {
+        List<Sensor> availableSensors = sensorManager.availableSensors(WearSensor.values());
+    }
+
+    public void onStartSingleCommandTap(WearSensor sensor) {
+        CollectionConfiguration config = new CollectionConfiguration(
+                selectedSensor,
+                android.hardware.SensorManager.SENSOR_DELAY_GAME,
+                selectedSensor == WearSensor.HEART_RATE || selectedSensor == WearSensor.LOCATION ? 1 : 50
+        );
+        serviceManager.startCollection(config, records -> {
+            // ...
+        });
+    }
+
+    public void onStopSingleCommandTap(Sensor sensor) {
+        serviceManager.stopCollection(sensor, records -> {
+            // ...
+        });
+    }
+    
+    // ...
+}
+```
+
+> [!TIP]
+> Please, refer to the [_Background Sensors_](https://github.com/GeoTecINIT/BackgroundSensors#servicemanager) documentation.
+
+##### Obtain the data in the smartphone
 To start or stop the data collection, the smartphone needs to be updated regarding the change in the data
 collection status. So, if we want to start/stop the data collection from the smartwatch, we have to notify that intention to the smartphone.
 Then, the smartphone will update its internal status and once everything is set up, it will confirm the smartwatch
@@ -296,6 +345,9 @@ requested for the specified sensor. Use it along `PermissionsManager.launchPermi
 ### `SensorManager`
 Refer to the [_Background Sensors_](https://github.com/GeoTecINIT/BackgroundSensors#sensormanager) documentation.
 
+### `ServiceManager`
+Refer to the [_Background Sensors_](https://github.com/GeoTecINIT/BackgroundSensors#servicemanager) documentation.
+
 ### [`PermissionsManager`](wearossensors/src/main/java/es/uji/geotec/wearossensors/permissions/PermissionsManager.java)
 | **Static Method**                                                                    | **Return type**     | **Description**                                                                                                                                                                                         |
 |--------------------------------------------------------------------------------------|---------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|

From 66c20a84b398dafa52cc5bc8fb6e1bca745a9e5a Mon Sep 17 00:00:00 2001
From: Miguel Matey Sanz <al341802@uji.es>
Date: Mon, 29 Jan 2024 13:01:17 +0100
Subject: [PATCH 6/6] fix: update typo in readme

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f5d599e..d642992 100644
--- a/README.md
+++ b/README.md
@@ -123,7 +123,7 @@ two main steps in the process:
 
 1. Check if permissions are required:
    - If the data collection is started using the paired smartphone, the check is automatic. You have to do nothing!
-   - If the data collection is started using the smartphone, you need to do the check using the [`PermissionsManager.launchPermissionsRequestIfNeeded()`](#permissionsmanager) method.
+   - If the data collection is started using the smartwatch, you need to do the check using the [`PermissionsManager.launchPermissionsRequestIfNeeded()`](#permissionsmanager) method.
 2. Request the required permissions: the library handles mostly of the process by you, but you still have to do execute some steps:
    - Create an Activity: it will be used by the library to request the permissions. This will allow you to define a UI where some information can be given prior to the permissions request.
    - In your activity: