NumericUtils: remove possible trailing whitespace

MainActivity: do not switch logbook on reload
LunaEvent: reorganize event text getters
2025-12-14 19:42:08 +01:00 · 2025-12-14 19:42:08 +01:00 · 2025-12-14 19:42:08 +01:00 · 2025-12-14 19:42:08 +01:00 · 2025-12-14 19:42:08 +01:00 · 2025-12-14 19:42:08 +01:00
3 changed files with 4 additions and 5 deletions
--- a/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/MainActivity.kt
@@ -455,7 +455,7 @@ class MainActivity : AppCompatActivity() {

        fun isValidTime(timeSeconds: Long, durationSeconds: Int): Boolean {
            val now = System.currentTimeMillis() / 1000
-            return (timeSeconds + durationSeconds) <= now && durationSeconds < (12 * 60 * 60)
+            return (timeSeconds + durationSeconds) <= now && durationSeconds < (24 * 60 * 60)
        }

        val onDateChange = { time: Long ->
@@ -499,7 +499,6 @@ class MainActivity : AppCompatActivity() {

        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
            val time = pickedDateTime.time.time / 1000
-
            if (isValidTime(time, duration)) {
                event.time = time
                event.quantity = duration
--- a/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
+++ b/app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt
@@ -104,7 +104,7 @@ class LunaEvent: Comparable<LunaEvent> {
    }

    fun getDialogTitle(context: Context): String {
-        return getTypeDescription(context, type)
+        return getDialogTitle(context, type)
    }

    fun getRowItemTitle(context: Context): String {
@@ -168,7 +168,7 @@ class LunaEvent: Comparable<LunaEvent> {
            )
        }

-        fun getTypeDescription(context: Context, type: Type): String {
+        fun getDialogTitle(context: Context, type: Type): String {
            return context.getString(
                when (type) {
                    Type.BABY_BOTTLE -> R.string.event_bottle_desc
--- a/app/src/main/java/utils/NumericUtils.kt
+++ b/app/src/main/java/utils/NumericUtils.kt
@@ -101,7 +101,7 @@ class NumericUtils (val context: Context) {
                else -> ""
            })
        }
-        return formatted.toString()
+        return formatted.toString().trim()
    }

    /**
Author	SHA1	Message	Date
Moritz Warning	4f0416e1c1	NumericUtils: remove possible trailing whitespace	2025-12-14 19:42:08 +01:00
Moritz Warning	8c2fcaaef5	MainActivity: do not switch logbook on reload	2025-12-14 19:42:08 +01:00
Moritz Warning	01907d7c4e	LunaEvent: reorganize event text getters Use method names that better reflect the use of the returned text.	2025-12-14 19:42:08 +01:00
Moritz Warning	3a3dc2faf4	Add dynamic header setting This makes the 'no breastfeeding' setting irrelevant.	2025-12-14 19:42:08 +01:00
Moritz Warning	2518118759	LunaEvent: use enum class for event types 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.	2025-12-14 19:42:08 +01:00
Moritz Warning	d8b67531db	MainActivity: increase bottle volume to 340ml This is the maximum amount found in sold bottles.	2025-12-14 19:42:08 +01:00
Moritz Warning	0a424e8807	improve statistics	2025-12-14 19:42:08 +01:00
Moritz Warning	8adacd3bfe	gradle: use uniform implementation directive for sardine-android	2025-12-14 19:42:08 +01:00
Moritz Warning	508c14ff6e	gradle: avoid inclusion of apk signing blobs See https://android.izzysoft.de/articles/named/iod-scan-apkchecks?lang=en#blobs	2025-12-14 19:42:08 +01:00
Moritz Warning	7d67a2e33b	gradle: set compileSDK/targetSdk to 36	2025-12-14 19:42:08 +01:00
Moritz Warning	a0dc023941	add statistics for bottle and sleep events	2025-12-14 19:42:08 +01:00
Moritz Warning	6759956461	MainActivity: show save button if any values has changed	2025-12-14 19:42:08 +01:00
Moritz Warning	c521a3373f	MainActivity: use unique templates for notes	2025-12-14 19:42:08 +01:00
Moritz Warning	1ad5f31b32	LunaEvent: add sleep event	2025-12-14 19:42:03 +01:00