activity_main: lower margin from 10 to 5dp

The buttons are big enough for fingers. Let's
make the view more compact.

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

@@ -39,6 +39,7 @@ import it.danieleverducci.lunatracker.repository.WebDAVLogbookRepository
 import kotlinx.coroutines.Runnable
 import okio.IOException
 import org.json.JSONException
+import utils.DateUtils
 import utils.NumericUtils
 import java.text.DateFormat
 import java.util.Calendar
@@ -74,9 +75,9 @@ class MainActivity : AppCompatActivity() {
         // Show view
         setContentView(R.layout.activity_main)
 
-        progressIndicator = findViewById<LinearProgressIndicator>(R.id.progress_indicator)
+        progressIndicator = findViewById(R.id.progress_indicator)
-        buttonsContainer = findViewById<ViewGroup>(R.id.buttons_container)
+        buttonsContainer = findViewById(R.id.buttons_container)
-        recyclerView = findViewById<RecyclerView>(R.id.list_events)
+        recyclerView = findViewById(R.id.list_events)
         recyclerView.setLayoutManager(LinearLayoutManager(applicationContext))
 
         // Set listeners
@@ -131,7 +132,7 @@ class MainActivity : AppCompatActivity() {
         val adapter = LunaEventRecyclerAdapter(this, items)
         adapter.onItemClickListener = object: LunaEventRecyclerAdapter.OnItemClickListener{
             override fun onItemClick(event: LunaEvent) {
-                showEventDetailDialog(event)
+                showEventDetailDialog(event, items)
             }
         }
         recyclerView.adapter = adapter
@@ -168,6 +169,12 @@ class MainActivity : AppCompatActivity() {
             logbookRepo = FileLogbookRepository()
         }
 
+        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
+        findViewById<View>(R.id.layout_nipples).visibility = when (noBreastfeeding) {
+            true -> View.GONE
+            false -> View.VISIBLE
+        }
+
         // Update list dates
         recyclerView.adapter?.notifyDataSetChanged()
 
@@ -302,25 +309,52 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
-    fun showEventDetailDialog(event: LunaEvent) {
+    fun getPreviousSameEvent(event: LunaEvent, items: ArrayList<LunaEvent>): LunaEvent? {
+        var previousEvent: LunaEvent? = null
+        for (item in items) {
+            if (item.type == event.type && item.time < event.time) {
+                if (previousEvent == null) {
+                    previousEvent = item
+                } else if (previousEvent.time < item.time) {
+                    previousEvent = item
+                }
+            }
+        }
+        return previousEvent
+    }
+
+    fun getNextSameEvent(event: LunaEvent, items: ArrayList<LunaEvent>): LunaEvent? {
+        var nextEvent: LunaEvent? = null
+        for (item in items) {
+            if (item.type == event.type && item.time > event.time) {
+                if (nextEvent == null) {
+                    nextEvent = item
+                } else if (nextEvent.time > item.time) {
+                    nextEvent = item
+                }
+            }
+        }
+        return nextEvent
+    }
+
+    fun showEventDetailDialog(event: LunaEvent, items: ArrayList<LunaEvent>) {
         // Do not update list while the detail is shown, to avoid changing the object below while it is changed by the user
         pauseLogbookUpdate = true
-        val dateFormat = DateFormat.getDateTimeInstance();
+        val dateFormat = DateFormat.getDateTimeInstance()
         val d = AlertDialog.Builder(this)
         d.setTitle(R.string.dialog_event_detail_title)
         val dialogView = layoutInflater.inflate(R.layout.dialog_event_detail, null)
-        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_emoji).setText(event.getTypeEmoji(this))
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_emoji).text = event.getTypeEmoji(this)
-        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_description).setText(event.getTypeDescription(this))
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_description).text = event.getTypeDescription(this)
-        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity).setText(
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_quantity).text =
             NumericUtils(this).formatEventQuantity(event)
-        )
+        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes).text = event.notes
-        dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_notes).setText(event.notes)
 
         val currentDateTime = Calendar.getInstance()
         currentDateTime.time = Date(event.time * 1000)
         val dateTextView = dialogView.findViewById<TextView>(R.id.dialog_event_detail_type_date)
         dateTextView.text = String.format(getString(R.string.dialog_event_detail_datetime_icon), dateFormat.format(currentDateTime.time))
