diff --git a/app/build.gradle b/app/build.gradle index d030d197..2459738b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -57,11 +57,11 @@ dependencies { // Import the BLE Common Library. // The BLE Common Library depends on BLE Library. It is enough to include the first one. - implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha05' + // implementation 'no.nordicsemi.android:ble-common:2.2.0-alpha05' // The BLE Common Library may be included from jcenter. If you want to modify the code, // clone both projects from GitHub and replace the line above with the following // (and also the according lines in the settings.gradle): - // implementation project(':ble-common') + implementation project(':ble-common') implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 62ddac46..258f48e9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -119,7 +119,7 @@ android:name="no.nordicsemi.android.nrftoolbox.dfu.NotificationActivity" android:label="@string/dfu_feature_title" /> @@ -129,7 +129,7 @@ @@ -139,7 +139,7 @@ - @@ -250,7 +250,7 @@ { +class CGMManager extends BatteryManager { /** Cycling Speed and Cadence service UUID. */ static final UUID CGMS_UUID = UUID.fromString("0000181F-0000-1000-8000-00805f9b34fb"); private static final UUID CGM_STATUS_UUID = UUID.fromString("00002AA9-0000-1000-8000-00805f9b34fb"); @@ -65,7 +65,7 @@ class CGMSManager extends BatteryManager { private BluetoothGattCharacteristic cgmSpecificOpsControlPointCharacteristic; private BluetoothGattCharacteristic recordAccessControlPointCharacteristic; - private SparseArray records = new SparseArray<>(); + private SparseArray records = new SparseArray<>(); /** A flag set to true if the remote device supports E2E CRC. */ private boolean secured; @@ -80,7 +80,7 @@ class CGMSManager extends BatteryManager { */ private long sessionStartTime; - CGMSManager(final Context context) { + CGMManager(final Context context) { super(context); } @@ -108,8 +108,8 @@ class CGMSManager extends BatteryManager { @Override public void onContinuousGlucoseMonitorFeaturesReceived(@NonNull final BluetoothDevice device, @NonNull final CGMFeatures features, final int type, final int sampleLocation, final boolean secured) { - CGMSManager.this.secured = features.e2eCrcSupported; - log(LogContract.Log.Level.APPLICATION, "E2E CRC feature " + (CGMSManager.this.secured ? "supported" : "not supported")); + CGMManager.this.secured = features.e2eCrcSupported; + log(LogContract.Log.Level.APPLICATION, "E2E CRC feature " + (CGMManager.this.secured ? "supported" : "not supported")); } }) .fail((device, status) -> log(Log.WARN, "Could not read CGM Feature characteristic")) @@ -155,7 +155,7 @@ class CGMSManager extends BatteryManager { // Calculate the sample timestamp based on the Session Start Time final long timestamp = sessionStartTime + (timeOffset * 60000L); // Sequence number is in minutes since Start Session - final CGMSRecord record = new CGMSRecord(timeOffset, glucoseConcentration, timestamp); + final CGMRecord record = new CGMRecord(timeOffset, glucoseConcentration, timestamp); records.put(record.sequenceNumber, record); callbacks.onCGMValueReceived(device, record); } @@ -332,7 +332,7 @@ class CGMSManager extends BatteryManager { /** * Returns a list of CGM records obtained from this device. The key in the array is the */ - SparseArray getRecords() { + SparseArray getRecords() { return records; } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManagerCallbacks.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManagerCallbacks.java similarity index 93% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManagerCallbacks.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManagerCallbacks.java index 47708ee4..4e4eec28 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSManagerCallbacks.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMManagerCallbacks.java @@ -20,16 +20,16 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.cgms; +package no.nordicsemi.android.nrftoolbox.cgm; import android.bluetooth.BluetoothDevice; import androidx.annotation.NonNull; import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks; -interface CGMSManagerCallbacks extends BatteryManagerCallbacks { +interface CGMManagerCallbacks extends BatteryManagerCallbacks { - void onCGMValueReceived(@NonNull final BluetoothDevice device, @NonNull final CGMSRecord record); + void onCGMValueReceived(@NonNull final BluetoothDevice device, @NonNull final CGMRecord record); void onOperationStarted(final @NonNull BluetoothDevice device); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSRecord.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMRecord.java similarity index 65% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSRecord.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMRecord.java index 233a1a8a..3be66f7d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSRecord.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMRecord.java @@ -1,9 +1,9 @@ -package no.nordicsemi.android.nrftoolbox.cgms; +package no.nordicsemi.android.nrftoolbox.cgm; import android.os.Parcel; import android.os.Parcelable; -class CGMSRecord implements Parcelable{ +class CGMRecord implements Parcelable{ /** Record sequence number. */ int sequenceNumber; /** The base time of the measurement (start time + sequenceNumber of minutes). */ @@ -11,27 +11,27 @@ class CGMSRecord implements Parcelable{ /** The glucose concentration in mg/dL. */ float glucoseConcentration; - CGMSRecord(final int sequenceNumber, final float glucoseConcentration, final long timestamp) { + CGMRecord(final int sequenceNumber, final float glucoseConcentration, final long timestamp) { this.sequenceNumber = sequenceNumber; this.glucoseConcentration = glucoseConcentration; this.timestamp = timestamp; } - private CGMSRecord(final Parcel in) { + private CGMRecord(final Parcel in) { this.sequenceNumber = in.readInt(); this.glucoseConcentration = in.readFloat(); this.timestamp = in.readLong(); } - public static final Creator CREATOR = new Creator() { + public static final Creator CREATOR = new Creator() { @Override - public CGMSRecord createFromParcel(final Parcel in) { - return new CGMSRecord(in); + public CGMRecord createFromParcel(final Parcel in) { + return new CGMRecord(in); } @Override - public CGMSRecord[] newArray(final int size) { - return new CGMSRecord[size]; + public CGMRecord[] newArray(final int size) { + return new CGMRecord[size]; } }; diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSRecordsAdapter.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMRecordsAdapter.java similarity index 77% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSRecordsAdapter.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMRecordsAdapter.java index 2f81b0be..dc1c0624 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSRecordsAdapter.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMRecordsAdapter.java @@ -1,4 +1,4 @@ -package no.nordicsemi.android.nrftoolbox.cgms; +package no.nordicsemi.android.nrftoolbox.cgm; import android.content.Context; import android.view.LayoutInflater; @@ -17,13 +17,13 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import no.nordicsemi.android.nrftoolbox.R; -class CGMSRecordsAdapter extends BaseAdapter { +class CGMRecordsAdapter extends BaseAdapter { private final static SimpleDateFormat timeFormat = new SimpleDateFormat("dd.MM.yyyy HH:mm", Locale.US); - private List records; + private List records; private LayoutInflater inflater; - CGMSRecordsAdapter(@NonNull final Context context) { + CGMRecordsAdapter(@NonNull final Context context) { records = new ArrayList<>(); inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } @@ -58,15 +58,15 @@ class CGMSRecordsAdapter extends BaseAdapter { viewHolder = (ViewHolder) view.getTag(); } - final CGMSRecord cgmsRecord = records.get(position); - viewHolder.concentration.setText(String.valueOf(cgmsRecord.glucoseConcentration)); - viewHolder.details.setText(viewHolder.details.getResources().getString(R.string.cgms_details, cgmsRecord.sequenceNumber)); - viewHolder.time.setText(timeFormat.format(new Date(cgmsRecord.timestamp))); + final CGMRecord CGMRecord = records.get(position); + viewHolder.concentration.setText(String.valueOf(CGMRecord.glucoseConcentration)); + viewHolder.details.setText(viewHolder.details.getResources().getString(R.string.cgms_details, CGMRecord.sequenceNumber)); + viewHolder.time.setText(timeFormat.format(new Date(CGMRecord.timestamp))); return view; } - void addItem(final CGMSRecord record) { + void addItem(final CGMRecord record) { records.add(record); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMSActivity.java similarity index 89% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSActivity.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMSActivity.java index b8ae410f..0feb0948 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgms/CGMSActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/cgm/CGMSActivity.java @@ -20,7 +20,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.cgms; +package no.nordicsemi.android.nrftoolbox.cgm; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; @@ -51,7 +51,7 @@ public class CGMSActivity extends BleProfileServiceReadyActivity records) { - cgmsRecordsAdapter.clear(); + private void loadAdapter(SparseArray records) { + CGMRecordsAdapter.clear(); for (int i = 0; i < records.size(); i++) { - cgmsRecordsAdapter.addItem(records.valueAt(i)); + CGMRecordsAdapter.addItem(records.valueAt(i)); } - cgmsRecordsAdapter.notifyDataSetChanged(); + CGMRecordsAdapter.notifyDataSetChanged(); } @Override @@ -119,11 +119,11 @@ public class CGMSActivity extends BleProfileServiceReadyActivity cgmsRecords = binder.getRecords(); + final SparseArray cgmsRecords = binder.getRecords(); if (cgmsRecords != null && cgmsRecords.size() > 0) { - if (cgmsRecordsAdapter == null) { - cgmsRecordsAdapter = new CGMSRecordsAdapter(CGMSActivity.this); - recordsListView.setAdapter(cgmsRecordsAdapter); + if (CGMRecordsAdapter == null) { + CGMRecordsAdapter = new CGMRecordsAdapter(CGMSActivity.this); + recordsListView.setAdapter(CGMRecordsAdapter); } loadAdapter(cgmsRecords); } @@ -156,7 +156,7 @@ public class CGMSActivity extends BleProfileServiceReadyActivity getRecords() { + SparseArray getRecords() { return manager.getRecords(); } @@ -70,7 +70,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback /** * Sends the request to obtain the first (oldest) record from glucose device. * The data will be returned to Glucose Measurement characteristic as a notification followed by Record Access Control - * Point indication with status code ({@link CGMSManager# RESPONSE_SUCCESS} or other in case of error. + * Point indication with status code ({@link CGMManager# RESPONSE_SUCCESS} or other in case of error. */ void getFirstRecord() { if (manager != null) @@ -132,8 +132,8 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback } @Override - protected LoggableBleManager initializeManager() { - return manager = new CGMSManager(this); + protected LoggableBleManager initializeManager() { + return manager = new CGMManager(this); } @@ -243,7 +243,7 @@ public class CGMService extends BleProfileService implements CGMSManagerCallback }; @Override - public void onCGMValueReceived(@NonNull final BluetoothDevice device, @NonNull final CGMSRecord record) { + public void onCGMValueReceived(@NonNull final BluetoothDevice device, @NonNull final CGMRecord record) { final Intent broadcast = new Intent(BROADCAST_NEW_CGMS_VALUE); broadcast.putExtra(EXTRA_DEVICE, getBluetoothDevice()); broadcast.putExtra(EXTRA_CGMS_RECORD, record); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRActivity.java similarity index 96% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRActivity.java index 74817698..69482a20 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRActivity.java @@ -19,7 +19,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hrs; +package no.nordicsemi.android.nrftoolbox.hr; import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; @@ -49,7 +49,7 @@ import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; * uses external library AChartEngine to show real time graph of HR values. */ // TODO The HRSActivity should be rewritten to use the service approach, like other do. -public class HRSActivity extends BleProfileActivity implements HRSManagerCallbacks { +public class HRActivity extends BleProfileActivity implements HRManagerCallbacks { @SuppressWarnings("unused") private final String TAG = "HRSActivity"; @@ -151,7 +151,7 @@ public class HRSActivity extends BleProfileActivity implements HRSManagerCallbac @Override protected UUID getFilterUUID() { - return HRSManager.HR_SERVICE_UUID; + return HRManager.HR_SERVICE_UUID; } private void updateGraph(final int hrmValue) { @@ -181,8 +181,8 @@ public class HRSActivity extends BleProfileActivity implements HRSManagerCallbac } @Override - protected LoggableBleManager initializeManager() { - final HRSManager manager = HRSManager.getInstance(getApplicationContext()); + protected LoggableBleManager initializeManager() { + final HRManager manager = HRManager.getInstance(getApplicationContext()); manager.setManagerCallbacks(this); return manager; } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java similarity index 95% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java index 5d3234fd..fdc91d93 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManager.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManager.java @@ -19,7 +19,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hrs; +package no.nordicsemi.android.nrftoolbox.hr; import android.bluetooth.BluetoothDevice; import android.bluetooth.BluetoothGatt; @@ -50,26 +50,26 @@ import no.nordicsemi.android.nrftoolbox.parser.HeartRateMeasurementParser; * All operations required to connect to device with BLE Heart Rate Service and reading * heart rate values are performed here. */ -public class HRSManager extends BatteryManager { +public class HRManager extends BatteryManager { static final UUID HR_SERVICE_UUID = UUID.fromString("0000180D-0000-1000-8000-00805f9b34fb"); private static final UUID BODY_SENSOR_LOCATION_CHARACTERISTIC_UUID = UUID.fromString("00002A38-0000-1000-8000-00805f9b34fb"); private static final UUID HEART_RATE_MEASUREMENT_CHARACTERISTIC_UUID = UUID.fromString("00002A37-0000-1000-8000-00805f9b34fb"); private BluetoothGattCharacteristic heartRateCharacteristic, bodySensorLocationCharacteristic; - private static HRSManager managerInstance = null; + private static HRManager managerInstance = null; /** * Singleton implementation of HRSManager class. */ - public static synchronized HRSManager getInstance(final Context context) { + public static synchronized HRManager getInstance(final Context context) { if (managerInstance == null) { - managerInstance = new HRSManager(context); + managerInstance = new HRManager(context); } return managerInstance; } - private HRSManager(final Context context) { + private HRManager(final Context context) { super(context); } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManagerCallbacks.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManagerCallbacks.java similarity index 91% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManagerCallbacks.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManagerCallbacks.java index 79f18706..7e02480d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/HRSManagerCallbacks.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/HRManagerCallbacks.java @@ -19,12 +19,12 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hrs; +package no.nordicsemi.android.nrftoolbox.hr; import no.nordicsemi.android.ble.common.profile.hr.BodySensorLocationCallback; import no.nordicsemi.android.ble.common.profile.hr.HeartRateMeasurementCallback; import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks; -interface HRSManagerCallbacks extends BatteryManagerCallbacks, BodySensorLocationCallback, HeartRateMeasurementCallback { +interface HRManagerCallbacks extends BatteryManagerCallbacks, BodySensorLocationCallback, HeartRateMeasurementCallback { } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/LineGraphView.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/LineGraphView.java similarity index 99% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/LineGraphView.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/LineGraphView.java index 0978fd4e..4793f01b 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hrs/LineGraphView.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/hr/LineGraphView.java @@ -19,7 +19,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hrs; +package no.nordicsemi.android.nrftoolbox.hr; import android.content.Context; import android.graphics.Color; diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTActivity.java similarity index 87% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSActivity.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTActivity.java index 28ad2ef6..137c6f1b 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTActivity.java @@ -19,7 +19,7 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hts; +package no.nordicsemi.android.nrftoolbox.ht; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; @@ -38,17 +38,17 @@ import android.widget.TextView; import java.util.UUID; import no.nordicsemi.android.nrftoolbox.R; -import no.nordicsemi.android.nrftoolbox.hts.settings.SettingsActivity; -import no.nordicsemi.android.nrftoolbox.hts.settings.SettingsFragment; +import no.nordicsemi.android.nrftoolbox.ht.settings.SettingsActivity; +import no.nordicsemi.android.nrftoolbox.ht.settings.SettingsFragment; import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; import no.nordicsemi.android.nrftoolbox.profile.BleProfileServiceReadyActivity; /** - * HTSActivity is the main Health Thermometer activity. It implements {@link HTSManagerCallbacks} - * to receive callbacks from {@link HTSManager} class. The activity supports portrait and landscape + * HTSActivity is the main Health Thermometer activity. It implements {@link HTManagerCallbacks} + * to receive callbacks from {@link HTManager} class. The activity supports portrait and landscape * orientations. */ -public class HTSActivity extends BleProfileServiceReadyActivity { +public class HTActivity extends BleProfileServiceReadyActivity { @SuppressWarnings("unused") private final String TAG = "HTSActivity"; @@ -111,7 +111,7 @@ public class HTSActivity extends BleProfileServiceReadyActivity getServiceClass() { - return HTSService.class; + return HTService.class; } @Override @@ -204,12 +204,12 @@ public class HTSActivity extends BleProfileServiceReadyActivity { +public class HTManager extends BatteryManager { /** Health Thermometer service UUID */ final static UUID HT_SERVICE_UUID = UUID.fromString("00001809-0000-1000-8000-00805f9b34fb"); /** Health Thermometer Measurement characteristic UUID */ @@ -54,7 +55,7 @@ public class HTSManager extends BatteryManager { private BluetoothGattCharacteristic htCharacteristic; - HTSManager(final Context context) { + HTManager(final Context context) { super(context); } @@ -82,7 +83,8 @@ public class HTSManager extends BatteryManager { @Override public void onTemperatureMeasurementReceived(@NonNull final BluetoothDevice device, - final float temperature, @TemperatureUnit final int unit, + final float temperature, + @TemperatureUnit final int unit, @Nullable final Calendar calendar, @Nullable @TemperatureType final Integer type) { callbacks.onTemperatureMeasurementReceived(device, temperature, unit, calendar, type); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManagerCallbacks.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManagerCallbacks.java similarity index 85% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManagerCallbacks.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManagerCallbacks.java index c8053b06..e35856d5 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSManagerCallbacks.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTManagerCallbacks.java @@ -19,15 +19,15 @@ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hts; +package no.nordicsemi.android.nrftoolbox.ht; import no.nordicsemi.android.ble.common.profile.ht.TemperatureMeasurementCallback; import no.nordicsemi.android.nrftoolbox.battery.BatteryManagerCallbacks; /** - * Interface {@link HTSManagerCallbacks} must be implemented by {@link HTSActivity} in order - * to receive callbacks from {@link HTSManager}. + * Interface {@link HTManagerCallbacks} must be implemented by {@link HTActivity} in order + * to receive callbacks from {@link HTManager}. */ -interface HTSManagerCallbacks extends BatteryManagerCallbacks, TemperatureMeasurementCallback { +interface HTManagerCallbacks extends BatteryManagerCallbacks, TemperatureMeasurementCallback { } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTService.java similarity index 96% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTService.java index 42c6d011..684e9afd 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/HTSService.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/HTService.java @@ -20,7 +20,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hts; +package no.nordicsemi.android.nrftoolbox.ht; import android.app.Notification; import android.app.NotificationManager; @@ -50,7 +50,7 @@ import no.nordicsemi.android.nrftoolbox.profile.BleProfileService; import no.nordicsemi.android.nrftoolbox.profile.LoggableBleManager; @SuppressWarnings("FieldCanBeLocal") -public class HTSService extends BleProfileService implements HTSManagerCallbacks { +public class HTService extends BleProfileService implements HTManagerCallbacks { public static final String BROADCAST_HTS_MEASUREMENT = "no.nordicsemi.android.nrftoolbox.hts.BROADCAST_HTS_MEASUREMENT"; public static final String EXTRA_TEMPERATURE = "no.nordicsemi.android.nrftoolbox.hts.EXTRA_TEMPERATURE"; @@ -66,7 +66,7 @@ public class HTSService extends BleProfileService implements HTSManagerCallbacks private Float temp; @SuppressWarnings("unused") - private HTSManager manager; + private HTManager manager; private final LocalBinder minder = new HTSBinder(); @@ -90,8 +90,8 @@ public class HTSService extends BleProfileService implements HTSManagerCallbacks } @Override - protected LoggableBleManager initializeManager() { - return manager = new HTSManager(this); + protected LoggableBleManager initializeManager() { + return manager = new HTManager(this); } @Override @@ -194,7 +194,7 @@ public class HTSService extends BleProfileService implements HTSManagerCallbacks private Notification createNotification(final int messageResId, final int defaults) { final Intent parentIntent = new Intent(this, FeaturesActivity.class); parentIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - final Intent targetIntent = new Intent(this, HTSActivity.class); + final Intent targetIntent = new Intent(this, HTActivity.class); final Intent disconnect = new Intent(ACTION_DISCONNECT); final PendingIntent disconnectAction = PendingIntent.getBroadcast(this, DISCONNECT_REQ, disconnect, PendingIntent.FLAG_UPDATE_CURRENT); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/settings/SettingsActivity.java similarity index 97% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsActivity.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/settings/SettingsActivity.java index 30065d79..9830868f 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/settings/SettingsActivity.java @@ -20,7 +20,7 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hts.settings; +package no.nordicsemi.android.nrftoolbox.ht.settings; import android.os.Bundle; import androidx.appcompat.app.AppCompatActivity; diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsFragment.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/settings/SettingsFragment.java similarity index 95% rename from app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsFragment.java rename to app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/settings/SettingsFragment.java index 27bd3d7a..316e7cc9 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/hts/settings/SettingsFragment.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/ht/settings/SettingsFragment.java @@ -20,10 +20,9 @@ * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -package no.nordicsemi.android.nrftoolbox.hts.settings; +package no.nordicsemi.android.nrftoolbox.ht.settings; import android.os.Bundle; -import android.preference.PreferenceFragment; import androidx.preference.PreferenceFragmentCompat; import no.nordicsemi.android.nrftoolbox.R; diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java index 50b5ed68..b3e0e842 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/profile/BleProfileExpandableListActivity.java @@ -143,7 +143,7 @@ public abstract class BleProfileExpandableListActivity extends ExpandableListAct } @Override - protected void onSaveInstanceState(final Bundle outState) { + protected void onSaveInstanceState(@NonNull final Bundle outState) { super.onSaveInstanceState(outState); outState.putBoolean(SIS_CONNECTION_STATUS, deviceConnected); outState.putString(SIS_DEVICE_NAME, deviceName); diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java index 063c0694..741ce79d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/proximity/DeviceAdapter.java @@ -37,11 +37,11 @@ import java.util.List; import no.nordicsemi.android.nrftoolbox.R; -public class DeviceAdapter extends RecyclerView.Adapter { +class DeviceAdapter extends RecyclerView.Adapter { private final ProximityService.ProximityBinder service; private final List devices; - DeviceAdapter(final ProximityService.ProximityBinder binder) { + DeviceAdapter(@NonNull final ProximityService.ProximityBinder binder) { service = binder; devices = service.getManagedDevices(); } @@ -63,7 +63,7 @@ public class DeviceAdapter extends RecyclerView.Adapter= 0) notifyItemChanged(position); } - public void onBatteryValueReceived(final BluetoothDevice device) { + void onBatteryValueReceived(final BluetoothDevice device) { final int position = devices.indexOf(device); if (position >= 0) notifyItemChanged(position); @@ -123,7 +123,7 @@ public class DeviceAdapter extends RecyclerView.Adapter { @NonNull @Override protected BatteryManagerGattCallback getGattCallback() { - return gattCallback; + return new RSCManagerGattCallback(); } /** * BluetoothGatt callbacks for connection/disconnection, service discovery, * receiving indication, etc. */ - private final BatteryManagerGattCallback gattCallback = new BatteryManagerGattCallback() { + private class RSCManagerGattCallback extends BatteryManagerGattCallback { @Override protected void initialize() { @@ -99,5 +99,5 @@ public class RSCManager extends BatteryManager { super.onDeviceDisconnected(); rscMeasurementCharacteristic = null; } - }; + } } diff --git a/app/src/main/res/layout-land/activity_feature_cgms.xml b/app/src/main/res/layout-land/activity_feature_cgms.xml index 45dfc77c..ccb5a46d 100644 --- a/app/src/main/res/layout-land/activity_feature_cgms.xml +++ b/app/src/main/res/layout-land/activity_feature_cgms.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - tools:context=".cgms.CGMSActivity"> + tools:context=".cgm.CGMSActivity"> + tools:context=".hr.HRActivity"> + tools:context=".ht.HTActivity"> + tools:context=".hr.HRActivity"> + tools:context=".hr.HRActivity"> + tools:context=".ht.HTActivity"> - - \ No newline at end of file + app:titleTextAppearance="@style/ActionBar.TitleText" /> \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar_w_spinner.xml b/app/src/main/res/layout/toolbar_w_spinner.xml index 569ad8f3..7161b8be 100644 --- a/app/src/main/res/layout/toolbar_w_spinner.xml +++ b/app/src/main/res/layout/toolbar_w_spinner.xml @@ -1,5 +1,4 @@ - - - - \ No newline at end of file + android:minWidth="160dp" /> + \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 51ac2229..a5e685dc 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -98,7 +98,7 @@ diff --git a/settings.gradle b/settings.gradle index 3dbd0f8b..93eadd71 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,9 +3,9 @@ include ':app', ':wear', ':common' // Uncomment these lines if you want to import the BLE Library and BLE Common Library as a project, // not from jcenter: -// include ':ble', ':ble-common' -// project(':ble').projectDir = file('../Android-BLE-Library/ble') -// project(':ble-common').projectDir = file('../Android-BLE-Common-Library/ble-common') +include ':ble', ':ble-common' +project(':ble').projectDir = file('../Android-BLE-Library/ble') +project(':ble-common').projectDir = file('../Android-BLE-Common-Library/ble-common') // Uncomment these lines if you want to import the DFULibrary as a project, not from jcenter: