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

Feature collection #19

Open
mwarning wants to merge 36 commits from mwarning/luna-tracker:bottle_time into master
pull from: mwarning/luna-tracker:bottle_time
merge into: penguin86:master
Conversation 19 Commits 36 Files Changed 31
+1428 -633
mwarning commented 2025-11-06 22:36:40 +01:00
Contributor
Copy Link
Copy Source

Features:

  • add sleep event (select start and stop date/time, display duration)
  • add height event
  • add statistics
    -adds mpandroidchart dependency
    -bar chart to show amount of bottle milk and event count
    -bar chart for sleep amount and event count
    -add fancy sleep frequency bar charts
    -all charts are available for per day, week, month
  • 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 for poo / pee events (<empty>, "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)
  • add setting "dynamic header", this populates the header and popup menu with the most popular events of the last 100 events. The count of header menu rows is also adjusted automatically.
  • increase maximum bottle volume to 340ml (maximum seen in the wild)

Bugfix:

  • do not change selected logbook on reload

Miscellaneous:

  • remove puke event value +/- 1 workaround with proper fix
  • in event details, change button text "OK" to "Close"
    • show an extra save button when a value has been changed
  • remove "no breastfeeding" settings, it is superseeded by "dynamic header" setting
  • rename "Breastfeeding" to "Nursing". The word is shorter and now does not stand out in the rows of menu.

Gradle:

All changes are backwards compatible.

Features: - add sleep event (select start and stop date/time, display duration) - add height event - ~~add statistics~~ -~~adds mpandroidchart dependency~~ -~~bar chart to show amount of bottle milk and event count~~ -~~bar chart for sleep amount and event count~~ -~~add fancy sleep frequency bar charts~~ -~~all charts are available for per day, week, month~~ - 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 for poo / pee events (`<empty>`, "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) - add setting "dynamic header", this populates the header and popup menu with the most popular events of the last 100 events. The count of header menu rows is also adjusted automatically. - increase maximum bottle volume to 340ml (maximum seen in the wild) Bugfix: - do not change selected logbook on reload Miscellaneous: - remove puke event value +/- 1 workaround with proper fix - in event details, change button text "OK" to "Close" - show an extra save button when a value has been changed - remove "no breastfeeding" settings, it is superseeded by "dynamic header" setting - rename "Breastfeeding" to "Nursing". The word is shorter and now does not stand out in the rows of menu. Gradle: - increase SDK version to 36 - remove funny binary signing blobs (https://android.izzysoft.de/articles/named/iod-scan-apkchecks?lang=en#blobs) - use uniform implementation directive for sardine-android All changes are backwards compatible.
mwarning marked the pull request as work in progress 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 marked the pull request as ready for review 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
Copy Source

@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 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
Copy Source

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 marked the pull request as work in progress 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 marked the pull request as ready for review 2025-11-16 01:35:54 +01:00
mwarning commented 2025-11-16 01:36:23 +01:00
Author
Contributor
Copy Link
Copy Source

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
mwarning force-pushed bottle_time from d4df3cfc18 to 9cce54c05e 2025-11-19 20:37:53 +01:00 Compare
mwarning force-pushed bottle_time from 9cce54c05e to 11a4f12fbe 2025-11-19 21:25:27 +01:00 Compare
mwarning force-pushed bottle_time from 11a4f12fbe to 19774016e1 2025-11-21 09:16:13 +01:00 Compare
mwarning force-pushed bottle_time from 19774016e1 to f8f5d68bb6 2025-11-21 21:58:28 +01:00 Compare
mwarning commented 2025-11-21 23:19:42 +01:00
Author
Contributor
Copy Link
Copy Source

Ok, I think it is done.

@penguin86 feel free to pick all changes you like :)

Ok, I think it is done. @penguin86 feel free to pick all changes you like :)
mwarning force-pushed bottle_time from 20d7612b46 to 479335f1c9 2025-11-21 23:29:10 +01:00 Compare
mwarning force-pushed bottle_time from 479335f1c9 to e9b41b4e06 2025-11-21 23:40:51 +01:00 Compare
mwarning force-pushed bottle_time from e9b41b4e06 to 3e64da2e2e 2025-12-11 22:57:09 +01:00 Compare
mwarning marked the pull request as work in progress 2025-12-11 23:01:45 +01:00
mwarning commented 2025-12-11 23:02:17 +01:00
Author
Contributor
Copy Link
Copy Source

WIP: the statistics feature does not compile yet. It is being overhault.

WIP: the statistics feature does not compile yet. It is being overhault.
mwarning force-pushed bottle_time from 3e64da2e2e to 341d2c5229 2025-12-11 23:33:27 +01:00 Compare
mwarning force-pushed bottle_time from 341d2c5229 to 58088aeec7 2025-12-12 15:06:19 +01:00 Compare
mwarning force-pushed bottle_time from 58088aeec7 to 8e4a5b89c0 2025-12-12 15:26:59 +01:00 Compare
mwarning force-pushed bottle_time from 8e4a5b89c0 to 4f0416e1c1 2025-12-15 15:48:27 +01:00 Compare
mwarning force-pushed bottle_time from 4f0416e1c1 to 6f69b581e4 2025-12-25 01:53:40 +01:00 Compare
mwarning force-pushed bottle_time from 6f69b581e4 to e820c11e68 2025-12-25 23:33:03 +01:00 Compare
penguin86 commented 2026-01-09 07:08:48 +01:00
Owner
Copy Link
Copy Source

Hello Moritz,
I started reviewing your pull request without noticing it was WIP.

I have some bug reports, but please ignore the ones you are currently working on (I may have tested incomplete features).

Statistics: Crash selecting Statistics -> Bottle per day:

FATAL EXCEPTION: main
Process: it.danieleverducci.lunatracker, PID: 13848
java.lang.AssertionError: Assertion failed
	at it.danieleverducci.lunatracker.StatisticsActivity.showBottleBarGraph(StatisticsActivity.kt:670)
	at it.danieleverducci.lunatracker.StatisticsActivity.showGraph$lambda$18(StatisticsActivity.kt:808)
	at it.danieleverducci.lunatracker.StatisticsActivity.$r8$lambda$eWcmoYqzneOEx0hFEqGeXiyLpgI(Unknown Source:0)
	at it.danieleverducci.lunatracker.StatisticsActivity$$ExternalSyntheticLambda2.invoke(D8$$SyntheticClass:0)
	at it.danieleverducci.lunatracker.StatisticsActivity.prepareGraph(StatisticsActivity.kt:800)
	at it.danieleverducci.lunatracker.StatisticsActivity.showGraph(StatisticsActivity.kt:808)
	at it.danieleverducci.lunatracker.StatisticsActivity$onCreate$1.call(StatisticsActivity.kt:101)
	at it.danieleverducci.lunatracker.StatisticsActivity$setupSpinner$1.onItemSelected(StatisticsActivity.kt:847)
	at android.widget.AdapterView.fireOnSelected(AdapterView.java:957)
	at android.widget.AdapterView.dispatchOnItemSelected(AdapterView.java:946)
	at android.widget.AdapterView.-$$Nest$mdispatchOnItemSelected(Unknown Source:0)
	at android.widget.AdapterView$SelectionNotifier.run(AdapterView.java:910)
	at android.os.Handler.handleCallback(Handler.java:991)
	at android.os.Handler.dispatchMessage(Handler.java:102)
	at android.os.Looper.loopOnce(Looper.java:232)
	at android.os.Looper.loop(Looper.java:317)
	at android.app.ActivityThread.main(ActivityThread.java:8934)
	at java.lang.reflect.Method.invoke(Native Method)
	at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:591)
	at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:911)

Statistics: empty screen for medicine statistics

On a logbook with a lot of medicine events (I can provide this one to you, if you need it to troubleshoot), I obtain a blank statistic screen: see screenshots:

Events: I'm not sure how the sleep event works: I see I can set a duration with the +5 button, but when I save, it says invalid date. I also tought it may measure between sleep events (i.e. create one sleep event to mark te start of the sleep and another one to mark the end), but in that case it doesn't seem to calculate the duration between the two events in the statistics.
Maybe the interface can be made more clear on how to use it.

As a side note, I'm a little worried the MPAndroidChart library is not currently mantained: the last release is from 2019, I hope it will not break due to one of the destructive changes Google likes to do to Android from release to release...

One last thing: may I suggest to split the features between more self-contained pull requests in the future? I.e. in the current case, the statistics feature could have been on another pull request, so I could have merged the other changes while the statistics feature is being worked on.
No need to change this one, it's just a suggestion for the future ones, if any.

As always, thanks very much for your contribution, Moritz!
Have a nice day.

Hello Moritz, I started reviewing your pull request without noticing it was WIP. I have some bug reports, but please ignore the ones you are currently working on (I may have tested incomplete features). **Statistics: Crash selecting Statistics -> Bottle per day:** ``` FATAL EXCEPTION: main Process: it.danieleverducci.lunatracker, PID: 13848 java.lang.AssertionError: Assertion failed at it.danieleverducci.lunatracker.StatisticsActivity.showBottleBarGraph(StatisticsActivity.kt:670) at it.danieleverducci.lunatracker.StatisticsActivity.showGraph$lambda$18(StatisticsActivity.kt:808) at it.danieleverducci.lunatracker.StatisticsActivity.$r8$lambda$eWcmoYqzneOEx0hFEqGeXiyLpgI(Unknown Source:0) at it.danieleverducci.lunatracker.StatisticsActivity$$ExternalSyntheticLambda2.invoke(D8$$SyntheticClass:0) at it.danieleverducci.lunatracker.StatisticsActivity.prepareGraph(StatisticsActivity.kt:800) at it.danieleverducci.lunatracker.StatisticsActivity.showGraph(StatisticsActivity.kt:808) at it.danieleverducci.lunatracker.StatisticsActivity$onCreate$1.call(StatisticsActivity.kt:101) at it.danieleverducci.lunatracker.StatisticsActivity$setupSpinner$1.onItemSelected(StatisticsActivity.kt:847) at android.widget.AdapterView.fireOnSelected(AdapterView.java:957) at android.widget.AdapterView.dispatchOnItemSelected(AdapterView.java:946) at android.widget.AdapterView.-$$Nest$mdispatchOnItemSelected(Unknown Source:0) at android.widget.AdapterView$SelectionNotifier.run(AdapterView.java:910) at android.os.Handler.handleCallback(Handler.java:991) at android.os.Handler.dispatchMessage(Handler.java:102) at android.os.Looper.loopOnce(Looper.java:232) at android.os.Looper.loop(Looper.java:317) at android.app.ActivityThread.main(ActivityThread.java:8934) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:591) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:911) ``` **Statistics: empty screen for medicine statistics** On a logbook with a lot of medicine events (I can provide this one to you, if you need it to troubleshoot), I obtain a blank statistic screen: see screenshots: - https://ichibi.eu/index.php/s/Zos4G9AWmwiZnSo - https://ichibi.eu/index.php/s/oN3kppky4WpWnDp Events: I'm not sure how the sleep event works: I see I can set a duration with the +5 button, but when I save, it says invalid date. I also tought it may measure between sleep events (i.e. create one sleep event to mark te start of the sleep and another one to mark the end), but in that case it doesn't seem to calculate the duration between the two events in the statistics. Maybe the interface can be made more clear on how to use it. As a side note, I'm a little worried the MPAndroidChart library is not currently mantained: the last release is from 2019, I hope it will not break due to one of the destructive changes Google likes to do to Android from release to release... One last thing: may I suggest to split the features between more self-contained pull requests in the future? I.e. in the current case, the statistics feature could have been on another pull request, so I could have merged the other changes while the statistics feature is being worked on. No need to change this one, it's just a suggestion for the future ones, if any. As always, thanks very much for your contribution, Moritz! Have a nice day.
mwarning commented 2026-01-09 22:26:55 +01:00
Author
Contributor
Copy Link
Copy Source

Hi @penguin86 , thank you for your constructive feedback. This MR is indeed work in progress and I am working on fixing the crashes (correct calender operations are difficult to get right and are the source of the crash you have seen).

Sleep Event: Yeah, it is a bit confusing. If you create a sleep event, then the "-5 / NOW / +5" buttons should not be visible. Those buttons are for setting and adjusting the wake up time after the event has been created and the baby woke up. I will improve it.

MPAndroidChart: it was what I have found every time I was looking for a Android chart library. The maintainance status is of a concern to me as well. The only thing I can do at this point is to make it easy to remove the statistics feature once the library becomes a liability.

Separated commits: I will try to improve it a bit while working on this MR. But it is a pain to do. :P

Medicine Events: That part I haven't had time to polish at all yet. Work in progress.

Hi @penguin86 , thank you for your constructive feedback. This MR is indeed work in progress and I am working on fixing the crashes (correct calender operations are difficult to get right and are the source of the crash you have seen). **Sleep Event:** Yeah, it is a bit confusing. If you create a sleep event, then the "-5 / NOW / +5" buttons should not be visible. Those buttons are for setting and adjusting the wake up time after the event has been created and the baby woke up. I will improve it. **MPAndroidChart**: it was what I have found every time I was looking for a Android chart library. The maintainance status is of a concern to me as well. The only thing I can do at this point is to make it easy to remove the statistics feature once the library becomes a liability. **Separated commits**: I will try to improve it a bit while working on this MR. But it is a pain to do. :P **Medicine Events**: That part I haven't had time to polish at all yet. Work in progress.
mwarning force-pushed bottle_time from e820c11e68 to 0cc9dc53fe 2026-01-11 21:55:37 +01:00 Compare
mwarning force-pushed bottle_time from 0cc9dc53fe to c636e48c7e 2026-01-12 22:45:23 +01:00 Compare
mwarning force-pushed bottle_time from c636e48c7e to 38930fe269 2026-01-23 06:50:39 +01:00 Compare
mwarning force-pushed bottle_time from 38930fe269 to a4b5ae7cd0 2026-02-01 22:59:49 +01:00 Compare
mwarning force-pushed bottle_time from a4b5ae7cd0 to a8b9691861 2026-02-11 22:04:47 +01:00 Compare
mwarning force-pushed bottle_time from a8b9691861 to be5463bf18 2026-02-11 22:06:40 +01:00 Compare
mwarning force-pushed bottle_time from be5463bf18 to 43f0519487 2026-02-12 23:02:38 +01:00 Compare
mwarning marked the pull request as ready for review 2026-02-12 23:26:01 +01:00
mwarning commented 2026-02-12 23:28:16 +01:00
Author
Contributor
Copy Link
Copy Source

hi @penguin86, I think this MR is ready.

  • reworked sleep event
  • remove medicine statistics

Here is a commit to remove the statistics completely in case MPAndroidChart becomes a liability due to missing maintainance: a8305b8fc9

hi @penguin86, I think this MR is ready. - reworked sleep event - remove medicine statistics Here is a commit to remove the statistics completely in case MPAndroidChart becomes a liability due to missing maintainance: https://git.ichibi.eu/mwarning/luna-tracker/commit/a8305b8fc994b7f65e67525fa1530640e59a77a8
mwarning commented 2026-02-12 23:32:20 +01:00
Author
Contributor
Copy Link
Copy Source

@penguin86 should this MR target the develop branch?

@penguin86 should this MR target the develop branch?
mwarning force-pushed bottle_time from 43f0519487 to ff48d1af59 2026-02-13 14:53:04 +01:00 Compare
mwarning force-pushed bottle_time from ff48d1af59 to 87442057db 2026-02-13 15:03:43 +01:00 Compare
mwarning force-pushed bottle_time from 87442057db to e1dbc2c628 2026-02-13 15:07:17 +01:00 Compare
mwarning force-pushed bottle_time from e1dbc2c628 to 905aeadabe 2026-02-19 00:06:40 +01:00 Compare
mwarning force-pushed bottle_time from fc48984c67 to 71c0bf6644 2026-02-19 00:15:31 +01:00 Compare
mwarning force-pushed bottle_time from 71c0bf6644 to 64fde74e2e 2026-02-19 08:49:30 +01:00 Compare
mwarning force-pushed bottle_time from 64fde74e2e to a1f3c7fdea 2026-02-19 10:36:45 +01:00 Compare
mwarning force-pushed bottle_time from a1f3c7fdea to 1763a9cfd0 2026-02-19 11:05:43 +01:00 Compare
mwarning force-pushed bottle_time from 1763a9cfd0 to 016dbf330b 2026-02-19 11:08:42 +01:00 Compare
mwarning force-pushed bottle_time from 016dbf330b to 143713cd9b 2026-02-19 11:30:53 +01:00 Compare
mwarning force-pushed bottle_time from 143713cd9b to c582fb64b7 2026-02-19 16:42:58 +01:00 Compare
mwarning force-pushed bottle_time from c582fb64b7 to 7895325297 2026-02-19 22:28:54 +01:00 Compare
mwarning commented 2026-02-19 22:35:56 +01:00
Author
Contributor
Copy Link
Copy Source

@penguin86 feel free to test and merge even without statistics (cherry-pick a8305b8fc9 to remove it).
I also just reaad in the readme that you want to bump sdk version yourself. No problem, just remove the commit after merging locally.

@penguin86 feel free to test and merge even without statistics (cherry-pick https://git.ichibi.eu/mwarning/luna-tracker/commit/a8305b8fc994b7f65e67525fa1530640e59a77a8 to remove it). I also just reaad in the readme that you want to bump sdk version yourself. No problem, just remove the commit after merging locally.
mwarning force-pushed bottle_time from 7895325297 to 422ecfb970 2026-02-22 13:49:03 +01:00 Compare
mwarning force-pushed bottle_time from 422ecfb970 to c58c68b78a 2026-02-24 21:37:47 +01:00 Compare
mwarning force-pushed bottle_time from 10efec4733 to 80fa8d8294 2026-03-06 12:04:24 +01:00 Compare
mwarning force-pushed bottle_time from 80fa8d8294 to 557a9ab69a 2026-03-06 12:35:02 +01:00 Compare
mwarning commented 2026-03-10 23:18:25 +01:00
Author
Contributor
Copy Link
Copy Source

It would be nice to have both short term statistics (like in #23) and long term statistics in the app. Maybe the long term statistics can be accessed via a button in the short term statistics.

It would be nice to have both short term statistics (like in #23) and long term statistics in the app. Maybe the long term statistics can be accessed via a button in the short term statistics.
mwarning force-pushed bottle_time from 9ed9964f69 to 16e5b39d6f 2026-06-12 16:25:15 +02:00 Compare
mwarning commented 2026-06-12 16:49:15 +02:00
Author
Contributor
Copy Link
Copy Source

@penguin86 I added a few minor fixes and a height event (on request from another user).

@penguin86 I added a few minor fixes and a height event (on request from another user).
mwarning commented 2026-06-27 20:06:08 +02:00
Author
Contributor
Copy Link
Copy Source

@penguin86 anything I can do to get this merged? Maybe there are too many changes in this MR. In this case we can have a call and go through the code and you can tell me what I need to throw out.

@penguin86 anything I can do to get this merged? Maybe there are too many changes in this MR. In this case we can have a call and go through the code and you can tell me what I need to throw out.
mwarning added 36 commits 2026-08-08 21:51:20 +02:00
events: allow editing of all used values 23372408d5 
1. Allow to change the date/time and
other relevant values of an event
on creation and after it was created.

2. Harmonize layout file names and
variable names.
MainActivity: preset quantity of bottle, weight and temperature 52b23151d6 
Use the quantity of previous events
to initialize new events.
notes: add icons to use previous/next event as template fb6edf981b
LunaEvent: remove quantity when the value is invalid d49701a488
strings: rename scale to weight in identifiers 742c5515b1
MainActivity: allow amount for poo and pee events 9f8f277d75 
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.
LunaEvent: add sleep event 44748506ff
MainActivity: use unique templates for notes a887d9f29f
MainActivity: show save button if any values has changed b417fe48a6
statistics: add LongTermStatisticsActivity: add statistics and sleep events 5882b7a874
gradle: set compileSDK/targetSdk to 36 7a1521d65a
gradle: avoid inclusion of apk signing blobs 215ac2fd0c 
See https://android.izzysoft.de/articles/named/iod-scan-apkchecks?lang=en#blobs
gradle: use uniform implementation directive for sardine-android d4b50916bb
MainActivity: increase bottle volume to 340ml d61f6f8abc 
This is the maximum amount found in sold bottles.
LunaEvent: use enum class for event types 945d585c7f 
This helps to have compile errors when some
case it not handled while adding a new type.
The enum class can also be interated over
to create a complete drop down list.
MainAcitivty: add dynamic header setting 52589cbff0 
The setting allows to build the menu and
popup list to be populated by the frequency
of events that has been created.
This also makes the 'no breastfeeding'
setting irrelevant.
LunaEvent: reorganize event text getters 369ec2197a 
Use method names that better reflect
the use of the returned text.
MainActivity: do not switch logbook on reload 358452a179
NumericUtils: remove possible trailing whitespace 2dbb3741be
MainActivity: sort events before saving 3ddff7895a 
Also replace notifyItemInserted since it does not
call the adapter to redraw the row striping when
a new event is added.
layout: replace menu icon with utf8 character 8cf4997567 
The three dot menu icosn looks odd when stretched
due to the dynamic menu feature. Thus replace it
with the hamburger menu character that looks better
when scaled.
MainActivity: rename datepicker 99826811f1
LunaEvent: rework sleep event d9feb05988 
Make the UI more flexible and
slightly easier to understand.
MainActivity: generate dynamic menu from last two weeks e04e05f752
MainActivity: inline nested function for dynamic menu 52b3467611
DateUtils: make duration rounded up to minutes f866ab3a27
MainActivity: set unit for bottle content 677013494c
MainActivity: show edit dialog for food and medicine quantity e5257cfd24
NumberUtils: remove unused numberFormat 8878128879
sleep: remove plus/minus buttons 57f3b32d07 
Make the UI simpler.
weight: add local unit to dialog 7eb5eeb804
event: add support for height 3226dd560d
notes: do not update quantity 55006331e8 
When using the tiny arrows to switch
between older texts, do not change
the quantity field.
activity_main: add horizontal margin to error message e4b8bff1bb
sleep: fix date picker usage d74524524a 
The time the date picker uses needs to be updated.
Also make some variable names more logical.
global: remove statistics 5663a838e7 
Remove until a more future proof solution is found
as mpandroidchart is not maintained anymore.
mwarning force-pushed bottle_time from 4f8209b793 to 5663a838e7 2026-08-08 21:51:20 +02:00 Compare
mwarning commented 2026-08-08 22:02:53 +02:00
Author
Contributor
Copy Link
Copy Source

I have removed statistics. This should make the MR easier to review.

I have removed statistics. This should make the MR easier to review.
penguin86 commented 2026-08-09 16:51:57 +02:00
Owner
Copy Link
Copy Source

Hello Moritz,
sorry for the very late reply. This PR is huge, so I find difficult to find time to review it toroughly in a single session. I'll try to review some commit a time until I get on par, and I'll skip testing every case that comes to my mind while reviewing every commit. I'll write below the concerns, so maybe you can check and I'll do a single final global check.
I suggest, for the next time, doing one PR for feature, so it is easier to review and I can merge it in less time.

Here's the first observation: in commit 358452a179 MainActivity: do not switch logbook on reload I fear if a new logbook is added (maybe from another device running the same app) and one is already selected, the new one will not be discovered. That was the whole point of having a refresh button (because the selected logbook is already refreshed automatically). Can you check if that's the case?

Thank you! I'll continue to review and write from time to time.

Hello Moritz, sorry for the very late reply. This PR is huge, so I find difficult to find time to review it toroughly in a single session. I'll try to review some commit a time until I get on par, and I'll skip testing every case that comes to my mind while reviewing every commit. I'll write below the concerns, so maybe you can check and I'll do a single final global check. I suggest, for the next time, doing one PR for feature, so it is easier to review and I can merge it in less time. Here's the first observation: in commit [358452a179](https://git.ichibi.eu/penguin86/luna-tracker/pulls/19/commits/358452a179ca7f7dc3b102d356046333a9389042) [MainActivity: do not switch logbook on reload](https://git.ichibi.eu/penguin86/luna-tracker/commit/358452a179ca7f7dc3b102d356046333a9389042) I fear if a new logbook is added (maybe from another device running the same app) and one is already selected, the new one will not be discovered. That was the whole point of having a refresh button (because the selected logbook is already refreshed automatically). Can you check if that's the case? Thank you! I'll continue to review and write from time to time.
👍 1
penguin86 commented 2026-08-09 17:05:56 +02:00
Owner
Copy Link
Copy Source

The sleep event with duration in d9feb05988 LunaEvent: rework sleep event is very cool, but also not intuitive. The user doesn't expect to have to click on the same icon of the event to set the end time. I'd change the clickable Zzz icon into something more evocative (maybe a clock icon or something) and add a caption below it "Set end time" or "Set duration".

The sleep event with duration in [d9feb05988](https://git.ichibi.eu/penguin86/luna-tracker/pulls/19/commits/d9feb05988b3a1b491cc64c36ae1ad81faec4719) [LunaEvent: rework sleep event](https://git.ichibi.eu/penguin86/luna-tracker/commit/d9feb05988b3a1b491cc64c36ae1ad81faec4719) is very cool, but also not intuitive. The user doesn't expect to have to click on the same icon of the event to set the end time. I'd change the clickable Zzz icon into something more evocative (maybe a clock icon or something) and add a caption below it "Set end time" or "Set duration".
penguin86 commented 2026-08-09 17:09:45 +02:00
Owner
Copy Link
Copy Source

e04e05f752 MainActivity: generate dynamic menu from last two weeks is definitely cool and makes the app faster to use, but I'd make clear the user need to have two weeks of data to use it, otherwise it's a little confusing. When I activated it on my test app with synthetic data, only the overflow menu icon was displayed.
Adding something like "You need at least two weeks of data for this to work" to the already present explanation text under the switch in settings should be enough!

[e04e05f752](https://git.ichibi.eu/penguin86/luna-tracker/pulls/19/commits/e04e05f752e017aff06f12b96a42a86d6a740341) [MainActivity: generate dynamic menu from last two weeks](https://git.ichibi.eu/penguin86/luna-tracker/commit/e04e05f752e017aff06f12b96a42a86d6a740341) is definitely cool and makes the app faster to use, but I'd make clear the user need to have two weeks of data to use it, otherwise it's a little confusing. When I activated it on my test app with synthetic data, only the overflow menu icon was displayed. Adding something like "You need at least two weeks of data for this to work" to the already present explanation text under the switch in settings should be enough!
penguin86 commented 2026-08-09 17:35:42 +02:00
Owner
Copy Link
Copy Source

Hey Moritz,
I reached the last commit, it seems ok to me, so if you wish to make the changes above, I think this can be merged.
Thanks a lot for the new features, they are very cool!
I took note of some changes to make (i.e. atm it's not very clear what can be clicked in the event detail, I'd set the button background on the next/prev texts and maybe a pen icon on the changeable fields), but I'll make them on my own after this PR is merged.
Thank you a lot for you contribution and your patience!
Have a nice day!

Hey Moritz, I reached the last commit, it seems ok to me, so if you wish to make the changes above, I think this can be merged. Thanks a lot for the new features, they are very cool! I took note of some changes to make (i.e. atm it's not very clear what can be clicked in the event detail, I'd set the button background on the next/prev texts and maybe a pen icon on the changeable fields), but I'll make them on my own after this PR is merged. Thank you a lot for you contribution and your patience! Have a nice day!
mwarning commented 2026-08-09 23:12:05 +02:00
Author
Contributor
Copy Link
Copy Source

@penguin86 thank you for your time. I will take a look next week.
Sorry for not splitting it up more. As it happens, commits build up on each other and that makes them dependent..

@penguin86 thank you for your time. I will take a look next week. Sorry for not splitting it up more. As it happens, commits build up on each other and that makes them dependent..
👍 1
This pull request can be merged automatically.
This branch is out-of-date with the base branch
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 https://git.ichibi.eu/mwarning/luna-tracker 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 (Daniele Verducci)
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: penguin86/luna-tracker#19
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?