-        dateTextView.setOnClickListener({
+        dateTextView.setOnClickListener {
             // Show datetime picker
             val startYear = currentDateTime.get(Calendar.YEAR)
             val startMonth = currentDateTime.get(Calendar.MONTH)
@@ -328,8 +362,8 @@ class MainActivity : AppCompatActivity() {
             val startHour = currentDateTime.get(Calendar.HOUR_OF_DAY)
             val startMinute = currentDateTime.get(Calendar.MINUTE)
 
-            DatePickerDialog(this, DatePickerDialog.OnDateSetListener { _, year, month, day ->
+            DatePickerDialog(this, { _, year, month, day ->
-                TimePickerDialog(this, TimePickerDialog.OnTimeSetListener { _, hour, minute ->
+                TimePickerDialog(this, { _, hour, minute ->
                     val pickedDateTime = Calendar.getInstance()
                     pickedDateTime.set(year, month, day, hour, minute)
                     currentDateTime.time = pickedDateTime.time
@@ -340,9 +374,9 @@ class MainActivity : AppCompatActivity() {
                     logbook?.sort()
                     recyclerView.adapter?.notifyDataSetChanged()
                     saveLogbook()
-                }, startHour, startMinute, false).show()
+                }, startHour, startMinute, android.text.format.DateFormat.is24HourFormat(this@MainActivity)).show()
             }, startYear, startMonth, startDay).show()
-        })
+        }
 
         d.setView(dialogView)
         d.setPositiveButton(R.string.dialog_event_detail_close_button) { dialogInterface, i -> dialogInterface.dismiss() }
@@ -354,6 +388,37 @@ class MainActivity : AppCompatActivity() {
             // Resume logbook update
             pauseLogbookUpdate = false
         })
+
+        // create next/previous links to events of the same type
+
+        val previousTextView = dialogView.findViewById<TextView>(R.id.dialog_event_previous)
+        val nextTextView = dialogView.findViewById<TextView>(R.id.dialog_event_next)
+        val nextEvent = getNextSameEvent(event, items)
+        val previousEvent = getPreviousSameEvent(event, items)
+
+        if (previousEvent != null) {
+            val emoji = previousEvent.getTypeEmoji(applicationContext)
+            val time = DateUtils.formatTimeDuration(applicationContext, event.time - previousEvent.time)
+            previousTextView.text = String.format("⬅️ %s %s", emoji, time)
+            previousTextView.setOnClickListener {
+                alertDialog.cancel()
+                showEventDetailDialog(previousEvent, items)
+            }
+        } else {
+            previousTextView.visibility = View.GONE
+        }
+
+        if (nextEvent != null) {
+            val emoji = nextEvent.getTypeEmoji(applicationContext)
+            val time = DateUtils.formatTimeDuration(applicationContext, nextEvent.time - event.time)
+            nextTextView.text = String.format("%s %s ➡️", time, emoji)
+            nextTextView.setOnClickListener {
+                alertDialog.cancel()
+                showEventDetailDialog(nextEvent, items)
+            }
+        } else {
+            nextTextView.visibility = View.GONE
+        }
     }
 
     fun showAddLogbookDialog(requestedByUser: Boolean) {
@@ -392,7 +457,7 @@ class MainActivity : AppCompatActivity() {
                     sAdapter.setDropDownViewResource(R.layout.row_logbook_spinner)
                     for (ln in logbooksNames) {
                         sAdapter.add(
-                            if (ln.isEmpty()) getString(R.string.default_logbook_name) else ln
+                            ln.ifEmpty { getString(R.string.default_logbook_name) }
                         )
                     }
                     spinner.adapter = sAdapter
@@ -410,7 +475,6 @@ class MainActivity : AppCompatActivity() {
                         }
 
                         override fun onNothingSelected(parent: AdapterView<*>?) {}
-
                     }
                 })
             }
@@ -560,7 +624,6 @@ class MainActivity : AppCompatActivity() {
                     onRepoError(getString(R.string.settings_generic_error) + error.toString())
                 })
             }
-
         })
     }
 
