michaelrhughes commented 3 years ago

This is a big one 😄

My wife's device keeps on pairing and I have to run upstairs to pair my footpod 🤣. To support multiple ANT+ devices I needed to do a lot of refactoring. If you feel this should be a fork instead of a PR let me know. Normally I would do this in a series of smaller PRs but I was low on time for this one.

Motivations for this PR:

My wife and I workout at the same time and I wanted to be able to choose what device is broadcasted over bluetooth. I had to keep on restarting the app until I get lucky with timing and it selects my device
Now that the HR sensor and the RSC sensor are added the code had a lot of boilerplate. There is lots of copying and pasting to add new sensors, I figured a reorganization of the code would be better to scale. Someone will have to add much less code to add new sensors.
I work in Kotlin a lot at work and Android has been going in that direction, Kotlin made this much quicker for me
Right now the Service is killed when the Android task is killed. It felt more intuitive to have a Stop button in the notification
I find myself using this app multiple times a week so I wanted something that worked perfectly for my use case. Hopefully it is useful for the community 😄
It was fun, I learnt a bunch about BLE

Disclaimers:

I do not have a Bsd or a Bc sensor so I was unable to test this sensor. They should be coded correctly though 🤞.
I do not have a combined Bsd/Bc sensor so I was unable to test this sensor. They should be coded correctly though 🤞.
I plan on making some more UI tweaks (spinners when things are loading, better displaying of units on device)
Long press to search for a device doesn't work anymore, you'd just restart the BLE Bridge

New Code Organization:

Activities/Fragments/Service just manage lifecycle, UI and communication between components
service/ant - has all ant specific code
service/ble - has all ble specific code
AntToBleBridge - manages the communication between the two

Adding a new Sensor

To add a new sensor you should be able to: 1) Add a new AntDevice, Add a new AntDeviceConnector 2) Add a new BleServiceType with all the BLE specific stuff, add it to the list of serviceTypes 3) Hook the two up between AntToBleBridge 4) No need to add UI or worry about lifecycle of Pcc or BLE

ScreenShots

You can see only one of the Stride SDM devices is broadcasting to BLE right now:

Screenshot_20210218-212250_CSC_BLE_Bridge

The updated Stop button:

Screenshot_20210218-212307_CSC_BLE_Bridge

starryalley commented 3 years ago

Awesome PR. I had to find some time to digest this but really appreciated your work!! Thank you!!

leaskovski commented 3 years ago

Do we know if this awesome PR is going to get accepted any time soon?