DateUtils: simplify code

The links will point to the previous/next
event of the same type

.idea/.name

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

.idea/AndroidProjectSystem.xml

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

.idea/compiler.xml

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

README.md

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

app/build.gradle.kts

@@ -12,8 +12,8 @@ android {
         applicationId = "it.danieleverducci.lunatracker"
         minSdk = 21
         targetSdk = 34
-        versionCode = 5
+        versionCode = 4
-        versionName = "0.7"
+        versionName = "0.6"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

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

@@ -47,7 +47,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="38dp"
-            android:layout_margin="5dp"
+            android:layout_margin="10dp"
             android:orientation="horizontal"
             android:gravity="center_vertical">
 
@@ -95,7 +95,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="50sp"
@@ -106,7 +106,7 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
                     android:textSize="50sp"
@@ -123,7 +123,7 @@
                     android:id="@+id/button_nipple_left"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -134,7 +134,7 @@
                     android:id="@+id/button_nipple_both"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -145,7 +145,7 @@
                     android:id="@+id/button_nipple_right"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -162,7 +162,7 @@
                     android:id="@+id/button_change_poo"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:layout_weight="2"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -173,7 +173,7 @@
                     android:id="@+id/button_change_pee"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:layout_weight="2"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -184,7 +184,7 @@
                     android:id="@+id/button_more"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
-                    android:layout_margin="5dp"
+                    android:layout_margin="10dp"
                     android:layout_weight="1"
                     android:background="@drawable/button_background"
                     android:gravity="center_horizontal"
@@ -198,7 +198,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="5dp"
             android:orientation="horizontal">
 
             <TextView

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

@@ -45,7 +45,7 @@
             <RadioButton android:id="@+id/settings_data_webdav"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="30dp"
                 android:text="@string/settings_storage_dav"/>
 
             <TextView
@@ -123,7 +123,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:layout_marginTop="5dp"
             android:layout_marginEnd="30dp">
 
             <TextView

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

@@ -11,7 +11,7 @@
         android:id="@+id/type"
         android:layout_width="90dp"
         android:layout_height="wrap_content"
-        android:paddingStart="10dp"
+        android:paddingLeft="10dp"
         android:textSize="28sp"
         android:lines="1"
         android:maxLines="1"

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

@@ -61,8 +61,8 @@
     <string name="minutes_ago">mins</string>
     <string name="hour_ago">hour</string>
     <string name="hours_ago">hours</string>
-    <string name="day_ago">day</string>
+    <string name="day_ago">year</string>
-    <string name="days_ago">days</string>
+    <string name="days_ago">years</string>
     <string name="year_ago">year</string>
     <string name="years_ago">years</string>
 

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

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

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

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

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

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

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-agp = "8.13.0"
+agp = "8.7.2"
 kotlin = "2.0.0"
 coreKtx = "1.10.1"
 junit = "4.13.2"

gradle/wrapper/gradle-wrapper.properties

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