NumericUtils: remove possible trailing whitespace

Use method names that better reflect
the use of the returned text.

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

@@ -420,11 +420,22 @@ class MainActivity : AppCompatActivity() {
         return dateTime
     }
 
-    fun addSleepEvent(event: LunaEvent) {
-        askSleepValue(event, true) { saveEvent(event) }
+    fun saveEvent(event: LunaEvent) {
+        if (!allEvents.contains(event)) {
+            // new event
+            logEvent(event)
+        }
+
+        logbook?.sort()
+        recyclerView.adapter?.notifyDataSetChanged()
+        saveLogbook()
     }
 
-    fun askSleepValue(event: LunaEvent, hideDurationButtons: Boolean, onPositive: () -> Unit) {
+    fun addSleepEvent(event: LunaEvent) {
+        askSleepValue(event) { saveEvent(event) }
+    }
+
+    fun askSleepValue(event: LunaEvent, onPositive: () -> Unit) {
         val d = AlertDialog.Builder(this)
         val dialogView = layoutInflater.inflate(R.layout.dialog_edit_duration, null)
         d.setTitle(event.getDialogTitle(this))
@@ -432,9 +443,8 @@ class MainActivity : AppCompatActivity() {
         d.setView(dialogView)
 
         val durationTextView = dialogView.findViewById<TextView>(R.id.dialog_date_duration)
-        val datePicker = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
-        val durationButtons = dialogView.findViewById<LinearLayout>(R.id.duration_buttons)
         val durationNowButton = dialogView.findViewById<Button>(R.id.dialog_date_duration_now)
+        val datePicker = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
         val durationMinus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_minus5)
         val durationPlus5Button = dialogView.findViewById<Button>(R.id.dialog_date_duration_plus5)
 
@@ -466,32 +476,24 @@ class MainActivity : AppCompatActivity() {
 
         onDateChange(pickedDateTime.time.time / 1000)
 
-        if (hideDurationButtons) {
-            durationButtons.visibility = View.GONE
-            d.setMessage(getString(R.string.log_sleep_dialog_description_start))
-        } else {
-            durationButtons.visibility = View.VISIBLE
-            d.setMessage(event.getDialogMessage(this))
-
-            fun adjust(minutes: Int) {
-                duration += minutes * 60
-                if (duration < 0) {
-                    duration = 0
-                }
-                onDateChange(pickedDateTime.time.time / 1000)
+        fun adjust(minutes: Int) {
+            duration += minutes * 60
+            if (duration < 0) {
+                duration = 0
             }
+            onDateChange(pickedDateTime.time.time / 1000)
+        }
 
-            durationMinus5Button.setOnClickListener { adjust(-5) }
-            durationPlus5Button.setOnClickListener { adjust(5) }
+        durationMinus5Button.setOnClickListener { adjust(-5) }
+        durationPlus5Button.setOnClickListener { adjust(5) }
 
-            durationNowButton.setOnClickListener {
-                val now = System.currentTimeMillis() / 1000
-                val start = pickedDateTime.time.time / 1000
-                if (now > start) {
-                    duration = (now - start).toInt()
-                    duration -= duration % 60 // prevent printing of seconds
-                    onDateChange(pickedDateTime.time.time / 1000)
-                }
+        durationNowButton.setOnClickListener {
+            val now = System.currentTimeMillis() / 1000
+            val start = pickedDateTime.time.time / 1000
+            if (now > start) {
+                duration = (now - start).toInt()
+                duration -= duration % 60 // prevent printing of seconds
+                onDateChange(pickedDateTime.time.time / 1000)
             }
         }
 
@@ -516,7 +518,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     fun addAmountEvent(event: LunaEvent) {
-        setToPreviousQuantity(event)
         askAmountValue(event, true) { saveEvent(event) }
     }
 
@@ -533,7 +534,7 @@ class MainActivity : AppCompatActivity() {
             R.array.AmountLabels,
             android.R.layout.simple_spinner_dropdown_item
         )
-
+        // set pre-selected item and ensure the quantity to index is in bounds
         spinner.setSelection(event.quantity.coerceIn(0, spinner.count - 1))
 
         val dateTV = dialogView.findViewById<TextView>(R.id.dialog_date_picker)
@@ -845,7 +846,7 @@ class MainActivity : AppCompatActivity() {
                 LunaEvent.Type.PUKE -> askAmountValue(event, false, updateValues)
                 LunaEvent.Type.TEMPERATURE -> askTemperatureValue(event, false, updateValues)
                 LunaEvent.Type.NOTE -> askNotes(event, false, updateValues)
-                LunaEvent.Type.SLEEP -> askSleepValue(event, false, updateValues)
+                LunaEvent.Type.SLEEP -> askSleepValue(event, updateValues)
                 else -> {
                     Log.w(TAG, "Unexpected type: ${event.type}")
                 }
@@ -1115,6 +1116,23 @@ class MainActivity : AppCompatActivity() {
         })
     }
 
+    fun logEvent(event: LunaEvent) {
+        savingEvent(true)
+
+        event.signature = signature
+
+        setLoading(true)
+        logbook?.logs?.add(0, event)
+        recyclerView.adapter?.notifyItemInserted(0)
+        recyclerView.smoothScrollToPosition(0)
+        saveLogbook(event)
+
+        // Check logbook size to avoid OOM errors
+        if (logbook?.isTooBig() == true) {
+            askToTrimLogbook()
+        }
+    }
+
     fun deleteEvent(event: LunaEvent) {
         // Update view
         savingEvent(true)
@@ -1126,32 +1144,6 @@ class MainActivity : AppCompatActivity() {
         saveLogbook()
     }
 
-    fun saveEvent(event: LunaEvent) {
-        if (allEvents.contains(event)) {
-            // event was modified
-            logbook?.sort()
-            recyclerView.adapter?.notifyDataSetChanged()
-            saveLogbook()
-        } else {
-            // add new event
-            savingEvent(true)
-            setLoading(true)
-            if (signature.isNotEmpty()) {
-                event.signature = signature
-            }
-            logbook?.logs?.add(0, event)
-            logbook?.sort()
-            recyclerView.adapter?.notifyDataSetChanged()
-            recyclerView.smoothScrollToPosition(0)
-            saveLogbook(event)
-
-            // Check logbook size to avoid OOM errors
-            if (logbook?.isTooBig() == true) {
-                askToTrimLogbook()
-            }
-        }
-    }
-
     /**
      * Saves the logbook. If saving while adding an event, please specify the event so in case
      * of error can be removed from the list.

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

@@ -61,7 +61,7 @@ class LunaEventRecyclerAdapter: RecyclerView.Adapter<LunaEventRecyclerAdapter.Lu
         val endTime = if (item.type == LunaEvent.Type.SLEEP) {
             item.quantity + item.time
         } else {
-            item.time
+             item.time
         }
         holder.time.text = DateUtils.formatTimeAgo(context, endTime)
         var quantityText = numericUtils.formatEventQuantity(item)

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

@@ -177,16 +177,15 @@
                     android:gravity="center_horizontal"
                     android:textSize="30sp"/>
 
-                <TextView
+                <ImageView
                     android:id="@+id/button_more"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
+                    android:layout_width="60dp"
+                    android:layout_height="match_parent"
                     android:layout_margin="5dp"
-                    android:layout_weight="1"
+                    android:layout_weight="0"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
-                    android:textSize="30sp"
-                    android:text="☰"
+                    android:src="@drawable/ic_more"
                     app:tint="@android:color/darker_gray"/>
 
             </LinearLayout>

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

@@ -21,7 +21,7 @@
             android:layout_height="match_parent"
             android:visibility="gone"
             android:gravity="center"
-            android:text="@string/statistics_no_data"/>
+            android:text="No Data"/>
 
     </FrameLayout>
 
@@ -32,18 +32,25 @@
         android:orientation="horizontal">
 
         <Spinner
-            android:id="@+id/graph_type_selection"
+            android:id="@+id/type_selection"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
-
+            android:gravity="center"
+            android:layout_weight="1" />
+<!--
         <Spinner
-            android:id="@+id/time_range_selection"
+            android:id="@+id/data_selection"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:gravity="center"/>
+            android:gravity="center"
+            android:layout_weight="1"/>
+-->
+        <Spinner
+            android:id="@+id/time_selection"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:layout_weight="1"/>
 
     </LinearLayout>
 

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

@@ -15,7 +15,6 @@
         android:text="💤"/>
 
     <LinearLayout
-        android:id="@+id/duration_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"

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

@@ -18,6 +18,13 @@
     <string name="event_colic_desc">Blähungskolik</string>
     <string name="event_unknown_desc"></string>
 
+    <string name="overflow_event_weight">⚖️ 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>
@@ -35,6 +42,7 @@
     <string name="no_connection_retry">Erneut versuchen</string>
 
     <string name="settings_title">Einstellungen</string>
+    <string name="settings_no_breastfeeding">Kein Stillen</string>
     <string name="settings_storage">Speicherort für Daten auswählen</string>
     <string name="settings_storage_local">Auf dem Gerät</string>
     <string name="settings_storage_local_desc">Datenschutzfreundlichste Lösung: Deine Daten verlassen dein Gerät nicht</string>

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

@@ -18,6 +18,13 @@
     <string name="event_colic_desc">Colique gazeuse</string>
     <string name="event_unknown_desc"></string>
 
+    <string name="overflow_event_weight">⚖️ 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>

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

@@ -3,6 +3,13 @@
     <string name="title">🌜 LunaTracker 🌛</string>
     <string name="logbook">Diario di bordo</string>
 
+    <string name="overflow_event_weight">⚖️ 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>

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

@@ -8,23 +8,33 @@
     </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>
-        <item>@string/statistics_medicine_events</item>
+        <item>BOTTLE_EVENTS</item>
+        <item>BOTTLE_SUM</item>
+        <item>BOTTLE_SUM_AVERAGE</item>
+        <item>SLEEP_SUM_AVERAGE</item>
+        <item>SLEEP_EVENTS</item>
+        <item>SLEEP_PATTERN</item>
     </string-array>
 
     <string-array name="StatisticsTypeValues">
-        <item>BOTTLE_SUM</item>
         <item>BOTTLE_EVENTS</item>
-        <item>SLEEP_SUM</item>
+        <item>BOTTLE_SUM</item>
+        <item>BOTTLE_SUM_AVERAGE</item>
+        <item>SLEEP_SUM_AVERAGE</item>
         <item>SLEEP_EVENTS</item>
         <item>SLEEP_PATTERN</item>
-        <item>MEDICINE_EVENTS</item>
+    </string-array>
+<!--
+    <string-array name="StatisticsDataLabels">
+        <item>Event</item>
+        <item>Amount</item>
     </string-array>
 
+    <string-array name="StatisticsDataValues">
+        <item>EVENT</item>
+        <item>AMOUNT</item>
+    </string-array>
+-->
     <string-array name="StatisticsTimeLabels">
         <item>Day</item>
         <item>Week</item>
@@ -36,4 +46,5 @@
         <item>WEEK</item>
         <item>MONTH</item>
     </string-array>
+
 </resources>

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

@@ -89,7 +89,6 @@
     <string name="no_connection_retry">Retry</string>
 
     <string name="statistics_title">Statistics</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>
@@ -131,7 +130,6 @@
     <string name="log_unknown_dialog_description"></string>
     <string name="log_weight_dialog_description">Insert the weight:</string>
     <string name="log_sleep_dialog_description">Set sleep duration:</string>
-    <string name="log_sleep_dialog_description_start">Start sleep cycle:</string>
 
     <string name="measurement_unit_liquid_base_metric" translatable="false">ml</string>
     <string name="measurement_unit_weight_base_metric" translatable="false">g</string>
@@ -142,13 +140,6 @@
     <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>