diff --git a/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.kt b/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.kt index 78c1dace9f..c4d26dfa7a 100644 --- a/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.kt +++ b/app/src/main/java/com/quran/labs/androidquran/ui/PagerActivity.kt @@ -508,6 +508,11 @@ class PagerActivity : AppCompatActivity(), AudioBarListener, OnBookmarkTagsUpdat } val nonRestoringViewPager = findViewById(R.id.quran_pager) +ViewCompat.setOnApplyWindowInsetsListener(nonRestoringViewPager) { view, windowInsets -> +val insets = windowInsets.getInsets(WindowInsetsCompat.Type.navigationBars()) +view.updatePadding(bottom = insets.bottom) +windowInsets +} nonRestoringViewPager.setIsDualPagesInLandscape( QuranUtils.isDualPagesInLandscape(this, quranScreenInfo) ) diff --git a/app/src/main/java/com/quran/labs/androidquran/view/QuranImagePageLayout.kt b/app/src/main/java/com/quran/labs/androidquran/view/QuranImagePageLayout.kt index cc7c8b2770..074bce886b 100644 --- a/app/src/main/java/com/quran/labs/androidquran/view/QuranImagePageLayout.kt +++ b/app/src/main/java/com/quran/labs/androidquran/view/QuranImagePageLayout.kt @@ -25,7 +25,7 @@ open class QuranImagePageLayout(context: Context) : QuranPageLayout(context) { override fun generateContentView(context: Context, isLandscape: Boolean): View { imageView = HighlightingImageView(context).apply { adjustViewBounds = true - setIsScrollable(isLandscape && shouldWrapWithScrollView(), isLandscape) + setIsScrollable(isScrollableLayout(context.resources), isLandscape) } return imageView } diff --git a/app/src/main/java/com/quran/labs/androidquran/view/QuranPageLayout.java b/app/src/main/java/com/quran/labs/androidquran/view/QuranPageLayout.java index 606c6714f2..9eb2f91fbf 100644 --- a/app/src/main/java/com/quran/labs/androidquran/view/QuranPageLayout.java +++ b/app/src/main/java/com/quran/labs/androidquran/view/QuranPageLayout.java @@ -89,7 +89,7 @@ public void initialize() { viewPaddingLarge = resources.getDimensionPixelSize(R.dimen.page_margin_large); LayoutParams lp = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT); - if (isLandscape && shouldWrapWithScrollView()) { + if (isScrollableLayout(resources)) { scrollView = new ObservableScrollView(context); scrollView.setFillViewport(true); addView(scrollView, lp); @@ -197,6 +197,13 @@ protected void onDraw(Canvas canvas) { protected abstract View generateContentView(@NonNull Context context, boolean isLandscape); +protected boolean isScrollableLayout(@NonNull Resources resources) { +final Configuration config = resources.getConfiguration(); +final boolean isLandscape = config.orientation == Configuration.ORIENTATION_LANDSCAPE; +final boolean isShortViewport = config.screenWidthDp > 0 && config.screenHeightDp > 0 && config.screenHeightDp < config.screenWidthDp * 1.4f; +return (isLandscape || isShortViewport) && shouldWrapWithScrollView(); +} + protected boolean shouldWrapWithScrollView() { return true; } diff --git a/app/src/test/java/com/quran/labs/androidquran/view/QuranPageLayoutTest.kt b/app/src/test/java/com/quran/labs/androidquran/view/QuranPageLayoutTest.kt new file mode 100644 index 0000000000..bcdd339a79 --- /dev/null +++ b/app/src/test/java/com/quran/labs/androidquran/view/QuranPageLayoutTest.kt @@ -0,0 +1,55 @@ +package com.quran.labs.androidquran.view + +import android.content.Context +import android.content.res.Configuration +import androidx.test.core.app.ApplicationProvider +import com.quran.labs.androidquran.base.TestApplication +import org.junit.Assert.assertFalse +import org.junit.Assert.assertTrue +import org.junit.Test +import org.junit.runner.RunWith +import org.robolectric.RobolectricTestRunner +import org.robolectric.annotation.Config + +@Config(application = TestApplication::class, sdk = [33]) +@RunWith(RobolectricTestRunner::class) +class QuranPageLayoutTest { + +@Test +fun fullScreenPortraitIsNotScrollable() { +val context = createContext(411, 915, Configuration.ORIENTATION_PORTRAIT) +val layout = QuranImagePageLayout(context) +assertFalse(layout.canScroll()) +} + +@Test +fun constrainedSplitScreenPortraitIsScrollable() { +val context = createContext(411, 420, Configuration.ORIENTATION_PORTRAIT) +val layout = QuranImagePageLayout(context) +assertTrue(layout.canScroll()) +} + +@Test +fun landscapeIsScrollable() { +val context = createContext(915, 411, Configuration.ORIENTATION_LANDSCAPE) +val layout = QuranImagePageLayout(context) +assertTrue(layout.canScroll()) +} + +@Test +fun tabletLayoutInConstrainedPortraitIsNotScrollable() { +val context = createContext(411, 420, Configuration.ORIENTATION_PORTRAIT) +val layout = QuranTabletImagePageLayout(context) +assertFalse(layout.canScroll()) +} + +private fun createContext(widthDp: Int, heightDp: Int, orientation: Int): Context { +val baseContext = ApplicationProvider.getApplicationContext() +val config = Configuration(baseContext.resources.configuration).apply { +screenWidthDp = widthDp +screenHeightDp = heightDp +this.orientation = orientation +} +return baseContext.createConfigurationContext(config) +} +}