Adjust loan due date display in feeds (PP-2631).

Author: io7m

README-CHANGES.xml

@@ -694,7 +694,7 @@
         </c:change>
       </c:changes>
     </c:release>
-    <c:release date="2025-08-13T19:01:43+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.17.0">
+    <c:release date="2025-08-18T10:41:58+00:00" is-open="true" ticket-system="org.lyrasis.jira" version="1.17.0">
       <c:changes>
         <c:change date="2025-07-15T00:00:00+00:00" summary="Add support for Boundless DRM."/>
         <c:change date="2025-07-15T00:00:00+00:00" summary="Respect book cover aspect ratios.">
@@ -737,16 +737,21 @@
             <c:ticket id="PP-2779"/>
           </c:tickets>
         </c:change>
-        <c:change date="2025-08-13T14:21:08+00:00" summary="Implement a new and improved bottom drawer on book details pages.">
+        <c:change date="2025-08-13T00:00:00+00:00" summary="Implement a new and improved bottom drawer on book details pages.">
           <c:tickets>
             <c:ticket id="PP-2753"/>
           </c:tickets>
         </c:change>
-        <c:change date="2025-08-13T19:01:43+00:00" summary="Ensure Download button is shown for borrowed books.">
+        <c:change date="2025-08-13T00:00:00+00:00" summary="Ensure Download button is shown for borrowed books.">
           <c:tickets>
             <c:ticket id="PP-2809"/>
           </c:tickets>
         </c:change>
+        <c:change date="2025-08-18T10:41:58+00:00" summary="Adjust loan due date display in feeds.">
+          <c:tickets>
+            <c:ticket id="PP-2631"/>
+          </c:tickets>
+        </c:change>
       </c:changes>
     </c:release>
   </c:releases>

simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedPagingDataAdapter.kt

@@ -17,6 +17,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.common.util.concurrent.MoreExecutors
 import io.reactivex.disposables.Disposable
 import org.joda.time.DateTime
+import org.joda.time.Days
 import org.joda.time.format.DateTimeFormat
 import org.librarysimplified.ui.R
 import org.nypl.simplified.books.api.Book
@@ -116,6 +117,8 @@ class CatalogFeedPagingDataAdapter(
       this.idle.findViewById<TextView>(R.id.bookCellIdleTitle)
     private val idleTime =
       this.idle.findViewById<TextView>(R.id.bookCellIdleTime)
+    private val idleTimeDays =
+      this.idle.findViewById<TextView>(R.id.bookCellIdleTimeDays)
     private val idleAuthor =
       this.idle.findViewById<TextView>(R.id.bookCellIdleAuthor)
     private val idleButtons =
@@ -203,6 +206,7 @@ class CatalogFeedPagingDataAdapter(
           this.idleTitle.text = item.feedEntry.title
           this.idleAuthor.text = item.feedEntry.authorsCommaSeparated
           this.idleTime.text = ""
+          this.idleTimeDays.text = ""
 
           val f =
             this@CatalogFeedPagingDataAdapter.covers.loadThumbnailInto(
@@ -522,6 +526,7 @@ class CatalogFeedPagingDataAdapter(
             R.string.catalogBookAvailabilityHeldQueue,
             position
           )
+        this.idleTimeDays.text = ""
       }
     }
 
@@ -666,12 +671,22 @@ class CatalogFeedPagingDataAdapter(
       loanDuration: DateTime?
     ) {
       if (loanDuration != null) {
+        val now = DateTime.now()
+        val days = Days.daysBetween(now, loanDuration)
+
         this.idleTime.text =
           this.idleTime.resources.getString(
             R.string.catalogBookCellBorrowingUntil,
-            org.nypl.simplified.ui.catalog.CatalogFeedPagingDataAdapter.Companion.loanEndFormatter.print(loanDuration)
+            loanEndFormatter.print(loanDuration)
+          )
+        this.idleTimeDays.text =
+          this.idleTime.resources.getString(
+            R.string.catalogBookCellBorrowingDays,
+            days.days
           )
+
         this.setVisible(this.idleTime, true)
+        this.setVisible(this.idleTimeDays, true)
       } else {
         this.hideIdleTime()
       }
@@ -680,6 +695,8 @@ class CatalogFeedPagingDataAdapter(
     private fun hideIdleTime() {
       this.idleTime.text = ""
       this.idleTime.visibility = GONE
+      this.idleTimeDays.text = ""
+      this.idleTimeDays.visibility = GONE
     }
 
     private fun onBookStatusLoanedNotDownloaded(

simplified-ui/src/main/res/layout/book_cell_idle.xml

@@ -105,19 +105,40 @@
                 android:text="@string/catalogRetry" />
         </LinearLayout>
 
-        <TextView
-            android:id="@+id/bookCellIdleTime"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:alpha="0.75"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textSize="12sp"
+            android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/bookCellIdleCover"
-            tools:text="Borrowed until 31st February 1976" />
+            app:layout_constraintStart_toEndOf="@id/bookCellIdleCover">
+
+            <TextView
+                android:id="@+id/bookCellIdleTime"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:alpha="0.75"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="12sp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                tools:text="Borrowed until 31st February 1976" />
+
+            <TextView
+                android:id="@+id/bookCellIdleTimeDays"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textSize="12sp"
+                android:textStyle="bold"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                tools:text="3 Days" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

simplified-ui/src/main/res/values/stringsCatalog.xml

@@ -94,7 +94,8 @@
   <string name="catalogSearch">Search</string>
   <string name="catalogDurationFormat">%1$s hours, %2$s minutes</string>
 
-  <string name="catalogBookCellBorrowingUntil">Borrowed until %1$s</string>
+  <string name="catalogBookCellBorrowingUntil">Due %1$s</string>
+  <string name="catalogBookCellBorrowingDays">%1$d Days</string>
 
   <string name="catalogBookDetailBorrowingFor">Borrowing for</string>
   <string name="catalogBookDetailBorrowedUntil">Borrowed until</string>