Navigator: Fix EPUB layout fallback (#57)

Fallback on `reflowable` if the `presentation.layout` hint is missing from a manifest.

Author: mickael-menu

CHANGELOG.md

@@ -30,6 +30,7 @@ All notable changes to this project will be documented in this file. Take a look
 #### Navigator
 
 * Fixed turning pages of an EPUB reflowable resource with an odd number of columns. A virtual blank trailing column is appended to the resource when displayed as two columns.
+* EPUB: Fallback on `reflowable` if the `presentation.layout` hint is missing from a manifest.
 
 
 ## [2.1.1]

readium/navigator/src/main/java/org/readium/r2/navigator/epub/EpubNavigatorFragment.kt

@@ -139,64 +139,72 @@ class EpubNavigatorFragment private constructor(
         resourcePager = binding.resourcePager
         resourcePager.type = Publication.TYPE.EPUB
 
-        if (publication.metadata.presentation.layout == EpubLayout.REFLOWABLE) {
-            resourcesSingle = publication.readingOrder.mapIndexed { index, link ->
-                PageResource.EpubReflowable(
-                    link = link,
-                    url = link.withBaseUrl(baseUrl).href,
-                    positionCount = positionsByReadingOrder.getOrNull(index)?.size ?: 0
-                )
-            }
+        when (publication.metadata.presentation.layout) {
+            EpubLayout.REFLOWABLE, null -> {
+                resourcesSingle = publication.readingOrder.mapIndexed { index, link ->
+                    PageResource.EpubReflowable(
+                        link = link,
+                        url = link.withBaseUrl(baseUrl).href,
+                        positionCount = positionsByReadingOrder.getOrNull(index)?.size ?: 0
+                    )
+                }
 
-            adapter = R2PagerAdapter(childFragmentManager, resourcesSingle)
-            resourcePager.type = Publication.TYPE.EPUB
+                adapter = R2PagerAdapter(childFragmentManager, resourcesSingle)
+                resourcePager.type = Publication.TYPE.EPUB
+            }
 
-        } else {
-            val resourcesSingle = mutableListOf<PageResource>()
-            val resourcesDouble = mutableListOf<PageResource>()
+            EpubLayout.FIXED -> {
+                val resourcesSingle = mutableListOf<PageResource>()
+                val resourcesDouble = mutableListOf<PageResource>()
 
-            // TODO needs work, currently showing two resources for fxl, needs to understand which two resources, left & right, or only right etc.
-            var doublePageLeft = ""
-            var doublePageRight = ""
+                // TODO needs work, currently showing two resources for fxl, needs to understand which two resources, left & right, or only right etc.
+                var doublePageLeft = ""
+                var doublePageRight = ""
 
-            for ((index, link) in publication.readingOrder.withIndex()) {
-                val url = link.withBaseUrl(baseUrl).href
-                resourcesSingle.add(PageResource.EpubFxl(url))
+                for ((index, link) in publication.readingOrder.withIndex()) {
+                    val url = link.withBaseUrl(baseUrl).href
+                    resourcesSingle.add(PageResource.EpubFxl(url))
 
-                // add first page to the right,
-                if (index == 0) {
-                    resourcesDouble.add(PageResource.EpubFxl("", url))
-                } else {
-                    // add double pages, left & right
-                    if (doublePageLeft == "") {
-                        doublePageLeft = url
+                    // add first page to the right,
+                    if (index == 0) {
+                        resourcesDouble.add(PageResource.EpubFxl("", url))
                     } else {
-                        doublePageRight = url
-                        resourcesDouble.add(PageResource.EpubFxl(doublePageLeft, doublePageRight))
-                        doublePageLeft = ""
+                        // add double pages, left & right
+                        if (doublePageLeft == "") {
+                            doublePageLeft = url
+                        } else {
+                            doublePageRight = url
+                            resourcesDouble.add(
+                                PageResource.EpubFxl(
+                                    doublePageLeft,
+                                    doublePageRight
+                                )
+                            )
+                            doublePageLeft = ""
+                        }
                     }
                 }
-            }
-            // add last page if there is only a left page remaining
-            if (doublePageLeft != "") {
-                resourcesDouble.add(PageResource.EpubFxl(doublePageLeft, ""))
-            }
+                // add last page if there is only a left page remaining
+                if (doublePageLeft != "") {
+                    resourcesDouble.add(PageResource.EpubFxl(doublePageLeft, ""))
+                }
 
-            this.resourcesSingle = resourcesSingle
-            this.resourcesDouble = resourcesDouble
+                this.resourcesSingle = resourcesSingle
+                this.resourcesDouble = resourcesDouble
 
-            resourcePager.type = Publication.TYPE.FXL
-            adapter = when (preferences.getInt(COLUMN_COUNT_REF, 0)) {
-                1 -> {
-                    R2PagerAdapter(childFragmentManager, resourcesSingle)
-                }
-                2 -> {
-                    R2PagerAdapter(childFragmentManager, resourcesDouble)
-                }
-                else -> {
-                    // TODO based on device
-                    // TODO decide if 1 page or 2 page
-                    R2PagerAdapter(childFragmentManager, resourcesSingle)
+                resourcePager.type = Publication.TYPE.FXL
+                adapter = when (preferences.getInt(COLUMN_COUNT_REF, 0)) {
+                    1 -> {
+                        R2PagerAdapter(childFragmentManager, resourcesSingle)
+                    }
+                    2 -> {
+                        R2PagerAdapter(childFragmentManager, resourcesDouble)
+                    }
+                    else -> {
+                        // TODO based on device
+                        // TODO decide if 1 page or 2 page
+                        R2PagerAdapter(childFragmentManager, resourcesSingle)
+                    }
                 }
             }
         }

test-app/src/main/java/org/readium/r2/testapp/reader/ReaderActivity.kt

@@ -18,10 +18,7 @@ import androidx.fragment.app.FragmentResultListener
 import androidx.fragment.app.commit
 import androidx.fragment.app.commitNow
 import androidx.lifecycle.ViewModelProvider
-import org.readium.r2.shared.publication.Locator
-import org.readium.r2.shared.publication.Publication
-import org.readium.r2.shared.publication.allAreAudio
-import org.readium.r2.shared.publication.allAreBitmap
+import org.readium.r2.shared.publication.*
 import org.readium.r2.shared.util.mediatype.MediaType
 import org.readium.r2.testapp.R
 import org.readium.r2.testapp.databinding.ActivityReaderBinding
@@ -59,7 +56,7 @@ open class ReaderActivity : AppCompatActivity() {
 
         if (savedInstanceState == null) {
 
-            if (publication.type == Publication.TYPE.EPUB) {
+            if (publication.type == Publication.TYPE.EPUB || publication.readingOrder.allAreHtml) {
                 val baseUrl = requireNotNull(inputData.baseUrl)
                 readerFragment = EpubReaderFragment.newInstance(baseUrl)