From d15b1a7281fa08b3829947a2216ede44cdf0acf0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 12 Aug 2026 20:58:18 +0000
Subject: [PATCH 1/2] fix(deps): update dependency androidx.compose:compose-bom
 to v2026.08.00

Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 ui/build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/build.gradle b/ui/build.gradle
index 3d1b4d99..10efcb19 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -47,7 +47,7 @@ android {
 dependencies {
     kapt "org.jetbrains.kotlin:kotlin-metadata-jvm:${kotlinVersion}"
 
-    implementation(platform("androidx.compose:compose-bom:2026.06.01"))
+    implementation(platform("androidx.compose:compose-bom:2026.08.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.material3:material3")

From cfdc01cf3aa12707920cd30dfb200239897ab350 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Thu, 13 Aug 2026 13:20:01 +0200
Subject: [PATCH 2/2] Fix Lint

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../nextcloud/android/common/core/utils/DateFormatter.kt | 9 +++++----
 core/src/main/res/values/strings.xml                     | 5 ++++-
 .../android/common/core/utils/DateFormatterTest.kt       | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt b/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt
index 4d947aca..c5da7255 100644
--- a/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt
+++ b/core/src/main/java/com/nextcloud/android/common/core/utils/DateFormatter.kt
@@ -62,10 +62,11 @@ class DateFormatter(
 
             // less than 1h
             span < ONE_HOUR_IN_MILLIS -> {
-                context.getString(
-                    R.string.date_formatting_relative_minutes,
-                    span / ONE_MINUTE_IN_MILLIS
-                )
+                context.resources
+                    .getQuantityString(
+                        R.plurals.date_formatting_relative_minutes,
+                        span.toInt() / ONE_MINUTE_IN_MILLIS
+                    )
             }
 
             // less than 1d
diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml
index 9080923c..b38b3f67 100644
--- a/core/src/main/res/values/strings.xml
+++ b/core/src/main/res/values/strings.xml
@@ -9,7 +9,10 @@
     <!-- relative time less than 1 minute using the term: Now -->
     <string name="date_formatting_now">Now</string>
     <!-- relative time in minutes, less than 1 hour, i.e. 1m, 5m, 59m -->
-    <string name="date_formatting_relative_minutes">%dm</string>
+    <plurals name="date_formatting_relative_minutes">
+        <item quantity="one">%dm</item>
+        <item quantity="other">%dm</item>
+    </plurals>
     <!-- relative time in hours, less than 1 day, i.e. 1h, 5h, 23h -->
     <plurals name="date_formatting_relative_hours">
         <item quantity="one">%dh</item>
diff --git a/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt b/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt
index 5f1ee776..7731dfb6 100644
--- a/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt
+++ b/core/src/test/java/com/nextcloud/android/common/core/utils/DateFormatterTest.kt
@@ -53,7 +53,7 @@ class DateFormatterTest {
         val calendar = Calendar.getInstance()
         calendar.add(Calendar.MINUTE, -5)
         val formattedDate = dateFormatter.getConditionallyRelativeFormattedTimeSpan(calendar)
-        val expected = context.getString(R.string.date_formatting_relative_minutes, 5)
+        val expected = context.resources.getQuantityString(R.plurals.date_formatting_relative_minutes, 5)
         assertEquals(expected, formattedDate)
     }