mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
attempt to add pspdfkit toolbars
This commit is contained in:
Satindar Dhillon
parent
f7c6b0834b
commit
44c4c3b8f1
2 changed files with 262 additions and 5 deletions
|
|
@ -1,27 +1,56 @@
|
|||
package app.omnivore.omnivore.ui.reader
|
||||
|
||||
import android.graphics.PointF
|
||||
import android.graphics.RectF
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.net.Uri
|
||||
import android.os.Bundle
|
||||
import android.util.Log
|
||||
import android.view.HapticFeedbackConstants
|
||||
import android.view.MotionEvent
|
||||
import android.widget.ImageView
|
||||
import android.widget.Toast
|
||||
import androidx.activity.viewModels
|
||||
import androidx.annotation.UiThread
|
||||
import androidx.annotation.IntRange
|
||||
import androidx.appcompat.app.AppCompatActivity
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.graphics.drawable.DrawableCompat
|
||||
import androidx.lifecycle.Observer
|
||||
import app.omnivore.omnivore.R
|
||||
import com.google.gson.Gson
|
||||
import com.pspdfkit.annotations.HighlightAnnotation
|
||||
import com.pspdfkit.annotations.Annotation
|
||||
import com.pspdfkit.annotations.LinkAnnotation
|
||||
import com.pspdfkit.annotations.actions.ActionType
|
||||
import com.pspdfkit.annotations.actions.UriAction
|
||||
import com.pspdfkit.configuration.PdfConfiguration
|
||||
import com.pspdfkit.configuration.page.PageScrollDirection
|
||||
import com.pspdfkit.document.DocumentSaveOptions
|
||||
import com.pspdfkit.document.PdfDocument
|
||||
import com.pspdfkit.document.search.SearchResult
|
||||
import com.pspdfkit.listeners.DocumentListener
|
||||
import com.pspdfkit.listeners.OnDocumentLongPressListener
|
||||
import com.pspdfkit.ui.PdfFragment
|
||||
import com.pspdfkit.ui.PdfOutlineView
|
||||
import com.pspdfkit.ui.PdfThumbnailBar
|
||||
import com.pspdfkit.ui.PdfThumbnailGrid
|
||||
import com.pspdfkit.ui.outline.DefaultBookmarkAdapter
|
||||
import com.pspdfkit.ui.outline.DefaultOutlineViewListener
|
||||
import com.pspdfkit.ui.search.PdfSearchViewModular
|
||||
import com.pspdfkit.ui.search.SearchResultHighlighter
|
||||
import com.pspdfkit.ui.search.SimpleSearchResultListener
|
||||
import com.pspdfkit.utils.PdfUtils
|
||||
import dagger.hilt.android.AndroidEntryPoint
|
||||
|
||||
@AndroidEntryPoint
|
||||
class PDFReaderActivity: AppCompatActivity(), DocumentListener {
|
||||
class PDFReaderActivity: AppCompatActivity(), DocumentListener, OnDocumentLongPressListener {
|
||||
private var hasLoadedHighlights = false
|
||||
|
||||
private lateinit var fragment: PdfFragment
|
||||
private lateinit var thumbnailBar: PdfThumbnailBar
|
||||
private lateinit var configuration: PdfConfiguration
|
||||
private lateinit var modularSearchView: PdfSearchViewModular
|
||||
private lateinit var thumbnailGrid: PdfThumbnailGrid
|
||||
private lateinit var highlighter: SearchResultHighlighter
|
||||
private lateinit var pdfOutlineView: PdfOutlineView
|
||||
|
||||
val viewModel: PDFReaderViewModel by viewModels()
|
||||
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
|
|
@ -52,8 +81,18 @@ class PDFReaderActivity: AppCompatActivity(), DocumentListener {
|
|||
fragment = supportFragmentManager.findFragmentById(R.id.fragmentContainer) as PdfFragment?
|
||||
?: createFragment(params.localFileUri, configuration)
|
||||
|
||||
// Initialize all PSPDFKit UI components.
|
||||
initModularSearchViewAndButton()
|
||||
initOutlineViewAndButton()
|
||||
initThumbnailBar()
|
||||
initThumbnailGridAndButton()
|
||||
|
||||
fragment.apply {
|
||||
addDocumentListener(this@PDFReaderActivity)
|
||||
addDocumentListener(modularSearchView)
|
||||
addDocumentListener(thumbnailBar.documentListener)
|
||||
addDocumentListener(thumbnailGrid)
|
||||
setOnDocumentLongPressListener(this@PDFReaderActivity)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -91,4 +130,189 @@ class PDFReaderActivity: AppCompatActivity(), DocumentListener {
|
|||
.commit()
|
||||
return fragment
|
||||
}
|
||||
|
||||
private fun initThumbnailGridAndButton() {
|
||||
thumbnailGrid = findViewById(R.id.thumbnailGrid)
|
||||
?: throw IllegalStateException("Error while loading CustomFragmentActivity. The example layout was missing the thumbnail grid view.")
|
||||
|
||||
thumbnailGrid.setOnPageClickListener { view, pageIndex ->
|
||||
fragment.pageIndex = pageIndex
|
||||
view.hide()
|
||||
}
|
||||
|
||||
// The thumbnail grid is hidden by default. Set up a click listener to show it.
|
||||
val openThumbnailGridButton = findViewById<ImageView>(R.id.openThumbnailGridButton)
|
||||
?: throw IllegalStateException(
|
||||
"Error while loading CustomFragmentActivity. The example layout" +
|
||||
" was missing the open thumbnail grid button with id `R.id.openThumbnailGridButton`."
|
||||
)
|
||||
|
||||
openThumbnailGridButton.apply {
|
||||
setImageDrawable(
|
||||
tintDrawable(
|
||||
openThumbnailGridButton.drawable,
|
||||
ContextCompat.getColor(this@PDFReaderActivity, R.color.white)
|
||||
)
|
||||
)
|
||||
setOnClickListener {
|
||||
if (thumbnailGrid.isShown) thumbnailGrid.hide() else thumbnailGrid.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun initThumbnailBar() {
|
||||
thumbnailBar = findViewById(R.id.thumbnailBar)
|
||||
?: throw IllegalStateException("Error while loading CustomFragmentActivity. The example layout was missing thumbnail bar view.")
|
||||
|
||||
thumbnailBar.setOnPageChangedListener { _, pageIndex: Int -> fragment.pageIndex = pageIndex }
|
||||
}
|
||||
|
||||
private fun initOutlineViewAndButton() {
|
||||
pdfOutlineView = findViewById(R.id.outlineView)
|
||||
?: throw IllegalStateException("Error while loading CustomFragmentActivity. The example layout was missing the outline view.")
|
||||
|
||||
pdfOutlineView.apply {
|
||||
val outlineViewListener = DefaultOutlineViewListener(fragment)
|
||||
setOnAnnotationTapListener(outlineViewListener)
|
||||
setOnOutlineElementTapListener(outlineViewListener)
|
||||
setBookmarkAdapter(DefaultBookmarkAdapter(fragment))
|
||||
}
|
||||
|
||||
val openOutlineButton = findViewById<ImageView>(R.id.openOutlineButton)
|
||||
?: throw IllegalStateException(
|
||||
"Error while loading CustomFragmentActivity. The example layout " +
|
||||
"was missing the open outline view button with id `R.id.openOutlineButton`."
|
||||
)
|
||||
|
||||
openOutlineButton.apply {
|
||||
setImageDrawable(
|
||||
tintDrawable(
|
||||
openOutlineButton.drawable,
|
||||
ContextCompat.getColor(this@PDFReaderActivity, R.color.white)
|
||||
)
|
||||
)
|
||||
setOnClickListener {
|
||||
if (pdfOutlineView.isShown) pdfOutlineView.hide() else pdfOutlineView.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun initModularSearchViewAndButton() {
|
||||
// The search result highlighter will highlight any selected result.
|
||||
highlighter = SearchResultHighlighter(this).also {
|
||||
fragment.addDrawableProvider(it)
|
||||
}
|
||||
|
||||
modularSearchView = findViewById(R.id.modularSearchView)
|
||||
?: throw IllegalStateException("Error while loading CustomFragmentActivity. The example layout was missing the search view.")
|
||||
|
||||
modularSearchView.setSearchViewListener(object : SimpleSearchResultListener() {
|
||||
override fun onMoreSearchResults(results: List<SearchResult>) {
|
||||
highlighter.addSearchResults(results)
|
||||
}
|
||||
|
||||
override fun onSearchCleared() {
|
||||
highlighter.clearSearchResults()
|
||||
}
|
||||
|
||||
override fun onSearchResultSelected(result: SearchResult?) {
|
||||
// Pass on the search result to the highlighter. If 'null' the highlighter will clear any selection.
|
||||
highlighter.setSelectedSearchResult(result)
|
||||
if (result != null) {
|
||||
fragment.scrollTo(PdfUtils.createPdfRectUnion(result.textBlock.pageRects), result.pageIndex, 250, false)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
// The search view is hidden by default (see layout). Set up a click listener that will show the view once pressed.
|
||||
val openSearchButton = findViewById<ImageView>(R.id.openSearchButton)
|
||||
?: throw IllegalStateException(
|
||||
"Error while loading CustomFragmentActivity. The example layout " +
|
||||
"was missing the open search button with id `R.id.openSearchButton`."
|
||||
)
|
||||
|
||||
openSearchButton.apply {
|
||||
setImageDrawable(
|
||||
tintDrawable(
|
||||
drawable,
|
||||
ContextCompat.getColor(this@PDFReaderActivity, R.color.white)
|
||||
)
|
||||
)
|
||||
setOnClickListener {
|
||||
if (modularSearchView.isShown) modularSearchView.hide() else modularSearchView.show()
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
override fun onBackPressed() {
|
||||
when {
|
||||
modularSearchView.isDisplayed -> {
|
||||
modularSearchView.hide()
|
||||
return
|
||||
}
|
||||
thumbnailGrid.isDisplayed -> {
|
||||
thumbnailGrid.hide()
|
||||
return
|
||||
}
|
||||
pdfOutlineView.isDisplayed -> {
|
||||
pdfOutlineView.hide()
|
||||
return
|
||||
}
|
||||
else -> super.onBackPressed()
|
||||
}
|
||||
}
|
||||
|
||||
override fun onDocumentLongPress(
|
||||
document: PdfDocument,
|
||||
@IntRange(from = 0) pageIndex: Int,
|
||||
event: MotionEvent?,
|
||||
pagePosition: PointF?,
|
||||
longPressedAnnotation: Annotation?
|
||||
): Boolean {
|
||||
// This code showcases how to handle long click gesture on the document links.
|
||||
fragment.view?.performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
|
||||
|
||||
if (longPressedAnnotation is LinkAnnotation) {
|
||||
val action = longPressedAnnotation.action
|
||||
if (action?.type == ActionType.URI) {
|
||||
val uri = (action as UriAction).uri ?: return true
|
||||
Toast.makeText(this@PDFReaderActivity, uri, Toast.LENGTH_LONG).show()
|
||||
return true
|
||||
}
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// Rest of the `DocumentListener` methods are unused.
|
||||
override fun onDocumentLoadFailed(exception: Throwable) = Unit
|
||||
|
||||
override fun onDocumentSave(document: PdfDocument, saveOptions: DocumentSaveOptions): Boolean = true
|
||||
|
||||
override fun onDocumentSaved(document: PdfDocument) = Unit
|
||||
|
||||
override fun onDocumentSaveFailed(document: PdfDocument, exception: Throwable) = Unit
|
||||
|
||||
override fun onDocumentSaveCancelled(document: PdfDocument) = Unit
|
||||
|
||||
override fun onPageClick(
|
||||
document: PdfDocument,
|
||||
@IntRange(from = 0) pageIndex: Int,
|
||||
event: MotionEvent?,
|
||||
pagePosition: PointF?,
|
||||
clickedAnnotation: Annotation?
|
||||
): Boolean = false
|
||||
|
||||
override fun onDocumentClick(): Boolean = false
|
||||
|
||||
override fun onPageChanged(document: PdfDocument, @IntRange(from = 0) pageIndex: Int) = Unit
|
||||
|
||||
override fun onDocumentZoomed(document: PdfDocument, @IntRange(from = 0) pageIndex: Int, scaleFactor: Float) = Unit
|
||||
|
||||
override fun onPageUpdated(document: PdfDocument, @IntRange(from = 0) pageIndex: Int) = Unit
|
||||
|
||||
private fun tintDrawable(drawable: Drawable, tint: Int): Drawable {
|
||||
val tintedDrawable = DrawableCompat.wrap(drawable)
|
||||
DrawableCompat.setTint(tintedDrawable, tint)
|
||||
return tintedDrawable
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,4 +33,37 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:visibility="invisible"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end|center"
|
||||
android:background="@color/design_default_color_primary"
|
||||
android:orientation="vertical"
|
||||
android:splitMotionEvents="false">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/openSearchButton"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:padding="12dp"
|
||||
android:src="@drawable/pspdf__ic_search" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/openOutlineButton"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:padding="12dp"
|
||||
android:src="@drawable/pspdf__ic_outline" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/openThumbnailGridButton"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:padding="12dp"
|
||||
android:src="@drawable/pspdf__ic_thumbnails" />
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
|
|
|||
Loading…
Reference in a new issue