@@ -708,10 +771,10 @@ class MainActivity : AppCompatActivity() {
             isOutsideTouchable = true
             val inflater = LayoutInflater.from(anchor.context)
             contentView = inflater.inflate(R.layout.more_events_popup, null)
-            contentView.findViewById<View>(R.id.button_medicine).setOnClickListener({
+            contentView.findViewById<View>(R.id.button_medicine).setOnClickListener {
                 askNotes(LunaEvent(LunaEvent.TYPE_MEDICINE))
                 dismiss()
-            })
+            }
             contentView.findViewById<View>(R.id.button_enema).setOnClickListener({
                 logEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
                 dismiss()

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

@@ -7,14 +7,13 @@ import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.progressindicator.LinearProgressIndicator
+import com.google.android.material.switchmaterial.SwitchMaterial
 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
@@ -24,6 +23,7 @@ open class SettingsActivity : AppCompatActivity() {
     protected lateinit var textViewWebDAVUser: TextView
     protected lateinit var textViewWebDAVPass: TextView
     protected lateinit var progressIndicator: LinearProgressIndicator
+    protected lateinit var switchNoBreastfeeding: SwitchMaterial
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,6 +35,8 @@ 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)
+        switchNoBreastfeeding = findViewById(R.id.switch_no_breastfeeding)
+
         findViewById<View>(R.id.settings_save).setOnClickListener({
             validateAndSave()
         })
@@ -49,11 +51,15 @@ open class SettingsActivity : AppCompatActivity() {
     fun loadSettings() {
         val dataRepo = settingsRepository.loadDataRepository()
         val webDavCredentials = settingsRepository.loadWebdavCredentials()
+        val noBreastfeeding = settingsRepository.loadNoBreastfeeding()
 
         when (dataRepo) {
             LocalSettingsRepository.DATA_REPO.LOCAL_FILE -> radioDataLocal.isChecked = true
             LocalSettingsRepository.DATA_REPO.WEBDAV -> radioDataWebDAV.isChecked = true
         }
+
+        switchNoBreastfeeding.isChecked = noBreastfeeding
+
         if (webDavCredentials != null) {
             textViewWebDAVUrl.setText(webDavCredentials[0])
             textViewWebDAVUser.setText(webDavCredentials[1])
@@ -149,6 +155,7 @@ open class SettingsActivity : AppCompatActivity() {
             if (radioDataWebDAV.isChecked) LocalSettingsRepository.DATA_REPO.WEBDAV
             else LocalSettingsRepository.DATA_REPO.LOCAL_FILE
         )
+        settingsRepository.saveNoBreastfeeding(switchNoBreastfeeding.isChecked)
         settingsRepository.saveWebdavCredentials(
             textViewWebDAVUrl.text.toString(),
             textViewWebDAVUser.text.toString(),

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 {
-        val MAX_SAFE_LOGBOOK_SIZE = 30000
+        const val MAX_SAFE_LOGBOOK_SIZE = 30000
     }
     val logs = ArrayList<LunaEvent>()
 

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

@@ -14,20 +14,20 @@ import java.util.Date
 class LunaEvent: Comparable<LunaEvent> {
 
     companion object {
-        val TYPE_BABY_BOTTLE = "BABY_BOTTLE"
+        const val TYPE_BABY_BOTTLE = "BABY_BOTTLE"
-        val TYPE_WEIGHT = "WEIGHT"
+        const val TYPE_WEIGHT = "WEIGHT"
-        val TYPE_BREASTFEEDING_LEFT_NIPPLE = "BREASTFEEDING_LEFT_NIPPLE"
+        const val TYPE_BREASTFEEDING_LEFT_NIPPLE = "BREASTFEEDING_LEFT_NIPPLE"
-        val TYPE_BREASTFEEDING_BOTH_NIPPLE = "BREASTFEEDING_BOTH_NIPPLE"
+        const val TYPE_BREASTFEEDING_BOTH_NIPPLE = "BREASTFEEDING_BOTH_NIPPLE"
-        val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
+        const val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
-        val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
+        const val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
-        val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
+        const val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
-        val TYPE_MEDICINE = "MEDICINE"
+        const val TYPE_MEDICINE = "MEDICINE"
-        val TYPE_ENEMA = "ENEMA"
+        const val TYPE_ENEMA = "ENEMA"
-        val TYPE_NOTE = "NOTE"
+        const val TYPE_NOTE = "NOTE"
-        val TYPE_CUSTOM = "CUSTOM"
+        const val TYPE_CUSTOM = "CUSTOM"
-        val TYPE_COLIC = "COLIC"
+        const val TYPE_COLIC = "COLIC"
-        val TYPE_TEMPERATURE = "TEMPERATURE"
+        const val TYPE_TEMPERATURE = "TEMPERATURE"
-        val TYPE_FOOD = "FOOD"
+        const val TYPE_FOOD = "FOOD"
     }
 
     private val jo: JSONObject

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

@@ -3,6 +3,7 @@ package it.danieleverducci.lunatracker.repository
 import android.content.Context
 import android.content.Context.MODE_PRIVATE
 import android.content.SharedPreferences
+import androidx.core.content.edit
 
 class LocalSettingsRepository(val context: Context) {
     companion object {
@@ -12,6 +13,7 @@ class LocalSettingsRepository(val context: Context) {
         val SHARED_PREFS_DAV_URL = "webdav_url"
         val SHARED_PREFS_DAV_USER = "webdav_user"
         val SHARED_PREFS_DAV_PASS = "webdav_password"
+        val SHARED_PREFS_NO_BREASTFEEDING = "no_breastfeeding"
     }
     enum class DATA_REPO {LOCAL_FILE, WEBDAV}
     val sharedPreferences: SharedPreferences
@@ -28,6 +30,14 @@ class LocalSettingsRepository(val context: Context) {
         return sharedPreferences.getInt(SHARED_PREFS_BB_CONTENT, 1)
     }
 
+    fun saveNoBreastfeeding(content: Boolean) {
+        sharedPreferences.edit().putBoolean(SHARED_PREFS_NO_BREASTFEEDING, content).apply()
+    }
+
+    fun loadNoBreastfeeding(): Boolean {
+        return sharedPreferences.getBoolean(SHARED_PREFS_NO_BREASTFEEDING, false)
+    }
+
     fun saveDataRepository(repo: DATA_REPO) {
         val spe = sharedPreferences.edit()
         spe.putString(

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

@@ -7,6 +7,62 @@ import java.util.Date
 
 class DateUtils {
     companion object {
+        fun formatTimeDuration(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 > 0) {
+                return format(years, days, R.string.year_ago, R.string.years_ago, R.string.day_ago, R.string.days_ago)
+            } else if (days > 0) {
+                return format(days, hours, R.string.day_ago, R.string.days_ago, R.string.hour_ago, R.string.hours_ago)
+            } else if (hours > 0) {
+                return format(hours, minutes, R.string.hour_ago, R.string.hours_ago, R.string.minute_ago, R.string.minutes_ago)
+            } else if (minutes > 0) {
+                return format(minutes, seconds, R.string.minute_ago, R.string.minute_ago, R.string.second_ago, R.string.seconds_ago)
+            } else {
+                return context.getString(R.string.now)
+            }
+        }
 
         /**
          * Formats the provided unix timestamp in a string like "3 hours, 26 minutes ago)
@@ -25,10 +81,10 @@ class DateUtils {
                 return DateFormat.getDateFormat(context).format(Date(unixTime*1000)) + "\n" +
                         DateFormat.getTimeFormat(context).format(Date(unixTime*1000))
 
-            var formattedTime = StringBuilder()
+            val formattedTime = StringBuilder()
             if (hoursAgo > 0) {
                 formattedTime.append(hoursAgo).append(" ")
-                if (hoursAgo.toInt() == 1)
+                if (hoursAgo == 1)
                     formattedTime.append(context.getString(R.string.hour_ago))
                 else
                     formattedTime.append(context.getString(R.string.hours_ago))
@@ -37,7 +93,7 @@ class DateUtils {
                 if (formattedTime.isNotEmpty())
                     formattedTime.append(", ")
                 formattedTime.append(minutesAgo).append(" ")
-                if (minutesAgo.toInt() == 1)
+                if (minutesAgo == 1)
                     formattedTime.append(context.getString(R.string.minute_ago))
                 else
                     formattedTime.append(context.getString(R.string.minutes_ago))

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

@@ -30,7 +30,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:text="@string/title"
-                android:textSize="26dp"
+                android:textSize="26sp"
                 android:gravity="center"/>
 
             <ImageView
@@ -47,7 +47,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="38dp"
-            android:layout_margin="10dp"
+            android:layout_margin="5dp"
             android:orientation="horizontal"
             android:gravity="center_vertical">
 
@@ -68,23 +68,17 @@
                 android:id="@+id/logbooks_add_button"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
-                android:layout_marginLeft="10dp"
+                android:layout_marginStart="10dp"
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
                 android:textStyle="bold"
                 android:textColor="@color/accent"
-                android:textSize="20dp"
+                android:textSize="20sp"
                 android:text="+"
                 android:background="@drawable/button_background"/>
 
         </LinearLayout>
 
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/log_an_event"
-            android:gravity="center_horizontal"/>
-
         <LinearLayout
             android:id="@+id/buttons_container"
             android:layout_width="match_parent"
@@ -101,10 +95,10 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:layout_margin="10dp"
+                    android:layout_margin="5dp"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="50dp"
+                    android:textSize="50sp"
                     android:text="@string/event_bottle_type"/>
 
                 <TextView
@@ -112,49 +106,50 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_margin="10dp"
+                    android:layout_margin="5dp"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="50dp"
+                    android:textSize="50sp"
                     android:text="@string/event_food_type"/>
 
             </LinearLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:id="@+id/layout_nipples">
 
                 <TextView
                     android:id="@+id/button_nipple_left"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
+                    android:layout_margin="5dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="30dp"
+                    android:textSize="30sp"
                     android:text="🤱⬅️"/>
 
                 <TextView
                     android:id="@+id/button_nipple_both"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
+                    android:layout_margin="5dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="30dp"
+                    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_margin="5dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="30dp"
+                    android:textSize="30sp"
                     android:text="🤱➡️️"/>
 
             </LinearLayout>
@@ -167,29 +162,29 @@
                     android:id="@+id/button_change_poo"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="10dp"
+                    android:layout_margin="5dp"
                     android:layout_weight="2"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="30dp"
+                    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_margin="5dp"
                     android:layout_weight="2"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="30dp"
+                    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_margin="5dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -200,21 +195,31 @@
 
         </LinearLayout>
 
-        <com.google.android.material.progressindicator.LinearProgressIndicator
+        <LinearLayout
-            android:id="@+id/progress_indicator"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
+            android:layout_marginTop="5dp"
-            android:indeterminate="true"
+            android:orientation="horizontal">
-            app:indicatorColor="@color/accent"
-            android:visibility="invisible"/>
 
-        <TextView
+            <TextView
-            android:layout_width="match_parent"
+                android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+                android:layout_height="wrap_content"
-            android:text="@string/logbook"
+                android:text="@string/logbook"
-            android:textColor="@color/accent"
+                android:textColor="@color/accent"
-            android:textStyle="bold"/>
+                android:textStyle="bold"/>
+
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progress_indicator"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_gravity="center"
+                android:layout_marginHorizontal="10dp"
+                android:indeterminate="true"
+                app:indicatorColor="@color/accent"
+                android:visibility="invisible"/>
+
+        </LinearLayout>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/list_events"
@@ -247,7 +252,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"
-            android:textSize="30dp"
+            android:textSize="30sp"
             android:textColor="@color/accent"
             android:text="@string/no_connection"/>
 
@@ -264,7 +269,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:drawableLeft="@drawable/ic_sync"
+            android:drawableStart="@drawable/ic_sync"
             android:drawableTint="@color/white"
             android:drawablePadding="10dp"
             android:text="@string/no_connection_retry"
@@ -275,7 +280,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="20dp"
-            android:drawableLeft="@drawable/ic_settings"
+            android:drawableStart="@drawable/ic_settings"
             android:drawableTint="@color/white"
             android:drawablePadding="10dp"
             android:text="@string/no_connection_go_to_settings"

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

@@ -39,26 +39,26 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:text="@string/settings_storage_local_desc"/>
 
             <RadioButton android:id="@+id/settings_data_webdav"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
+                android:layout_marginTop="20dp"
                 android:text="@string/settings_storage_dav"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:text="@string/settings_storage_dav_desc"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:textStyle="bold"
                 android:text="@string/settings_storage_dav_url"/>
 
@@ -66,7 +66,7 @@
                 android:id="@+id/settings_data_webdav_url"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:hint="@string/settings_storage_dav_url_hint"
                 android:inputType="textUri"
                 android:background="@drawable/textview_background"/>
@@ -75,7 +75,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:textStyle="bold"
                 android:text="@string/settings_storage_dav_user"/>
 
@@ -83,7 +83,7 @@
                 android:id="@+id/settings_data_webdav_user"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:inputType="textEmailAddress"
                 android:background="@drawable/textview_background"/>
 
@@ -91,17 +91,23 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
                 android:textStyle="bold"
                 android:text="@string/settings_storage_dav_pass"/>
 
-            <EditText
+            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/settings_data_webdav_pass"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="30dp"
+                android:layout_marginStart="30dp"
-                android:inputType="textPassword"
+                app:passwordToggleEnabled="true">
-                android:background="@drawable/textview_background"/>
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/settings_data_webdav_pass"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/textview_background"
+                    android:inputType="textPassword" />
+            </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.progressindicator.LinearProgressIndicator
                 android:id="@+id/progress_indicator"
@@ -109,36 +115,59 @@
                 android:layout_height="wrap_content"
                 android:indeterminate="true"
                 app:indicatorColor="@color/accent"
-                android:layout_margin="20dp"
+                android:layout_marginTop="20dp"
                 android:visibility="invisible"/>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal">
-
-                <Button
-                    android:id="@+id/settings_cancel"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:layout_marginRight="20dp"
-                    android:background="@drawable/button_background"
-                    android:textColor="@color/accent"
-                    android:text="@android:string/cancel"/>
-
-                <Button
-                    android:id="@+id/settings_save"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:textColor="@color/accent"
-                    android:background="@drawable/button_background"
-                    android:text="@android:string/ok"/>
-
-            </LinearLayout>
         </RadioGroup>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:layout_marginTop="5dp"
+            android:layout_marginEnd="30dp">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_weight="1"
+                android:layout_height="wrap_content"
+                android:textStyle="bold"
+                android:text="@string/no_breastfeeding" />
+
+            <com.google.android.material.switchmaterial.SwitchMaterial
+                android:id="@+id/switch_no_breastfeeding"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="20dp"
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/settings_cancel"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:layout_marginEnd="20dp"
+                android:background="@drawable/button_background"
+                android:textColor="@color/accent"
+                android:text="@android:string/cancel"/>
+
+            <Button
+                android:id="@+id/settings_save"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:textColor="@color/accent"
+                android:background="@drawable/button_background"
+                android:text="@android:string/ok"/>
+
+        </LinearLayout>
+
     </LinearLayout>
 
 </ScrollView>

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -10,18 +11,18 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center_horizontal"
-        android:textSize="60dp"
+        android:textSize="60sp"
-        android:text="@string/event_diaperchange_pee_type"/>
+        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:layout_marginTop="12dp"
         android:gravity="center_horizontal"
         android:textColor="@color/accent"
-        android:textSize="24dp"
+        android:textSize="32sp"
-        android:text="@string/event_diaperchange_pee_desc"/>
+        android:text="@string/event_diaperchange_pee_desc" />
 
     <TextView
         android:id="@+id/dialog_event_detail_type_date"
@@ -30,18 +31,20 @@
         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:textSize="16sp"
         android:textStyle="bold"
-        android:text="@string/dialog_event_detail_datetime_icon"/>
+        android:text="@string/dialog_event_detail_datetime_icon"
+        app:drawableEndCompat="@drawable/ic_edit" />
 
     <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"/>
+        android:textSize="28sp"
+        android:text="@string/dialog_event_detail_quantity"/>
 
     <ScrollView
         android:layout_width="match_parent"
@@ -53,7 +56,37 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textStyle="italic"
-            android:text="Notes"/>
+            android:textSize="20sp"
+            android:text="@string/dialog_event_detail_notes"/>
 
     </ScrollView>
+
+    <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/number_edit_dialog.xml

@@ -17,6 +17,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:text="g"/>
 </LinearLayout>

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

@@ -14,6 +14,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        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:paddingLeft="10dp"
+        android:paddingStart="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="Description"/>
+        android:text="@string/row_luna_event_description"/>
 
     <TextView
         android:id="@+id/quantity"
@@ -35,7 +35,7 @@
         android:layout_marginLeft="5dp"
         android:layout_marginRight="5dp"
         android:gravity="center_horizontal"
-        android:text="Qty"/>
+        android:text="@string/row_luna_event_quantity"/>
 
     <TextView
         android:id="@+id/time"
@@ -46,6 +46,6 @@
         android:textStyle="bold"
         android:ellipsize="end"
         android:maxLines="2"
-        android:text="Time"/>
+        android:text="@string/row_luna_event_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="Description"/>
+            android:text="@string/row_luna_event_description"/>
 
         <TextView
             android:id="@+id/quantity"
@@ -41,7 +41,7 @@
             android:layout_marginLeft="5dp"
             android:layout_marginRight="5dp"
             android:gravity="center_horizontal"
-            android:text="Qty"/>
+            android:text="@string/dialog_event_detail_quantity"/>
 
         <TextView
             android:id="@+id/time"
@@ -52,7 +52,7 @@
             android:textStyle="bold"
             android:ellipsize="end"
             android:maxLines="2"
-            android:text="Time"/>
+            android:text="@string/row_luna_event_time"/>
 
     </LinearLayout>
 

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

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">LunaTracker</string>
     <string name="title">🌜 LunaTracker 🌛</string>
-    <string name="log_an_event">Ereignis protokollieren:</string>
     <string name="logbook">Ereignisprotokoll</string>
 
     <string name="log_bottle_dialog_title">Fläschchen</string>
@@ -51,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>

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

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">LunaTracker</string>
     <string name="title">🌜 LunaTracker 🌛</string>
-    <string name="log_an_event">Ajouter une entrée:</string>
     <string name="logbook">Entrées enregistrées</string>
 
     <string name="log_bottle_dialog_title">Biberon</string>
@@ -37,7 +36,7 @@
 
     <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>
+    <string name="toast_event_add_error">Impossible d\'enregistrer cette entrée</string>
     <string name="toast_integer_error">Valeur invalide. Renseignez un nombre.</string>
 
     <string name="now">maintenant </string>
@@ -53,18 +52,18 @@
 
     <string name="settings_title">Paramètres</string>
     <string name="settings_storage">Choisir le lieu de stockage des données</string>
-    <string name="settings_storage_local">Sur l'appareil'</string>
+    <string name="settings_storage_local">Sur l\'appareil\'</string>
-    <string name="settings_storage_local_desc">La solution la plus respectueuse de la vie privée : les données ne quittent pas l'appareil</string>
+    <string name="settings_storage_local_desc">La solution la plus respectueuse de la vie privée : les données ne quittent pas l\'appareil</string>
     <string name="settings_storage_dav">Sur un serveur WebDAV</string>
-    <string name="settings_storage_dav_desc">Vous pouvez utiliser n'importe quel service WebDAV (par exemple Nextcloud, Owncloud, Dropbox, Box...) pour sauvegarder les données. De cette façon, vous pouvez les synchroniser entre plusieurs appareils (Ex : celui de papa, celui de maman, celui de grand-mère...). Vous aurez besoin de l'adresse WebDAV, que vous trouverez dans la documentation de votre fournisseur (par exemple, pour Nextcloud web, vous la trouverez dans les paramètres de l'application Fichiers).</string>
+    <string name="settings_storage_dav_desc">Vous pouvez utiliser n\'importe quel service WebDAV (par exemple Nextcloud, Owncloud, Dropbox, Box...) pour sauvegarder les données. De cette façon, vous pouvez les synchroniser entre plusieurs appareils (Ex : celui de papa, celui de maman, celui de grand-mère...). Vous aurez besoin de l\'adresse WebDAV, que vous trouverez dans la documentation de votre fournisseur (par exemple, pour Nextcloud web, vous la trouverez dans les paramètres de l\'application Fichiers).</string>
     <string name="settings_storage_dav_url">URL WebDAV</string>
     <string name="settings_storage_dav_url_hint">https://</string>
-    <string name="settings_storage_dav_user">Nom d'utilisateur</string>
+    <string name="settings_storage_dav_user">Nom d\'utilisateur</string>
     <string name="settings_storage_dav_pass">Mot de passe</string>
-    <string name="settings_network_error">Impossible d'accéder au serveur: </string>
+    <string name="settings_network_error">Impossible d\'accéder au serveur: </string>
-    <string name="settings_webdav_error_denied">Nom d'utilisateur ou mot de passe incorrect pour le service WebDAV</string>
+    <string name="settings_webdav_error_denied">Nom d\'utilisateur ou mot de passe incorrect pour le service WebDAV</string>
-    <string name="settings_webdav_error_server_offline">Impossible d'accéder au serveur WebDAV</string>
+    <string name="settings_webdav_error_server_offline">Impossible d\'accéder au serveur WebDAV</string>
-    <string name="settings_webdav_error_generic">Une erreur est survenue en essayant d'accéder au serveur WebDAV:</string>
+    <string name="settings_webdav_error_generic">Une erreur est survenue en essayant d\'accéder au serveur WebDAV:</string>
     <string name="settings_webdav_creation_error_generic">Impossible de sauvegarder un fichier sur le serveur WebDAV:</string>
     <string name="settings_webdav_creation_ok">Connexion réussie avec le serveur WebDAV</string>
     <string name="settings_json_error">Il y a un fichier sur le serveur WebDAV, toutefois il est corronpu ou illisible. Merci de le supprimer et réessayer</string>
@@ -72,8 +71,8 @@
     <string name="settings_webdav_upload_error">Une erreur est survenue en téléversant le journal local %1$s sur %2$s</string>
 
     <string name="trim_logbook_dialog_title">Votre journal grossit !</string>
-    <string name="trim_logbook_dialog_message_local">Le fichier de votre journal a beaucoup grossi. Nous recommandons de supprimer les entrées les plus vieilles pour éviter des crashs de l'application.</string>
+    <string name="trim_logbook_dialog_message_local">Le fichier de votre journal a beaucoup grossi. Nous recommandons de supprimer les entrées les plus vieilles pour éviter des crashs de l\'application.</string>
-    <string name="trim_logbook_dialog_message_dav">Le fichier de votre journal a beaucoup grossi. Nous recommandons de supprimer les entrées les plus vieilles pour éviter des crashs de l'application. Si vous voulez garder un historique, vous pouvez sauvegarder le fichier "lunatracker_logbook.json" ou le renommer pour créer un nouveau journal.</string>
+    <string name="trim_logbook_dialog_message_dav">Le fichier de votre journal a beaucoup grossi. Nous recommandons de supprimer les entrées les plus vieilles pour éviter des crashs de l\'application. Si vous voulez garder un historique, vous pouvez sauvegarder le fichier "lunatracker_logbook.json" ou le renommer pour créer un nouveau journal.</string>
     <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>
 
@@ -82,15 +81,15 @@
     <string name="log_notes_dialog_qty_hint">Quantité (ou vide)</string>
     <string name="log_notes_dialog_note_hint">Notes ...</string>
 
-    <string name="dialog_event_detail_title">Détails de l'entrée</string>
+    <string name="dialog_event_detail_title">Détails de l\'entrée</string>
     <string name="dialog_event_detail_close_button">OK</string>
     <string name="dialog_event_detail_delete_button">Supprimer</string>
 
     <string name="dialog_add_logbook_title">Ajouter un journal</string>
     <string name="dialog_add_logbook_logbookname">👶 Nom du journal</string>
-    <string name="dialog_add_logbook_message">Renseignez un nom pour identifier ce journal. Ce nom apparaîtra en haut de l'écran et, si vous utilisez WebDAV, il figurera également dans le nom du fichier enreigstré.</string>
-    <string name="dialog_add_logbook_message_intro">Bienvenue ! Pour utiliser cette application, vous devez créer au moins un carnet de bord. Vous voudrez probablement l'appeler avec le nom de votre enfant.</string>
 
+    <string name="dialog_add_logbook_message">Renseignez un nom pour identifier ce journal. Ce nom apparaîtra en haut de l\'écran et, si vous utilisez WebDAV, il figurera également dans le nom du fichier enreigstré.</string>
+    <string name="dialog_add_logbook_message_intro">Bienvenue ! Pour utiliser cette application, vous devez créer au moins un carnet de bord. Vous voudrez probablement l\'appeler avec le nom de votre enfant.</string>
     <string name="default_logbook_name">👶 Mon premier carnet de bord</string>
     <string name="logbook_created">Journal ajouté: </string>
 

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

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">LunaTracker</string>
     <string name="title">🌜 LunaTracker 🌛</string>
-    <string name="log_an_event">Logga un evento:</string>
     <string name="logbook">Diario di bordo</string>
 
     <string name="log_bottle_dialog_title">Biberon</string>

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

@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">LunaTracker</string>
     <string name="title">🌜 LunaTracker 🌛</string>
-    <string name="log_an_event">Log an event:</string>
     <string name="logbook">Logged events</string>
 
     <string name="log_bottle_dialog_title">Baby bottle</string>
@@ -56,22 +55,30 @@
     <string name="toast_integer_error">Invalid value. Insert an integer.</string>
 
     <string name="now">now</string>
-    <string name="hour_ago">hour</string>
+    <string name="second_ago">sec</string>
-    <string name="hours_ago">hours</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">year</string>
+    <string name="days_ago">years</string>
+    <string name="year_ago">year</string>
+    <string name="years_ago">years</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="no_breastfeeding">No Breastfeeding</string>
+
     <string name="settings_title">Settings</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>
     <string name="settings_storage_dav">On a WebDAV server</string>
-    <string name="settings_storage_dav_desc">You can use any WebDAV service (i.e. Nextcloud, Owncloud, Dropbox, Box…) to save the data. In this way, you can syncronize it between more devices, i.e., the dad\'s, the mom\'s, the grandma\'s… You will need the WebDAV url, you can find it in your provider\'s documentation (i.e. in Nextcloud web is in the Files app settings)</string>
+    <string name="settings_storage_dav_desc">You can use any WebDAV service (i.e. Nextcloud, Owncloud, Dropbox, Box…) to save the data. In this way, you can syncronize it between more devices, i.e., the dad\'s, the mom\'s, the grandma\'s… You will need the WebDAV URL, you can find it in your provider\'s documentation (i.e. in Nextcloud web is in the Files app settings)</string>
     <string name="settings_storage_dav_url">WebDAV URL</string>
     <string name="settings_storage_dav_url_hint">https://</string>
     <string name="settings_storage_dav_user">Username</string>
@@ -106,10 +113,16 @@
     <string name="measurement_unit_temperature_base_imperial" translatable="false">°F</string>
     <string name="measurement_unit_temperature_base_metric" translatable="false">°C</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_datetime_icon" translatable="false">🕒 %s1</string>
+    <string name="dialog_event_detail_datetime_icon" translatable="false">🕒 %s</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_add_logbook_title">Add logbook</string>
     <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>