penguin86/luna-tracker
1
2
Fork 2
Code Issues 13 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add puke and bath events, add signature setting #16

Merged
penguin86 merged 9 commits from mwarning/luna-tracker:master into develop 2025-11-05 07:56:01 +01:00
Conversation 9 Commits 9 Files Changed 15 +300 -93
mwarning commented 2025-09-25 23:54:34 +02:00
Contributor
Copy Link

Features:

  • add bath event
  • add puke event
  • add event signature setting (helps to track who did what in case multiple people help out)
  • do not show seconds in event details (=> less visual clutter, the date picker does not allow to select seconds anyway)

Code Quality:

  • add fallback for metric detection
  • use property syntax and add more const
  • add help text for no-breastfeeding setting
Features: - add bath event - add puke event - add event signature setting (helps to track who did what in case multiple people help out) - do not show seconds in event details (=> less visual clutter, the date picker does not allow to select seconds anyway) Code Quality: - add fallback for metric detection - use property syntax and add more const - add help text for no-breastfeeding setting
Screenshot_1759160415.png
184 KiB
Screenshot_1759160474.png
206 KiB
Screenshot_1759160415.png Screenshot_1759160474.png
mwarning added 3 commits 2025-09-25 23:54:34 +02:00
small code cleanup 242bfe39ae
NumericUtils: provide fallback for LocaleData.getMeasurementSystem eeebaeb7f3 
LocaleData.getMeasurementSystem is available at API level 28
but the app supports API level 21.
add puke event 609a9cb534
mwarning commented 2025-09-25 23:55:48 +02:00
Author
Contributor
Copy Link

This code might need some polishing. Maybe there something better for measuring a puke event...

This code might need some polishing. Maybe there something better for measuring a puke event...
mwarning force-pushed master from 609a9cb534 to 57504573f4 2025-09-25 23:57:53 +02:00 Compare
mwarning force-pushed master from 57504573f4 to b1e035d03e 2025-09-26 00:01:02 +02:00 Compare
mwarning force-pushed master from b1e035d03e to fbb3ad1faa 2025-09-26 00:02:49 +02:00 Compare
mwarning force-pushed master from fbb3ad1faa to 3890662305 2025-09-26 08:44:12 +02:00 Compare
mwarning added 1 commit 2025-09-26 16:21:26 +02:00
more_events_popup: move enema to bottom and adjust padding 9c8f4af176 
Enemas are usually are rare thing. Let's
move it to the bottom. Also adjust padding
to have more space to display all items.
mwarning force-pushed master from 9c8f4af176 to 6af9c09a89 2025-09-26 16:29:35 +02:00 Compare
mwarning commented 2025-09-26 22:05:53 +02:00
Author
Contributor
Copy Link

instead of low/medium/high, little/-/plenty seems to be more fitting.

EDIT: I removed the quantity for puke events. Too much hassle.

instead of low/medium/high, little/-/plenty seems to be more fitting. EDIT: I removed the quantity for puke events. Too much hassle.
👍 1
mwarning changed title from Add puke event to [WIP] Add puke event 2025-09-27 01:21:22 +02:00
mwarning force-pushed master from 6af9c09a89 to 7ec5e48b12 2025-09-29 03:35:24 +02:00 Compare
mwarning changed title from [WIP] Add puke event to [WIP] Add puke and bath events, add signature setting 2025-09-29 03:40:19 +02:00
mwarning force-pushed master from 7ec5e48b12 to d204b877f5 2025-09-29 05:04:21 +02:00 Compare
mwarning force-pushed master from d204b877f5 to 66fbc9b55f 2025-09-29 09:11:17 +02:00 Compare
mwarning force-pushed master from 66fbc9b55f to d6b9df757c 2025-09-29 09:13:02 +02:00 Compare
mwarning force-pushed master from d6b9df757c to ac8eb209eb 2025-09-29 09:18:28 +02:00 Compare
mwarning force-pushed master from ac8eb209eb to b0629e383b 2025-09-29 09:33:49 +02:00 Compare
mwarning force-pushed master from b0629e383b to 4a443e19d3 2025-09-29 13:44:15 +02:00 Compare
mwarning changed title from [WIP] Add puke and bath events, add signature setting to Add puke and bath events, add signature setting 2025-09-29 13:44:36 +02:00
mwarning commented 2025-09-29 13:44:45 +02:00
Author
Contributor
Copy Link

