Wear: running mode complication and picker + updated AAPS V4 WFF watchface - #5062
Open
olorinmaia wants to merge 10 commits into
Open
Wear: running mode complication and picker + updated AAPS V4 WFF watchface#5062olorinmaia wants to merge 10 commits into
olorinmaia wants to merge 10 commits into
Conversation
Show the current running mode as a color icon on the watchface (SMALL_IMAGE / ICON, image-only). Tap opens a small picker with the allowed mode changes, reusing the tile's confirm flow. - EventData.Status: new loopMode field (UNKNOWN for older senders) - Phone: send mode with status; resend on mode change so the watch does not wait for the next loop run - Wear: RunningModeComplication (no sync -> UNKNOWN), mode picker activity, "running_mode" tap action + preference entry
Picker icons now match the tile icon colors (explicit tint - the ic_loop_* drawables carry a theme tint that painted them all in one color). Suspend color rule: text stays yellow so it differs from disabled red, icons are red like the tile icon.
- Show all modes in the picker: the phone now sends the full list and the 4-slot tile drops "Disable loop" on the watch side instead - Header shows the active mode under the title, with remaining time for a temporary mode (new Status.modeEndTime field), colored with the same text colors as the loop status screen (shared mapping) - Fixed picker order: resume/reconnect first, then disconnect, suspend, closed, LGS, open, disable - Tighter header layout (subtitle inside the list header) - White provider icon so the complication chooser entry looks like the other AAPS complications
For watchfaces without tiles or complications the main menu is the only path to the picker. BG graph moved down next to it, both placed between Profile switch and Settings.
- Active mode and remaining time on separate lines (mode slightly bigger and colored, duration in secondary gray reusing the "%1$s remaining" string) - Compact header without ListHeader when a subtitle is shown: its min-height and padding pushed the title off the top edge and left a large gap under it - Closed loop first in the list when offered (the way back to normal looping), before resume/reconnect and the temporary modes
The request page for Disconnect pump and Suspend loop only showed the duration. Add the requested mode name above it, colored like the mode text (suspend yellow, disconnect gray) - same layout as the temp target confirm page.
New face revision adds two top slots: running mode (SMALL_IMAGE, colored mode icon, tap opens the picker) and uploader/phone battery. Default providers injected for all 7 slots; SAFE_WATCH_FACES added to the two new providers so the face can bind them automatically. Previews and the install menu icon updated.
Position tweaks from Watch Face Studio: text and title moved up in the middle circle complications, and the top left/right complications nudged and mirrored.
olorinmaia
changed the title
Contributor
|
Tested latest commit#d68f4e0a. Works great for my Samsung GW6. Did need to change settings for the WF to keep showing data when the watch goes into locking state (Samsungs Wrist detection):
Latest commit has 2 additional slots for complications at the upper left and right: I use them for showing the AAPS snooze "button" and Phones battery level. |
Contributor
Author
|
Further testing with other WFF watchfaces, like DMM13 from Glucodatahandler the same issue is present there. A quick google search also confirms that this is WFF related, and setting needs to be toggled by the user. Old code-based watchfaces aren't using complications and aren't affected. Samsung watchfaces may also be "whitelisted" from this, but there doesn't seem to be any way to bypass it by code. We can consider leaving a note in wiki regarding this and the WFF watchface. 
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What
Compatibility
Old phone with new watch (and reverse) is safe: new Status fields have defaults and unknown fields are ignored.
Tests
New: RunningModeComplicationTest, Status round-trip + legacy decode in EventDataTest, tile filter + picker overload in RunningModeSourceTest.
:wear:test :core:interfaces:test :plugins:sync:test :core:ui:test passed
Tested OK on AAPS/AAPSClient wear
Screenshots