Update .gitignore and compiler.xml

Reviewed-on: #19

.gitignore

@@ -1,6 +1,8 @@
 *.iml
 .gradle
 /local.properties
+/.idea/deviceManager.xml
+/.idea/codeStyles
 /.idea/caches
 /.idea/libraries
 /.idea/modules.xml

.idea/compiler.xml

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

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

@@ -57,6 +57,7 @@ class MainActivity : AppCompatActivity() {
         var currentPopupItems = listOf<LunaEvent.Type>()
     }
 
+    lateinit var settingsRepository : LocalSettingsRepository
     var logbook: Logbook? = null
     var pauseLogbookUpdate = false
     lateinit var progressIndicator: LinearProgressIndicator
@@ -77,6 +78,7 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         handler = Handler(mainLooper)
+        settingsRepository = LocalSettingsRepository(this@MainActivity)
 
         // Show view
         setContentView(R.layout.activity_main)
@@ -139,7 +141,6 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun populateHeaderMenu() {
-        val settingsRepository = LocalSettingsRepository(this)
         val dynamicMenu = settingsRepository.loadDynamicMenu()
         val eventTypeStats = mutableMapOf<LunaEvent.Type, Int>()
 
@@ -212,7 +213,6 @@ class MainActivity : AppCompatActivity() {
     override fun onStart() {
         super.onStart()
 
-        val settingsRepository = LocalSettingsRepository(this)
         if (settingsRepository.loadDataRepository() == LocalSettingsRepository.DATA_REPO.WEBDAV) {
             val webDavCredentials = settingsRepository.loadWebdavCredentials()
             if (webDavCredentials == null) {
@@ -764,7 +764,7 @@ class MainActivity : AppCompatActivity() {
         val d = AlertDialog.Builder(this)
         d.setTitle(R.string.trim_logbook_dialog_title)
         d.setMessage(
-            when (LocalSettingsRepository(this).loadDataRepository()) {
+            when (settingsRepository.loadDataRepository()) {
                 LocalSettingsRepository.DATA_REPO.WEBDAV -> R.string.trim_logbook_dialog_message_dav
                 else -> R.string.trim_logbook_dialog_message_local
             }
@@ -1000,7 +1000,9 @@ class MainActivity : AppCompatActivity() {
                     val spinner = findViewById<Spinner>(R.id.logbooks_spinner)
                     val sAdapter = ArrayAdapter<String>(this@MainActivity, android.R.layout.simple_spinner_item)
                     sAdapter.setDropDownViewResource(R.layout.row_logbook_spinner)
-                    for (ln in logbooksNames) {
+
+                    val selectedLogbook = settingsRepository.loadSelectedLogbook()
+                    logbooksNames.forEach { ln ->
                         sAdapter.add(
                             ln.ifEmpty { getString(R.string.default_logbook_name) }
                         )
@@ -1013,14 +1015,20 @@ class MainActivity : AppCompatActivity() {
                             position: Int,
                             id: Long
                         ) {
+                            val logbookName = logbooksNames[position]
                             // Changed logbook: empty list
                             setListAdapter(arrayListOf())
                             // Load logbook
-                            loadLogbook(logbooksNames.get(position))
+                            loadLogbook(logbookName)
+                            // Save logbook selection
+                            settingsRepository.saveSelectedLogbook(logbookName)
                         }
 
                         override fun onNothingSelected(parent: AdapterView<*>?) {}
                     }
+
+                    val selected = logbooksNames.indexOf(selectedLogbook)
+                    if (selected > 0) spinner.setSelection(selected)
                 })
             }
 

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

@@ -15,6 +15,7 @@ class LocalSettingsRepository(val context: Context) {
         const val SHARED_PREFS_DAV_PASS = "webdav_password"
         const val SHARED_PREFS_DYNAMIC_MENU = "dynamic_menu"
         const val SHARED_PREFS_SIGNATURE = "signature"
+        const val SHARED_PREFS_SELECTED_LOGBOOK = "selected_logbook"
     }
     enum class DATA_REPO {LOCAL_FILE, WEBDAV}
     val sharedPreferences: SharedPreferences
@@ -76,4 +77,14 @@ class LocalSettingsRepository(val context: Context) {
             return null
         return arrayOf(url, user, pass)
     }
+
+    fun saveSelectedLogbook(selectedLogbookName: String) {
+        sharedPreferences.edit (commit = true) {
+            putString(SHARED_PREFS_SELECTED_LOGBOOK, selectedLogbookName)
+        }
+    }
+
+    fun loadSelectedLogbook() : String? {
+        return sharedPreferences.getString(SHARED_PREFS_SELECTED_LOGBOOK, null)
+    }
 }

app/src/main/res/drawable/ic_edit.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="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-    
-</vector>

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

@@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>

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

@@ -16,6 +16,8 @@
     <string name="event_note_desc">Notiz</string>
     <string name="event_temperature_desc">Temperatur</string>
     <string name="event_colic_desc">Blähungskolik</string>
+    <string name="event_puke_desc">Erbrechen</string>
+    <string name="event_bath_desc">Bad</string>
     <string name="event_unknown_desc"></string>
 
     <string name="toast_event_added">Ereignis gespeichert</string>
@@ -35,6 +37,8 @@
     <string name="no_connection_retry">Erneut versuchen</string>
 
     <string name="settings_title">Einstellungen</string>
+    <string name="settings_signature">Signatur</string>
+    <string name="settings_signature_desc">Fügen Sie jedem von Ihnen erstellten Ereignis eine Signatur hinzu, die für andere sichtbar ist. Dies ist nützlich, wenn mehrere Personen Ereignisse hinzufügen.</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>
@@ -48,7 +52,6 @@
     <string name="settings_webdav_error_denied">Falscher WebDAV-Benutzer oder falsches Passwort</string>
     <string name="settings_webdav_error_server_offline">WebDAV-Server ist derzeit nicht verfügbar</string>
     <string name="settings_webdav_error_generic">Fehler beim Zugriff auf WebDAV:</string>
-    <string name="settings_webdav_creation_error_generic">Eine Datei konnte auf dem WebDAV-Server nicht gespeichert werden:</string>
     <string name="settings_webdav_creation_ok">Erfolgreich mit dem WebDAV-Server verbunden</string>
     <string name="settings_json_error">Es befindet sich eine Speicherdatei auf dem Server, aber sie ist beschädigt oder unlesbar. Bitte lösche die Datei.</string>
     <string name="settings_generic_error">Fehler: </string>
@@ -62,7 +65,6 @@
 
     <string name="log_bottle_dialog_description">Trinkmenge eingeben</string>
     <string name="log_medicine_dialog_description">Medikamentenname, Menge, Art, Notizen, …:</string>
-    <string name="log_notes_dialog_description">Notizen:</string>
     <string name="log_notes_dialog_note_hint">Notiz eingeben</string>
     <string name="log_notes_dialog_qty_hint">Menge (optional)</string>
     <string name="log_temperature_dialog_description">Temperatur eingeben</string>
@@ -71,6 +73,9 @@
     <string name="dialog_event_detail_title">Ereignisdetails</string>
     <string name="dialog_event_detail_close_button">OK</string>
     <string name="dialog_event_detail_delete_button">Löschen</string>
+    <string name="dialog_event_detail_quantity">Menge</string>
+    <string name="dialog_event_detail_notes">Notiz</string>
+    <string name="dialog_event_detail_signature">von %s</string>
 
     <string name="dialog_add_logbook_title">Logbuch hinzufügen</string>
     <string name="dialog_add_logbook_logbookname">👶 Logbuchname</string>

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

@@ -48,7 +48,6 @@
     <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_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>
     <string name="settings_generic_error">Erreur: </string>
@@ -62,7 +61,6 @@
 
     <string name="log_bottle_dialog_description">Renseignez la quantité contenue dans le biberon</string>
     <string name="log_medicine_dialog_description">nom du médicament, quantité, type, notes …:</string>
-    <string name="log_notes_dialog_description">Notes:</string>
     <string name="log_notes_dialog_note_hint">Notes ...</string>
     <string name="log_notes_dialog_qty_hint">Quantité (ou vide)</string>
     <string name="log_temperature_dialog_description">Renseignez la Température</string>

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

@@ -48,7 +48,6 @@
     <string name="settings_webdav_error_denied">Nome utente o password WebDAV sbagliati</string>
     <string name="settings_webdav_error_server_offline">Il server WebDAV non è al momento disponibile</string>
     <string name="settings_webdav_error_generic">Si è verificato un errore tentando di accedere al server WebDAV:</string>
-    <string name="settings_webdav_creation_error_generic">Impossibile creare un file di salvataggio sul server WebDAV:</string>
     <string name="settings_webdav_creation_ok">Connessione al server WebDAV avvenuta con successo</string>
     <string name="settings_json_error">Sul server esiste un salvataggio, ma è corrotto o illeggibile. Cancellare il file </string>
     <string name="settings_generic_error">Si è verificato un errore: </string>
@@ -62,7 +61,6 @@
 
     <string name="log_bottle_dialog_description">Inserisci la quantità contenuta nel biberon</string>
     <string name="log_medicine_dialog_description">Nome della medicina, quantità, formato, note…:</string>
-    <string name="log_notes_dialog_description">Note:</string>
     <string name="log_notes_dialog_note_hint">Inserisci le note</string>
     <string name="log_notes_dialog_qty_hint">Quantità, o vuoto</string>
     <string name="log_temperature_dialog_description">Inserisci la temperatura</string>

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="accent">#FFE68F</color>
-    <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
     <color name="translucent">#c000</color>
     <color name="transparent">#0000</color>

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

@@ -109,7 +109,6 @@
     <string name="settings_webdav_error_denied">Wrong WebDAV user or password</string>
     <string name="settings_webdav_error_server_offline">WebDAV server is currently unavailable</string>
     <string name="settings_webdav_error_generic">Error while trying to access WebDAV:</string>
-    <string name="settings_webdav_creation_error_generic">Unable to save a file on the WebDAV server:</string>
     <string name="settings_webdav_creation_ok">Successfully connected with the WebDAV server</string>
     <string name="settings_json_error">There\'s a save file on the server, but it is corrupted or unreadable. Please delete it </string>
     <string name="settings_generic_error">Error: </string>
@@ -124,7 +123,6 @@
     <string name="log_amount_dialog_description">Select the amount:</string>
     <string name="log_bottle_dialog_description">Insert the quantity contained in the baby bottle:</string>
     <string name="log_medicine_dialog_description">Medicine name, quantity, type, notes…:</string>
-    <string name="log_notes_dialog_description">Notes:</string>
     <string name="log_notes_dialog_note_hint">Write some notes</string>
     <string name="log_notes_dialog_qty_hint">Quantity (or empty)</string>
     <string name="log_temperature_dialog_description">Select the temperature:</string>
@@ -144,13 +142,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>
@@ -164,9 +155,7 @@
     <string name="dialog_event_detail_signature">by %s</string>
 
     <string name="dialog_duration_button_clear">Clear</string>
-    <string name="dialog_duration_button_minus_5">-5 min</string>
     <string name="dialog_duration_button_now">Now</string>
-    <string name="dialog_duration_button_plus_5">+5 min</string>
 
     <string name="dialog_add_logbook_title">Add logbook</string>
     <string name="dialog_add_logbook_logbookname">👶 Logbook name</string>

gradle.properties

@@ -21,3 +21,13 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+android.defaults.buildfeatures.resvalues=true
+android.sdk.defaultTargetSdkToCompileSdkIfUnset=false
+android.enableAppCompileTimeRClass=false
+android.usesSdkInManifest.disallowed=false
+android.uniquePackageNames=false
+android.dependency.useConstraints=true
+android.r8.strictFullModeForKeepRules=false
+android.r8.optimizedResourceShrinking=false
+android.builtInKotlin=false
+android.newDsl=false

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
-agp = "8.13.0"
+agp = "9.4.1"
-kotlin = "2.0.0"
+kotlin = "2.2.10"
 coreKtx = "1.10.1"
 junit = "4.13.2"
 junitVersion = "1.1.5"

gradle/wrapper/gradle-wrapper.properties

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