2-group-android/PDFReaderPro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ocean 2025-11-07 10:23:39 +08:00
parent 6d3b6261ce
commit a277d6743b
19 changed files with 193 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt
View File

@ -182,6 +182,7 @@ class MergePdfActivity : BaseActivity() {
const val EXTRA_SELECTED_LIST = "extra_selected_list" const val EXTRA_SELECTED_LIST = "extra_selected_list"
const val EXTRA_PDF_LIST = "extra_pdf_list" const val EXTRA_PDF_LIST = "extra_pdf_list"
const val TAG = "MergePdfActivity" const val TAG = "MergePdfActivity"
const val TAG_TOW = "MergePdfActivity_DIALOG"//标记从dialog进入
fun createIntent(context: Context, list: ArrayList<PdfDocumentEntity>): Intent { fun createIntent(context: Context, list: ArrayList<PdfDocumentEntity>): Intent {
return Intent(context, MergePdfActivity::class.java).apply { return Intent(context, MergePdfActivity::class.java).apply {

5
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt
View File

@ -145,8 +145,8 @@ class PdfPickerActivity : BaseActivity() {
return@collect return@collect
} }
val sortedList = sortDocuments(list) val sortedList = sortDocuments(list)
// 标记已选择项 // 标记已选择项，从合并界面进入到选择进行合并选项，从外部dialog进入也进行合并选项
if (fromActivityResult == MergePdfActivity.TAG) { if (fromActivityResult == MergePdfActivity.TAG || fromActivityResult == MergePdfActivity.TAG_TOW) {
markSelectedItems(sortedList, historyList) markSelectedItems(sortedList, historyList)
} }
// 再根据来源过滤 // 再根据来源过滤
@ -222,6 +222,7 @@ class PdfPickerActivity : BaseActivity() {
binding.continueNowBtn.setOnSingleClickListener { binding.continueNowBtn.setOnSingleClickListener {
val selectedItems = adapter.getSelectedItems() val selectedItems = adapter.getSelectedItems()
if (selectedItems.size >= 2) { if (selectedItems.size >= 2) {
//从dialog点击进来的，就不进行result了。直接进入合并界面
if (fromActivityResult == MergePdfActivity.TAG) { if (fromActivityResult == MergePdfActivity.TAG) {
returnSelectedResult(ArrayList(selectedItems)) returnSelectedResult(ArrayList(selectedItems))
} else { } else {

8
app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt
View File

@ -169,10 +169,10 @@ class PdfToImageActivity : BaseActivity() {
} }
private fun updateSelectAllState(b: Boolean) { private fun updateSelectAllState(b: Boolean) {
binding.selectAll.setBackgroundResource( // binding.selectAll.setBackgroundResource(
if (b) R.drawable.dr_circular_sel_on_bg // if (b) R.drawable.dr_circular_sel_on_bg
else R.drawable.dr_circular_sel_off_bg // else R.drawable.dr_circular_sel_off_bg
) // )
} }
private fun updateContinueNowBtnState(b: Boolean) { private fun updateContinueNowBtnState(b: Boolean) {

8
app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt
View File

@ -207,10 +207,10 @@ class SplitPdfActivity : BaseActivity() {
} }
private fun updateSelectAllState(b: Boolean) { private fun updateSelectAllState(b: Boolean) {
binding.selectAll.setBackgroundResource( // binding.selectAll.setBackgroundResource(
if (b) R.drawable.dr_circular_sel_on_bg // if (b) R.drawable.dr_circular_sel_on_bg
else R.drawable.dr_circular_sel_off_bg // else R.drawable.dr_circular_sel_off_bg
) // )
} }
private fun updateContinueNowBtnState(b: Boolean) { private fun updateContinueNowBtnState(b: Boolean) {

2
app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt
View File

@ -54,7 +54,7 @@ class SplitPdfAdapter(
if (item.previewFilePath != null) { if (item.previewFilePath != null) {
Glide.with(holder.binding.root) Glide.with(holder.binding.root)
.load(File(item.previewFilePath ?: "")) .load(File(item.previewFilePath ?: ""))
.transform(CenterCrop(), RoundedCorners(8.dpToPx(holder.binding.root.context))) .transform(CenterCrop(), RoundedCorners(4.dpToPx(holder.binding.root.context)))
.into(image) .into(image)
} }
bindSelection(item, holder) bindSelection(item, holder)

25
app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt
View File

@ -9,9 +9,13 @@ import android.widget.Toast
import androidx.fragment.app.activityViewModels import androidx.fragment.app.activityViewModels
import com.all.pdfreader.pro.app.R import com.all.pdfreader.pro.app.R
import com.all.pdfreader.pro.app.databinding.DialogListMoreBinding import com.all.pdfreader.pro.app.databinding.DialogListMoreBinding
import com.all.pdfreader.pro.app.model.PdfPickerSource
import com.all.pdfreader.pro.app.model.PrintResult import com.all.pdfreader.pro.app.model.PrintResult
import com.all.pdfreader.pro.app.model.RenameType import com.all.pdfreader.pro.app.model.RenameType
import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity import com.all.pdfreader.pro.app.room.entity.PdfDocumentEntity
import com.all.pdfreader.pro.app.ui.act.MergePdfActivity
import com.all.pdfreader.pro.app.ui.act.PdfPickerActivity
import com.all.pdfreader.pro.app.ui.act.PdfToImageActivity
import com.all.pdfreader.pro.app.ui.act.PdfViewActivity import com.all.pdfreader.pro.app.ui.act.PdfViewActivity
import com.all.pdfreader.pro.app.ui.act.SplitPdfActivity import com.all.pdfreader.pro.app.ui.act.SplitPdfActivity
import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag
@ -223,6 +227,27 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment()
GotoPageDialogFragment().show(parentFragmentManager, "GotoPage") GotoPageDialogFragment().show(parentFragmentManager, "GotoPage")
dismiss() dismiss()
} }
binding.mergeBtn.setOnClickListener {
val list = arrayListOf(pdfDocument)
val intent = PdfPickerActivity.createIntent(
requireActivity(), PdfPickerSource.MERGE,
MergePdfActivity.TAG_TOW, list
)
startActivity(intent)
dismiss()
}
binding.pdfToImgBtn.setOnClickListener {
val intent = PdfToImageActivity.createIntent(requireActivity(), pdfDocument.filePath,
PdfPickerSource.PDF_TO_IMAGES)
startActivity(intent)
dismiss()
}
binding.pdfToLongImgBtn.setOnClickListener {
val intent = PdfToImageActivity.createIntent(requireActivity(), pdfDocument.filePath,
PdfPickerSource.TO_LONG_IMAGE)
startActivity(intent)
dismiss()
}
} }
private fun updateCollectUi(b: Boolean) { private fun updateCollectUi(b: Boolean) {

4
app/src/main/res/drawable/dr_item_page_img_sel_off_bg.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners <corners
android:topLeftRadius="8dp" android:topLeftRadius="4dp"
android:bottomRightRadius="8dp" /> android:bottomRightRadius="4dp" />
<solid android:color="@color/icon_sel_off_color" /> <solid android:color="@color/icon_sel_off_color" />
</shape> </shape>

4
app/src/main/res/drawable/dr_item_page_img_sel_on_bg.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners <corners
android:topLeftRadius="8dp" android:topLeftRadius="4dp"
android:bottomRightRadius="8dp" /> android:bottomRightRadius="4dp" />
<solid android:color="@color/icon_sel_on_color" /> <solid android:color="@color/icon_sel_on_color" />
</shape> </shape>

4
app/src/main/res/drawable/dr_item_page_number_sel_off_bg.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners <corners
android:bottomLeftRadius="8dp" android:bottomLeftRadius="4dp"
android:topRightRadius="8dp" /> android:topRightRadius="4dp" />
<solid android:color="@color/icon_sel_off_color" /> <solid android:color="@color/icon_sel_off_color" />
</shape> </shape>

4
app/src/main/res/drawable/dr_item_page_number_sel_on_bg.xml
View File

@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<corners <corners
android:bottomLeftRadius="8dp" android:bottomLeftRadius="4dp"
android:topRightRadius="8dp" /> android:topRightRadius="4dp" />
<solid android:color="@color/icon_sel_on_color" /> <solid android:color="@color/icon_sel_on_color" />
</shape> </shape>

2
app/src/main/res/drawable/dr_sel_off_frame.xml
View File

@ -3,5 +3,5 @@
android:shape="rectangle"> android:shape="rectangle">
<stroke android:color="@color/placeholder_bg_color" <stroke android:color="@color/placeholder_bg_color"
android:width="1dp"/> android:width="1dp"/>
<corners android:radius="8dp" /> <corners android:radius="4dp" />
</shape> </shape>

2
app/src/main/res/drawable/dr_sel_on_frame.xml
View File

@ -3,5 +3,5 @@
android:shape="rectangle"> android:shape="rectangle">
<stroke android:color="@color/icon_sel_on_color" <stroke android:color="@color/icon_sel_on_color"
android:width="1dp"/> android:width="1dp"/>
<corners android:radius="8dp" /> <corners android:radius="4dp" />
</shape> </shape>

9
app/src/main/res/drawable/icon_merge_red.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M18.84,8.05H16.49V5.42C16.49,4.585 16.158,3.783 15.567,3.193C14.976,2.602 14.175,2.27 13.34,2.27H5.45C4.614,2.27 3.813,2.602 3.222,3.193C2.632,3.783 2.3,4.585 2.3,5.42V13.31C2.3,14.145 2.632,14.947 3.222,15.537C3.813,16.128 4.614,16.46 5.45,16.46H7.92V18.57C7.92,19.405 8.252,20.207 8.842,20.797C9.433,21.388 10.234,21.72 11.07,21.72H18.84C19.674,21.717 20.474,21.385 21.064,20.795C21.654,20.204 21.987,19.405 21.99,18.57V11.2C21.987,10.365 21.654,9.566 21.064,8.976C20.474,8.385 19.674,8.053 18.84,8.05ZM4.1,13.31V5.42C4.098,5.242 4.133,5.066 4.2,4.902C4.267,4.737 4.367,4.588 4.492,4.462C4.618,4.337 4.767,4.237 4.932,4.17C5.096,4.103 5.272,4.069 5.45,4.07H13.34C13.698,4.07 14.041,4.212 14.294,4.465C14.548,4.719 14.69,5.062 14.69,5.42V13.31C14.687,13.667 14.544,14.009 14.292,14.262C14.039,14.514 13.697,14.657 13.34,14.66H5.45C5.092,14.66 4.748,14.518 4.495,14.265C4.242,14.011 4.1,13.668 4.1,13.31ZM20.19,18.57C20.19,18.928 20.048,19.271 19.794,19.525C19.541,19.778 19.198,19.92 18.84,19.92H11.07C10.712,19.92 10.368,19.778 10.115,19.525C9.862,19.271 9.72,18.928 9.72,18.57V16.46H13.34C14.175,16.46 14.976,16.128 15.567,15.537C16.158,14.947 16.49,14.145 16.49,13.31V9.85H18.84C19.198,9.85 19.541,9.992 19.794,10.245C20.048,10.499 20.19,10.842 20.19,11.2V18.57Z"
android:fillColor="#E43521"/>
</vector>

21
app/src/main/res/drawable/icon_pdf2img.xml Normal file
View File

@ -0,0 +1,21 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M19.35,21.57H4.93C4.295,21.567 3.686,21.314 3.236,20.864C2.787,20.415 2.533,19.806 2.53,19.17V4.75C2.53,4.113 2.783,3.503 3.233,3.053C3.683,2.603 4.294,2.35 4.93,2.35H13.93C14.169,2.35 14.398,2.445 14.567,2.614C14.735,2.782 14.83,3.011 14.83,3.25C14.83,3.489 14.735,3.718 14.567,3.886C14.398,4.055 14.169,4.15 13.93,4.15H4.93C4.771,4.15 4.619,4.213 4.506,4.326C4.393,4.438 4.33,4.591 4.33,4.75V19.17C4.33,19.329 4.393,19.482 4.506,19.594C4.619,19.707 4.771,19.77 4.93,19.77H19.35C19.509,19.77 19.662,19.707 19.774,19.594C19.887,19.482 19.95,19.329 19.95,19.17V10.98C19.95,10.741 20.045,10.512 20.214,10.344C20.383,10.175 20.612,10.08 20.85,10.08C21.089,10.08 21.318,10.175 21.487,10.344C21.655,10.512 21.75,10.741 21.75,10.98V19.17C21.75,19.806 21.497,20.417 21.047,20.867C20.597,21.317 19.987,21.57 19.35,21.57Z"
android:fillColor="#E43521"/>
<path
android:pathData="M20.26,21.25C20.141,21.253 20.023,21.232 19.913,21.187C19.802,21.142 19.703,21.075 19.62,20.99L10.26,11.63C10.142,11.512 10.002,11.417 9.847,11.353C9.693,11.289 9.527,11.256 9.36,11.256C9.193,11.256 9.027,11.289 8.872,11.353C8.718,11.417 8.578,11.512 8.46,11.63L4.07,16.02C3.986,16.103 3.886,16.169 3.776,16.214C3.667,16.259 3.55,16.282 3.431,16.282C3.313,16.281 3.196,16.257 3.086,16.212C2.977,16.166 2.878,16.099 2.795,16.015C2.711,15.931 2.645,15.831 2.6,15.722C2.556,15.612 2.533,15.495 2.533,15.377C2.534,15.258 2.557,15.141 2.603,15.032C2.649,14.922 2.716,14.823 2.8,14.74L7.18,10.36C7.766,9.801 8.545,9.489 9.355,9.489C10.165,9.489 10.944,9.801 11.53,10.36L20.89,19.72C21.058,19.889 21.152,20.117 21.152,20.355C21.152,20.593 21.058,20.821 20.89,20.99C20.808,21.074 20.71,21.141 20.602,21.186C20.494,21.231 20.377,21.253 20.26,21.25Z"
android:fillColor="#E43521"/>
<path
android:pathData="M20.85,16.22C20.73,16.22 20.612,16.196 20.503,16.149C20.393,16.103 20.293,16.035 20.21,15.95L17.88,13.62C17.871,13.611 17.861,13.604 17.85,13.599C17.839,13.595 17.827,13.592 17.815,13.592C17.802,13.592 17.79,13.595 17.779,13.599C17.768,13.604 17.758,13.611 17.75,13.62L15.63,15.73C15.458,15.88 15.235,15.96 15.007,15.952C14.779,15.945 14.562,15.851 14.4,15.689C14.239,15.528 14.145,15.311 14.137,15.083C14.13,14.854 14.209,14.632 14.36,14.46L16.48,12.34C16.835,11.989 17.315,11.792 17.815,11.792C18.314,11.792 18.794,11.989 19.15,12.34L21.49,14.68C21.612,14.808 21.695,14.968 21.728,15.142C21.76,15.316 21.741,15.496 21.673,15.659C21.605,15.823 21.491,15.963 21.345,16.062C21.199,16.162 21.027,16.217 20.85,16.22Z"
android:fillColor="#E43521"/>
<path
android:pathData="M18.99,8.57H16.23C15.991,8.57 15.762,8.475 15.594,8.306C15.425,8.138 15.33,7.909 15.33,7.67V4.83C15.33,4.591 15.425,4.362 15.594,4.194C15.762,4.025 15.991,3.93 16.23,3.93C16.469,3.93 16.698,4.025 16.867,4.194C17.035,4.362 17.13,4.591 17.13,4.83V6.77H18.99C19.229,6.77 19.458,6.865 19.626,7.034C19.795,7.202 19.89,7.431 19.89,7.67C19.89,7.909 19.795,8.138 19.626,8.306C19.458,8.475 19.229,8.57 18.99,8.57Z"
android:fillColor="#E43521"/>
<path
android:pathData="M16.23,8.57C16.053,8.569 15.88,8.517 15.733,8.418C15.586,8.32 15.471,8.181 15.403,8.017C15.334,7.854 15.316,7.674 15.349,7.5C15.382,7.327 15.466,7.166 15.59,7.04L19.59,3.04C19.759,2.872 19.987,2.778 20.225,2.778C20.463,2.778 20.692,2.872 20.86,3.04C21.029,3.21 21.123,3.44 21.123,3.68C21.123,3.92 21.029,4.15 20.86,4.32L16.86,8.32C16.691,8.483 16.465,8.573 16.23,8.57Z"
android:fillColor="#E43521"/>
</vector>

18
app/src/main/res/drawable/icon_pdf2long_img.xml Normal file
View File

@ -0,0 +1,18 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M18.77,15.82C18.554,15.818 18.345,15.74 18.18,15.6L9.86,8.38C9.727,8.248 9.548,8.174 9.36,8.174C9.173,8.174 8.993,8.248 8.86,8.38L5.31,11.61C5.224,11.696 5.122,11.764 5.009,11.809C4.896,11.854 4.775,11.876 4.653,11.873C4.531,11.87 4.411,11.842 4.301,11.792C4.19,11.741 4.091,11.669 4.009,11.579C3.927,11.489 3.864,11.383 3.824,11.268C3.784,11.153 3.768,11.031 3.777,10.91C3.785,10.788 3.818,10.67 3.874,10.562C3.93,10.453 4.007,10.358 4.1,10.28L7.62,7.08C8.083,6.621 8.709,6.363 9.36,6.363C10.012,6.363 10.638,6.621 11.1,7.08L19.38,14.25C19.519,14.37 19.618,14.53 19.663,14.708C19.708,14.885 19.698,15.073 19.634,15.245C19.57,15.417 19.455,15.565 19.304,15.67C19.153,15.774 18.974,15.83 18.79,15.83L18.77,15.82Z"
android:fillColor="#E43521"/>
<path
android:pathData="M19.58,12.03C19.358,12.033 19.143,11.95 18.98,11.8L16.89,9.9L14.89,11.76C14.721,11.928 14.493,12.022 14.255,12.022C14.017,12.022 13.788,11.928 13.62,11.76C13.535,11.677 13.469,11.578 13.423,11.469C13.377,11.36 13.354,11.243 13.354,11.125C13.354,11.007 13.377,10.89 13.423,10.781C13.469,10.672 13.535,10.573 13.62,10.49L15.69,8.49C15.999,8.204 16.404,8.045 16.825,8.045C17.246,8.045 17.651,8.204 17.96,8.49L20.12,10.49C20.296,10.651 20.401,10.875 20.413,11.113C20.424,11.351 20.34,11.583 20.18,11.76C20.02,11.921 19.806,12.017 19.58,12.03Z"
android:fillColor="#E43521"/>
<path
android:pathData="M6.93,21.79H6.44C5.742,21.79 5.073,21.513 4.58,21.02C4.087,20.526 3.81,19.858 3.81,19.16V4.84C3.812,4.144 4.09,3.478 4.583,2.987C5.076,2.496 5.744,2.22 6.44,2.22H17.86C18.555,2.22 19.221,2.496 19.712,2.987C20.204,3.479 20.48,4.145 20.48,4.84V16.35H18.68V4.84C18.68,4.622 18.593,4.414 18.439,4.26C18.286,4.106 18.077,4.02 17.86,4.02H6.44C6.221,4.02 6.012,4.106 5.856,4.26C5.701,4.413 5.612,4.622 5.61,4.84V19.16C5.61,19.38 5.697,19.591 5.853,19.747C6.008,19.903 6.219,19.99 6.44,19.99H6.93V21.79Z"
android:fillColor="#E43521"/>
<path
android:pathData="M6.82,21.82C6.635,21.82 6.451,21.803 6.27,21.77C6.054,21.724 5.862,21.6 5.732,21.422C5.601,21.244 5.541,21.024 5.562,20.804C5.583,20.584 5.684,20.38 5.846,20.23C6.008,20.08 6.219,19.994 6.44,19.99H7.14C7.408,19.945 7.658,19.823 7.86,19.64C8.168,19.232 8.385,18.764 8.499,18.266C8.613,17.767 8.62,17.251 8.52,16.75C8.504,16.624 8.516,16.497 8.553,16.376C8.591,16.255 8.654,16.143 8.738,16.048C8.822,15.954 8.926,15.878 9.042,15.827C9.158,15.775 9.283,15.749 9.41,15.75H21.54C21.752,15.751 21.958,15.827 22.12,15.964C22.283,16.101 22.392,16.291 22.43,16.5C22.683,17.925 22.371,19.392 21.56,20.59C21.218,20.981 20.792,21.289 20.314,21.492C19.836,21.694 19.318,21.786 18.8,21.76H7.28L6.82,21.82ZM9.82,19.99H18.82C19.075,20.013 19.332,19.977 19.571,19.885C19.81,19.793 20.025,19.648 20.2,19.46C20.578,18.909 20.761,18.247 20.72,17.58H10.34C10.333,18.416 10.138,19.24 9.77,19.99H9.82Z"
android:fillColor="#E43521"/>
</vector>

9
app/src/main/res/drawable/icon_select_all_black.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M6.51,10.717C6.299,10.717 6.096,10.635 5.945,10.488L3.245,7.855C3.168,7.781 3.108,7.692 3.066,7.595C3.024,7.497 3.001,7.392 3,7.285C2.997,7.071 3.08,6.863 3.23,6.71C3.38,6.556 3.585,6.468 3.8,6.465C4.015,6.462 4.222,6.545 4.375,6.695L6.455,8.723L11.068,3.307C11.136,3.224 11.22,3.155 11.315,3.105C11.41,3.054 11.515,3.023 11.622,3.014C11.729,3.004 11.837,3.016 11.94,3.049C12.042,3.081 12.137,3.134 12.219,3.204C12.302,3.274 12.369,3.359 12.417,3.455C12.466,3.552 12.495,3.656 12.502,3.764C12.51,3.871 12.496,3.979 12.461,4.081C12.427,4.183 12.372,4.277 12.301,4.358L7.126,10.433C7.054,10.517 6.966,10.586 6.866,10.635C6.767,10.684 6.658,10.712 6.547,10.717H6.51ZM17.13,10.74C14.996,10.74 13.26,9.004 13.26,6.87C13.26,4.736 14.996,3 17.13,3C19.264,3 21,4.736 21,6.87C21,9.004 19.264,10.74 17.13,10.74ZM17.13,4.62C16.685,4.62 16.25,4.752 15.88,4.999C15.51,5.246 15.222,5.598 15.051,6.009C14.881,6.42 14.836,6.872 14.923,7.309C15.01,7.745 15.224,8.146 15.539,8.461C15.854,8.776 16.255,8.99 16.691,9.077C17.128,9.164 17.58,9.119 17.991,8.949C18.402,8.778 18.754,8.49 19.001,8.12C19.248,7.75 19.38,7.315 19.38,6.87C19.379,6.273 19.142,5.702 18.72,5.28C18.299,4.858 17.726,4.621 17.13,4.62ZM17.13,21C14.996,21 13.26,19.264 13.26,17.13C13.26,14.996 14.996,13.26 17.13,13.26C19.264,13.26 21,14.996 21,17.13C21,19.264 19.264,21 17.13,21ZM17.13,14.88C16.685,14.88 16.25,15.012 15.88,15.259C15.51,15.506 15.222,15.858 15.051,16.269C14.881,16.68 14.836,17.132 14.923,17.569C15.01,18.005 15.224,18.406 15.539,18.721C15.854,19.036 16.255,19.25 16.691,19.337C17.128,19.424 17.58,19.379 17.991,19.209C18.402,19.038 18.754,18.75 19.001,18.38C19.248,18.01 19.38,17.575 19.38,17.13C19.379,16.534 19.142,15.962 18.72,15.54C18.299,15.118 17.726,14.881 17.13,14.88ZM6.87,21C4.736,21 3,19.264 3,17.13C3,14.996 4.736,13.26 6.87,13.26C9.004,13.26 10.74,14.996 10.74,17.13C10.74,19.264 9.004,21 6.87,21ZM6.87,14.88C6.425,14.88 5.99,15.012 5.62,15.259C5.25,15.506 4.962,15.858 4.791,16.269C4.621,16.68 4.576,17.132 4.663,17.569C4.75,18.005 4.964,18.406 5.279,18.721C5.594,19.036 5.995,19.25 6.431,19.337C6.868,19.424 7.32,19.379 7.731,19.209C8.142,19.038 8.494,18.75 8.741,18.38C8.988,18.01 9.12,17.575 9.12,17.13C9.119,16.534 8.882,15.962 8.46,15.54C8.038,15.118 7.467,14.881 6.87,14.88Z"
android:fillColor="@color/black"/>
</vector>

23
app/src/main/res/layout/activity_pdf_split.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_color" android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
<View <View
@ -15,22 +15,20 @@
<LinearLayout <LinearLayout
android:id="@+id/statusLayout" android:id="@+id/statusLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="44dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/backBtn" android:id="@+id/backBtn"
android:layout_width="40dp" android:layout_width="40dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginStart="8dp" android:background="@drawable/dr_click_effect_oval_transparent"
android:layout_marginEnd="8dp"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="8dp"
android:layout_height="24dp" android:layout_height="14dp"
android:src="@drawable/back_black" /> android:src="@drawable/back_black" />
</LinearLayout> </LinearLayout>
@ -51,6 +49,7 @@
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="44dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:gravity="center"> android:gravity="center">
@ -58,9 +57,7 @@
android:id="@+id/selectAll" android:id="@+id/selectAll"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="@drawable/dr_circular_sel_off_bg" android:src="@drawable/icon_select_all_black" />
android:padding="2dp"
android:src="@drawable/gou_white" />
</LinearLayout> </LinearLayout>
@ -68,6 +65,7 @@
android:id="@+id/addBtn" android:id="@+id/addBtn"
android:layout_width="44dp" android:layout_width="44dp"
android:layout_height="44dp" android:layout_height="44dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:gravity="center"> android:gravity="center">
@ -76,9 +74,7 @@
android:id="@+id/addAll" android:id="@+id/addAll"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="@drawable/dr_circular_sel_on_bg" android:src="@drawable/add_icon_black" />
android:padding="2dp"
android:src="@drawable/add_icon_white" />
</LinearLayout> </LinearLayout>
@ -91,6 +87,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/splitListLayout" android:id="@+id/splitListLayout"
android:background="@color/bg_color"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="visible"> android:visibility="visible">

18
app/src/main/res/layout/activity_pdf_to_img.xml
View File

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/bg_color" android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
<View <View
@ -15,22 +15,20 @@
<LinearLayout <LinearLayout
android:id="@+id/statusLayout" android:id="@+id/statusLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="44dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/backBtn" android:id="@+id/backBtn"
android:layout_width="40dp" android:layout_width="40dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_marginStart="8dp" android:background="@drawable/dr_click_effect_oval_transparent"
android:layout_marginEnd="8dp"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
android:layout_width="24dp" android:layout_width="8dp"
android:layout_height="24dp" android:layout_height="14dp"
android:src="@drawable/back_black" /> android:src="@drawable/back_black" />
</LinearLayout> </LinearLayout>
@ -52,15 +50,14 @@
android:layout_height="44dp" android:layout_height="44dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="@drawable/dr_click_effect_oval_transparent"
android:gravity="center"> android:gravity="center">
<ImageView <ImageView
android:id="@+id/selectAll" android:id="@+id/selectAll"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:background="@drawable/dr_circular_sel_off_bg" android:src="@drawable/icon_select_all_black" />
android:padding="2dp"
android:src="@drawable/gou_white" />
</LinearLayout> </LinearLayout>
@ -74,6 +71,7 @@
<RelativeLayout <RelativeLayout
android:id="@+id/splitListLayout" android:id="@+id/splitListLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/bg_color"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="visible"> android:visibility="visible">

70
app/src/main/res/layout/dialog_list_more.xml
View File

@ -283,6 +283,30 @@
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/mergeBtn"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_merge_red" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/merge_pdf"
style="@style/TextViewFont_PopMedium"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/splitBtn" android:id="@+id/splitBtn"
android:layout_width="match_parent" android:layout_width="match_parent"
@ -306,6 +330,52 @@
android:textSize="14sp" /> android:textSize="14sp" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:id="@+id/pdfToImgBtn"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_pdf2img" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/pdf_to_img"
style="@style/TextViewFont_PopMedium"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/pdfToLongImgBtn"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="@drawable/dr_click_effect_rectangle_transparent"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@drawable/icon_pdf2long_img" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:text="@string/pdf_to_long_img"
style="@style/TextViewFont_PopMedium"
android:textColor="@color/text_color_lv1"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/setPasswordBtn" android:id="@+id/setPasswordBtn"