Skip to content

FIXME: Properly implement DualPage.AUTO depending on the device orien… #723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

FIXME: Properly implement DualPage.AUTO depending on the device orien… #723

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 37 additions & 21 deletions readium/navigator/src/main/java/org/readium/r2/navigator/epub/EpubNavigatorFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ import androidx.lifecycle.withStarted
import androidx.viewpager.widget.ViewPager
import kotlin.math.ceil
import kotlin.reflect.KClass
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.Job
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down Expand Up @@ -472,28 +474,37 @@ public class EpubNavigatorFragment internal constructor(
}

private fun resetResourcePagerAdapter() {
adapter = when (publication.metadata.presentation.layout) {
EpubLayout.REFLOWABLE, null -> {
R2PagerAdapter(childFragmentManager, resourcesSingle)
}
EpubLayout.FIXED -> {
when (viewModel.dualPageMode) {
// FIXME: Properly implement DualPage.AUTO depending on the device orientation.
DualPage.OFF, DualPage.AUTO -> {
R2PagerAdapter(childFragmentManager, resourcesSingle)
}
DualPage.ON -> {
R2PagerAdapter(childFragmentManager, resourcesDouble)
CoroutineScope(Dispatchers.Main).launch {

adapter = when (publication.metadata.presentation.layout) {
EpubLayout.REFLOWABLE, null -> {
R2PagerAdapter(childFragmentManager, resourcesSingle)
}

EpubLayout.FIXED -> {
when (viewModel.dualPageMode) {
DualPage.OFF, DualPage.AUTO -> {
val displayMetrics = requireContext().resources.displayMetrics
if (displayMetrics.widthPixels > displayMetrics.heightPixels) {
R2PagerAdapter(childFragmentManager, resourcesDouble)
} else {
R2PagerAdapter(childFragmentManager, resourcesSingle)
}
}

DualPage.ON -> {
R2PagerAdapter(childFragmentManager, resourcesDouble)
}
}
}
}
}
adapter.listener = PagerAdapterListener()
resourcePager.adapter = adapter
resourcePager.direction = overflow.value.readingProgression
resourcePager.layoutDirection = when (settings.value.readingProgression) {
ReadingProgression.RTL -> LayoutDirection.RTL
ReadingProgression.LTR -> LayoutDirection.LTR
adapter.listener = PagerAdapterListener()
resourcePager.adapter = adapter
resourcePager.direction = overflow.value.readingProgression
resourcePager.layoutDirection = when (settings.value.readingProgression) {
ReadingProgression.RTL -> LayoutDirection.RTL
ReadingProgression.LTR -> LayoutDirection.LTR
}
}
}

Expand Down Expand Up @@ -533,6 +544,7 @@ public class EpubNavigatorFragment internal constructor(
}
}
}
resetResourcePagerAdapter()
}

private fun handleEvent(event: EpubNavigatorViewModel.Event) {
Expand Down Expand Up @@ -637,9 +649,13 @@ public class EpubNavigatorFragment internal constructor(
setCurrent(resourcesSingle)
} else {
when (viewModel.dualPageMode) {
// FIXME: Properly implement DualPage.AUTO depending on the device orientation.
DualPage.OFF, DualPage.AUTO -> {
setCurrent(resourcesSingle)
val displayMetrics = requireContext().resources.displayMetrics
if (displayMetrics.widthPixels > displayMetrics.heightPixels) {
setCurrent(resourcesDouble)
} else {
setCurrent(resourcesSingle)
}
}
DualPage.ON -> {
setCurrent(resourcesDouble)
Expand Down