diff --git a/app/src/main/java/lee/module/sample/MainActivity.kt b/app/src/main/java/lee/module/sample/MainActivity.kt index 3a60e52..b25301d 100644 --- a/app/src/main/java/lee/module/sample/MainActivity.kt +++ b/app/src/main/java/lee/module/sample/MainActivity.kt @@ -37,7 +37,7 @@ class MainActivity : AppCompatActivity() { } getPdf = registerForActivityResult(ActivityResultContracts.GetContent()) { - startPdfActivity(it) + it?.let { startPdfActivity(it) } } findViewById(R.id.btnOpenLocalFile).setOnClickListener { @@ -80,7 +80,8 @@ class MainActivity : AppCompatActivity() { private fun startPdfActivity(uri: Uri) { Intent(Intent.ACTION_VIEW).apply { val fileExtension = MimeTypeMap.getFileExtensionFromUrl(uri.toString()) - val type = MimeTypeMap.getSingleton().getMimeTypeFromExtension(fileExtension.toLowerCase()) + val type = MimeTypeMap.getSingleton() + .getMimeTypeFromExtension(fileExtension.toLowerCase()) setDataAndType(uri, type) addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3b3795e..773dfe4 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,9 +1,9 @@ diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 74d3c24..e18b747 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -11,6 +11,7 @@ @color/black ?attr/colorPrimaryVariant + @android:color/transparent \ No newline at end of file diff --git a/pdfview/src/main/java/lee/module/pdfview/pdf/PdfView.kt b/pdfview/src/main/java/lee/module/pdfview/pdf/PdfView.kt index 0312733..f307c4c 100644 --- a/pdfview/src/main/java/lee/module/pdfview/pdf/PdfView.kt +++ b/pdfview/src/main/java/lee/module/pdfview/pdf/PdfView.kt @@ -5,10 +5,7 @@ import android.graphics.pdf.PdfRenderer import android.net.Uri import android.util.AttributeSet import android.widget.Toast -import androidx.core.content.ContextCompat -import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.RecyclerView -import lee.module.pdfview.R class PdfView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0 @@ -16,9 +13,6 @@ class PdfView @JvmOverloads constructor( init { layoutManager = PreloadLayoutManager(context) - addItemDecoration(DividerItemDecoration(context, VERTICAL).apply { - setDrawable(ContextCompat.getDrawable(context, R.drawable.pv_divider_vertical_16)!!) - }) } fun setPdfRenderer(renderer: PdfRenderer) { diff --git a/pdfview/src/main/java/lee/module/pdfview/pdf/PdfViewAdapter.kt b/pdfview/src/main/java/lee/module/pdfview/pdf/PdfViewAdapter.kt index 00019dd..33448fd 100644 --- a/pdfview/src/main/java/lee/module/pdfview/pdf/PdfViewAdapter.kt +++ b/pdfview/src/main/java/lee/module/pdfview/pdf/PdfViewAdapter.kt @@ -4,9 +4,7 @@ import android.graphics.Bitmap import android.graphics.pdf.PdfRenderer import android.view.LayoutInflater import android.view.ViewGroup -import androidx.core.view.updateLayoutParams import androidx.recyclerview.widget.RecyclerView -import lee.module.pdfview.R import lee.module.pdfview.databinding.PvPdfItemBinding class PdfViewAdapter( @@ -55,10 +53,6 @@ class PdfViewAdapter( RecyclerView.ViewHolder(binding.root) { fun bind(bitmap: Bitmap) { - binding.root.updateLayoutParams { - height = - getScreenHeight() - itemView.resources.getDimensionPixelSize(R.dimen.pv_bottom_spacing) - } binding.ivContent.setImageBitmap(bitmap) } } diff --git a/pdfview/src/main/java/lee/module/pdfview/pdf/PreloadLayoutManager.kt b/pdfview/src/main/java/lee/module/pdfview/pdf/PreloadLayoutManager.kt index edf1d9a..bb0786d 100644 --- a/pdfview/src/main/java/lee/module/pdfview/pdf/PreloadLayoutManager.kt +++ b/pdfview/src/main/java/lee/module/pdfview/pdf/PreloadLayoutManager.kt @@ -7,6 +7,6 @@ import androidx.recyclerview.widget.RecyclerView class PreloadLayoutManager(context: Context) : LinearLayoutManager(context) { override fun getExtraLayoutSpace(state: RecyclerView.State?): Int { - return 3 * getScreenHeight() + return 5 * getScreenHeight() } } diff --git a/pdfview/src/main/res/drawable/pv_divider_vertical_16.xml b/pdfview/src/main/res/drawable/pv_divider_vertical_16.xml deleted file mode 100644 index c60109f..0000000 --- a/pdfview/src/main/res/drawable/pv_divider_vertical_16.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - diff --git a/pdfview/src/main/res/layout/activity_pv_pdf_view.xml b/pdfview/src/main/res/layout/activity_pv_pdf_view.xml index b472b35..f00d875 100644 --- a/pdfview/src/main/res/layout/activity_pv_pdf_view.xml +++ b/pdfview/src/main/res/layout/activity_pv_pdf_view.xml @@ -2,4 +2,8 @@ + android:layout_height="match_parent" + android:background="@android:color/darker_gray" + android:clipToPadding="false" + android:paddingTop="8dp" + android:paddingBottom="8dp" /> diff --git a/pdfview/src/main/res/layout/pv_pdf_item.xml b/pdfview/src/main/res/layout/pv_pdf_item.xml index fc22295..7c91711 100644 --- a/pdfview/src/main/res/layout/pv_pdf_item.xml +++ b/pdfview/src/main/res/layout/pv_pdf_item.xml @@ -1,8 +1,20 @@ - + android:layout_height="match_parent"> + + + +