Added widget for WearOS device battery level #195

RobertoW-UK · 2024-12-23T09:52:17Z

Note: The new string "widget_wearos_battery_level" will need translations.

pachi81 · 2024-12-23T10:04:25Z

Looks good for first check. But, I do not merge at the moment. Maybe next year, as there is no time left. This year.
Thank you!

RobertoW-UK · 2024-12-23T10:12:32Z

That's fine, thanks for looking.. have a great xmas!

pachi81 · 2024-12-23T13:38:02Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

@@ -28,15 +30,17 @@ enum class WidgetType(val cls: Class<*>) {
    GLUCOSE_TREND_DELTA(GlucoseTrendDeltaWidget::class.java),
    GLUCOSE_TREND_DELTA_TIME(GlucoseTrendDeltaTimeWidget::class.java),
    GLUCOSE_TREND_DELTA_TIME_IOB_COB(GlucoseTrendDeltaTimeIobCobWidget::class.java),
-    OTHER_UNIT(OtherUnitWidget::class.java);
+    OTHER_UNIT(OtherUnitWidget::class.java),
+    BATTERY_LEVEL(BatteryLevelWidget::class.java);


I think you can not use this base class, as these widget will not be updated for Battery-Level change.
You have to use an own class with parent NotifierInterface and register for NotifySource.NODE_BATTERY_LEVEL.

Also for NotifySource.CAPILITY_INFO, this will be called, if wear is connected or disconnected...

The widget Notifier should only be active, if there is at least one Widget active.
The object/class must be initialized via GlucoDataServiceMobile::onCreate():

GlucoDataHandler/mobile/src/main/java/de/michelinside/glucodatahandler/GlucoDataServiceMobile.kt

Line 165 in f546973

GlucoseBaseWidget.updateWidgets(applicationContext)

I'll investigate this

Have moved this into a separate class now

Then remove all changes to this class.

pachi81 · 2024-12-23T13:39:41Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

+
+
+        if (hasBatteryLevel) {
+            var deviceNameStr = "No WearOS Device"


No static text! Check, if there is already one. For example "activity_main_disconnected_label".

My bad, will add new string

pachi81 · 2024-12-23T13:40:46Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

+
+            if (WearPhoneConnection.nodesConnected) {
+                if (WearPhoneConnection.connectionError) {
+                    deviceNameStr = "Connection error"


No static text here.

My bad, will add new string

pachi81 · 2024-12-23T13:41:24Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

+
+        if (hasBatteryLevel) {
+            var deviceNameStr = "No WearOS Device"
+            var levelStr = "?%"


Either ?% or --%

pachi81 · 2024-12-23T13:43:03Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

+                    deviceNameStr = "Connection error"
+                }
+                else {
+                    WearPhoneConnection.getNodeBatterLevels().firstNotNullOf { (name, level) ->


I also thought about supporting for more than one watch, but this is more a corner case and would make it too complicated... So using only the first is fine!

I did think about this too.. I figured it would be unlikely a user would have more than one device

pachi81 · 2024-12-23T13:44:10Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

+                    WearPhoneConnection.getNodeBatterLevels().firstNotNullOf { (name, level) ->
+                        if (level > 0)
+                            levelStr = "$level%"
+                        deviceNameStr = name


Maybe we can simplify the name, while removing "(...)" For example "Galaxy Watch 5 (abc)" would be nicer to have only "Galaxy Watch 5".

I only have my own watch as reference which doesn't have anything in braces after the name.. I can check for that case and remove if required.

Here is my watch name

Or leave it as it is, I will change in the Wear class to have the same name everywhere.

…er to also send device name.

RobertoW-UK · 2025-01-08T10:38:18Z

Hi Michael, I have moved this login into a separate class now.
I don't seem to be receiving CAPILITY_INFO messages when the watch connection is lost however..

pachi81 · 2025-01-08T10:47:23Z

common/src/main/java/de/michelinside/glucodatahandler/common/WearPhoneConnection.kt

+            if (node != null)
+                deviceName = node.displayName
+
+            extra.putString(BatteryReceiver.DEVICENAME, deviceName);


Maybe it makes more sense to add the nodeId, so the data can be requested by nodeId...

Have removed this field now as I'm using broadcast to update widgets.

pachi81 · 2025-01-08T11:34:04Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidgetNotifier.kt

+        try {
+            Log.d(LOG_ID, "OnNotifyData called for source $dataSource ${extras?.toString()}")
+
+            if (dataSource == NotifySource.NODE_BATTERY_LEVEL) {


What about CAPILITY_INFO?
I think it would be better to trigger a broadcast to like here:

GlucoDataHandler/mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

Line 71 in f546973

val intent = Intent(context, type.cls)

I don't see CAPILITY_INFO when my watch goes onto airplane mode or I disable all connectivity. Any ideas why I don't see these?
Changing to a broadcast should be straightforward enough

Sometime it take some time, until the GDH gets this information. Just checkout the main screen for connection, as long the Watch is connected, GDH did not get the info from the system...

Updated to use broadcast. Battery level and watch name now taken from nodesConnected data

pachi81 · 2025-01-08T11:35:55Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidgetNotifier.kt

+                appWidgetIds.forEach { appWidgetId ->
+                    BatteryLevelWidget.updateWidget(context, appWidgetManager, appWidgetId,
+                        extras?.getInt(BatteryReceiver.LEVEL) ?: 0,
+                        extras?.getString(BatteryReceiver.DEVICENAME) ?: context.getString(R.string.activity_main_disconnected_label)


This may cause problems, if there is more than one watch connected, the widget would change every time between the both watches. Better use the broadcast, which will trigger OnUpdate in Widget class.

Will this help for multiple watches? It's pretty edge case that someone would have more than one..

BATTERY_LEVEL(BatteryLevelWidget::class.java) - This line shouldn't be there, I thought I had removed that. I'm not using your GlucoseBaseWidget class at all now.

capillity_logs.txt

Michael, here's some example logs.. At line 18 I get the CAPILITY_INFO message ok.. after this I put my watch into airplane mode and observe the watch being removed from the main screen, but I don't get any corresponding CAPILITY_INFO message in my handler to indicate this...

You are right. I have to check and will fix it. Sorry!

Mi Michael, that isn't working quite as expected.. I get the message will null in extras when watch is disconnected.. When the watch connects I get the same message with a null payload..

Yes, that is the reason that you should not use the extras. Just trigger a widget update with the related broadcast, which will cause calling "onUpdate", where you are using the first watch in list..

The way I had planned to implement this was to stop the BATTERY_LEVEL notification if extras was null and restart if extras had data.. Are you happy to leave the BATTERY_LEVEL notifier running if the watch is disconnected?

As long there is a widget present, you should keep notifier for both sources.
On each "OnNotifyData" for these sources, you should trigger an update of all widgets using the broadcast.

Cool. That makes things simpler

pachi81 · 2025-01-08T11:36:43Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

@@ -28,15 +30,17 @@ enum class WidgetType(val cls: Class<*>) {
    GLUCOSE_TREND_DELTA(GlucoseTrendDeltaWidget::class.java),
    GLUCOSE_TREND_DELTA_TIME(GlucoseTrendDeltaTimeWidget::class.java),
    GLUCOSE_TREND_DELTA_TIME_IOB_COB(GlucoseTrendDeltaTimeIobCobWidget::class.java),
-    OTHER_UNIT(OtherUnitWidget::class.java);
+    OTHER_UNIT(OtherUnitWidget::class.java),
+    BATTERY_LEVEL(BatteryLevelWidget::class.java);


Then remove all changes to this class.

…m BatteryReceiver

pachi81 · 2025-01-09T12:28:32Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

+
+
+
+


Still some changes left ;-)

pachi81 · 2025-01-09T12:31:31Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidget.kt

+    companion object {
+        const val LOG_ID = "GDH.widget.BatteryLevelWidget"
+
+        fun updateWidget(


Move to class (not companion) and make it private.

I think, this can be private, but not important...

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidget.kt

…perly.

pachi81

Really good work!!! Thank you soo much!

pachi81 · 2025-01-09T14:10:35Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidget.kt

+    companion object {
+        const val LOG_ID = "GDH.widget.BatteryLevelWidget"
+
+        fun updateWidget(


I think, this can be private, but not important...

pachi81 · 2025-01-09T14:18:00Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidget.kt

+
+                // Use values from current connection if we have one as it might take a while to get a NODE_BATTERY_LEVEL message to update widget
+                if (WearPhoneConnection.nodesConnected && !WearPhoneConnection.connectionError) {
+                    WearPhoneConnection.getNodeBatterLevels().firstNotNullOf { (name, level) ->


What about creating a new function return first BatteryLevel and name using pickBestNodeId()!?

GlucoDataHandler/common/src/main/java/de/michelinside/glucodatahandler/common/WearPhoneConnection.kt

Line 283 in f546973

fun pickBestNodeId(): String? {

This can be moved to companion object of WearPhoneConnection and a new function return the battery level for this nodeId:
fun getNodeBatteryLevel(nodeId: String)

Just an improvement/suggestion...

Have implemented this

pachi81 · 2025-01-09T14:19:10Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidgetNotifier.kt

+
+    fun init() {
+        Log.d(LOG_ID, "init called")
+        AddNotifier()


Only add, if there is a widget. Just keep the one in OnUpdate and remove the init...

pachi81 · 2025-01-09T14:20:42Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidgetNotifier.kt

+
+            val appWidgetManager = AppWidgetManager.getInstance(context)
+            val componentName =
+                ComponentName(context!!.packageName, BatteryLevelWidget::class.java.name)


Better use context as param!?

Added safety checks

pachi81 · 2025-01-09T14:20:57Z

mobile/src/main/java/de/michelinside/glucodatahandler/widget/BatteryLevelWidgetNotifier.kt

+    fun RemoveNotifier() {
+        try {
+            Log.d(LOG_ID, "RemoveNotifier called for " +  this.toString())
+            InternalNotifier.remNotifier(context!!, this)


Same here, use context as Param

Added safety checks

…hecks when accessing context

RobertoW-UK · 2025-01-22T19:44:51Z

Hi Michael, do you need me to make any more changes to this branch?

pachi81 · 2025-01-22T19:53:34Z

Hi Michael, do you need me to make any more changes to this branch?

I will have a look tomorrow.
As soon I have some time, I will test and merge it.
Thank you for your work!!!

pachi81 · 2025-01-23T08:43:52Z

Looks good so far! I will test it.
Just another question, which source are you using?

RobertoW-UK · 2025-01-23T09:24:06Z

Looks good so far! I will test it. Just another question, which source are you using?

Juggluco

pachi81 · 2025-01-23T09:32:07Z

Looks good so far! I will test it. Just another question, which source are you using?

Juggluco

Thank you! Same like me. I hoped, you are using Dexcom, as it would be great to have someone, who knows my code and can check the Dexcom Share part, as I do not have access. I have to find another one :-)

RobertoW-UK · 2025-01-23T10:00:47Z

Looks good so far! I will test it. Just another question, which source are you using?

Juggluco

Thank you! Same like me. I hoped, you are using Dexcom, as it would be great to have someone, who knows my code and can check the Dexcom Share part, as I do not have access. I have to find another one :-)

Good luck finding somebody :)

pachi81 · 2025-01-26T20:59:27Z

@RobertoW-UK Are you interested in continuing develop something for GDH?
So I can send you some topics.

Best regards, Michael

RobertoW-UK · 2025-01-27T14:44:10Z

Hey Michael, would be happy to help out.. Bear in mind I'm learning Android as I go though :)

pachi81 · 2025-01-27T15:47:03Z

Hey Michael, would be happy to help out.. Bear in mind I'm learning Android as I go though :)

This is really no problem, as this is my first Android app and the most things, I´m doing, are also new to me.
So here is a list of topics, which can be done without getting in conflict with my current work:

API 35 support (Edge to edge layout)
Lockscreen: add custom background image
AOD support
Nightscout upload

You can also write me a mail: [email protected]

Regards, Michael

Added widget for WearOS device battery level

c697012

pachi81 requested changes Dec 23, 2024

View reviewed changes

Moved bettery level widget into it's own class. Updated BatteryReceiv…

072e572

…er to also send device name.

RobertoW-UK requested a review from pachi81 January 8, 2025 10:38

pachi81 reviewed Jan 8, 2025

View reviewed changes

Now using broadcaster to update widgets. Removed DeviceName field fro…

a9a8ba8

…m BatteryReceiver

pachi81 reviewed Jan 9, 2025

View reviewed changes

mobile/src/main/java/de/michelinside/glucodatahandler/widget/GlucoseBaseWidget.kt

Copy link

Owner

pachi81 Jan 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still some changes left ;-)

pachi81 requested changes Jan 9, 2025

View reviewed changes

Only add notifiers if widgets present. Handle watch disconnection pro…

cf2c067

…perly.

RobertoW-UK requested a review from pachi81 January 9, 2025 14:05

pachi81 reviewed Jan 9, 2025

View reviewed changes

rwalker-bluebeck added 2 commits January 9, 2025 15:57

Removed init function from BatteryLevelWidgetNotifier. Added safety c…

ea9b5ba

…hecks when accessing context

Use pickBestNodeId to get battery level

ff2de23

RobertoW-UK requested a review from pachi81 January 9, 2025 17:25

Merge branch 'master' into battery_level_widget

c648531



		if (hasBatteryLevel) {
		var deviceNameStr = "No WearOS Device"

Added widget for WearOS device battery level #195

Are you sure you want to change the base?

Added widget for WearOS device battery level #195

Conversation

RobertoW-UK commented Dec 23, 2024

pachi81 commented Dec 23, 2024

RobertoW-UK commented Dec 23, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RobertoW-UK commented Jan 8, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pachi81 Jan 9, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pachi81 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

RobertoW-UK commented Jan 22, 2025

pachi81 commented Jan 22, 2025

pachi81 commented Jan 23, 2025

RobertoW-UK commented Jan 23, 2025

pachi81 commented Jan 23, 2025

RobertoW-UK commented Jan 23, 2025

pachi81 commented Jan 26, 2025

RobertoW-UK commented Jan 27, 2025

pachi81 commented Jan 27, 2025

pachi81 Jan 9, 2025 •

edited

Loading