Use Parcelable for Publication, and use readingOrder instead of image…

…s for CBZ
readium · Feb 4, 2020 · 7ae44d9 · 7ae44d9
1 parent b6dca6d
commit 7ae44d9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/comic/ComicActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/comic/ComicActivity.kt
@@ -44,7 +44,7 @@ class ComicActivity : R2CbzActivity(), CoroutineScope, NavigatorDelegate {
             return booksDB.books.currentLocator(bookId)?.let {
                 it
             } ?: run {
-                val resource = publication.images[resourcePager.currentItem]
+                val resource = publication.readingOrder[resourcePager.currentItem]
                 val resourceHref = resource.href
                 val resourceType = resource.type ?: ""
                 Locator(resourceHref, resourceType, publication.metadata.title, Locations(progression = 0.0))
@@ -74,7 +74,7 @@ class ComicActivity : R2CbzActivity(), CoroutineScope, NavigatorDelegate {
         navigatorDelegate = this
         bookId = intent.getLongExtra("bookId", -1)
 
-        currentPagerPosition = publication.images.indexOfFirst { it.href == currentLocation?.href }
+        currentPagerPosition = publication.readingOrder.indexOfFirst { it.href == currentLocation?.href }
         resourcePager.currentItem = currentPagerPosition
 
         toggleActionBar()

diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDetailActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/opds/OPDSDetailActivity.kt
@@ -53,7 +53,7 @@ class OPDSDetailActivity : AppCompatActivity(), CoroutineScope {
         val database = BooksDatabase(this)
 
         val opdsDownloader = OPDSDownloader(this)
-        val publication: Publication = intent.getSerializableExtra("publication") as Publication
+        val publication: Publication = intent.getParcelableExtra("publication") as Publication
         nestedScrollView {
             fitsSystemWindows = true
             lparams(width = matchParent, height = matchParent)

diff --git a/r2-testapp/src/main/java/org/readium/r2/testapp/outline/R2OutlineActivity.kt b/r2-testapp/src/main/java/org/readium/r2/testapp/outline/R2OutlineActivity.kt
@@ -55,7 +55,7 @@ class R2OutlineActivity : AppCompatActivity() {
         val tabHost = findViewById<TabHost>(R.id.tabhost)
         tabHost.setup()
 
-        val publication = intent.getSerializableExtra("publication") as Publication
+        val publication = intent.getParcelableExtra("publication") as Publication
 
         title = publication.metadata.title