ready for review

ready for review
mwarning force-pushed master from 4a443e19d3 to 6b6e55804d 2025-09-29 14:20:17 +02:00 Compare
mwarning force-pushed master from 6b6e55804d to ce349fe1cf 2025-09-29 17:50:17 +02:00 Compare
mwarning force-pushed master from ce349fe1cf to f3fb584ec2 2025-09-29 19:12:50 +02:00 Compare
penguin86 commented 2025-10-15 08:48:36 +02:00
Owner
Copy Link

Hello Moritz! Thanks for all the good work, and sorry for the late review: busy period...
I'm not sure about showing the seconds to 0, it presents a value not matching the real one. It'd be better to not have the seconds at all instead of showing a wrong value.
It may be possible just passing a parameter to getDateTimeInstance (see i.e. https://docs.oracle.com/javase/8/docs/api/java/text/DateFormat.html#SHORT ).
May I ask you to change it?
Feel free to decide to remove the seconds or revert the change, at your will.
I reviewed the rest of the PR and seems very nice and sound to me!

Thank you a lot!

Hello Moritz! Thanks for all the good work, and sorry for the late review: busy period... I'm not sure about showing the seconds to 0, it presents a value not matching the real one. It'd be better to not have the seconds at all instead of showing a wrong value. It may be possible just passing a parameter to `getDateTimeInstance` (see i.e. https://docs.oracle.com/javase/8/docs/api/java/text/DateFormat.html#SHORT ). May I ask you to change it? Feel free to decide to remove the seconds or revert the change, at your will. I reviewed the rest of the PR and seems very nice and sound to me! Thank you a lot!
mwarning commented 2025-10-16 08:19:55 +02:00
Author
Contributor
Copy Link

hi, thank you for the review.
I tried to remove the seconds, but that was not working. That is why I opted to make it zero. I can try to remove it again or will revert the change.

hi, thank you for the review. I tried to remove the seconds, but that was not working. That is why I opted to make it zero. I can try to remove it again or will revert the change.
mwarning force-pushed master from f3fb584ec2 to 50baa76d35 2025-10-26 13:51:34 +01:00 Compare
mwarning force-pushed master from 50baa76d35 to a90f939428 2025-10-26 13:54:30 +01:00 Compare
mwarning commented 2025-10-26 14:00:38 +01:00
Author
Contributor
Copy Link

@penguin86 I have found a way to not show the seconds (for API >= 24). Also, I have added a quantity for the puke evetn (little, normal, plenty). Let me know what you think. Maybe there are more fitting words to describe a quantity here.

@penguin86 I have found a way to not show the seconds (for API >= 24). Also, I have added a quantity for the puke evetn (little, normal, plenty). Let me know what you think. Maybe there are more fitting words to describe a quantity here.
mwarning force-pushed master from a90f939428 to 71cf754ac8 2025-10-26 20:23:57 +01:00 Compare
mwarning force-pushed master from 71cf754ac8 to 7f67c758c9 2025-10-26 20:38:31 +01:00 Compare
penguin86 merged commit 193e21ce25 into develop 2025-11-05 07:56:01 +01:00
penguin86 commented 2025-11-05 07:56:16 +01:00
Owner
Copy Link

Thank you for your contribution Moritz!

Thank you for your contribution Moritz!
🎉 1
mwarning commented 2025-11-05 12:43:32 +01:00
Author
Contributor
Copy Link

Thank you for the review. Until next time.

Thank you for the review. Until next time.
mwarning commented 2025-11-05 22:19:33 +01:00
Author
Contributor
Copy Link

I noticed a small bug with the bug event. For the puke amount I have the values 0/1/2 as quantity. That means the NumericUtils.formatEventQuantity will disregard the 0 value. Either we let quantity be a nullable (cleaner design) or we use 1/2/3 as quantity (quick and less intrusive).

Let me create a fix..

I noticed a small bug with the bug event. For the puke amount I have the values 0/1/2 as quantity. That means the NumericUtils.formatEventQuantity will disregard the 0 value. Either we let quantity be a nullable (cleaner design) or we use 1/2/3 as quantity (quick and less intrusive). Let me create a fix..
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
penguin86
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: penguin86/luna-tracker#16
No description provided.
Delete Branch "mwarning/luna-tracker:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?