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

Feature collection #19

Open
mwarning wants to merge 7 commits from mwarning/luna-tracker:bottle_time into master
pull from: mwarning/luna-tracker:bottle_time
merge into: penguin86:master
Conversation 3 Commits 7 Files Changed 21 +855 -305
mwarning commented 2025-11-06 22:36:40 +01:00
Contributor
Copy Link

Features:

  • add sleep event (select start and stop date/time, display duration)
  • allow change of event time and quantity/notes after the event has been created
  • add pre/next icons for medicine/note event to use other events as template
    • allows quicker creation of repeating events
  • add quantity to poo / pee events (<unspecified>, little, normal, plenty)
  • use previous used quantity for bottle/weight/temperature for new events
  • rename scale to weight - makes more sense when looking at other measurement events (temperature)

All changes are backwards compatible.

Features: - add sleep event (select start and stop date/time, display duration) - allow change of event time and quantity/notes after the event has been created - add pre/next icons for medicine/note event to use other events as template - allows quicker creation of repeating events - add quantity to poo / pee events (`<unspecified>`, little, normal, plenty) - use previous used quantity for bottle/weight/temperature for new events - rename scale to weight - makes more sense when looking at other measurement events (temperature) All changes are backwards compatible.
mwarning added 1 commit 2025-11-06 22:36:41 +01:00
add time to ask bottle content dialog 5be2917839 
Usually people only enter bottle events
some time after the baby has been feed

To be able to change the date/time on
event creation saves time.
mwarning changed title from add time to ask bottle content dialog to [WIP] add time to ask bottle content dialog 2025-11-06 22:45:51 +01:00
mwarning force-pushed bottle_time from 5be2917839 to cbba6b7a90 2025-11-09 23:22:33 +01:00 Compare
mwarning force-pushed bottle_time from cbba6b7a90 to 53bab2d22c 2025-11-09 23:29:06 +01:00 Compare
mwarning force-pushed bottle_time from 53bab2d22c to 4e9eeff6aa 2025-11-10 00:04:48 +01:00 Compare
mwarning changed title from [WIP] add time to ask bottle content dialog to [WIP] Use edit button for all events 2025-11-10 00:07:03 +01:00
mwarning force-pushed bottle_time from 4e9eeff6aa to aaccef54a5 2025-11-10 17:51:10 +01:00 Compare
mwarning force-pushed bottle_time from aaccef54a5 to b719903a73 2025-11-10 20:53:47 +01:00 Compare
mwarning force-pushed bottle_time from b719903a73 to 5ffeff445f 2025-11-11 22:14:53 +01:00 Compare
mwarning changed title from [WIP] Use edit button for all events to [WIP] Allow editing of all events 2025-11-11 22:20:58 +01:00
mwarning force-pushed bottle_time from 5ffeff445f to c52a74c7e3 2025-11-11 23:08:26 +01:00 Compare
mwarning changed title from [WIP] Allow editing of all events to Allow editing of all events 2025-11-11 23:11:23 +01:00
mwarning changed title from Allow editing of all events to events: allow editing of all values 2025-11-11 23:12:08 +01:00
mwarning force-pushed bottle_time from c52a74c7e3 to f8bd760f7a 2025-11-11 23:16:09 +01:00 Compare
mwarning force-pushed bottle_time from f8bd760f7a to d8978a9b8c 2025-11-12 00:17:07 +01:00 Compare
mwarning force-pushed bottle_time from d8978a9b8c to 83294401dc 2025-11-12 08:08:12 +01:00 Compare
mwarning force-pushed bottle_time from 83294401dc to a941fc4fce 2025-11-12 08:09:21 +01:00 Compare
mwarning force-pushed bottle_time from a941fc4fce to 4c5ac59355 2025-11-12 08:10:56 +01:00 Compare
mwarning force-pushed bottle_time from 4c5ac59355 to 17e1d2c6ea 2025-11-12 08:23:22 +01:00 Compare
mwarning commented 2025-11-12 10:03:18 +01:00
Author
Contributor
Copy Link

@penguin86 ready for review :)

@penguin86 ready for review :)
mwarning force-pushed bottle_time from 17e1d2c6ea to f7969541ae 2025-11-12 14:31:03 +01:00 Compare
mwarning force-pushed bottle_time from f7969541ae to 4492b36b23 2025-11-12 15:25:31 +01:00 Compare
mwarning force-pushed bottle_time from 4492b36b23 to 563e431c1d 2025-11-13 11:40:52 +01:00 Compare
mwarning added 1 commit 2025-11-14 09:26:20 +01:00
MainActivity: preset quantity of bottle, weight and temperature b271f63cb7 
Use the quantity of previous events
to initialize new events.
mwarning added 5 commits 2025-11-14 21:42:33 +01:00
notes: add icons to use previous/next event as template 1cfaf17d47
LunaEvent: remove quantity when the value is invalid b58350543a
strings: rename scale to weight in identifiers d71e9cdf95
MainActivity: allow amount for poo and pee events 2c502444d6 
An unspecified amount has also been added
to have the same semantics as before.

During these actions, the strings for title
and description of dialogs have been cleaned up.
add sleep event 6b1a82d7d0
mwarning changed title from events: allow editing of all values to Feature collection 2025-11-14 21:47:58 +01:00
mwarning force-pushed bottle_time from 6b1a82d7d0 to 99c7e5f94d 2025-11-14 21:59:56 +01:00 Compare
mwarning force-pushed bottle_time from 99c7e5f94d to 3ae71c36a7 2025-11-14 22:01:33 +01:00 Compare
mwarning commented 2025-11-14 22:08:40 +01:00
Author
Contributor
Copy Link

The only thing missing now is a statistics activity. But that is for another time.

The only thing missing now is a statistics activity. But that is for another time.
mwarning force-pushed bottle_time from 3ae71c36a7 to 88e9cb7deb 2025-11-14 22:41:51 +01:00 Compare
mwarning changed title from Feature collection to [WIP] Feature collection 2025-11-15 20:33:41 +01:00
mwarning force-pushed bottle_time from 88e9cb7deb to d34aa8e950 2025-11-16 01:34:58 +01:00 Compare
mwarning changed title from [WIP] Feature collection to Feature collection 2025-11-16 01:35:54 +01:00
mwarning commented 2025-11-16 01:36:23 +01:00
Author
Contributor
Copy Link

Looks good now.

Looks good now.
mwarning force-pushed bottle_time from d34aa8e950 to e756a2a3fc 2025-11-16 07:52:45 +01:00 Compare
mwarning force-pushed bottle_time from e756a2a3fc to ed10dca216 2025-11-16 13:31:47 +01:00 Compare
mwarning force-pushed bottle_time from ed10dca216 to fc3b67638d 2025-11-17 14:55:44 +01:00 Compare
This pull request can be merged automatically.
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u bottle_time:mwarning-bottle_time
git checkout mwarning-bottle_time
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
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

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

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?