Merge branch 'main' of github.com:ThePalaceProject/android-core into …

…feature/update-libraries # Conflicts: # simplified-app-palace/build.gradle.kts
ThePalaceProject · Nov 8, 2023 · 06d5a93 · 06d5a93
2 parents 556cc6f + a1abaf4
commit 06d5a93
Show file tree

Hide file tree

Showing 7 changed files with 215 additions and 228 deletions.
diff --git a/README-CHANGES.xml b/README-CHANGES.xml
diff --git a/org.thepalaceproject.android.platform b/org.thepalaceproject.android.platform
diff --git a/simplified-app-palace/build.gradle.kts b/simplified-app-palace/build.gradle.kts
@@ -475,6 +475,7 @@ dependencies {
     implementation(libs.androidx.viewpager)
     implementation(libs.androidx.viewpager2)
     implementation(libs.androidx.webkit)
+    implementation(libs.azam.ulidj)
     implementation(libs.commons.compress)
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.annotations)
@@ -617,6 +618,4 @@ dependencies {
     implementation(libs.truevfs.driver.zip)
     implementation(libs.truevfs.kernel.impl)
     implementation(libs.truevfs.kernel.spec)
-    implementation(libs.ulid.kotlin)
-    implementation(libs.ulid.kotlin.jvm)
 }
diff --git a/simplified-books-time-tracking/build.gradle.kts b/simplified-books-time-tracking/build.gradle.kts
@@ -18,6 +18,5 @@ dependencies {
     implementation(libs.rxandroid2)
     implementation(libs.rxjava2)
     implementation(libs.slf4j)
-    implementation(libs.ulid.kotlin)
-    implementation(libs.ulid.kotlin.jvm)
+    implementation(libs.azam.ulidj)
 }
diff --git a/...ime-tracking/src/main/java/org/nypl/simplified/books/time/tracking/TimeTrackingService.kt b/...ime-tracking/src/main/java/org/nypl/simplified/books/time/tracking/TimeTrackingService.kt
@@ -1,6 +1,7 @@
 package org.nypl.simplified.books.time.tracking
 
 import android.content.Context
+import io.azam.ulidj.ULID
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.disposables.Disposable
@@ -11,7 +12,6 @@ import org.librarysimplified.audiobook.api.PlayerEvent
 import org.nypl.simplified.accounts.api.AccountID
 import org.nypl.simplified.profiles.controller.api.ProfilesControllerType
 import org.slf4j.LoggerFactory
-import ulid.ULID
 import java.io.File
 import java.net.URI
 import java.util.concurrent.TimeUnit
@@ -183,7 +183,7 @@ class TimeTrackingService(
 
   private fun createTimeTrackingEntry() {
     currentTimeTrackingEntry = TimeTrackingEntry(
-      id = ULID.randomULID(),
+      id = ULID.random(),
       duringMinute = dateFormatter.print(DateTime.now()),
       secondsPlayed = 0
     )

diff --git a/simplified-tests/build.gradle.kts b/simplified-tests/build.gradle.kts
@@ -295,8 +295,7 @@ val dependencyObjects = listOf(
     libs.truevfs.driver.zip,
     libs.truevfs.kernel.impl,
     libs.truevfs.kernel.spec,
-    libs.ulid.kotlin,
-    libs.ulid.kotlin.jvm,
+    libs.azam.ulidj,
 )
 
 dependencies {

diff --git a/...ed-ui-catalog/src/main/java/org/librarysimplified/ui/catalog/CatalogBookDetailFragment.kt b/...ed-ui-catalog/src/main/java/org/librarysimplified/ui/catalog/CatalogBookDetailFragment.kt
@@ -453,7 +453,7 @@ class CatalogBookDetailFragment : Fragment(R.layout.book_detail) {
         this.onBookStatusHeld(status, bookPreviewStatus)
       }
       is BookStatus.Loaned -> {
-        this.onBookStatusLoaned(status, book.book, bookPreviewStatus)
+        this.onBookStatusLoaned(status, book.book)
       }
       is BookStatus.Holdable -> {
         this.onBookStatusHoldable(status, bookPreviewStatus)
@@ -825,13 +825,10 @@ class CatalogBookDetailFragment : Fragment(R.layout.book_detail) {
 
   private fun onBookStatusLoaned(
     bookStatus: BookStatus.Loaned,
-    book: Book,
-    bookPreviewStatus: BookPreviewStatus
+    book: Book
   ) {
     this.buttons.removeAllViews()
 
-    var createPreviewButton = bookPreviewStatus != BookPreviewStatus.None
-
     when (bookStatus) {
       is BookStatus.Loaned.LoanedNotDownloaded -> {
         this.buttons.addView(
@@ -849,23 +846,8 @@ class CatalogBookDetailFragment : Fragment(R.layout.book_detail) {
             )
           }
         )
-
-        if (createPreviewButton) {
-          this.buttons.addView(this.buttonCreator.createButtonSpace())
-          this.buttons.addView(
-            this.buttonCreator.createReadPreviewButton(
-              bookFormat = parameters.feedEntry.probableFormat,
-              onClick = {
-                viewModel.openBookPreview(parameters.feedEntry)
-              }
-            )
-          )
-        }
       }
       is BookStatus.Loaned.LoanedDownloaded -> {
-        // the book preview button can be ignored
-        createPreviewButton = false
-
         when (val format = book.findPreferredFormat()) {
           is BookFormat.BookFormatPDF,
           is BookFormat.BookFormatEPUB -> {
@@ -912,8 +894,7 @@ class CatalogBookDetailFragment : Fragment(R.layout.book_detail) {
           }
         )
       )
-    } else if (!createPreviewButton) {
-      // add spaces on both sides if there aren't any other buttons
+    } else {
       this.buttons.addView(this.buttonCreator.createButtonSizedSpace(), 0)
       this.buttons.addView(this.buttonCreator.createButtonSizedSpace())
     }