README.md

@@ -8,5 +8,3 @@ You have to react fast, event if it's 4 AM and you have no idea why is crying.
 This app is meant to log all the relevant events (diaper change, breastfeeding, baby bottle feeding...), so you can always remember when has been done last time. It supports syncing the data between different devices (using your WebDAV server for the best privacy) so that when the baby needs attentions, the dad can step in leaving the mom sleeping peacefully.
 
 Dedicated to my daughter Luna.
-
-![Screenshot](fastlane/metadata/android/en-US/images/phoneScreenshots/1.png)

app/build.gradle.kts

@@ -13,7 +13,7 @@ android {
         minSdk = 29
         targetSdk = 34
         versionCode = 1
-        versionName = "0.2"
+        versionName = "1.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -4,12 +4,9 @@ import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.util.Log
-import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.EditText
 import android.widget.NumberPicker
-import android.widget.PopupWindow
 import android.widget.TextView
 import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
@@ -34,7 +31,6 @@ import org.json.JSONException
 class MainActivity : AppCompatActivity() {
     companion object {
         val TAG = "MainActivity"
-        val UPDATE_EVERY_SECS: Long = 30
     }
 
     lateinit var logbook: Logbook
@@ -93,10 +89,6 @@ class MainActivity : AppCompatActivity() {
                 LunaEvent.TYPE_DIAPERCHANGE_PEE
             )
         ) }
-        val moreButton = findViewById<View>(R.id.button_more)
-        moreButton.setOnClickListener {
-            showOverflowPopupWindow(moreButton)
-        }
         findViewById<View>(R.id.button_no_connection_settings).setOnClickListener({
             showSettings()
         })
