diff --git a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt index 8a812c85..31fbbb11 100644 --- a/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/filemanager/pro/activities/PDFViewerActivity.kt @@ -8,10 +8,9 @@ import android.print.PrintAttributes import android.print.PrintManager import android.view.View import android.view.WindowManager -import androidx.constraintlayout.widget.ConstraintLayout import androidx.viewpager2.widget.MarginPageTransformer +import android.widget.RelativeLayout import androidx.viewpager2.widget.ViewPager2 -import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.REAL_FILE_PATH import com.simplemobiletools.commons.helpers.isPiePlus @@ -59,6 +58,7 @@ class PDFViewerActivity : SimpleActivity() { } private fun setupMenu() { + (pdf_viewer_appbar.layoutParams as RelativeLayout.LayoutParams).topMargin = statusBarHeight pdf_viewer_toolbar.menu.apply { findItem(R.id.menu_print).isVisible = realFilePath.isNotEmpty() findItem(R.id.menu_print).setOnMenuItemClickListener { @@ -71,29 +71,20 @@ class PDFViewerActivity : SimpleActivity() { finish() } - setupViewOffsets() - val primaryColor = getProperPrimaryColor() - page_counter.background?.applyColorFilter(primaryColor) - page_counter.setTextColor(primaryColor.getContrastColor()) - } - - override fun onConfigurationChanged(newConfig: Configuration) { - super.onConfigurationChanged(newConfig) - setupViewOffsets() - } - - private fun setupViewOffsets() { - val pageCounterMargin = resources.getDimension(R.dimen.normal_margin).toInt() - (pdf_viewer_appbar.layoutParams as ConstraintLayout.LayoutParams).topMargin = statusBarHeight if (!portrait && navigationBarOnSide && navigationBarWidth > 0) { pdf_viewer_appbar.setPadding(0, 0, navigationBarWidth, 0) } else { pdf_viewer_appbar.setPadding(0, 0, 0, 0) } + } - (page_counter.layoutParams as ConstraintLayout.LayoutParams).apply { - rightMargin = navigationBarWidth + pageCounterMargin - bottomMargin = navigationBarHeight + pageCounterMargin + override fun onConfigurationChanged(newConfig: Configuration) { + super.onConfigurationChanged(newConfig) + (pdf_viewer_appbar.layoutParams as RelativeLayout.LayoutParams).topMargin = statusBarHeight + if (!portrait && navigationBarOnSide && navigationBarWidth > 0) { + pdf_viewer_appbar.setPadding(0, 0, navigationBarWidth, 0) + } else { + pdf_viewer_appbar.setPadding(0, 0, 0, 0) } } @@ -120,15 +111,6 @@ class PDFViewerActivity : SimpleActivity() { return } - pdf_viewer.registerOnPageChangeCallback(object : OnPageChangeCallback() { - override fun onPageSelected(position: Int) { - updatePageCounter(position) - } - }) - - updatePageCounter(0) - page_counter.beVisible() - showSystemUI(true) val filename = getFilenameFromUri(uri) @@ -137,10 +119,6 @@ class PDFViewerActivity : SimpleActivity() { } } - private fun updatePageCounter(position: Int) { - page_counter.text = "${position + 1} / ${pdf_viewer.adapter?.itemCount}" - } - private fun printText() { val adapter = PdfDocumentAdapter(this, realFilePath) @@ -160,7 +138,6 @@ class PDFViewerActivity : SimpleActivity() { showSystemUI(true) } - page_counter.animate().alpha(newAlpha).start() top_shadow.animate().alpha(newAlpha).start() pdf_viewer_appbar.animate().alpha(newAlpha).withStartAction { if (newAlpha == 1f) { diff --git a/app/src/main/res/layout/activity_pdf_viewer.xml b/app/src/main/res/layout/activity_pdf_viewer.xml index 11109b08..93244f33 100644 --- a/app/src/main/res/layout/activity_pdf_viewer.xml +++ b/app/src/main/res/layout/activity_pdf_viewer.xml @@ -1,10 +1,9 @@ - - - + android:contentDescription="@null" /> + app:elevation="0dp"> - +