remove log event title

Keep the main page simpler and have a bit more
space for log messages.

.idea/.name

@@ -1 +0,0 @@
-LunaTracker

.idea/AndroidProjectSystem.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AndroidProjectSystem">
-    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
-  </component>
-</project>

.idea/compiler.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="21" />
-  </component>
-</project>

README.md

@@ -1,7 +1,5 @@
 # 🌜 LunaTracker 🌛
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/it/packages/it.danieleverducci.lunatracker/)
-
 LunaTracker is a newborn baby tracking app.
 
 Parenting can be tough. You get home from the hospital, exhausted, with this little fragile unknown thingy that has no user manual and a single way to let you know something's not ok: crying.
@@ -13,8 +11,7 @@ Dedicated to my daughter Luna.
 
 ![Screenshot](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)
 
-## Thanks for the valuable contributions to:
+Thanks for the valuable contributions to:
 
-- Chepycou (French translation)
+Chepycou (French translation)
-- Daniel Neubauer (German translation)
+Daniel Neubauer (German translation)
-- Moritz Warning (Various bugfixes and new features)

app/build.gradle.kts

@@ -6,14 +6,14 @@ plugins {
 
 android {
     namespace = "it.danieleverducci.lunatracker"
-    compileSdk = 36
+    compileSdk = 34
 
     defaultConfig {
         applicationId = "it.danieleverducci.lunatracker"
         minSdk = 21
-        targetSdk = 36
+        targetSdk = 34
-        versionCode = 7
+        versionCode = 4
-        versionName = "0.9"
+        versionName = "0.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -31,12 +31,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
     }
-    dependenciesInfo {
-        // Disables dependency metadata when building APKs.
-        includeInApk = false
-        // Disables dependency metadata when building Android App Bundles.
-        includeInBundle = false
-    }
     kotlinOptions {
         jvmTarget = "11"
     }
@@ -46,6 +40,7 @@ android {
 }
 
 dependencies {
+
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)
@@ -56,7 +51,7 @@ dependencies {
     implementation(libs.androidx.material3)
     implementation(libs.androidx.appcompat)
     implementation(libs.androidx.recyclerview)
-    implementation(libs.sardine.android)
+    implementation("com.github.thegrizzlylabs:sardine-android:v0.9")
     implementation(libs.material)
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
@@ -65,5 +60,4 @@ dependencies {
     androidTestImplementation(libs.androidx.ui.test.junit4)
     debugImplementation(libs.androidx.ui.tooling)
     debugImplementation(libs.androidx.ui.test.manifest)
-    implementation(libs.mpandroidchart.vv310)
 }

app/src/main/AndroidManifest.xml

@@ -30,10 +30,6 @@
             android:name=".SettingsActivity"
             android:label="@string/settings_title"
             android:theme="@style/Theme.LunaTracker"/>
-        <activity
-            android:name=".StatisticsActivity"
-            android:label="@string/statistics_title"
-            android:theme="@style/Theme.LunaTracker"/>
     </application>
 
 </manifest>

app/src/main/java/it/danieleverducci/lunatracker/SettingsActivity.kt

@@ -2,9 +2,7 @@ package it.danieleverducci.lunatracker
 
 import android.os.Bundle
 import android.view.View
-import android.widget.EditText
 import android.widget.RadioButton
-import android.widget.Spinner
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
@@ -14,8 +12,10 @@ import com.thegrizzlylabs.sardineandroid.impl.SardineException
 import it.danieleverducci.lunatracker.repository.FileLogbookRepository
 import it.danieleverducci.lunatracker.repository.LocalSettingsRepository
 import it.danieleverducci.lunatracker.repository.LogbookListObtainedListener
+import it.danieleverducci.lunatracker.repository.LogbookRepository
 import it.danieleverducci.lunatracker.repository.WebDAVLogbookRepository
 import okio.IOException
+import org.json.JSONException
 
 open class SettingsActivity : AppCompatActivity() {
     protected lateinit var settingsRepository: LocalSettingsRepository
@@ -25,8 +25,7 @@ open class SettingsActivity : AppCompatActivity() {
     protected lateinit var textViewWebDAVUser: TextView
     protected lateinit var textViewWebDAVPass: TextView
     protected lateinit var progressIndicator: LinearProgressIndicator
-    protected lateinit var switchDynamicMenu: SwitchMaterial
+    protected lateinit var switchNoBreastfeeding: SwitchMaterial
-    protected lateinit var textViewSignature: EditText
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -38,8 +37,7 @@ open class SettingsActivity : AppCompatActivity() {
         textViewWebDAVUser = findViewById(R.id.settings_data_webdav_user)
         textViewWebDAVPass = findViewById(R.id.settings_data_webdav_pass)
         progressIndicator = findViewById(R.id.progress_indicator)
-        switchDynamicMenu = findViewById(R.id.switch_dynamic_menu)
+        switchNoBreastfeeding = findViewById(R.id.switch_no_breastfeeding)
-        textViewSignature = findViewById(R.id.settings_signature)
 
         findViewById<View>(R.id.settings_save).setOnClickListener({
             validateAndSave()
@@ -55,21 +53,19 @@ open class SettingsActivity : AppCompatActivity() {
     fun loadSettings() {
         val dataRepo = settingsRepository.loadDataRepository()
         val webDavCredentials = settingsRepository.loadWebdavCredentials()
-        val dynamicMenu = settingsRepository.loadDynamicMenu()
+        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
-        val signature = settingsRepository.loadSignature()
 
         when (dataRepo) {
             LocalSettingsRepository.DATA_REPO.LOCAL_FILE -> radioDataLocal.isChecked = true
             LocalSettingsRepository.DATA_REPO.WEBDAV -> radioDataWebDAV.isChecked = true
         }
 
-        textViewSignature.setText(signature)
+        switchNoBreastfeeding.isChecked = noBreastfeeding
-        switchDynamicMenu.isChecked = dynamicMenu
 
         if (webDavCredentials != null) {
-            textViewWebDAVUrl.text = webDavCredentials[0]
+            textViewWebDAVUrl.setText(webDavCredentials[0])
-            textViewWebDAVUser.text = webDavCredentials[1]
+            textViewWebDAVUser.setText(webDavCredentials[1])
-            textViewWebDAVPass.text = webDavCredentials[2]
+            textViewWebDAVPass.setText(webDavCredentials[2])
         }
     }
 
@@ -161,8 +157,7 @@ open class SettingsActivity : AppCompatActivity() {
             if (radioDataWebDAV.isChecked) LocalSettingsRepository.DATA_REPO.WEBDAV
             else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
         )
-        settingsRepository.saveDynamicMenu(switchDynamicMenu.isChecked)
+        settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
-        settingsRepository.saveSignature(textViewSignature.text.toString())
         settingsRepository.saveWebdavCredentials(
             textViewWebDAVUrl.text.toString(),
             textViewWebDAVUser.text.toString(),
@@ -177,7 +172,7 @@ open class SettingsActivity : AppCompatActivity() {
      */
     private fun copyLocalLogbooksToWebdav(webDAVLogbookRepository: WebDAVLogbookRepository, listener: OnCopyLocalLogbooksToWebdavFinishedListener) {
         Thread(Runnable {
-            val errors = StringBuilder()
+            var errors = StringBuilder()
             val fileLogbookRepo = FileLogbookRepository()
             val logbooks = fileLogbookRepo.getAllLogbooks(this)
             for (logbook in logbooks) {

app/src/main/java/it/danieleverducci/lunatracker/StatisticsActivity.kt

@@ -1,901 +0,0 @@
-package it.danieleverducci.lunatracker
-
-import android.graphics.Canvas
-import android.graphics.Color
-import android.os.Bundle
-import android.util.Log
-import android.view.View
-import android.widget.AdapterView
-import android.widget.ArrayAdapter
-import android.widget.Spinner
-import android.widget.TextView
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.graphics.toColorInt
-import com.github.mikephil.charting.animation.ChartAnimator
-import com.github.mikephil.charting.charts.BarChart
-import com.github.mikephil.charting.components.YAxis
-import com.github.mikephil.charting.data.BarData
-import com.github.mikephil.charting.data.BarDataSet
-import com.github.mikephil.charting.data.BarEntry
-import com.github.mikephil.charting.data.Entry
-import com.github.mikephil.charting.formatter.ValueFormatter
-import com.github.mikephil.charting.highlight.Highlight
-import com.github.mikephil.charting.interfaces.dataprovider.BarDataProvider
-import com.github.mikephil.charting.listener.OnChartValueSelectedListener
-import com.github.mikephil.charting.renderer.HorizontalBarChartRenderer
-import com.github.mikephil.charting.utils.ViewPortHandler
-import it.danieleverducci.lunatracker.entities.LunaEvent
-import utils.DateUtils
-import utils.NumericUtils
-import java.text.SimpleDateFormat
-import java.util.Calendar
-import java.util.Date
-import java.util.Locale
-import kotlin.math.max
-import kotlin.math.min
-
-class StatisticsActivity : AppCompatActivity() {
-    var lastToastShown = 0L
-
-    lateinit var barChart: BarChart
-    lateinit var noDataTextView: TextView
-    lateinit var graphTypeSpinner: Spinner
-    lateinit var timeRangeSpinner: Spinner
-
-    lateinit var unixToSpan: (Long) -> Int
-    lateinit var spanToUnix: (Int) -> Long
-
-    enum class GraphType {
-        BOTTLE_EVENTS,
-        BOTTLE_SUM,
-        SLEEP_SUM,
-        SLEEP_EVENTS,
-        SLEEP_PATTERN
-    }
-
-    enum class TimeRange {
-        DAY,
-        WEEK,
-        MONTH
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContentView(R.layout.activity_statistics)
-
-        val logbookName = intent.getStringExtra("LOOGBOOK_NAME")
-        if (logbookName == null) {
-            finish()
-            return
-        }
-
-        noDataTextView = findViewById(R.id.no_data)
-
-        barChart = findViewById(R.id.bar_chart)
-        barChart.setBackgroundColor(Color.WHITE)
-        barChart.description.text = logbookName
-        barChart.setDrawValueAboveBar(false)
-
-        barChart.axisLeft.setAxisMinimum(0F)
-        barChart.axisLeft.setDrawGridLines(false)
-        barChart.axisLeft.setDrawLabels(false)
-
-        barChart.axisRight.setDrawGridLines(false)
-        barChart.axisRight.setDrawLabels(false)
-
-        barChart.xAxis.setDrawLabels(true)
-        barChart.xAxis.setDrawAxisLine(false)
-
-        barChart.isScaleXEnabled = false
-        barChart.isScaleYEnabled = true
-
-        graphTypeSpinner = findViewById(R.id.graph_type_selection)
-        timeRangeSpinner = findViewById(R.id.time_range_selection)
-
-        setupSpinner(graphTypeSelection.name,
-            R.id.graph_type_selection,
-            R.array.StatisticsTypeLabels,
-            R.array.StatisticsTypeValues,
-            object : SpinnerItemSelected {
-                override fun call(newValue: String?) {
-                    //Log.d("event", "new value: $newValue")
-                    newValue ?: return
-                    graphTypeSelection = GraphType.valueOf(newValue)
-                    showGraph()
-                }
-            }
-        )
-
-        setupSpinner(timeRangeSelection.name,
-            R.id.time_range_selection,
-            R.array.StatisticsTimeLabels,
-            R.array.StatisticsTimeValues,
-            object : SpinnerItemSelected {
-                override fun call(newValue: String?) {
-                    //Log.d("event", "new value: $newValue")
-                    newValue ?: return
-                    timeRangeSelection = TimeRange.valueOf(newValue)
-                    setSpans()
-                    showGraph()
-                }
-            }
-        )
-
-        setSpans()
-        showGraph()
-    }
-
-    fun setSpans() {
-        unixToSpan  = when (timeRangeSelection) {
-            TimeRange.DAY -> { unix: Long -> unixToDays(unix) }
-            TimeRange.WEEK -> { unix: Long -> unixToWeeks(unix) }
-            TimeRange.MONTH -> { unix: Long -> unixToMonths(unix) }
-        }
-
-        spanToUnix = when (timeRangeSelection) {
-            TimeRange.DAY -> { span: Int -> daysToUnix(span) }
-            TimeRange.WEEK -> { span: Int -> weeksToUnix(span) }
-            TimeRange.MONTH -> { span: Int -> monthsToUnix(span) }
-        }
-    }
-
-    data class SleepRange(val start: Long, var end: Long)
-
-    fun toSleepRanges(events: List<LunaEvent>): ArrayList<SleepRange> {
-        val ranges = arrayListOf<SleepRange>()
-        val now = System.currentTimeMillis() / 1000
-
-        // Transform events into time ranges.
-        // Merge overlapping times and extend
-        // ongoing sleep events until now.
-        var warningShown = false
-        for (event in events) {
-            val startTime = event.time
-            val endTime = if (event.quantity == 0) {
-                now
-            } else {
-                event.time + event.quantity
-            }
-
-            // handle overlap
-            val previousRange = ranges.lastOrNull()
-            if (previousRange != null && previousRange.end > startTime) {
-                // cap previous range to avoid overlap
-                previousRange.end = startTime
-                if (!warningShown) {
-                    Toast.makeText(applicationContext, "Overlapping sleep event at ${DateUtils.formatDateTime(startTime)}", Toast.LENGTH_SHORT).show()
-                    warningShown = true
-                }
-            }
-
-            ranges.add(SleepRange(startTime, endTime))
-        }
-
-        return ranges
-    }
-
-    fun showSleepPatternBarGraphSlotted(state: GraphState) {
-        val ranges = toSleepRanges(state.events)
-        val values = ArrayList<BarEntry>()
-        val stack = ArrayList(List(state.endSpan - state.startSpan + 1) { IntArray(24 * 60 * 60 / SLEEP_PATTERN_GRANULARITY) })
-
-        fun stackValuePattern(index: Int, spanBegin: Long, spanEnd: Long, begin: Long, end: Long) {
-            val beginDays = unixToDays(begin)
-            val endDays = unixToDays(end)
-            var mid = begin
-
-            for (i in beginDays..endDays) {
-                // i is the days/weeks/months since unix epoch
-                val dayBegin = daysToUnix(i)
-                val dayEnd =  daysToUnix(i + 1)
-                val sleepBegin = max(mid, dayBegin)
-                val sleepEnd = min(end, dayEnd)
-
-                if (sleepBegin != sleepEnd) {
-                    assert(dayBegin <= dayEnd)
-                    assert(sleepBegin <= sleepEnd)
-                    val iBegin = (sleepBegin - dayBegin) / SLEEP_PATTERN_GRANULARITY
-                    val iEnd = iBegin + (sleepEnd - sleepBegin) / SLEEP_PATTERN_GRANULARITY
-                    for (j in iBegin..<iEnd) {
-                        stack[index][j.toInt()] += 1
-                    }
-                }
-                mid = sleepEnd
-            }
-        }
-
-        for (range in ranges) {
-            // a sleep event can span to another day
-            // distribute sleep time over the days
-            val startUnix = range.start
-            val endUnix = range.end
-            val begIndex = unixToSpan(startUnix)
-            val endIndex = unixToSpan(endUnix)
-            var mid = startUnix
-
-            for (i in begIndex..endIndex) {
-                // i is the days/weeks/months since unix epoch
-                val spanBegin = spanToUnix(i)
-                val spanEnd =  spanToUnix(i + 1)
-                val sleepBegin = max(mid, spanBegin)
-                val sleepEnd = min(endUnix, spanEnd)
-                val index = i - state.startSpan
-                val duration = sleepEnd - sleepBegin
-
-                state.dayCounter.setDaysWithData(sleepBegin, sleepEnd)
-                stackValuePattern(index, spanBegin, spanEnd, sleepBegin, sleepEnd)
-
-                mid = sleepEnd
-            }
-        }
-
-        fun mapColor(occurrences: Int, maxOccurrences: Int): Int {
-            // occurrences: number of reported sleeps in a specific time slot
-            // maxOccurrences: maximum number of days with data that can contribute to maxOccurrences
-            assert(maxOccurrences > 0)
-            assert(occurrences <= maxOccurrences)
-
-            // map to color
-            val q = occurrences.toFloat() / maxOccurrences.toFloat()
-            val i = q * (SLEEP_PATTERN_COLORS.size - 1).toFloat()
-            return SLEEP_PATTERN_COLORS[i.toInt()]
-        }
-
-        val allColors = ArrayList<Int>()
-
-        // convert array of time slots that represent a day to value and color arrays used by chart library
-        for ((index, dayArray) in stack.withIndex()) {
-            val daysWithData = state.dayCounter.countDaysWithData(spanToUnix(state.startSpan + index), spanToUnix(state.startSpan + index + 1))
-
-            val vals = ArrayList<Float>()
-
-            var prevIndex = -1 // time slot index
-            var prevValue = -1 // number of entries we have found for time slot
-            for ((i, v) in dayArray.withIndex()) {
-                if (i == 0) {
-                    prevIndex = i
-                    prevValue = v
-                } else if (prevValue != v) {
-                    vals.add((i - prevIndex).toFloat())
-                    allColors.add(mapColor(prevValue.coerceAtMost(daysWithData), daysWithData))
-                    prevIndex = i
-                    prevValue = v
-                }
-            }
-
-            if (prevIndex != -1) {
-                vals.add((dayArray.size - prevIndex).toFloat())
-                allColors.add(mapColor(prevValue, daysWithData))
-            }
-
-            assert(values.size == index)
-            values.add(BarEntry(values.size.toFloat(), vals.toFloatArray()))
-        }
-
-        barChart.setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
-            override fun onValueSelected(e: Entry?, h: Highlight?) {
-                if (e == null || h == null) {
-                    return
-                }
-
-                val index = e.x.toInt()
-                if (index !in 0..values.size) {
-                    return
-                }
-
-                val value = values[index]
-                if (value.yVals == null || h.stackIndex !in 0..value.yVals.size) {
-                    return
-                }
-
-                if ((lastToastShown + TOAST_FREQUENCY_MS) > System.currentTimeMillis()) {
-                    // only show one Toast message after another
-                    return
-                }
-
-                val dayStartUnix = daysToUnix(unixToDays(state.startUnix) + index)
-
-                val startSeconds =
-                    SLEEP_PATTERN_GRANULARITY * value.yVals.sliceArray(0..<h.stackIndex)
-                        .fold(0) { acc, y -> acc + y.toInt() }
-                val durationSeconds =
-                    SLEEP_PATTERN_GRANULARITY * value.yVals[h.stackIndex].toInt()
-                val endSeconds = startSeconds + durationSeconds
-
-                val format = SimpleDateFormat("HH:mm", Locale.getDefault())
-                val startTimeString =
-                    format.format((dayStartUnix + startSeconds) * 1000).toString()
-                val endTimeString =
-                    format.format((dayStartUnix + endSeconds) * 1000).toString()
-                val durationString = DateUtils.formatTimeDuration(applicationContext, durationSeconds.toLong())
-
-                val daysWithData =
-                    stack[e.x.toInt()][startSeconds / SLEEP_PATTERN_GRANULARITY]
-                val daysWithDataMax = state.dayCounter.countDaysWithData(
-                    spanToUnix(state.startSpan + index),
-                    spanToUnix(state.startSpan + index + 1)
-                )
-
-                // percentage of days in this span where baby is asleep in this time slot
-                val pc = if (daysWithDataMax > 0) {
-                    (100F * daysWithData.toFloat() / daysWithDataMax.toFloat()).toInt()
-                } else {
-                    // no data for this day
-                    0
-                }
-
-                Toast.makeText(
-                    applicationContext,
-                    "$startTimeString - $endTimeString ($durationString) - ${pc}%",
-                    Toast.LENGTH_LONG
-                ).show()
-                lastToastShown = System.currentTimeMillis()
-            }
-
-            override fun onNothingSelected() {}
-        })
-
-        val set1 = BarDataSet(values, "")
-        set1.colors = allColors
-        set1.setDrawValues(false) // usually too many values
-        set1.isHighlightEnabled = true
-        set1.setDrawIcons(false)
-
-        val data = BarData(set1)
-        data.setValueTextSize(12f)
-
-        val valueCount = min(values.size, 24)
-        barChart.setData(data)
-        barChart.legend.isEnabled = false
-        barChart.setVisibleXRangeMaximum(valueCount.toFloat())
-        barChart.xAxis.setLabelCount(valueCount)
-        barChart.xAxis.setCenterAxisLabels(false)
-        barChart.moveViewTo(data.getEntryCount().toFloat(), 0f, YAxis.AxisDependency.LEFT)
-        barChart.invalidate()
-    }
-
-    // Sleep pattern bars that do not use time slots.
-    // This is useful/nicer for bars that only represent data of a singular days.
-    fun showSleepPatternBarGraphDaily(state: GraphState) {
-        val ranges = toSleepRanges(state.events)
-        val values = ArrayList(List(state.endSpan - state.startSpan + 1) { BarEntry(it.toFloat(), FloatArray(0)) })
-
-        // stack awake/sleep durations
-        fun stackValuePattern(index: Int, spanBegin: Long, spanEnd: Long, begin: Long, end: Long) {
-            assert(begin in spanBegin..spanEnd)
-            assert(end in spanBegin..spanEnd)
-            assert(begin <= end)
-
-            val x = values[index].x
-            val yVals  = values[index].yVals // alternating sleep/awake durations
-            val y = yVals.fold(0F) { acc, next -> acc + next }
-
-            // y value is seconds when last awake
-            val awakeDuration = max(begin - spanBegin - y.toLong(), 0L)
-            val sleepDuration = end - begin
-
-            if ((awakeDuration + sleepDuration) > (spanEnd - spanBegin)) {
-                Log.e(TAG, "Invalid sleep duration, exceeds day/week or month bounds => ignore value")
-                return
-            }
-
-            // update value
-            val newYVals = appendToFloatArray(yVals, awakeDuration.toFloat(), sleepDuration.toFloat())
-            assert(index == x.toInt())
-            values[index] = BarEntry(index.toFloat(), newYVals)
-        }
-
-        for (range in ranges) {
-            // a sleep event can span to another day
-            // distribute sleep time over the days
-            val startUnix = range.start
-            val endUnix = range.end
-            val begIndex = unixToSpan(startUnix)
-            val endIndex = unixToSpan(endUnix)
-            var mid = startUnix
-
-            for (i in begIndex..endIndex) {
-                // i is the days/weeks/months since unix epoch
-                val spanBegin = spanToUnix(i)
-                val spanEnd =  spanToUnix(i + 1)
-                val sleepBegin = max(mid, spanBegin)
-                val sleepEnd = min(endUnix, spanEnd)
-                val index = i - state.startSpan
-                val duration = sleepEnd - sleepBegin
-
-                state.dayCounter.setDaysWithData(sleepBegin, sleepEnd)
-                stackValuePattern(index, spanBegin, spanEnd, sleepBegin, sleepEnd)
-
-                mid = sleepEnd
-            }
-        }
-
-        // awake phase color is transparent
-        val set1 = BarDataSet(values, "")
-        set1.colors = arrayListOf("#00000000".toColorInt(), "#72d7f5".toColorInt())
-        set1.setDrawValues(false) // usually too many values
-        set1.setDrawIcons(false)
-        set1.isHighlightEnabled = true
-
-        barChart.setOnChartValueSelectedListener(object : OnChartValueSelectedListener {
-            override fun onValueSelected(e: Entry?, h: Highlight?) {
-                if (e == null || h == null) {
-                    return
-                }
-
-                val index = e.x.toInt()
-                if (index !in 0..values.size) {
-                    return
-                }
-
-                val value = values[index]
-                if (value.yVals == null || h.stackIndex !in 0..value.yVals.size) {
-                    return
-                }
-
-                if ((lastToastShown + TOAST_FREQUENCY_MS) > System.currentTimeMillis()) {
-                    // only show one Toast message after another
-                    return
-                }
-
-                val duration = value.yVals[h.stackIndex].toInt()
-                val durationString = DateUtils.formatTimeDuration(applicationContext, duration.toLong())
-
-                val offsetUnix = spanToUnix(state.startSpan + e.x.toInt()) // start of the time span (day/week/month)
-                val startUnix = offsetUnix + value.yVals.sliceArray(0..<h.stackIndex).fold(0) { acc, y -> acc + y.toInt() }
-                val endUnix = startUnix + duration
-
-                val format = SimpleDateFormat("HH:mm", Locale.getDefault())
-                val startTimeString = format.format(startUnix * 1000).toString()
-                val endTimeString = format.format(endUnix * 1000).toString()
-                Toast.makeText(applicationContext, "$startTimeString - $endTimeString ($durationString)", Toast.LENGTH_LONG).show()
-                lastToastShown = System.currentTimeMillis()
-            }
-
-            override fun onNothingSelected() {}
-        })
-
-        val data = BarData(set1)
-        data.setValueTextSize(12f)
-
-        val valueCount = min(values.size, 24)
-        barChart.setData(data)
-        barChart.legend.isEnabled = false
-        barChart.setVisibleXRangeMaximum(valueCount.toFloat())
-        barChart.xAxis.setLabelCount(valueCount)
-        barChart.xAxis.setCenterAxisLabels(false)
-        barChart.moveViewTo(data.getEntryCount().toFloat(), 0f, YAxis.AxisDependency.LEFT)
-        barChart.invalidate()
-    }
-
-    // Make sure the value on the bar is not out of screen.
-    class CustomHorizontalBarChartRenderer(chart: BarDataProvider, animator: ChartAnimator, viewPortHandler: ViewPortHandler): HorizontalBarChartRenderer(chart, animator, viewPortHandler) {
-        override fun drawValue(
-            c: Canvas,
-            valueText: String,
-            x: Float,
-            y: Float,
-            color: Int
-        ) {
-            mValuePaint.setColor(color)
-            c.drawText(valueText, x.coerceAtLeast(60F), y, mValuePaint)
-        }
-    }
-
-    fun showSleepBarGraph(state: GraphState) {
-        val ranges = toSleepRanges(state.events)
-        val values = ArrayList(List(state.endSpan - state.startSpan + 1) { BarEntry(it.toFloat(), 0F) })
-
-        for (range in ranges) {
-            // a sleep event can span to another day
-            // distribute sleep time over the days
-            val startUnix = range.start
-            val endUnix = range.end
-            val begIndex = unixToSpan(startUnix)
-            val endIndex = unixToSpan(endUnix)
-            var mid = startUnix
-
-            for (i in begIndex..endIndex) {
-                // i is the days/weeks/months since unix epoch
-                val spanBegin = spanToUnix(i)
-                val spanEnd =  spanToUnix(i + 1)
-                val sleepBegin = max(mid, spanBegin)
-                val sleepEnd = min(endUnix, spanEnd)
-                val index = i - state.startSpan
-                val duration = sleepEnd - sleepBegin
-
-                state.dayCounter.setDaysWithData(sleepBegin, sleepEnd)
-
-                if (graphTypeSelection == GraphType.SLEEP_SUM) {
-                    values[index].y += duration.toFloat()
-                } else if (graphTypeSelection == GraphType.SLEEP_EVENTS) {
-                    values[index].y += 1F
-                } else {
-                    Log.e(TAG, "Unexpected graph type.")
-                    return
-                }
-
-                mid = sleepEnd
-            }
-        }
-
-        for (index in values.indices) {
-            val daysWithData = state.dayCounter.countDaysWithData(spanToUnix(state.startSpan + index), spanToUnix(state.startSpan + index + 1))
-            if (daysWithData == 0) {
-                assert(values[index].y == 0F)
-            } else {
-                values[index].y /= daysWithData
-            }
-        }
-
-        val set1 = BarDataSet(values, "")
-        set1.setDrawValues(true)
-        set1.setDrawIcons(false)
-        set1.isHighlightEnabled = false
-
-        val data = BarData(set1)
-        data.setValueTextSize(12f)
-        data.setValueFormatter(object : ValueFormatter() {
-            override fun getFormattedValue(value: Float): String {
-
-                val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
-                return when (graphTypeSelection) {
-                    GraphType.SLEEP_EVENTS -> {
-                        prefix + value.toInt().toString()
-                    }
-                    GraphType.SLEEP_SUM -> {
-                        prefix + DateUtils.formatTimeDuration(applicationContext, value.toLong())
-                    }
-                    else -> {
-                        Log.e(TAG, "unhandled graphTypeSelection $graphTypeSelection")
-                        prefix + value.toInt().toString()
-                    }
-                }
-            }
-        })
-
-        val valueCount = min(values.size, 24)
-        barChart.renderer = CustomHorizontalBarChartRenderer(barChart, barChart.animator, barChart.viewPortHandler)
-        barChart.setData(data)
-        barChart.legend.isEnabled = false
-        barChart.setVisibleXRangeMaximum(valueCount.toFloat())
-        barChart.xAxis.setLabelCount(valueCount)
-        barChart.xAxis.setCenterAxisLabels(false)
-        barChart.moveViewTo(data.getEntryCount().toFloat(), 0f, YAxis.AxisDependency.LEFT)
-        barChart.invalidate()
-    }
-
-    fun showBottleBarGraph(state: GraphState) {
-        val values = ArrayList(List(state.endSpan - state.startSpan + 1) { BarEntry(it.toFloat(), 0F) })
-
-        for (event in state.events) {
-            val index = unixToSpan(event.time) - state.startSpan
-
-            state.dayCounter.setDaysWithData(event.time, event.time)
-
-            if (graphTypeSelection == GraphType.BOTTLE_EVENTS) {
-                values[index].y += 1F
-            } else if (graphTypeSelection == GraphType.BOTTLE_SUM) {
-                values[index].y += event.quantity.toFloat()
-            } else {
-                Log.e(TAG, "unhandled graphTypeSelection: $graphTypeSelection")
-                return
-            }
-        }
-
-        for (index in values.indices) {
-            val daysWithData = state.dayCounter.countDaysWithData(spanToUnix(state.startSpan + index), spanToUnix(state.startSpan + index + 1))
-            if (daysWithData == 0) {
-                assert(values[index].y == 0F)
-            } else {
-                values[index].y /= daysWithData
-            }
-        }
-
-        val set1 = BarDataSet(values, "")
-        set1.setDrawValues(true)
-        set1.isHighlightEnabled = false
-
-        val data = BarData(set1)
-        data.setValueTextSize(12f)
-        data.setValueFormatter(object : ValueFormatter() {
-            override fun getFormattedValue(value: Float): String {
-                val prefix = if (timeRangeSelection == TimeRange.DAY) { "" } else { "⌀ " }
-                return when (graphTypeSelection) {
-                    GraphType.BOTTLE_EVENTS -> {
-                        prefix + value.toInt().toString()
-                    }
-                    GraphType.BOTTLE_SUM -> {
-                        prefix + NumericUtils(applicationContext).formatEventQuantity(LunaEvent.Type.BABY_BOTTLE, value.toInt())
-                    }
-                    else -> {
-                        Log.e(TAG, "unhandled graphTypeSelection")
-                        prefix + value.toInt()
-                    }
-                }
-            }
-        })
-
-        val valueCount = min(values.size, 24)
-        barChart.renderer = CustomHorizontalBarChartRenderer(barChart, barChart.animator, barChart.viewPortHandler)
-        barChart.setData(data)
-        barChart.setVisibleXRangeMaximum(valueCount.toFloat())
-        barChart.xAxis.setLabelCount(valueCount)
-        barChart.xAxis.setCenterAxisLabels(false)
-        barChart.moveViewTo(data.getEntryCount().toFloat(), 0f, YAxis.AxisDependency.LEFT)
-        barChart.invalidate()
-    }
-
-    class DayCounter(val startDays: Int, val stopDays: Int) {
-        val daysWithData = BooleanArray(stopDays - startDays + 1)
-
-        // count days in a span that have data
-        // e.g. return 7 (days) for applied span of a week where there is data for every day 
-        fun countDaysWithData(beginUnix: Long, endUnix: Long): Int {
-            val beginDays = unixToDays(beginUnix)
-            val endDays = unixToDays(endUnix)
-            var count = 0
-            for (i in (beginDays - startDays)..<(endDays - startDays)) {
-                count += if (daysWithData[i]) { 1 } else { 0 }
-            }
-            return count
-        }
-
-        fun setDaysWithData(beginUnix: Long, endUnix: Long) {
-            val beginDays = unixToDays(beginUnix)
-            val endDays = unixToDays(endUnix)
-            assert(beginDays <= endDays)
-            assert(startDays <= beginDays)
-            for (i in (beginDays - startDays)..(endDays - startDays)) {
-                daysWithData[i] = true
-            }
-        }
-    }
-
-    data class GraphState(val events: List<LunaEvent>, val dayCounter: DayCounter, val startUnix: Long, val endUnix: Long, val startSpan: Int, val endSpan: Int)
-
-    fun showGraph() {
-        barChart.fitScreen()
-        barChart.data?.clearValues()
-        barChart.xAxis.valueFormatter = null
-        barChart.notifyDataSetChanged()
-        barChart.clear()
-        barChart.invalidate()
-
-        val type = when (graphTypeSelection) {
-            GraphType.BOTTLE_EVENTS,
-            GraphType.BOTTLE_SUM -> LunaEvent.Type.BABY_BOTTLE
-            GraphType.SLEEP_EVENTS,
-            GraphType.SLEEP_SUM,
-            GraphType.SLEEP_PATTERN -> LunaEvent.Type.SLEEP
-        }
-
-        val events = MainActivity.allEvents.filter { it.type == type }.sortedBy { it.time }
-
-        if (events.isEmpty()) {
-            barChart.visibility = View.GONE
-            noDataTextView.visibility = View.VISIBLE
-            return
-        } else {
-            barChart.visibility = View.VISIBLE
-            noDataTextView.visibility = View.GONE
-        }
-
-        // unix time span of all events
-        val startUnix = events.minOf { it.time }
-        val endUnix = System.currentTimeMillis() / 1000
-
-        // convert to days, weeks or months
-        val startSpan = unixToSpan(startUnix)
-        val endSpan = unixToSpan(endUnix)
-
-        // days when the a day/week/month starts/ends
-        val startDays = unixToDays(spanToUnix(startSpan))
-        val endDays = unixToDays(spanToUnix(endSpan + 1)) // until end of next span
-        val dayCounter = DayCounter(startDays, endDays)
-
-        // print dates
-        barChart.xAxis.valueFormatter = object: ValueFormatter() {
-            override fun getFormattedValue(value: Float): String {
-                val index = value.toInt()
-                val unixSeconds = spanToUnix(startSpan + index)
-
-                val dateTime = Calendar.getInstance()
-                dateTime.time = Date(1000L * unixSeconds)
-                val year = dateTime.get(Calendar.YEAR)
-                val month = dateTime.get(Calendar.MONTH) + 1 // month starts at 0
-                val week = dateTime.get(Calendar.WEEK_OF_YEAR)
-                val day = dateTime.get(Calendar.DAY_OF_MONTH)
-
-                // Adjust years if the first week of a year starts in the previous year.
-                val years = if (month == 12 && week == 1) {
-                    year + 1
-                } else {
-                    year
-                }
-
-                val days = "%02d".format(day)
-                val weeks = "%02d".format(week)
-                val months = "%02d".format(month)
-
-                return when (timeRangeSelection) {
-                    TimeRange.DAY -> "$days/$months/$years"
-                    TimeRange.WEEK -> "$weeks/$years"
-                    TimeRange.MONTH -> "$months/$years"
-                }
-            }
-        }
-
-        val state = GraphState(events, dayCounter, startUnix, endUnix, startSpan, endSpan)
-
-        when (graphTypeSelection) {
-            GraphType.BOTTLE_EVENTS,
-            GraphType.BOTTLE_SUM -> showBottleBarGraph(state)
-            GraphType.SLEEP_EVENTS,
-            GraphType.SLEEP_SUM -> showSleepBarGraph(state)
-            GraphType.SLEEP_PATTERN -> if (timeRangeSelection == TimeRange.DAY) {
-                // specialized pattern bar for daily view (optional)
-                showSleepPatternBarGraphDaily(state)
-            } else {
-                showSleepPatternBarGraphSlotted(state)
-            }
-        }
-    }
-
-    private interface SpinnerItemSelected {
-        fun call(newValue: String?)
-    }
-
-    private fun setupSpinner(
-        currentValue: String,
-        spinnerId: Int,
-        arrayId: Int,
-        arrayValuesId: Int,
-        callback: SpinnerItemSelected
-    ) {
-        val arrayValues = resources.getStringArray(arrayValuesId)
-        val spinner = findViewById<Spinner>(spinnerId)
-        val spinnerAdapter =
-            ArrayAdapter.createFromResource(this, arrayId, R.layout.statistics_spinner_item)
-
-        spinner.adapter = spinnerAdapter
-        spinner.setSelection(arrayValues.indexOf(currentValue))
-        spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
-            var check = 0
-            override fun onItemSelected(parent: AdapterView<*>?, view: View?, pos: Int, id: Long) {
-                if (pos >= arrayValues.size) {
-                    Toast.makeText(
-                        this@StatisticsActivity,
-                        "pos out of bounds: $arrayValues", Toast.LENGTH_SHORT
-                    ).show()
-                    return
-                }
-                if (check++ > 0) {
-                    callback.call(arrayValues[pos])
-                }
-            }
-
-            override fun onNothingSelected(parent: AdapterView<*>?) {
-                // ignore
-            }
-        }
-    }
-
-    companion object {
-        const val TAG = "StatisticsActivity"
-
-        // 15 min steps
-        const val SLEEP_PATTERN_GRANULARITY = 15 * 60
-
-        // Time between toast messages (to prevent jams)
-        const val TOAST_FREQUENCY_MS = 3500
-
-        // color gradient
-        val SLEEP_PATTERN_COLORS = arrayOf(
-            "#FFFFFF".toColorInt(), "#EEF5F7".toColorInt(), "#DDEBEF".toColorInt(), "#CCE2E7".toColorInt(),
-            "#BBD8DF".toColorInt(), "#AACED7".toColorInt(), "#99C4CF".toColorInt(), "#88BAC7".toColorInt(),
-            "#77B1BF".toColorInt(), "#66A7B7".toColorInt(), "#559DAF".toColorInt(), "#4493A7".toColorInt(),
-            "#33899F".toColorInt(), "#228097".toColorInt(), "#11768F".toColorInt(), "#006C87".toColorInt()
-        )
-
-        var graphTypeSelection = GraphType.SLEEP_SUM
-        var timeRangeSelection = TimeRange.DAY
-
-        private val dateTime = Calendar.getInstance() // scratch pad
-
-        // convert month to seconds since epoch
-        fun unixToMonths(seconds: Long): Int {
-            dateTime.time = Date(seconds * 1000)
-            val years = dateTime.get(Calendar.YEAR)
-            val months = dateTime.get(Calendar.MONTH)
-            return 12 * years + months
-        }
-
-        // convert month to seconds since epoch
-        fun monthsToUnix(months: Int): Long {
-            dateTime.time = Date(0)
-            dateTime.set(Calendar.YEAR, months / 12)
-            dateTime.set(Calendar.MONTH, months % 12)
-            dateTime.set(Calendar.HOUR, 0)
-            dateTime.set(Calendar.MINUTE, 0)
-            dateTime.set(Calendar.SECOND, 0)
-            return dateTime.time.time / 1000
-        }
-
-        // convert seconds to weeks since epoch
-        fun unixToWeeks(seconds: Long): Int {
-            dateTime.time = Date(seconds * 1000)
-            val years = dateTime.get(Calendar.YEAR) - 1970
-            val weeks = dateTime.get(Calendar.WEEK_OF_YEAR)
-            val month = dateTime.get(Calendar.MONTH) + 1 // month starts at 0
-
-            if (month == 12 && weeks == 1) {
-                // The first week if the year might start in the previous year.
-                return 52 * (years + 1) + weeks
-            }
-
-            return 52 * years + weeks
-        }
-
-        // convert weeks to seconds since epoch
-        fun weeksToUnix(weeks: Int): Long {
-            dateTime.time = Date(0)
-            dateTime.set(Calendar.YEAR, 1970 + weeks / 52)
-            dateTime.set(Calendar.WEEK_OF_YEAR, weeks % 52)
-            dateTime.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY)
-            dateTime.set(Calendar.HOUR, 0)
-            dateTime.set(Calendar.MINUTE, 0)
-            dateTime.set(Calendar.SECOND, 0)
-            return dateTime.time.time / 1000
-        }
-
-        // convert seconds to days since epoch
-        fun unixToDays(seconds: Long): Int {
-            dateTime.time = Date(seconds * 1000)
-            val years = dateTime.get(Calendar.YEAR)
-            val days = dateTime.get(Calendar.DAY_OF_YEAR)
-            return 365 * years + days
-        }
-
-        // convert days to seconds since epoch
-        fun daysToUnix(days: Int): Long {
-            dateTime.time = Date(0)
-            dateTime.set(Calendar.YEAR, days / 365)
-            dateTime.set(Calendar.DAY_OF_YEAR, days % 365)
-            dateTime.set(Calendar.HOUR, 0)
-            dateTime.set(Calendar.MINUTE, 0)
-            dateTime.set(Calendar.SECOND, 0)
-            return dateTime.time.time / 1000
-        }
-
-        fun appendToFloatArray(array: FloatArray, vararg values: Float): FloatArray {
-            // create new array
-            val newArray = FloatArray(array.size + values.size)
-            // copy old values
-            for (i in array.indices) {
-                newArray[i] = array[i]
-            }
-            // add new values
-            for (i in values.indices) {
-                newArray[array.size + i] = values[i]
-            }
-            return newArray
-        }
-
-        // for debugging
-        fun debugBarValues(values: ArrayList<BarEntry>) {
-            for (value in values) {
-                val yVals = value.yVals
-                if (yVals != null) {
-                    val y = yVals.fold(0F) { acc, next -> acc + next }
-                    val yVals = yVals.joinToString { it.toString() }
-                    Log.d(TAG, "value: ${value.x} $y ($yVals)")
-                } else {
-                    Log.d(TAG, "value: ${value.x} ${value.y}")
-                }
-            }
-        }
-    }
-}

app/src/main/java/it/danieleverducci/lunatracker/adapters/LunaEventRecyclerAdapter.kt

@@ -52,17 +52,18 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
         )
         holder.quantity.setTextColor(ContextCompat.getColor(context, R.color.textColor))
         // Contents
-        holder.type.text = item.getHeaderEmoji(context)
+        holder.type.text = item.getTypeEmoji(context)
-        holder.description.text = when (item.type) {
+        holder.description.text = when(item.type) {
-            LunaEvent.Type.MEDICINE -> item.notes
+            LunaEvent.TYPE_MEDICINE -> item.notes
-            LunaEvent.Type.NOTE -> item.notes
+            LunaEvent.TYPE_NOTE -> item.notes
-            else -> item.getRowItemTitle(context)
+            LunaEvent.TYPE_CUSTOM -> item.notes
+            else -> item.getTypeDescription(context)
         }
-        holder.time.text = DateUtils.formatTimeAgo(context, item.getEndTime())
+        holder.time.text = DateUtils.formatTimeAgo(context, item.time)
         var quantityText = numericUtils.formatEventQuantity(item)
 
         // if the event is weight, show difference with the last one
-        if (item.type == LunaEvent.Type.WEIGHT) {
+        if (item.type == LunaEvent.TYPE_WEIGHT) {
             val lastWeight = getPreviousWeightEvent(position)
             if (lastWeight != null) {
                 val differenceInWeight = item.quantity - lastWeight.quantity
@@ -93,7 +94,7 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
             return null
         for (pos in startFromPosition + 1 until items.size) {
             val item = items.get(pos)
-            if (item.type != LunaEvent.Type.WEIGHT)
+            if (item.type != LunaEvent.TYPE_WEIGHT)
                 continue
             return item
         }

app/src/main/java/it/danieleverducci/lunatracker/entities/Logbook.kt

@@ -2,7 +2,7 @@ package it.danieleverducci.lunatracker.entities
 
 class Logbook(val name: String) {
     companion object {
-        const val MAX_SAFE_LOGBOOK_SIZE = 30000
+        val MAX_SAFE_LOGBOOK_SIZE = 30000
     }
     val logs = ArrayList<LunaEvent>()
 

app/src/main/java/it/danieleverducci/lunatracker/entities/LunaEvent.kt

@@ -12,24 +12,22 @@ import java.util.Date
  * release, it is simply ignored by previous ones).
  */
 class LunaEvent: Comparable<LunaEvent> {
-    enum class Type {
+
-        BABY_BOTTLE,
+    companion object {
-        FOOD,
+        val TYPE_BABY_BOTTLE = "BABY_BOTTLE"
-        BREASTFEEDING_LEFT_NIPPLE,
+        val TYPE_WEIGHT = "WEIGHT"
-        BREASTFEEDING_BOTH_NIPPLE,
+        val TYPE_BREASTFEEDING_LEFT_NIPPLE = "BREASTFEEDING_LEFT_NIPPLE"
-        BREASTFEEDING_RIGHT_NIPPLE,
+        val TYPE_BREASTFEEDING_BOTH_NIPPLE = "BREASTFEEDING_BOTH_NIPPLE"
-        DIAPERCHANGE_POO,
+        val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
-        DIAPERCHANGE_PEE,
+        val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
-        SLEEP,
+        val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
-        WEIGHT,
+        val TYPE_MEDICINE = "MEDICINE"
-        MEDICINE,
+        val TYPE_ENEMA = "ENEMA"
-        ENEMA,
+        val TYPE_NOTE = "NOTE"
-        NOTE,
+        val TYPE_CUSTOM = "CUSTOM"
-        COLIC,
+        val TYPE_COLIC = "COLIC"
-        TEMPERATURE,
+        val TYPE_TEMPERATURE = "TEMPERATURE"
-        PUKE,
+        val TYPE_FOOD = "FOOD"
-        BATH,
-        UNKNOWN
     }
 
     private val jo: JSONObject
@@ -39,36 +37,22 @@ class LunaEvent: Comparable<LunaEvent> {
         set(value) {
             jo.put("time", value)
         }
-    var type: Type
+    var type: String
-        get(): Type {
+        get(): String = jo.getString("type")
-            return try {
-                Type.valueOf(jo.getString("type"))
-            } catch (_: Exception) {
-                Type.UNKNOWN
-            }
-        }
         set(value) {
-            jo.put("type", value.name)
+            jo.put("type", value)
         }
     var quantity: Int
         get() = jo.optInt("quantity")
         set(value) {
             if (value > 0)
                 jo.put("quantity", value)
-            else
-                jo.remove("quantity")
         }
     var notes: String
         get(): String = jo.optString("notes")
         set(value) {
             jo.put("notes", value)
         }
-    var signature: String
-        get(): String = jo.optString("signature")
-        set(value) {
-            if (value.isNotEmpty())
-                jo.put("signature", value)
-        }
 
     constructor(jo: JSONObject) {
         this.jo = jo
@@ -77,53 +61,65 @@ class LunaEvent: Comparable<LunaEvent> {
             throw IllegalArgumentException("JSONObject is not a LunaEvent")
     }
 
-    constructor(event: LunaEvent) {
+    constructor(type: String) {
-        this.jo = JSONObject()
-        this.type = event.type
-        this.time = event.time
-        this.quantity = event.quantity
-        this.notes = event.notes
-        this.signature = event.signature
-    }
-
-    constructor(type: Type) {
         this.jo = JSONObject()
         this.time = System.currentTimeMillis() / 1000
         this.type = type
     }
 
-    constructor(type: Type, quantity: Int) {
+    constructor(type: String, quantity: Int) {
         this.jo = JSONObject()
         this.time = System.currentTimeMillis() / 1000
         this.type = type
         this.quantity = quantity
     }
 
-    fun getHeaderEmoji(context: Context): String {
+    fun getTypeEmoji(context: Context): String {
-        return getHeaderEmoji(context, type)
+        return context.getString(
+            when (type) {
+                TYPE_BABY_BOTTLE -> R.string.event_bottle_type
+                TYPE_WEIGHT -> R.string.event_scale_type
+                TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
+                TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
+                TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
+                TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
+                TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
+                TYPE_MEDICINE -> R.string.event_medicine_type
+                TYPE_ENEMA -> R.string.event_enema_type
+                TYPE_NOTE -> R.string.event_note_type
+                TYPE_TEMPERATURE -> R.string.event_temperature_type
+                TYPE_COLIC -> R.string.event_colic_type
+                TYPE_FOOD -> R.string.event_food_type
+                else -> R.string.event_unknown_type
+            }
+        )
     }
 
-    fun getDialogTitle(context: Context): String {
+    fun getTypeDescription(context: Context): String {
-        return getDialogTitle(context, type)
+        return context.getString(
+            when (type) {
+                TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
+                TYPE_WEIGHT -> R.string.event_scale_desc
+                TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
+                TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
+                TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
+                TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
+                TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
+                TYPE_MEDICINE -> R.string.event_medicine_desc
+                TYPE_ENEMA -> R.string.event_enema_desc
+                TYPE_NOTE -> R.string.event_note_desc
+                TYPE_TEMPERATURE -> R.string.event_temperature_desc
+                TYPE_COLIC -> R.string.event_colic_desc
+                TYPE_FOOD -> R.string.event_food_desc
+                else -> R.string.event_unknown_desc
+            }
+        )
     }
 
-    fun getRowItemTitle(context: Context): String {
+    fun getDialogMessage(context: Context): String? {
-        return getPopupItemTitle(context, type).split(" ", limit = 2).last() // remove emoji
+        return when(type) {
-    }
+            TYPE_MEDICINE -> context.getString(R.string.log_medicine_dialog_description)
-
+            else -> null
-    fun getDialogMessage(context: Context): String {
-        return getDialogMessage(context, type)
-    }
-
-    fun getStartTime(): Long {
-        return time
-    }
-
-    fun getEndTime(): Long {
-        return if (type == Type.SLEEP) {
-            time + quantity
-        } else {
-            time
         }
     }
 
@@ -132,101 +128,10 @@ class LunaEvent: Comparable<LunaEvent> {
     }
 
     override fun toString(): String {
-        return "$type qty: $quantity time: ${Date(time * 1000)}"
+        return "${type} qty: $quantity time: ${Date(time * 1000)}"
     }
 
     override fun compareTo(other: LunaEvent): Int {
         return (this.time - other.time).toInt()
     }
-
-    companion object {
-        fun getHeaderEmoji(context: Context, type: Type): String {
-            return context.getString(
-                when (type) {
-                    Type.BABY_BOTTLE -> R.string.event_bottle_type
-                    Type.WEIGHT -> R.string.event_weight_type
-                    Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
-                    Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
-                    Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
-                    Type.DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
-                    Type.DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
-                    Type.MEDICINE -> R.string.event_medicine_type
-                    Type.ENEMA -> R.string.event_enema_type
-                    Type.NOTE -> R.string.event_note_type
-                    Type.TEMPERATURE -> R.string.event_temperature_type
-                    Type.COLIC -> R.string.event_colic_type
-                    Type.FOOD -> R.string.event_food_type
-                    Type.PUKE -> R.string.event_puke_type
-                    Type.BATH -> R.string.event_bath_type
-                    Type.SLEEP -> R.string.event_sleep_type
-                    Type.UNKNOWN -> R.string.event_unknown_type
-                }
-            )
-        }
-
-        fun getDialogMessage(context: Context, type: Type): String {
-            return context.getString(
-                when (type) {
-                    Type.BABY_BOTTLE -> R.string.log_bottle_dialog_description
-                    Type.MEDICINE -> R.string.log_medicine_dialog_description
-                    Type.TEMPERATURE -> R.string.log_temperature_dialog_description
-                    Type.DIAPERCHANGE_POO,
-                    Type.DIAPERCHANGE_PEE,
-                    Type.PUKE -> R.string.log_amount_dialog_description
-                    Type.WEIGHT -> R.string.log_weight_dialog_description
-                    Type.SLEEP -> R.string.log_duration_dialog_description
-                    else -> R.string.log_unknown_dialog_description
-                }
-            )
-        }
-
-        fun getDialogTitle(context: Context, type: Type): String {
-            return context.getString(
-                when (type) {
-                    Type.BABY_BOTTLE -> R.string.event_bottle_desc
-                    Type.WEIGHT -> R.string.event_weight_desc
-                    Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
-                    Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
-                    Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
-                    Type.DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
-                    Type.DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
-                    Type.MEDICINE -> R.string.event_medicine_desc
-                    Type.ENEMA -> R.string.event_enema_desc
-                    Type.NOTE -> R.string.event_note_desc
-                    Type.TEMPERATURE -> R.string.event_temperature_desc
-                    Type.COLIC -> R.string.event_colic_desc
-                    Type.FOOD -> R.string.event_food_desc
-                    Type.PUKE -> R.string.event_puke_desc
-                    Type.BATH -> R.string.event_bath_desc
-                    Type.SLEEP -> R.string.event_sleep_desc
-                    Type.UNKNOWN -> R.string.event_unknown_desc
-                }
-            )
-        }
-
-        // Entries for for popup list
-        fun getPopupItemTitle(context: Context, type: Type): String {
-            return context.getString(
-                when (type) {
-                    Type.BABY_BOTTLE -> R.string.event_type_item_bottle
-                    Type.WEIGHT -> R.string.event_type_item_weight
-                    Type.BREASTFEEDING_LEFT_NIPPLE -> R.string.event_type_item_breastfeeding_left
-                    Type.BREASTFEEDING_BOTH_NIPPLE -> R.string.event_type_item_breastfeeding_both
-                    Type.BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_type_item_breastfeeding_right
-                    Type.DIAPERCHANGE_POO -> R.string.event_type_item_diaperchange_poo
-                    Type.DIAPERCHANGE_PEE -> R.string.event_type_item_diaperchange_pee
-                    Type.MEDICINE -> R.string.event_type_item_medicine
-                    Type.ENEMA -> R.string.event_type_item_enema
-                    Type.NOTE -> R.string.event_type_item_note
-                    Type.TEMPERATURE -> R.string.event_type_item_temperature
-                    Type.COLIC -> R.string.event_type_item_colic
-                    Type.FOOD -> R.string.event_type_item_food
-                    Type.PUKE -> R.string.event_type_item_puke
-                    Type.BATH -> R.string.event_type_item_bath
-                    Type.SLEEP -> R.string.event_type_item_sleep
-                    Type.UNKNOWN -> R.string.event_type_item_unknown
-                }
-            )
-        }
-    }
 }

app/src/main/java/it/danieleverducci/lunatracker/repository/FileLogbookRepository.kt

@@ -13,9 +13,9 @@ import java.io.FilenameFilter
 
 class FileLogbookRepository: LogbookRepository {
     companion object {
-        const val TAG = "FileLogbookRepository"
+        val TAG = "FileLogbookRepository"
-        const val FILE_NAME_START = "data"
+        val FILE_NAME_START = "data"
-        const val FILE_NAME_END = ".json"
+        val FILE_NAME_END = ".json"
     }
 
     override fun loadLogbook(context: Context, name: String, listener: LogbookLoadedListener) {
@@ -32,7 +32,7 @@ class FileLogbookRepository: LogbookRepository {
     fun loadLogbook(context: Context, name: String): Logbook {
         val logbook = Logbook(name)
         val fileName = getFileName(name)
-        val file = File(context.filesDir, fileName)
+        val file = File(context.getFilesDir(), fileName)
         val json = FileInputStream(file).bufferedReader().use { it.readText() }
         val ja = JSONArray(json)
         for (i in 0 until ja.length()) {
@@ -58,7 +58,7 @@ class FileLogbookRepository: LogbookRepository {
 
     fun saveLogbook(context: Context, logbook: Logbook) {
         val fileName = getFileName(logbook.name)
-        val file = File(context.filesDir, fileName)
+        val file = File(context.getFilesDir(), fileName)
         val ja = JSONArray()
         for (l in logbook.logs) {
             ja.put(l.toJson())
@@ -82,7 +82,7 @@ class FileLogbookRepository: LogbookRepository {
     }
 
     private fun listLogbooks(context: Context): ArrayList<String> {
-        val logbooksFileNames = context.filesDir.list(object: FilenameFilter {
+        val logbooksFileNames = context.getFilesDir().list(object: FilenameFilter {
             override fun accept(dir: File?, name: String?): Boolean {
                 if (name == null)
                     return false

app/src/main/java/it/danieleverducci/lunatracker/repository/LocalSettingsRepository.kt

@@ -7,14 +7,13 @@ import androidx.core.content.edit
 
 class LocalSettingsRepository(val context: Context) {
     companion object {
-        const val SHARED_PREFS_FILE_NAME = "lunasettings"
+        val SHARED_PREFS_FILE_NAME = "lunasettings"
-        const val SHARED_PREFS_BB_CONTENT = "bbcontent"
+        val SHARED_PREFS_BB_CONTENT = "bbcontent"
-        const val SHARED_PREFS_DATA_REPO = "data_repo"
+        val SHARED_PREFS_DATA_REPO = "data_repo"
-        const val SHARED_PREFS_DAV_URL = "webdav_url"
+        val SHARED_PREFS_DAV_URL = "webdav_url"
-        const val SHARED_PREFS_DAV_USER = "webdav_user"
+        val SHARED_PREFS_DAV_USER = "webdav_user"
-        const val SHARED_PREFS_DAV_PASS = "webdav_password"
+        val SHARED_PREFS_DAV_PASS = "webdav_password"
-        const val SHARED_PREFS_DYNAMIC_MENU = "dynamic_menu"
+        val SHARED_PREFS_NO_BREASTFEEDING = "no_breastfeeding"
-        const val SHARED_PREFS_SIGNATURE = "signature"
     }
     enum class DATA_REPO {LOCAL_FILE, WEBDAV}
     val sharedPreferences: SharedPreferences
@@ -23,32 +22,32 @@ class LocalSettingsRepository(val context: Context) {
         sharedPreferences = context.getSharedPreferences(SHARED_PREFS_FILE_NAME, MODE_PRIVATE)
     }
 
-    fun saveSignature(content: String) {
+    fun saveBabyBottleContent(content: Int) {
-        sharedPreferences.edit { putString(SHARED_PREFS_SIGNATURE, content) }
+        sharedPreferences.edit().putInt(SHARED_PREFS_BB_CONTENT, content).apply()
     }
 
-    fun loadSignature(): String {
+    fun loadBabyBottleContent(): Int {
-        return sharedPreferences.getString(SHARED_PREFS_SIGNATURE, "") ?: ""
+        return sharedPreferences.getInt(SHARED_PREFS_BB_CONTENT, 1)
     }
 
-    fun saveDynamicMenu(content: Boolean) {
+    fun saveNoBreastfeeding(content: Boolean) {
-        sharedPreferences.edit { putBoolean(SHARED_PREFS_DYNAMIC_MENU, content) }
+        sharedPreferences.edit().putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content).apply()
     }
 
-    fun loadDynamicMenu(): Boolean {
+    fun loadNoBreastfeeding(): Boolean {
-        return sharedPreferences.getBoolean(SHARED_PREFS_DYNAMIC_MENU, false)
+        return sharedPreferences.getBoolean(SHARED_PREFS_NO_BREASTFEEDING, false)
     }
 
     fun saveDataRepository(repo: DATA_REPO) {
-        sharedPreferences.edit(commit = true) {
+        val spe = sharedPreferences.edit()
-            putString(
+        spe.putString(
             SHARED_PREFS_DATA_REPO,
             when (repo) {
                 DATA_REPO.WEBDAV -> "webdav"
                 DATA_REPO.LOCAL_FILE -> "localfile"
             }
         )
-        }
+        spe.commit()
     }
 
     fun loadDataRepository(): DATA_REPO {
@@ -61,11 +60,11 @@ class LocalSettingsRepository(val context: Context) {
     }
 
     fun saveWebdavCredentials(url: String, username: String, password: String) {
-        sharedPreferences.edit(commit = true) {
+        val spe = sharedPreferences.edit()
-            putString(SHARED_PREFS_DAV_URL, url)
+        spe.putString(SHARED_PREFS_DAV_URL, url)
-            putString(SHARED_PREFS_DAV_USER, username)
+        spe.putString(SHARED_PREFS_DAV_USER, username)
-            putString(SHARED_PREFS_DAV_PASS, password)
+        spe.putString(SHARED_PREFS_DAV_PASS, password)
-        }
+        spe.commit()
     }
 
     fun loadWebdavCredentials(): Array<String>? {

app/src/main/java/utils/DateUtils.kt

@@ -1,80 +1,15 @@
 package utils
 
 import android.content.Context
-import android.os.Build
 import android.text.format.DateFormat
 import it.danieleverducci.lunatracker.R
 import java.util.Date
 
 class DateUtils {
     companion object {
-        /**
-         * Format time duration in seconds as e.g. "2 hours, 1 min", rounded to minutes.
-         * Used for the duration to the next/previous event in the event details dialog.
-         */
-        fun formatTimeDuration(context: Context, secondsDiff: Long): String {
-            val adjusted = (secondsDiff + 30) - (secondsDiff + 30) % 60
-            return formatTimeDurationExact(context, adjusted)
-        }
-
-        fun formatTimeDurationExact(context: Context, secondsDiff: Long): String {
-            var seconds = secondsDiff
-
-            val years = (seconds / (365 * 24 * 60 * 60F)).toLong()
-            seconds -= years * (365 * 24 * 60 * 60)
-            val days = (seconds / (24 * 60 * 60F)).toLong()
-            seconds -= days * (24 * 60 * 60)
-            val hours = (seconds / (60 * 60F)).toLong()
-            seconds -= hours * (60 * 60)
-            val minutes = (seconds / 60F).toLong()
-            seconds -= minutes * 60
-
-            fun format(value1: Long, value2: Long, resIdSingular1: Int, resIdPlural1: Int, resIdSingular2: Int, resIdPlural2: Int): String {
-                val builder = StringBuilder()
-                if (value1 == 0L) {
-                    // omit
-                } else if (value1 == 1L) {
-                    builder.append(value1)
-                    builder.append(" ")
-                    builder.append(context.getString(resIdSingular1))
-                } else {
-                    builder.append(value1)
-                    builder.append(" ")
-                    builder.append(context.getString(resIdPlural1))
-                }
-
-                if (value1 > 0L && value2 > 0L) {
-                    builder.append(", ")
-                }
-
-                if (value2 == 0L) {
-                    // omit
-                } else if (value2 == 1L) {
-                    builder.append(value2)
-                    builder.append(" ")
-                    builder.append(context.getString(resIdSingular2))
-                } else {
-                    builder.append(value2)
-                    builder.append(" ")
-                    builder.append(context.getString(resIdPlural2))
-                }
-                return builder.toString()
-            }
-
-            if (years != 0L) {
-                return format(years, days, R.string.year_ago, R.string.years_ago, R.string.day_ago, R.string.days_ago)
-            } else if (days != 0L) {
-                return format(days, hours, R.string.day_ago, R.string.days_ago, R.string.hour_ago, R.string.hours_ago)
-            } else if (hours != 0L) {
-                return format(hours, minutes, R.string.hour_ago, R.string.hours_ago, R.string.minute_ago, R.string.minutes_ago)
-            } else {
-                return format(minutes, seconds, R.string.minute_ago, R.string.minute_ago, R.string.second_ago, R.string.seconds_ago)
-            }
-        }
 
         /**
-         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago".
+         * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago)
-         * Used for the event list.
          */
         fun formatTimeAgo(context: Context, unixTime: Long): String {
             val secondsDiff = (System.currentTimeMillis() / 1000) - unixTime
@@ -90,10 +25,10 @@ class DateUtils {
                 return DateFormat.getDateFormat(context).format(Date(unixTime*1000)) + "\n" +
                         DateFormat.getTimeFormat(context).format(Date(unixTime*1000))
 
-            val formattedTime = StringBuilder()
+            var formattedTime = StringBuilder()
             if (hoursAgo > 0) {
                 formattedTime.append(hoursAgo).append(" ")
-                if (hoursAgo == 1)
+                if (hoursAgo.toInt() == 1)
                     formattedTime.append(context.getString(R.string.hour_ago))
                 else
                     formattedTime.append(context.getString(R.string.hours_ago))
@@ -102,28 +37,12 @@ class DateUtils {
                 if (formattedTime.isNotEmpty())
                     formattedTime.append(", ")
                 formattedTime.append(minutesAgo).append(" ")
-                if (minutesAgo == 1)
+                if (minutesAgo.toInt() == 1)
                     formattedTime.append(context.getString(R.string.minute_ago))
                 else
                     formattedTime.append(context.getString(R.string.minutes_ago))
             }
             return formattedTime.toString()
         }
-
-        /**
-         * Format time as localized string without seconds. E.g. "Sept 18, 2025, 03:36 PM".
-         * Used in the event detail dialog.
-         */
-        fun formatDateTime(unixTime: Long): String {
-            val date = Date(unixTime * 1000)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                val dateFormat = android.icu.text.DateFormat.getDateTimeInstance(android.icu.text.DateFormat.DEFAULT, android.icu.text.DateFormat.SHORT)
-                return dateFormat.format(date)
-            } else {
-                // fallback
-                val dateFormat = java.text.DateFormat.getDateTimeInstance()
-                return dateFormat.format(date)
-            }
-        }
     }
 }

app/src/main/java/utils/NumericUtils.kt

@@ -3,11 +3,8 @@ package utils
 import android.content.Context
 import android.icu.util.LocaleData
 import android.icu.util.ULocale
-import android.os.Build
-import android.util.Log
 import it.danieleverducci.lunatracker.R
 import it.danieleverducci.lunatracker.entities.LunaEvent
-import utils.DateUtils.Companion.formatTimeDuration
 import java.text.NumberFormat
 
 class NumericUtils (val context: Context) {
@@ -17,101 +14,66 @@ class NumericUtils (val context: Context) {
     val measurement_unit_weight_tiny: String
     val measurement_unit_temperature_base: String
 
-    private fun isMetricSystem(): Boolean {
-       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
-            return (measurementSystem == LocaleData.MeasurementSystem.SI)
-       } else {
-            val locale = context.resources.configuration.locale
-            return when (locale.country) {
-                // https://en.wikipedia.org/wiki/United_States_customary_units
-                // https://en.wikipedia.org/wiki/Imperial_units
-                "US" -> false // US IMPERIAL
-                // UK, Myanmar, Liberia,
-                "GB", "MM", "LR" -> false // IMPERIAL
-                else -> true // METRIC
-            }
-       }
-    }
-
     init {
         this.numberFormat = NumberFormat.getInstance()
+        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
         this.measurement_unit_liquid_base = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_liquid_base_metric
             else
                 R.string.measurement_unit_liquid_base_imperial
         )
         this.measurement_unit_weight_base = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_weight_base_metric
             else
                 R.string.measurement_unit_weight_base_imperial
         )
         this.measurement_unit_weight_tiny = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_weight_tiny_metric
             else
                 R.string.measurement_unit_weight_tiny_imperial
         )
         this.measurement_unit_temperature_base = context.getString(
-            if (isMetricSystem())
+            if (measurementSystem == LocaleData. MeasurementSystem.SI)
                 R.string.measurement_unit_temperature_base_metric
             else
                 R.string.measurement_unit_temperature_base_imperial
         )
     }
 
-    fun formatEventQuantity(event: LunaEvent): String {
+    fun formatEventQuantity(item: LunaEvent): String {
-        return formatEventQuantity(event.type, event.quantity)
-    }
-
-    fun formatEventQuantity(type: LunaEvent.Type, quantity: Int): String {
         val formatted = StringBuilder()
-        if (quantity > 0) {
+        if ((item.quantity ?: 0) > 0) {
-            formatted.append(when (type) {
+            if (item.type == LunaEvent.TYPE_TEMPERATURE)
-                LunaEvent.Type.TEMPERATURE ->
+                formatted.append((item.quantity / 10.0f).toString())
-                    (quantity / 10.0f).toString()
+            else
-                LunaEvent.Type.DIAPERCHANGE_POO,
+                formatted.append(item.quantity)
-                LunaEvent.Type.DIAPERCHANGE_PEE,
-                LunaEvent.Type.PUKE -> {
-                    val array = context.resources.getStringArray(R.array.AmountLabels)
-                    return array.getOrElse(quantity) {
-                        Log.e("NumericUtils", "Invalid index $quantity")
-                        return ""
-                    }
-                }
-                LunaEvent.Type.SLEEP -> formatTimeDuration(context, quantity.toLong())
-                else -> quantity
-            })
 
             formatted.append(" ")
             formatted.append(
-                when (type) {
+                when (item.type) {
-                    LunaEvent.Type.BABY_BOTTLE -> measurement_unit_liquid_base
+                    LunaEvent.TYPE_BABY_BOTTLE -> measurement_unit_liquid_base
-                    LunaEvent.Type.WEIGHT -> measurement_unit_weight_base
+                    LunaEvent.TYPE_WEIGHT -> measurement_unit_weight_base
-                    LunaEvent.Type.MEDICINE -> measurement_unit_weight_tiny
+                    LunaEvent.TYPE_MEDICINE -> measurement_unit_weight_tiny
-                    LunaEvent.Type.TEMPERATURE -> measurement_unit_temperature_base
+                    LunaEvent.TYPE_TEMPERATURE -> measurement_unit_temperature_base
                     else -> ""
                 }
             )
-        } else {
-            formatted.append(when (type) {
-                LunaEvent.Type.SLEEP -> "💤" // baby is sleeping
-                else -> ""
-            })
         }
-        return formatted.toString().trim()
+        return formatted.toString()
     }
 
     /**
      * Returns a valid quantity range for the event type.
      * @return min, max, normal
      */
-    fun getValidEventQuantityRange(lunaEventType: LunaEvent.Type): Triple<Int, Int, Int>? {
+    fun getValidEventQuantityRange(lunaEventType: String): Triple<Int, Int, Int>? {
+        val measurementSystem = LocaleData.getMeasurementSystem(ULocale.getDefault())
         return when (lunaEventType) {
-            LunaEvent.Type.TEMPERATURE -> {
+            LunaEvent.TYPE_TEMPERATURE -> {
-                if (isMetricSystem())
+                if (measurementSystem == LocaleData. MeasurementSystem.SI)
                     Triple(
                         context.resources.getInteger(R.integer.human_body_temp_min_metric),
                         context.resources.getInteger(R.integer.human_body_temp_max_metric),

app/src/main/res/drawable/ic_more.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+    
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -47,7 +47,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="38dp"
-            android:layout_margin="5dp"
+            android:layout_margin="10dp"
             android:orientation="horizontal"
             android:gravity="center_vertical">
 
@@ -86,28 +86,27 @@
             android:orientation="vertical">
 
             <LinearLayout
-                android:id="@+id/linear_layout_row1"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
 
                 <TextView
-                    android:id="@+id/button1_row1"
+                    android:id="@+id/button_bottle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_weight="1"
+                    android:layout_weight="2"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="50sp"
                     android:text="@string/event_bottle_type"/>
 
                 <TextView
-                    android:id="@+id/button2_row1"
+                    android:id="@+id/button_food"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="50sp"
@@ -116,108 +115,101 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/linear_layout_row2"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:id="@+id/layout_nipples">
 
                 <TextView
-                    android:id="@+id/button1_row2"
+                    android:id="@+id/button_nipple_left"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"/>
-
-                <TextView
-                    android:id="@+id/button2_row2"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"/>
-
-                <TextView
-                    android:id="@+id/button3_row2"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"/>
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/linear_layout_row3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <TextView
-                    android:id="@+id/button1_row3"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="2"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"/>
-
-                <TextView
-                    android:id="@+id/button2_row3"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
-                    android:layout_weight="2"
-                    android:background="@drawable/button_background"
-                    android:gravity="center_horizontal"
-                    android:textSize="30sp"/>
-
-                <TextView
-                    android:id="@+id/button_more"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="30sp"
-                    android:text="☰"
+                    android:text="🤱⬅️"/>
+
+                <TextView
+                    android:id="@+id/button_nipple_both"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"
+                    android:text="🤱↔️"/>
+
+                <TextView
+                    android:id="@+id/button_nipple_right"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"
+                    android:text="🤱➡️️"/>
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/button_change_poo"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"
+                    android:text="🚼 💩"/>
+
+                <TextView
+                    android:id="@+id/button_change_pee"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="10dp"
+                    android:layout_weight="2"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:textSize="30sp"
+                    android:text="🚼 💧"/>
+
+                <ImageView
+                    android:id="@+id/button_more"
+                    android:layout_width="0dp"
+                    android:layout_height="match_parent"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1"
+                    android:background="@drawable/button_background"
+                    android:gravity="center_horizontal"
+                    android:src="@drawable/ic_more"
                     app:tint="@android:color/darker_gray"/>
 
             </LinearLayout>
 
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
-            android:orientation="horizontal">
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/logbook"
-                android:textColor="@color/accent"
-                android:textStyle="bold"/>
-
         <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/progress_indicator"
-                android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                android:layout_weight="1"
+            android:layout_margin="10dp"
-                android:layout_gravity="center"
-                android:layout_marginHorizontal="10dp"
             android:indeterminate="true"
             app:indicatorColor="@color/accent"
             android:visibility="invisible"/>
 
-        </LinearLayout>
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/logbook"
+            android:textColor="@color/accent"
+            android:textStyle="bold"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list_events"

app/src/main/res/layout/activity_settings.xml

@@ -45,7 +45,7 @@
             <RadioButton android:id="@+id/settings_data_webdav"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="30dp"
                 android:text="@string/settings_storage_dav"/>
 
             <TextView
@@ -119,57 +119,27 @@
                 android:visibility="invisible"/>
         </RadioGroup>
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="bold"
-            android:text="@string/settings_signature" />
-
-        <EditText
-            android:id="@+id/settings_signature"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="5dp"
-            android:inputType="textEmailAddress"
-            android:background="@drawable/textview_background"/>
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/settings_signature_desc"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginTop="20dp">
+            android:layout_marginEnd="30dp">
 
             <TextView
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:layout_height="wrap_content"
                 android:textStyle="bold"
-                android:text="@string/settings_dynamic_menu" />
+                android:text="@string/no_breastfeeding" />
 
             <com.google.android.material.switchmaterial.SwitchMaterial
-                android:id="@+id/switch_dynamic_menu"
+                android:id="@+id/switch_no_breastfeeding"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
                 android:layout_weight="1" />
 
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/settings_dynamic_menu_desc"/>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

app/src/main/res/layout/activity_statistics.xml

@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="10dp">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1">
-
-        <com.github.mikephil.charting.charts.HorizontalBarChart
-            android:id="@+id/bar_chart"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <TextView
-            android:id="@+id/no_data"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:visibility="gone"
-            android:gravity="center"
-            android:text="@string/statistics_no_data"/>
-
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:orientation="horizontal">
-
-        <Spinner
-            android:id="@+id/graph_type_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
-
-        <Spinner
-            android:id="@+id/time_range_selection"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
-
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/layout/dialog_edit_bottle.xml

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <NumberPicker
-            android:id="@+id/dialog_number_picker"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"/>
-
-        <TextView
-            android:id="@+id/dialog_number_picker_unit"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:text="ml"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="20dp"/>
-
-</LinearLayout>

app/src/main/res/layout/dialog_edit_duration.xml

@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:gravity="center"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@+id/dialog_date_duration"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:textSize="20sp"
-        android:text="💤"/>
-
-    <LinearLayout
-        android:id="@+id/duration_buttons"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:gravity="center"
-        android:layout_marginTop="20dp"
-        android:layout_marginHorizontal="10dp"
-        android:orientation="horizontal">
-
-        <Button
-            android:id="@+id/dialog_date_duration_minus5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/dialog_duration_button_minus_5"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_now"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/dialog_duration_button_now"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_clear"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/dialog_duration_button_clear"/>
-
-        <Button
-            android:id="@+id/dialog_date_duration_plus5"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:text="@string/dialog_duration_button_plus_5"/>
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:gravity="center"
-        android:layout_marginTop="20dp"
-        android:layout_marginHorizontal="10dp"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/dialog_date_picker_begin"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1"/>
-
-        <TextView
-            android:id="@+id/dialog_date_range_delimiter"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1"
-            android:text="－"/>
-
-        <TextView
-            android:id="@+id/dialog_date_picker_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:layout_weight="1"/>
-
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/layout/dialog_edit_weight.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="horizontal">
-
-        <EditText
-            android:id="@+id/dialog_number_edittext"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            android:inputType="number"
-            android:hint="0"
-            android:background="@drawable/textview_background"/>
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:text="g"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="20dp"/>
-
-</LinearLayout>

app/src/main/res/layout/dialog_event_detail.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp">
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_emoji"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:textSize="60dp"
+        android:text="@string/event_diaperchange_pee_type"/>
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_description"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="10dp"
+        android:gravity="center_horizontal"
+        android:textColor="@color/accent"
+        android:textSize="24dp"
+        android:text="@string/event_diaperchange_pee_desc"/>
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_date"
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginTop="20dp"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_vertical"
+        android:drawableEnd="@drawable/ic_edit"
+        android:drawablePadding="10dp"
+        android:drawableTint="@color/accent"
+        android:textStyle="bold"
+        android:text="@string/dialog_event_detail_datetime_icon"/>
+
+    <TextView
+        android:id="@+id/dialog_event_detail_type_quantity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:text="Quantity"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="200dp"
+        android:layout_marginTop="20dp">
+
+        <TextView
+            android:id="@+id/dialog_event_detail_type_notes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textStyle="italic"
+            android:text="Notes"/>
+
+    </ScrollView>
+</LinearLayout>

app/src/main/res/layout/dialog_event_details.xml

@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingTop="20dp"
-    android:paddingBottom="10dp"
-    android:paddingHorizontal="20dp">
-
-    <TextView
-        android:id="@+id/dialog_event_detail_type_emoji"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textSize="60sp"
-        android:text="@string/event_diaperchange_pee_type" />
-
-    <TextView
-        android:id="@+id/dialog_event_detail_type_description"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="12dp"
-        android:gravity="center_horizontal"
-        android:textColor="@color/accent"
-        android:textSize="32sp"
-        android:text="@string/event_diaperchange_pee_desc" />
-
-    <TextView
-        android:id="@+id/dialog_event_detail_type_date"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_marginTop="20dp"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center_vertical"
-        android:drawablePadding="10dp"
-        android:drawableTint="@color/accent"
-        android:textSize="16sp"
-        android:textStyle="bold"/>
-
-    <TextView
-        android:id="@+id/dialog_event_detail_type_quantity"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:textSize="28sp"
-        android:text="@string/dialog_event_detail_quantity"/>
-
-    <TextView
-        android:id="@+id/dialog_event_detail_type_date_end"
-        android:layout_width="wrap_content"
-        android:layout_height="40dp"
-        android:layout_gravity="center_horizontal"
-        android:gravity="center_vertical"
-        android:drawablePadding="10dp"
-        android:drawableTint="@color/accent"
-        android:visibility="gone"
-        android:textSize="16sp"
-        android:textStyle="bold"/>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="200dp"
-        android:layout_marginTop="20dp">
-
-        <TextView
-            android:id="@+id/dialog_event_detail_type_notes"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textStyle="italic"
-            android:textSize="20sp"
-            android:text="@string/dialog_event_detail_notes"/>
-
-    </ScrollView>
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:id="@+id/dialog_event_detail_type_signature"
-        android:layout_marginBottom="5dp"
-        android:visibility="gone"/>
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/dialog_event_previous"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:textSize="12sp"
-            android:text="" />
-
-        <Space
-            android:layout_width="0dp"
-            android:layout_weight="1"
-            android:layout_height="match_parent" />
-
-        <TextView
-            android:id="@+id/dialog_event_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:textSize="12sp"
-            android:text="" />
-
-    </LinearLayout>
-
-</LinearLayout>

app/src/main/res/layout/dialog_notes.xml

@@ -24,34 +24,4 @@
         android:hint="@string/log_notes_dialog_note_hint"
         android:background="@drawable/textview_background"/>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="5dp"
-        android:gravity="end"
-        android:orientation="horizontal">
-
-        <TextView
-            android:id="@+id/notes_template_prev"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18dp"
-            android:text="⬅️"/>
-
-        <TextView
-            android:id="@+id/notes_template_next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="18dp"
-            android:text="➡️"/>
-
-    </LinearLayout>
-
-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="15dp"/>
-
 </LinearLayout>

app/src/main/res/layout/more_events_popup.xml

@@ -2,25 +2,73 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="10dp"
+    android:padding="20dp"
     android:background="@color/transparent">
 
     <LinearLayout
-        android:id="@+id/layout_list"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
             <TextView
-                android:id="@+id/button_statistics"
+                android:id="@+id/button_medicine"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:padding="10dp"
+                android:padding="20dp"
                 android:background="@drawable/dropdown_list_item_background"
                 style="@style/OverflowMenuText"
-                android:text="📊 Statistics"/>
+                android:text="@string/overflow_event_medicine"/>
+
+            <TextView
+                android:id="@+id/button_enema"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/dropdown_list_item_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_enema"/>
+
+            <TextView
+                android:id="@+id/button_note"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/dropdown_list_item_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_note"/>
+
+            <TextView
+                android:id="@+id/button_temperature"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/dropdown_list_item_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_temperature"/>
+
+            <TextView
+                android:id="@+id/button_colic"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/dropdown_list_item_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_colic"/>
+
+            <TextView
+                android:id="@+id/button_scale"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginTop="10dp"
+                android:padding="20dp"
+                android:background="@drawable/dropdown_list_item_background"
+                style="@style/OverflowMenuText"
+                android:text="@string/overflow_event_scale"/>
 
-                <!-- Other buttons are inserted dynamically -->
     </LinearLayout>
 
 </ScrollView>

app/src/main/res/layout/more_events_popup_item.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tv"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_marginTop="10dp"
-    android:padding="10dp"
-    android:background="@drawable/dropdown_list_item_background"
-    style="@style/OverflowMenuText"
-    android:text="Item Template"/>

app/src/main/res/layout/number_edit_dialog.xml

@@ -4,19 +4,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-    android:gravity="center"
+    android:gravity="center">
-    android:orientation="vertical">
 
-    <Spinner
+    <EditText
-        android:id="@+id/dialog_amount_value"
+        android:id="@+id/dialog_number_edittext"
-        android:layout_width="250dp"
+        android:layout_width="150dp"
         android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"/>
+        android:inputType="number"
+        android:hint="0"
+        android:background="@drawable/textview_background"/>
 
     <TextView
-        android:id="@+id/dialog_date_picker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"/>
+        android:layout_marginStart="10dp"
-
+        android:text="g"/>
 </LinearLayout>

app/src/main/res/layout/number_picker_dialog.xml

@@ -4,12 +4,16 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_gravity="center"
-    android:gravity="center"
+    android:gravity="center">
-    android:orientation="vertical">
 
-    <TextView
+    <NumberPicker
-        android:id="@+id/dialog_date_picker"
+        android:id="@+id/dialog_number_picker"
-        android:layout_width="wrap_content"
+        android:layout_width="150dp"
         android:layout_height="wrap_content"/>
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="10dp"
+        android:text="ml"/>
 </LinearLayout>

app/src/main/res/layout/row_luna_event.xml

@@ -11,7 +11,7 @@
         android:id="@+id/type"
         android:layout_width="90dp"
         android:layout_height="wrap_content"
-        android:paddingStart="10dp"
+        android:paddingLeft="10dp"
         android:textSize="28sp"
         android:lines="1"
         android:maxLines="1"
@@ -25,7 +25,7 @@
         android:ellipsize="end"
         android:maxLines="2"
         android:textColor="@color/accent"
-        android:text="@string/row_luna_event_description"/>
+        android:text="Description"/>
 
     <TextView
         android:id="@+id/quantity"
@@ -35,7 +35,7 @@
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:gravity="center_horizontal"
-        android:text="@string/row_luna_event_quantity"/>
+        android:text="Qty"/>
 
     <TextView
         android:id="@+id/time"
@@ -46,6 +46,6 @@
         android:textStyle="bold"
         android:ellipsize="end"
         android:maxLines="2"
-        android:text="@string/row_luna_event_time"/>
+        android:text="Time"/>
 
 </LinearLayout>

app/src/main/res/layout/row_luna_event_vertical.xml

@@ -31,7 +31,7 @@
             android:maxLines="2"
             android:gravity="center_horizontal"
             android:textColor="@color/accent"
-            android:text="@string/row_luna_event_description"/>
+            android:text="Description"/>
 
         <TextView
             android:id="@+id/quantity"
@@ -41,7 +41,7 @@
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:gravity="center_horizontal"
-            android:text="@string/dialog_event_detail_quantity"/>
+            android:text="Qty"/>
 
         <TextView
             android:id="@+id/time"
@@ -52,7 +52,7 @@
             android:textStyle="bold"
             android:ellipsize="end"
             android:maxLines="2"
-            android:text="@string/row_luna_event_time"/>
+            android:text="Time"/>
 
     </LinearLayout>
 

app/src/main/res/layout/statistics_spinner_item.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView  
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent" 
-    android:layout_height="wrap_content"
-    android:textSize="20sp"
-    android:gravity="center"
-    android:padding="5dip" />

app/src/main/res/layout/temperature_dialog.xml

@@ -23,11 +23,4 @@
         android:layout_height="wrap_content"
         android:textSize="30sp"
         android:textColor="@color/accent"/>
-
-    <TextView
-        android:id="@+id/dialog_date_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"/>
-
 </LinearLayout>

app/src/main/res/values-de/strings.xml

@@ -3,9 +3,18 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Ereignisprotokoll</string>
 
+    <string name="log_bottle_dialog_title">Fläschchen</string>
+    <string name="log_bottle_dialog_description">Trinkmenge eingeben</string>
+
+    <string name="log_weight_dialog_title">Gewicht</string>
+    <string name="log_weight_dialog_description">Gewicht eingeben</string>
+
+    <string name="log_temperature_dialog_title">Temperatur</string>
+    <string name="log_temperature_dialog_description">Temperatur eingeben</string>
+
     <string name="event_bottle_desc">Fläschchen</string>
     <string name="event_food_desc">Essen</string>
-    <string name="event_weight_desc">Gewicht</string>
+    <string name="event_scale_desc">Gewicht</string>
     <string name="event_breastfeeding_left_desc">Stillen (links)</string>
     <string name="event_breastfeeding_both_desc">Stillen</string>
     <string name="event_breastfeeding_right_desc">Stillen (rechts)</string>
@@ -18,6 +27,13 @@
     <string name="event_colic_desc">Blähungskolik</string>
     <string name="event_unknown_desc"></string>
 
+    <string name="overflow_event_scale">⚖️ Gewicht</string>
+    <string name="overflow_event_medicine">💊 Medikament</string>
+    <string name="overflow_event_enema">🪠 Einlauf</string>
+    <string name="overflow_event_note">📝 Notiz</string>
+    <string name="overflow_event_temperature">🌡️ Temperatur</string>
+    <string name="overflow_event_colic">💨 Blähungskolik</string>
+
     <string name="toast_event_added">Ereignis gespeichert</string>
     <string name="toast_logbook_saved">Logbuch gespeichert</string>
     <string name="toast_event_add_error">Ereignis konnte nicht protokolliert werden</string>
@@ -34,6 +50,8 @@
     <string name="no_connection_go_to_settings">Einstellungen</string>
     <string name="no_connection_retry">Erneut versuchen</string>
 
+    <string name="no_breastfeeding">Kein Stillen</string>
+
     <string name="settings_title">Einstellungen</string>
     <string name="settings_storage">Speicherort für Daten auswählen</string>
     <string name="settings_storage_local">Auf dem Gerät</string>
@@ -60,13 +78,10 @@
     <string name="trim_logbook_dialog_button_ok">Jetzt bereinigen</string>
     <string name="trim_logbook_dialog_button_cancel">Später erinnern</string>
 
-    <string name="log_bottle_dialog_description">Trinkmenge eingeben</string>
-    <string name="log_medicine_dialog_description">Medikamentenname, Menge, Art, Notizen, …:</string>
     <string name="log_notes_dialog_description">Notizen:</string>
-    <string name="log_notes_dialog_note_hint">Notiz eingeben</string>
+    <string name="log_medicine_dialog_description">Medikamentenname, Menge, Art, Notizen, …:</string>
     <string name="log_notes_dialog_qty_hint">Menge (optional)</string>
-    <string name="log_temperature_dialog_description">Temperatur eingeben</string>
+    <string name="log_notes_dialog_note_hint">Notiz eingeben</string>
-    <string name="log_weight_dialog_description">Gewicht eingeben</string>
 
     <string name="dialog_event_detail_title">Ereignisdetails</string>
     <string name="dialog_event_detail_close_button">OK</string>

app/src/main/res/values-fr/strings.xml

@@ -3,9 +3,18 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Entrées enregistrées</string>
 
+    <string name="log_bottle_dialog_title">Biberon</string>
+    <string name="log_bottle_dialog_description">Renseignez la quantité contenue dans le biberon</string>
+
+    <string name="log_weight_dialog_title">Poids</string>
+    <string name="log_weight_dialog_description">Renseignez le poids</string>
+
+    <string name="log_temperature_dialog_title">Température</string>
+    <string name="log_temperature_dialog_description">Renseignez la Température</string>
+
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_food_desc">Nourriture</string>
-    <string name="event_weight_desc">Poids</string>
+    <string name="event_scale_desc">Poids</string>
     <string name="event_breastfeeding_left_desc">Allaitement (sein gauche)</string>
     <string name="event_breastfeeding_both_desc">Allaitement</string>
     <string name="event_breastfeeding_right_desc">Allaitement (sein droit)</string>
@@ -18,6 +27,13 @@
     <string name="event_colic_desc">Colique gazeuse</string>
     <string name="event_unknown_desc"></string>
 
+    <string name="overflow_event_scale">⚖️ Poids</string>
+    <string name="overflow_event_medicine">💊 Médicament</string>
+    <string name="overflow_event_enema">🪠 Lavement</string>
+    <string name="overflow_event_note">📝 Note</string>
+    <string name="overflow_event_temperature">🌡️ Température</string>
+    <string name="overflow_event_colic">💨 Colique gazeuse</string>
+
     <string name="toast_event_added">Entrée ajoutée</string>
     <string name="toast_logbook_saved">Journal ajouté</string>
     <string name="toast_event_add_error">Impossible d\'enregistrer cette entrée</string>
@@ -60,13 +76,10 @@
     <string name="trim_logbook_dialog_button_ok">Supprimer les vieilles entrées maintenant</string>
     <string name="trim_logbook_dialog_button_cancel">Me rappeller plus tard</string>
 
-    <string name="log_bottle_dialog_description">Renseignez la quantité contenue dans le biberon</string>
-    <string name="log_medicine_dialog_description">nom du médicament, quantité, type, notes …:</string>
     <string name="log_notes_dialog_description">Notes:</string>
-    <string name="log_notes_dialog_note_hint">Notes ...</string>
+    <string name="log_medicine_dialog_description">nom du médicament, quantité, type, notes …:</string>
     <string name="log_notes_dialog_qty_hint">Quantité (ou vide)</string>
-    <string name="log_temperature_dialog_description">Renseignez la Température</string>
+    <string name="log_notes_dialog_note_hint">Notes ...</string>
-    <string name="log_weight_dialog_description">Renseignez le poids</string>
 
     <string name="dialog_event_detail_title">Détails de l\'entrée</string>
     <string name="dialog_event_detail_close_button">OK</string>

app/src/main/res/values-it/strings.xml

@@ -3,9 +3,25 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Diario di bordo</string>
 
+    <string name="log_bottle_dialog_title">Biberon</string>
+    <string name="log_bottle_dialog_description">Inserisci la quantità contenuta nel biberon</string>
+
+    <string name="log_weight_dialog_title">Pesata</string>
+    <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
+
+    <string name="log_temperature_dialog_title">Temperatura</string>
+    <string name="log_temperature_dialog_description">Inserisci la temperatura</string>
+
+    <string name="overflow_event_scale">⚖️ Peso</string>
+    <string name="overflow_event_medicine">💊 Medicina</string>
+    <string name="overflow_event_enema">🪠 Clistere</string>
+    <string name="overflow_event_note">📝 Nota</string>
+    <string name="overflow_event_temperature">🌡️ Temperatura</string>
+    <string name="overflow_event_colic">💨 Colichette</string>
+
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_food_desc">Cibo</string>
-    <string name="event_weight_desc">Pesata</string>
+    <string name="event_scale_desc">Pesata</string>
     <string name="event_breastfeeding_left_desc">Allatt. al seno (sx)</string>
     <string name="event_breastfeeding_both_desc">Allatt. al seno</string>
     <string name="event_breastfeeding_right_desc">Allatt. al seno (dx)</string>
@@ -60,13 +76,10 @@
     <string name="trim_logbook_dialog_button_ok">Cancella i più vecchi</string>
     <string name="trim_logbook_dialog_button_cancel">Ricordamelo dopo</string>
 
-    <string name="log_bottle_dialog_description">Inserisci la quantità contenuta nel biberon</string>
-    <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
     <string name="log_notes_dialog_description">Note:</string>
-    <string name="log_notes_dialog_note_hint">Inserisci le note</string>
+    <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
     <string name="log_notes_dialog_qty_hint">Quantità, o vuoto</string>
-    <string name="log_temperature_dialog_description">Inserisci la temperatura</string>
+    <string name="log_notes_dialog_note_hint">Inserisci le note</string>
-    <string name="log_weight_dialog_description">Inserisci il peso rilevato</string>
 
     <string name="dialog_event_detail_title">Dettaglio evento</string>
     <string name="dialog_event_detail_close_button">OK</string>

app/src/main/res/values/arrays.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string-array name="AmountLabels">
-        <item>@string/amount_unspecified</item>
-        <item>@string/amount_little</item>
-        <item>@string/amount_normal</item>
-        <item>@string/amount_plenty</item>
-    </string-array>
-
-    <string-array name="StatisticsTypeLabels">
-        <item>@string/statistics_bottle_sum</item>
-        <item>@string/statistics_bottle_events</item>
-        <item>@string/statistics_sleep_sum</item>
-        <item>@string/statistics_sleep_events</item>
-        <item>@string/statistics_sleep_pattern</item>
-    </string-array>
-
-    <string-array name="StatisticsTypeValues">
-        <item>BOTTLE_SUM</item>
-        <item>BOTTLE_EVENTS</item>
-        <item>SLEEP_SUM</item>
-        <item>SLEEP_EVENTS</item>
-        <item>SLEEP_PATTERN</item>
-    </string-array>
-
-    <string-array name="StatisticsTimeLabels">
-        <item>Day</item>
-        <item>Week</item>
-        <item>Month</item>
-    </string-array>
-
-    <string-array name="StatisticsTimeValues">
-        <item>DAY</item>
-        <item>WEEK</item>
-        <item>MONTH</item>
-    </string-array>
-</resources>

app/src/main/res/values/strings.xml

@@ -3,13 +3,21 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Logged events</string>
 
-    <!-- menu header items -->
+    <string name="log_bottle_dialog_title">Baby bottle</string>
+    <string name="log_bottle_dialog_description">Insert the quantity contained in the baby bottle</string>
+
+    <string name="log_weight_dialog_title">Weight</string>
+    <string name="log_weight_dialog_description">Insert the weight</string>
+
+    <string name="log_temperature_dialog_title">Temperature</string>
+    <string name="log_temperature_dialog_description">Insert the temperature</string>
+
     <string name="event_bottle_type" translatable="false">🍼</string>
     <string name="event_food_type" translatable="false">🥣</string>
-    <string name="event_weight_type" translatable="false">⚖️</string>
+    <string name="event_scale_type" translatable="false">⚖️</string>
-    <string name="event_breastfeeding_left_type" translatable="false">🤱⬅️</string>
+    <string name="event_breastfeeding_left_type" translatable="false">🤱 ←</string>
-    <string name="event_breastfeeding_both_type" translatable="false">🤱↔️</string>
+    <string name="event_breastfeeding_both_type" translatable="false">🤱 ↔</string>
-    <string name="event_breastfeeding_right_type" translatable="false">🤱➡️️</string>
+    <string name="event_breastfeeding_right_type" translatable="false">🤱 →</string>
     <string name="event_diaperchange_poo_type" translatable="false">🚼 💩</string>
     <string name="event_diaperchange_pee_type" translatable="false">🚼 💧</string>
     <string name="event_medicine_type" translatable="false">💊</string>
@@ -17,85 +25,49 @@
     <string name="event_note_type" translatable="false">📝</string>
     <string name="event_temperature_type" translatable="false">🌡️</string>
     <string name="event_colic_type" translatable="false">💨</string>
-    <string name="event_puke_type" translatable="false">🤮</string>
+    <string name="event_unknown_type" translatable="false">\?</string>
-    <string name="event_bath_type" translatable="false">🛁</string>
-    <string name="event_sleep_type" translatable="false">💤</string>
-    <string name="event_unknown_type" translatable="false">❓</string>
 
-    <!-- dropdown menu item -->
+    <string name="event_bottle_desc">Baby bottle</string>
-    <string name="event_type_item_bottle">🍼 Bottle</string>
-    <string name="event_type_item_food">🥣 Food</string>
-    <string name="event_type_item_weight">⚖️ Weight</string>
-    <string name="event_type_item_breastfeeding_left">🤱⬅️ Nursing</string>
-    <string name="event_type_item_breastfeeding_both">🤱↔️ Nursing</string>
-    <string name="event_type_item_breastfeeding_right">🤱➡️️ Nursing</string>
-    <string name="event_type_item_diaperchange_poo">🚼💩 Diaper</string>
-    <string name="event_type_item_diaperchange_pee">🚼💧 Diaper</string>
-    <string name="event_type_item_medicine">💊 Medicine</string>
-    <string name="event_type_item_enema">🪠 Enema</string>
-    <string name="event_type_item_note">📝 Note</string>
-    <string name="event_type_item_temperature">🌡️ Temperature</string>
-    <string name="event_type_item_colic">💨 Colic</string>
-    <string name="event_type_item_puke">🤮 Puke</string>
-    <string name="event_type_item_sleep">💤 Sleep</string>
-    <string name="event_type_item_bath">🛁 Bath</string>
-    <string name="event_type_item_unknown">❓ Unknown</string>
-
-    <!-- dialog titles -->
-    <string name="event_bottle_desc">Milk Bottle</string>
     <string name="event_food_desc">Food</string>
-    <string name="event_weight_desc">Weight</string>
+    <string name="event_scale_desc">Weight</string>
-    <string name="event_breastfeeding_left_desc">Nursing (left)</string>
+    <string name="event_breastfeeding_left_desc">Breastfeeding (left)</string>
-    <string name="event_breastfeeding_both_desc">Nursing (both)</string>
+    <string name="event_breastfeeding_both_desc">Breastfeeding</string>
-    <string name="event_breastfeeding_right_desc">Nursing (right)</string>
+    <string name="event_breastfeeding_right_desc">Breastfeeding (right)</string>
-    <string name="event_diaperchange_poo_desc">Diaper Change (poo)</string>
+    <string name="event_diaperchange_poo_desc">Diaper chg (poo)</string>
-    <string name="event_diaperchange_pee_desc">Diaper Change (pee)</string>
+    <string name="event_diaperchange_pee_desc">Diaper chg (pee)</string>
     <string name="event_medicine_desc">Medicine</string>
     <string name="event_enema_desc">Enema</string>
     <string name="event_note_desc">Note</string>
     <string name="event_temperature_desc">Temperature</string>
     <string name="event_colic_desc">Gaseous colic</string>
-    <string name="event_puke_desc">Puke</string>
+    <string name="event_unknown_desc"></string>
-    <string name="event_bath_desc">Bath</string>
+
-    <string name="event_sleep_desc">Sleep</string>
+    <string name="overflow_event_scale">⚖️ Weight</string>
-    <string name="event_unknown_desc">Unknown</string>
+    <string name="overflow_event_medicine">💊 Medicine</string>
+    <string name="overflow_event_enema">🪠 Enema</string>
+    <string name="overflow_event_note">📝 Note</string>
+    <string name="overflow_event_temperature">🌡️ Temperature</string>
+    <string name="overflow_event_colic">💨 Gaseous colic</string>
 
     <string name="toast_event_added">Event logged</string>
     <string name="toast_logbook_saved">Logbook saved</string>
     <string name="toast_event_add_error">Unable to log the event</string>
     <string name="toast_integer_error">Invalid value. Insert an integer.</string>
-    <string name="toast_date_error">Invalid date.</string>
 
     <string name="now">now</string>
-    <string name="second_ago">sec</string>
-    <string name="seconds_ago">secs</string>
-    <string name="minute_ago">min</string>
-    <string name="minutes_ago">mins</string>
     <string name="hour_ago">hour</string>
     <string name="hours_ago">hours</string>
-    <string name="day_ago">day</string>
+    <string name="minute_ago">min</string>
-    <string name="days_ago">days</string>
+    <string name="minutes_ago">mins</string>
-    <string name="year_ago">year</string>
-    <string name="years_ago">years</string>
-
-    <string name="amount_unspecified"></string>
-    <string name="amount_little">Little</string>
-    <string name="amount_normal">Normal</string>
-    <string name="amount_plenty">Plenty</string>
 
     <string name="no_connection">No connection</string>
     <string name="no_connection_explain">Unable to reach WebDAV service</string>
     <string name="no_connection_go_to_settings">Settings</string>
     <string name="no_connection_retry">Retry</string>
 
-    <string name="statistics_title">Statistics</string>
+    <string name="no_breastfeeding">No Breastfeeding</string>
-    <string name="statistics_no_data">No Data</string>
 
-    <string name="settings_dynamic_menu">Dynamic Menu</string>
-    <string name="settings_dynamic_menu_desc">Populate the header menu with the most used events.</string>
     <string name="settings_title">Settings</string>
-    <string name="settings_signature">Signature</string>
-    <string name="settings_signature_desc">Attach a signature to each event you create and for others to see. Useful if multiple people add events.</string>
     <string name="settings_storage">Choose where to save data</string>
     <string name="settings_storage_local">On device</string>
     <string name="settings_storage_local_desc">Most privacy-friendly solution: data doesn\'t leave your device</string>
@@ -121,16 +93,10 @@
     <string name="trim_logbook_dialog_button_ok">Trim it now</string>
     <string name="trim_logbook_dialog_button_cancel">Remind me later</string>
 
-    <string name="log_amount_dialog_description">Select the amount:</string>
-    <string name="log_bottle_dialog_description">Insert the quantity contained in the baby bottle:</string>
-    <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
     <string name="log_notes_dialog_description">Notes:</string>
-    <string name="log_notes_dialog_note_hint">Write some notes</string>
+    <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
     <string name="log_notes_dialog_qty_hint">Quantity (or empty)</string>
-    <string name="log_temperature_dialog_description">Select the temperature:</string>
+    <string name="log_notes_dialog_note_hint">Write some notes</string>
-    <string name="log_unknown_dialog_description"></string>
-    <string name="log_weight_dialog_description">Insert the weight:</string>
-    <string name="log_duration_dialog_description">Set duration:</string>
 
     <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
     <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
@@ -141,29 +107,10 @@
     <string name="measurement_unit_temperature_base_imperial" translatable="false">°F</string>
     <string name="measurement_unit_temperature_base_metric" translatable="false">°C</string>
 
-    <string name="statistics_bottle_events">Bottle Events</string>
-    <string name="statistics_bottle_sum">Bottle Per Day</string>
-    <string name="statistics_medicine_events">Medicine Events</string>
-    <string name="statistics_sleep_sum">Sleep Per Day</string>
-    <string name="statistics_sleep_events">Sleep Events</string>
-    <string name="statistics_sleep_pattern">Sleep Pattern</string>
-
-    <string name="row_luna_event_description">Description</string>
-    <string name="row_luna_event_quantity">Qty</string>
-    <string name="row_luna_event_time">Time</string>
-
     <string name="dialog_event_detail_title">Event detail</string>
-    <string name="dialog_event_detail_close_button">Close</string>
+    <string name="dialog_event_detail_datetime_icon" translatable="false">🕒 %s1</string>
-    <string name="dialog_event_detail_save_button">Save</string>
+    <string name="dialog_event_detail_close_button">OK</string>
     <string name="dialog_event_detail_delete_button">Delete</string>
-    <string name="dialog_event_detail_quantity">Quantity</string>
-    <string name="dialog_event_detail_notes">Notes</string>
-    <string name="dialog_event_detail_signature">by %s</string>
-
-    <string name="dialog_duration_button_clear">Clear</string>
-    <string name="dialog_duration_button_minus_5">-5 min</string>
-    <string name="dialog_duration_button_now">Now</string>
-    <string name="dialog_duration_button_plus_5">+5 min</string>
 
     <string name="dialog_add_logbook_title">Add logbook</string>
     <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>

app/src/main/res/values/themes.xml

@@ -4,11 +4,6 @@
     <style name="Theme.LunaTracker" parent="Theme.AppCompat.NoActionBar">
         <item name="colorAccent">@color/accent</item>
         <item name="android:textColor">@color/textColor</item>
-
-        <!-- make the screen not overlap with the system bars -->
-        <item name="android:fitsSystemWindows">true</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
     </style>
 
     <style name="OverflowMenuText">

fastlane/metadata/android/en-US/full_description.txt

@@ -6,7 +6,6 @@ This app is meant to log all the relevant events (diaper change, breastfeeding,
 Dedicated to my daughter Luna.
 
 
-A HUGE thanks to all our contributors. See https://git.ichibi.eu/penguin86/luna-tracker/src/branch/master/README.md
 
 NOTE: The content on this app is for informational or educational purposes only and does not substitute professional medical advice or consultations with healthcare professionals.
 Feature graphic ("Baby and baby milk bottle. Baby feeding."): © Vyacheslav Argenberg / http://www.vascoplanet.com/, CC BY 4.0 <https://creativecommons.org/licenses/by/4.0>, via Wikimedia Commons

fastlane/metadata/android/fr-FR/full_description.txt

@@ -8,8 +8,6 @@ Elle permet de synchroniser les données entre différents appareils (en utilisa
 Dédié à ma fille Luna.
 
 
-Un grand merci à tous nos contributeurs. Voir https://git.ichibi.eu/penguin86/luna-tracker/src/branch/master/README.md
-
 REMARQUE : le contenu de cette application est fourni à titre informatif ou éducatif uniquement et ne remplace pas les conseils médicaux professionnels ou les consultations avec des professionnels de la santé.
 
 Crédit image ("Baby and baby milk bottle. Baby feeding."): © Vyacheslav Argenberg / http://www.vascoplanet.com/, CC BY 4.0 <https://creativecommons.org/licenses/by/4.0>, via Wikimedia Commons

fastlane/metadata/android/it-IT/full_description.txt

@@ -6,7 +6,6 @@ Quest'app è pensata per memorizzare tutti gli eventi del bambino (cambio di pan
 Dedicato a mia figlia Luna.
 
 
-Un grandissimo ringraziamento a tutti i contributors! Vedi https://git.ichibi.eu/penguin86/luna-tracker/src/branch/master/README.md
 
 NOTA: il contenuto di quest'app ha solo scopo informativo o didattico e non sostituisce il consulto medico professionale o le consulenze con operatori sanitari.
 Feature graphic ("Baby and baby milk bottle. Baby feeding."): © Vyacheslav Argenberg / http://www.vascoplanet.com/, CC BY 4.0 <https://creativecommons.org/licenses/by/4.0>, via Wikimedia Commons

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.0"
+agp = "8.7.2"
 kotlin = "2.0.0"
 coreKtx = "1.10.1"
 junit = "4.13.2"
@@ -9,11 +9,8 @@ lifecycleRuntimeKtx = "2.6.1"
 activityCompose = "1.8.0"
 composeBom = "2024.04.01"
 appcompat = "1.7.0"
-mpandroidchart = "v4.2.2"
-mpandroidchartVersion = "v3.1.0"
 recyclerview = "1.3.2"
 material = "1.12.0"
-sardineAndroid = "v0.9"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -33,9 +30,6 @@ androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 material = { group = "com.google.android.material", name = "material", version.ref = "material" }
-mpandroidchart = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpandroidchart" }
-mpandroidchart-vv310 = { module = "com.github.PhilJay:MPAndroidChart", version.ref = "mpandroidchartVersion" }
-sardine-android = { module = "com.github.thegrizzlylabs:sardine-android", version.ref = "sardineAndroid" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Nov 02 10:58:51 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle.kts

@@ -16,7 +16,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven(url = uri("https://jitpack.io"))
+        maven(url = "https://jitpack.io")
     }
 }