@@ -146,6 +138,7 @@ class MainActivity : AppCompatActivity() {
 
         // Reload data
         loadLogbook()
+        handler.postDelayed(updateListRunnable, 1000*30)
     }
 
     override fun onStop() {
@@ -184,7 +177,7 @@ class MainActivity : AppCompatActivity() {
         d.setTitle(R.string.log_weight_dialog_title)
         d.setMessage(R.string.log_weight_dialog_description)
         d.setView(dialogView)
-        val weightET = dialogView.findViewById<EditText>(R.id.dialog_number_edittext)
+        val weightET = dialogView.findViewById<TextView>(R.id.dialog_number_edittext)
         d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
             val weight = weightET.text.toString().toIntOrNull()
             if (weight != null)
@@ -197,38 +190,6 @@ class MainActivity : AppCompatActivity() {
         alertDialog.show()
     }
 
-    fun askNotes(lunaEvent: LunaEvent) {
-        val d = AlertDialog.Builder(this)
-        val dialogView = layoutInflater.inflate(R.layout.dialog_notes, null)
-        d.setTitle(lunaEvent.getTypeDescription(this))
-        d.setMessage(
-            when (lunaEvent.type){
-                LunaEvent.TYPE_MEDICINE -> R.string.log_medicine_dialog_description
-                else -> R.string.log_notes_dialog_description
-            }
-        )
-        d.setView(dialogView)
-        val notesET = dialogView.findViewById<EditText>(R.id.notes_edittext)
-        val qtyET = dialogView.findViewById<EditText>(R.id.notes_qty_edittext)
-        d.setPositiveButton(android.R.string.ok) { dialogInterface, i ->
-            val qtyStr = qtyET.text.toString()
-            if (qtyStr.isNotEmpty()) {
-                val qty = qtyStr.toIntOrNull()
-                if (qty == null) {
-                    Toast.makeText(this, R.string.toast_integer_error, Toast.LENGTH_SHORT).show()
-                    return@setPositiveButton
-                }
-                lunaEvent.quantity = qty
-            }
-            val notes = notesET.text.toString()
-            lunaEvent.notes = notes
-            logEvent(lunaEvent)
-        }
-        d.setNegativeButton(android.R.string.cancel) { dialogInterface, i -> dialogInterface.dismiss() }
-        val alertDialog = d.create()
-        alertDialog.show()
-    }
-
     fun askToTrimLogbook() {
         val d = AlertDialog.Builder(this)
         d.setTitle(R.string.trim_logbook_dialog_title)
@@ -253,10 +214,6 @@ class MainActivity : AppCompatActivity() {
         if (savingEvent)
             return
 
-        // Reset time counter
-        handler.removeCallbacks(updateListRunnable)
-        handler.postDelayed(updateListRunnable, UPDATE_EVERY_SECS*1000)
-
         // Load data
         setLoading(true)
         logbookRepo?.loadLogbook(this, object: LogbookLoadedListener{
@@ -427,25 +384,4 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun showOverflowPopupWindow(anchor: View) {
-        PopupWindow(anchor.context).apply {
-            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({
-                askNotes(LunaEvent(LunaEvent.TYPE_MEDICINE))
-                dismiss()
-            })
-            contentView.findViewById<View>(R.id.button_enema).setOnClickListener({
-                logEvent(LunaEvent(LunaEvent.TYPE_ENEMA))
-                dismiss()
-            })
-            contentView.findViewById<View>(R.id.button_custom).setOnClickListener({
-                Toast.makeText(anchor.context, "TODO: Implement custom events", Toast.LENGTH_SHORT).show()
-                dismiss()
-            })
-        }.also { popupWindow ->
-            popupWindow.showAsDropDown(anchor)
-        }
-    }
 }

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

@@ -33,8 +33,30 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
         position: Int
     ) {
         val item = items.get(position)
-        holder.type.text = item.getTypeEmoji(context)
+        holder.type.text = context.getString(
-        holder.description.text = item.getTypeDescription(context)
+            when (item.type) {
+                LunaEvent.TYPE_BABY_BOTTLE -> R.string.event_bottle_type
+                LunaEvent.TYPE_WEIGHT -> R.string.event_scale_type
+                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_type
+                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_type
+                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_type
+                LunaEvent.TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_type
+                LunaEvent.TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_type
+                else -> R.string.event_unknown_type
+            }
+        )
+        holder.description.text = context.getString(
+            when (item.type) {
+                LunaEvent.TYPE_BABY_BOTTLE -> R.string.event_bottle_desc
+                LunaEvent.TYPE_WEIGHT -> R.string.event_scale_desc
+                LunaEvent.TYPE_BREASTFEEDING_LEFT_NIPPLE -> R.string.event_breastfeeding_left_desc
+                LunaEvent.TYPE_BREASTFEEDING_BOTH_NIPPLE -> R.string.event_breastfeeding_both_desc
+                LunaEvent.TYPE_BREASTFEEDING_RIGHT_NIPPLE -> R.string.event_breastfeeding_right_desc
+                LunaEvent.TYPE_DIAPERCHANGE_POO -> R.string.event_diaperchange_poo_desc
+                LunaEvent.TYPE_DIAPERCHANGE_PEE -> R.string.event_diaperchange_pee_desc
+                else -> R.string.event_unknown_desc
+            }
+        )
         holder.quantity.text = if ((item.quantity ?: 0) > 0) item.quantity.toString() else ""
         holder.time.text = formatTimeAgo(context, item.time)
     }

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

@@ -1,7 +1,5 @@
 package it.danieleverducci.lunatracker.entities
 
-import android.content.Context
-import it.danieleverducci.lunatracker.R
 import org.json.JSONObject
 import java.util.Date
 
@@ -21,9 +19,6 @@ class LunaEvent {
         val TYPE_BREASTFEEDING_RIGHT_NIPPLE = "BREASTFEEDING_RIGHT_NIPPLE"
         val TYPE_DIAPERCHANGE_POO = "DIAPERCHANGE_POO"
         val TYPE_DIAPERCHANGE_PEE = "DIAPERCHANGE_PEE"
-        val TYPE_MEDICINE = "MEDICINE"
-        val TYPE_ENEMA = "ENEMA"
-        val TYPE_CUSTOM = "CUSTOM"
     }
 
     private val jo: JSONObject
@@ -44,11 +39,6 @@ class LunaEvent {
             if (value > 0)
                 jo.put("quantity", value)
         }
-    var notes: String
-        get(): String = jo.getString("notes")
-        set(value) {
-            jo.put("notes", value)
-        }
 
     constructor(jo: JSONObject) {
         this.jo = jo
@@ -70,40 +60,6 @@ class LunaEvent {
         this.quantity = quantity
     }
 
-    fun getTypeEmoji(context: Context): String {
-        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
-                else -> R.string.event_unknown_type
-            }
-        )
-    }
-
-    fun getTypeDescription(context: Context): String {
-        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
-                else -> R.string.event_unknown_desc
-            }
-        )
-    }
-
     fun toJson(): JSONObject {
         return jo
     }

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

@@ -3,8 +3,6 @@
     <stroke
         android:width="2dp"
         android:color="@color/accent" />
-    <solid
-        android:color="@color/cardview_dark_background"/>
     <corners android:radius="15dp" />
     <padding
         android:bottom="5dp"

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

@@ -1,5 +0,0 @@
-<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

@@ -108,7 +108,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:layout_weight="2"
+                    android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="30dp"
@@ -119,23 +119,12 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_margin="10dp"
-                    android:layout_weight="2"
+                    android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="30dp"
                     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>

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

@@ -1,23 +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:padding="20dp">
-
-    <EditText
-        android:id="@+id/notes_qty_edittext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:lines="1"
-        android:inputType="number"
-        android:hint="@string/log_notes_dialog_qty_hint"/>
-
-    <EditText
-        android:id="@+id/notes_edittext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="top"
-        android:lines="10"/>
-
-</LinearLayout>

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

@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:padding="20dp"
-    android:background="@color/transparent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/button_medicine"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:padding="20dp"
-                android:background="@drawable/button_background"
-                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/button_background"
-                android:text="@string/overflow_event_enema"/>
-
-
-            <LinearLayout
-                android:id="@+id/overflow_event_custom_container"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-            </LinearLayout>
-
-            <TextView
-                android:id="@+id/button_custom"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_marginTop="10dp"
-                android:padding="20dp"
-                android:background="@drawable/button_background"
-                android:text="@string/overflow_event_custom"/>
-
-    </LinearLayout>
-
-</ScrollView>

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

@@ -17,14 +17,8 @@
     <string name="event_breastfeeding_right_type">🤱 →</string>
     <string name="event_diaperchange_poo_type">🚼 💩</string>
     <string name="event_diaperchange_pee_type">🚼 💧</string>
-    <string name="event_medicine_type">💊</string>
-    <string name="event_enema_type">🪠</string>
     <string name="event_unknown_type">-</string>
 
-    <string name="overflow_event_medicine">💊 Medicina</string>
-    <string name="overflow_event_enema">🪠 Clistere</string>
-    <string name="overflow_event_custom">➕ Aggiungi evento personalizzato</string>
-
     <string name="event_bottle_desc">Biberon</string>
     <string name="event_scale_desc">Pesata</string>
     <string name="event_breastfeeding_left_desc">Allatt. al seno (sx)</string>
@@ -32,8 +26,6 @@
     <string name="event_breastfeeding_right_desc">Allatt. al seno (dx)</string>
     <string name="event_diaperchange_poo_desc">Cambio (con cacca)</string>
     <string name="event_diaperchange_pee_desc">Cambio (con pipì)</string>
-    <string name="event_medicine_desc">Medicina</string>
-    <string name="event_enema_desc">Clistere</string>
     <string name="event_unknown_desc"></string>
 
     <string name="toast_event_added">Evento aggiunto</string>
@@ -76,8 +68,4 @@
     <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_notes_dialog_description">Note:</string>
-    <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
-    <string name="log_notes_dialog_qty_hint">Quantità (numero intero), o lascia vuoto</string>
-
 </resources>

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

@@ -4,6 +4,5 @@
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="translucent">#c000</color>
-    <color name="transparent">#0000</color>
     <color name="grey">#ccc</color>
 </resources>

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

@@ -17,9 +17,7 @@
     <string name="event_breastfeeding_right_type">🤱 →</string>
     <string name="event_diaperchange_poo_type">🚼 💩</string>
     <string name="event_diaperchange_pee_type">🚼 💧</string>
-    <string name="event_medicine_type">💊</string>
+    <string name="event_unknown_type">-</string>
-    <string name="event_enema_type">🪠</string>
-    <string name="event_unknown_type">\?</string>
 
     <string name="event_bottle_desc">Baby bottle</string>
     <string name="event_scale_desc">Weight</string>
@@ -28,14 +26,8 @@
     <string name="event_breastfeeding_right_desc">Breastfeeding (right)</string>
     <string name="event_diaperchange_poo_desc">Diaper chg (poo)</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_unknown_desc"></string>
 
-    <string name="overflow_event_medicine">💊 Medicine</string>
-    <string name="overflow_event_enema">🪠 Enema</string>
-    <string name="overflow_event_custom">➕ Add custom event</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>
@@ -57,7 +49,7 @@
     <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>
@@ -76,8 +68,4 @@
     <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_notes_dialog_description">Notes:</string>
-    <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
-    <string name="log_notes_dialog_qty_hint">Integer quantity, or leave blank</string>
-
 </resources>