Remove the much hated button durations and replace with text

io7m · io7m · commit b995a4bc683b · 2025-05-22T13:42:25.000+01:00
Affects: https://ebce-lyrasis.atlassian.net/browse/PP-2560
diff --git a/simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogButtons.kt b/simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogButtons.kt
@@ -42,16 +42,6 @@ class CatalogButtons(
     return text
   }
 
-  @UiThread
-  fun createCenteredTextForButtons(
-    centeredText: String
-  ): TextView {
-    return AppCompatTextView(this.context).apply {
-      gravity = Gravity.CENTER
-      text = centeredText
-    }
-  }
-
   @UiThread
   fun createButton(
     text: Int,
@@ -73,56 +63,6 @@ class CatalogButtons(
     return button
   }
 
-  @UiThread
-  fun createReadButtonWithLoanDuration(
-    loanDuration: String,
-    onClick: () -> Unit
-  ): View {
-    return createButtonWithDuration(loanDuration, R.string.catalogRead, onClick)
-  }
-
-  @UiThread
-  fun createDownloadButtonWithLoanDuration(
-    loanDuration: String,
-    onClick: () -> Unit
-  ): View {
-    return createButtonWithDuration(loanDuration, R.string.catalogDownload, onClick)
-  }
-
-  @UiThread
-  fun createListenButtonWithLoanDuration(
-    loanDuration: String,
-    onClick: () -> Unit
-  ): View {
-    return createButtonWithDuration(loanDuration, R.string.catalogListen, onClick)
-  }
-
-  @UiThread
-  fun createButtonWithDuration(
-    loanDuration: String,
-    @StringRes res: Int,
-    onClick: () -> Unit
-  ): View {
-    val button = MaterialButton(this.context)
-    button.text = this.context.getString(res)
-    button.contentDescription = this.context.getString(res)
-    button.layoutParams = this.buttonLayoutParameters(true)
-    button.maxLines = 1
-    button.ellipsize = TextUtils.TruncateAt.END
-    button.setOnClickListener {
-      button.isEnabled = false
-      onClick.invoke()
-      button.isEnabled = true
-    }
-    button.iconSize = this.screenSizeInformation.dpToPixels(24).toInt()
-    button.icon = CatalogTimedLoanDrawable(
-      context = this.context,
-      screenSizeInformation = this.screenSizeInformation,
-      durationText = loanDuration
-    )
-    return button
-  }
-
   @UiThread
   fun createReadButton(
     onClick: (Button) -> Unit,
@@ -307,12 +247,4 @@ class CatalogButtons(
     buttonLayoutParams.width = 0
     return buttonLayoutParams
   }
-
-  @UiThread
-  fun wrapContentParameters(): LinearLayout.LayoutParams {
-    return LinearLayout.LayoutParams(
-      LinearLayout.LayoutParams.WRAP_CONTENT,
-      LinearLayout.LayoutParams.WRAP_CONTENT
-    )
-  }
 }
diff --git a/simplified-ui/src/main/java/org/nypl/simplified/ui/catalog/CatalogFeedPagingDataAdapter.kt b/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.format.DateTimeFormat
 import org.librarysimplified.ui.R
 import org.nypl.simplified.books.api.Book
 import org.nypl.simplified.books.api.BookFormat
@@ -64,9 +65,12 @@ class CatalogFeedPagingDataAdapter(
   private val onBookViewerOpen: (Book, BookFormat) -> Unit,
   private val onBookDelete: (CatalogBookStatus<*>) -> Unit,
   private val onShowTaskError: (TaskResult.Failure<*>) -> Unit,
-) : PagingDataAdapter<FeedEntry, CatalogFeedPagingDataAdapter.ViewHolder>(diffCallback) {
+) : PagingDataAdapter<FeedEntry, CatalogFeedPagingDataAdapter.ViewHolder>(org.nypl.simplified.ui.catalog.CatalogFeedPagingDataAdapter.Companion.diffCallback) {
 
   companion object {
+    private val loanEndFormatter =
+      DateTimeFormat.forPattern("MMM d, yyyy")
+
     private val diffCallback =
       object : DiffUtil.ItemCallback<FeedEntry>() {
         override fun areContentsTheSame(
@@ -110,8 +114,8 @@ class CatalogFeedPagingDataAdapter(
       this.view.findViewById<ProgressBar>(R.id.bookCellIdleCoverProgress)
     private val idleTitle =
       this.idle.findViewById<TextView>(R.id.bookCellIdleTitle)
-    private val idleMeta =
-      this.idle.findViewById<TextView>(R.id.bookCellIdleMeta)
+    private val idleTime =
+      this.idle.findViewById<TextView>(R.id.bookCellIdleTime)
     private val idleAuthor =
       this.idle.findViewById<TextView>(R.id.bookCellIdleAuthor)
     private val idleButtons =
@@ -182,7 +186,7 @@ class CatalogFeedPagingDataAdapter(
               .filter { event -> event.bookId == item.bookID }
               .subscribe { event -> this.onStatusChangedForFeedEntry(item) }
 
-          for (v in listOf(view, this.idle, this.error, this.corrupt, this.progress)) {
+          for (v in listOf(this.view, this.idle, this.error, this.corrupt, this.progress)) {
             v.setOnClickListener { this@CatalogFeedPagingDataAdapter.onBookSelected(item) }
           }
 
@@ -192,6 +196,7 @@ class CatalogFeedPagingDataAdapter(
           this.errorTitle.text = item.feedEntry.title
           this.idleTitle.text = item.feedEntry.title
           this.idleAuthor.text = item.feedEntry.authorsCommaSeparated
+          this.idleTime.text = ""
 
           val f =
             this@CatalogFeedPagingDataAdapter.covers.loadThumbnailInto(
@@ -587,42 +592,30 @@ class CatalogFeedPagingDataAdapter(
       this.setVisible(this.progress, false)
 
       this.idleButtons.removeAllViews()
+      this.setIdleTime(this.getLoanDuration(book))
 
       when (val format = book.findPreferredFormat()) {
         is BookFormat.BookFormatPDF,
         is BookFormat.BookFormatEPUB -> {
-          val loanDuration = getLoanDuration(book)
           this.idleButtons.addView(
-            if (loanDuration.isNotEmpty()) {
-              this.buttonCreator.createReadButtonWithLoanDuration(loanDuration) {
+            this.buttonCreator.createReadButton(
+              onClick = {
                 this.onBookViewerOpen(book, format)
-              }
-            } else {
-              this.buttonCreator.createReadButton(
-                onClick = {
-                  this.onBookViewerOpen(book, format)
-                },
-                heightMatchParent = true
-              )
-            }
+              },
+              heightMatchParent = true
+            )
           )
         }
 
         is BookFormat.BookFormatAudioBook -> {
-          val loanDuration = getLoanDuration(book)
+          val loanDuration = this.getLoanDurationText(book)
           this.idleButtons.addView(
-            if (loanDuration.isNotEmpty()) {
-              this.buttonCreator.createListenButtonWithLoanDuration(loanDuration) {
+            this.buttonCreator.createListenButton(
+              onClick = {
                 this.onBookViewerOpen(book, format)
-              }
-            } else {
-              this.buttonCreator.createListenButton(
-                onClick = {
-                  this.onBookViewerOpen(book, format)
-                },
-                heightMatchParent = true
-              )
-            }
+              },
+              heightMatchParent = true
+            )
           )
         }
 
@@ -631,7 +624,7 @@ class CatalogFeedPagingDataAdapter(
         }
       }
 
-      if (isBookReturnable(book)) {
+      if (this.isBookReturnable(book)) {
         this.idleButtons.addView(this.buttonCreator.createButtonSpace())
         this.idleButtons.addView(
           this.buttonCreator.createRevokeLoanButton(
@@ -641,7 +634,7 @@ class CatalogFeedPagingDataAdapter(
             heightMatchParent = true
           )
         )
-      } else if (isBookDeletable(book)) {
+      } else if (this.isBookDeletable(book)) {
         this.idleButtons.addView(this.buttonCreator.createButtonSpace())
         this.idleButtons.addView(
           this.buttonCreator.createRevokeLoanButton(
@@ -654,6 +647,20 @@ class CatalogFeedPagingDataAdapter(
       }
     }
 
+    private fun setIdleTime(
+      loanDuration: DateTime?
+    ) {
+      if (loanDuration != null) {
+        this.idleTime.text =
+          this.idleTime.resources.getString(
+            R.string.catalogBookCellBorrowingUntil,
+            loanEndFormatter.print(loanDuration)
+          )
+      } else {
+        this.idleTime.text = ""
+      }
+    }
+
     private fun onBookStatusLoanedNotDownloaded(
       book: Book,
       status: Loaned.LoanedNotDownloaded
@@ -664,17 +671,10 @@ class CatalogFeedPagingDataAdapter(
       this.setVisible(this.progress, false)
 
       this.idleButtons.removeAllViews()
-
-      val loanDuration = getLoanDuration(book)
+      this.setIdleTime(this.getLoanDuration(book))
 
       this.idleButtons.addView(
         when {
-          loanDuration.isNotEmpty() -> {
-            this.buttonCreator.createDownloadButtonWithLoanDuration(loanDuration) {
-              this.onBookBorrow(book)
-            }
-          }
-
           status.isOpenAccess -> {
             this.buttonCreator.createGetButton(
               onClick = {
@@ -695,7 +695,7 @@ class CatalogFeedPagingDataAdapter(
         }
       )
 
-      if (isBookReturnable(book)) {
+      if (this.isBookReturnable(book)) {
         this.idleButtons.addView(this.buttonCreator.createButtonSpace())
         this.idleButtons.addView(
           this.buttonCreator.createRevokeLoanButton(
@@ -705,7 +705,7 @@ class CatalogFeedPagingDataAdapter(
             heightMatchParent = true
           )
         )
-      } else if (isBookDeletable(book)) {
+      } else if (this.isBookDeletable(book)) {
         this.idleButtons.addView(this.buttonCreator.createButtonSpace())
         this.idleButtons.addView(
           this.buttonCreator.createRevokeLoanButton(
@@ -788,27 +788,34 @@ class CatalogFeedPagingDataAdapter(
      * existing code.
      */
 
-    private fun getLoanDuration(book: Book): String {
+    private fun getLoanDurationText(
+      book: Book
+    ): String {
+      val endDate = this.getLoanDuration(book)
+      return if (endDate != null) {
+        CatalogBookAvailabilityStrings.intervalStringLoanDuration(
+          this.view.context.resources,
+          DateTime.now(),
+          endDate
+        )
+      } else {
+        ""
+      }
+    }
+
+    private fun getLoanDuration(
+      book: Book
+    ): DateTime? {
       val status = BookStatus.fromBook(book)
       return if (status is Loaned.LoanedDownloaded ||
         status is Loaned.LoanedNotDownloaded
       ) {
         val endDate = (status as? Loaned.LoanedDownloaded)?.loanExpiryDate
           ?: (status as? Loaned.LoanedNotDownloaded)?.loanExpiryDate
 
-        if (
-          endDate != null
-        ) {
-          CatalogBookAvailabilityStrings.intervalStringLoanDuration(
-            this.view.context.resources,
-            DateTime.now(),
-            endDate
-          )
-        } else {
-          ""
-        }
+        endDate
       } else {
-        ""
+        null
       }
     }
 
diff --git a/simplified-ui/src/main/res/layout/book_cell_idle.xml b/simplified-ui/src/main/res/layout/book_cell_idle.xml
@@ -14,7 +14,6 @@
         android:layout_height="@dimen/catalogFeedCellHeight"
         android:layout_marginStart="16dp"
         android:contentDescription="@null"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -58,21 +57,6 @@
         app:layout_constraintTop_toBottomOf="@id/bookCellIdleTitle"
         tools:text="Mary Shelley" />
 
-    <TextView
-        android:id="@+id/bookCellIdleMeta"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textSize="12sp"
-        android:textStyle="italic"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/bookCellIdleCover"
-        app:layout_constraintTop_toBottomOf="@id/bookCellIdleAuthor"
-        tools:text="eBook - The New York Public Library" />
-
     <LinearLayout
         android:id="@+id/bookCellIdleButtons"
         android:layout_width="0dp"
@@ -82,7 +66,7 @@
         android:layout_marginBottom="8dp"
         android:gravity="center_vertical"
         android:orientation="horizontal"
-        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/bookCellIdleTime"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/bookCellIdleCover">
 
@@ -124,4 +108,21 @@
             tools:text="@string/catalogRetry"
             tools:visibility="visible" />
     </LinearLayout>
+
+    <TextView
+        android:id="@+id/bookCellIdleTime"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="8dp"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textSize="12sp"
+        android:alpha="0.75"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@id/bookCellIdleCover"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:text="Borrowed until 31st February 1976" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/simplified-ui/src/main/res/values/dimensions.xml b/simplified-ui/src/main/res/values/dimensions.xml
@@ -18,8 +18,8 @@
   <dimen name="catalogFacetTabCornerRadius">8dp</dimen>
   <dimen name="catalogFacetTabStandardHeight">36dp</dimen>
   <dimen name="catalogFacetTabStroke">4dp</dimen>
-  <dimen name="catalogFeedCellButtonsHeight">45dp</dimen>
-  <dimen name="catalogFeedCellHeight">128dp</dimen>
+  <dimen name="catalogFeedCellButtonsHeight">40dp</dimen>
+  <dimen name="catalogFeedCellHeight">160dp</dimen>
   <dimen name="catalogFeedCellImageWidth">80dp</dimen>
   <dimen name="catalogFeedCoversSpace">8dp</dimen>
   <dimen name="catalogLaneCoverMaximumWidth">96dp</dimen>
diff --git a/simplified-ui/src/main/res/values/stringsCatalog.xml b/simplified-ui/src/main/res/values/stringsCatalog.xml
@@ -91,6 +91,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="catalogBookDetailBorrowingFor">Borrowing for</string>
   <string name="catalogBookDetailBorrowedUntil">Borrowed until</string>
 
