diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt index 0a9f93d..7c08570 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/MergePdfActivity.kt @@ -182,6 +182,7 @@ class MergePdfActivity : BaseActivity() { const val EXTRA_SELECTED_LIST = "extra_selected_list" const val EXTRA_PDF_LIST = "extra_pdf_list" const val TAG = "MergePdfActivity" + const val TAG_TOW = "MergePdfActivity_DIALOG"//标记从dialog进入 fun createIntent(context: Context, list: ArrayList): Intent { return Intent(context, MergePdfActivity::class.java).apply { diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt index ecba6dc..88b2f94 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfPickerActivity.kt @@ -145,8 +145,8 @@ class PdfPickerActivity : BaseActivity() { return@collect } val sortedList = sortDocuments(list) - // 标记已选择项 - if (fromActivityResult == MergePdfActivity.TAG) { + // 标记已选择项，从合并界面进入到选择进行合并选项，从外部dialog进入也进行合并选项 + if (fromActivityResult == MergePdfActivity.TAG || fromActivityResult == MergePdfActivity.TAG_TOW) { markSelectedItems(sortedList, historyList) } // 再根据来源过滤 @@ -222,6 +222,7 @@ class PdfPickerActivity : BaseActivity() { binding.continueNowBtn.setOnSingleClickListener { val selectedItems = adapter.getSelectedItems() if (selectedItems.size >= 2) { + //从dialog点击进来的，就不进行result了。直接进入合并界面 if (fromActivityResult == MergePdfActivity.TAG) { returnSelectedResult(ArrayList(selectedItems)) } else { diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt index 583025f..620e6ea 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/PdfToImageActivity.kt @@ -169,10 +169,10 @@ class PdfToImageActivity : BaseActivity() { } private fun updateSelectAllState(b: Boolean) { - binding.selectAll.setBackgroundResource( - if (b) R.drawable.dr_circular_sel_on_bg - else R.drawable.dr_circular_sel_off_bg - ) +// binding.selectAll.setBackgroundResource( +// if (b) R.drawable.dr_circular_sel_on_bg +// else R.drawable.dr_circular_sel_off_bg +// ) } private fun updateContinueNowBtnState(b: Boolean) { diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt index 55409d6..2dbfe95 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/act/SplitPdfActivity.kt @@ -207,10 +207,10 @@ class SplitPdfActivity : BaseActivity() { } private fun updateSelectAllState(b: Boolean) { - binding.selectAll.setBackgroundResource( - if (b) R.drawable.dr_circular_sel_on_bg - else R.drawable.dr_circular_sel_off_bg - ) +// binding.selectAll.setBackgroundResource( +// if (b) R.drawable.dr_circular_sel_on_bg +// else R.drawable.dr_circular_sel_off_bg +// ) } private fun updateContinueNowBtnState(b: Boolean) { diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt index edf4fcf..f7bd090 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/adapter/SplitPdfAdapter.kt @@ -54,7 +54,7 @@ class SplitPdfAdapter( if (item.previewFilePath != null) { Glide.with(holder.binding.root) .load(File(item.previewFilePath ?: "")) - .transform(CenterCrop(), RoundedCorners(8.dpToPx(holder.binding.root.context))) + .transform(CenterCrop(), RoundedCorners(4.dpToPx(holder.binding.root.context))) .into(image) } bindSelection(item, holder) diff --git a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt index 851cc60..2e408bd 100644 --- a/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt +++ b/app/src/main/java/com/all/pdfreader/pro/app/ui/dialog/ListMoreDialogFragment.kt @@ -9,9 +9,13 @@ import android.widget.Toast import androidx.fragment.app.activityViewModels import com.all.pdfreader.pro.app.R 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.RenameType 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.SplitPdfActivity import com.all.pdfreader.pro.app.ui.fragment.FavoriteFrag @@ -223,6 +227,27 @@ class ListMoreDialogFragment(val filePath: String) : BottomSheetDialogFragment() GotoPageDialogFragment().show(parentFragmentManager, "GotoPage") 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) { diff --git a/app/src/main/res/drawable/dr_item_page_img_sel_off_bg.xml b/app/src/main/res/drawable/dr_item_page_img_sel_off_bg.xml index dd9a43f..e33b3ac 100644 --- a/app/src/main/res/drawable/dr_item_page_img_sel_off_bg.xml +++ b/app/src/main/res/drawable/dr_item_page_img_sel_off_bg.xml @@ -2,7 +2,7 @@ + android:topLeftRadius="4dp" + android:bottomRightRadius="4dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/dr_item_page_img_sel_on_bg.xml b/app/src/main/res/drawable/dr_item_page_img_sel_on_bg.xml index 5c83ec6..23b86d5 100644 --- a/app/src/main/res/drawable/dr_item_page_img_sel_on_bg.xml +++ b/app/src/main/res/drawable/dr_item_page_img_sel_on_bg.xml @@ -2,7 +2,7 @@ + android:topLeftRadius="4dp" + android:bottomRightRadius="4dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/dr_item_page_number_sel_off_bg.xml b/app/src/main/res/drawable/dr_item_page_number_sel_off_bg.xml index 11c6fb0..3445a93 100644 --- a/app/src/main/res/drawable/dr_item_page_number_sel_off_bg.xml +++ b/app/src/main/res/drawable/dr_item_page_number_sel_off_bg.xml @@ -2,7 +2,7 @@ + android:bottomLeftRadius="4dp" + android:topRightRadius="4dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/dr_item_page_number_sel_on_bg.xml b/app/src/main/res/drawable/dr_item_page_number_sel_on_bg.xml index cfee03f..776fc9e 100644 --- a/app/src/main/res/drawable/dr_item_page_number_sel_on_bg.xml +++ b/app/src/main/res/drawable/dr_item_page_number_sel_on_bg.xml @@ -2,7 +2,7 @@ + android:bottomLeftRadius="4dp" + android:topRightRadius="4dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/dr_sel_off_frame.xml b/app/src/main/res/drawable/dr_sel_off_frame.xml index 57d977b..a040fb9 100644 --- a/app/src/main/res/drawable/dr_sel_off_frame.xml +++ b/app/src/main/res/drawable/dr_sel_off_frame.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/dr_sel_on_frame.xml b/app/src/main/res/drawable/dr_sel_on_frame.xml index dbcef5b..8edbae2 100644 --- a/app/src/main/res/drawable/dr_sel_on_frame.xml +++ b/app/src/main/res/drawable/dr_sel_on_frame.xml @@ -3,5 +3,5 @@ android:shape="rectangle"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/icon_merge_red.xml b/app/src/main/res/drawable/icon_merge_red.xml new file mode 100644 index 0000000..d6d74f7 --- /dev/null +++ b/app/src/main/res/drawable/icon_merge_red.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/icon_pdf2img.xml b/app/src/main/res/drawable/icon_pdf2img.xml new file mode 100644 index 0000000..f4e4a94 --- /dev/null +++ b/app/src/main/res/drawable/icon_pdf2img.xml @@ -0,0 +1,21 @@ + + + + + + + diff --git a/app/src/main/res/drawable/icon_pdf2long_img.xml b/app/src/main/res/drawable/icon_pdf2long_img.xml new file mode 100644 index 0000000..7041647 --- /dev/null +++ b/app/src/main/res/drawable/icon_pdf2long_img.xml @@ -0,0 +1,18 @@ + + + + + + diff --git a/app/src/main/res/drawable/icon_select_all_black.xml b/app/src/main/res/drawable/icon_select_all_black.xml new file mode 100644 index 0000000..c4a4c12 --- /dev/null +++ b/app/src/main/res/drawable/icon_select_all_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_pdf_split.xml b/app/src/main/res/layout/activity_pdf_split.xml index 59c5ccb..6a37a25 100644 --- a/app/src/main/res/layout/activity_pdf_split.xml +++ b/app/src/main/res/layout/activity_pdf_split.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_color" + android:background="@color/white" android:orientation="vertical"> @@ -51,6 +49,7 @@ android:layout_width="44dp" android:layout_height="44dp" android:layout_marginStart="8dp" + android:background="@drawable/dr_click_effect_oval_transparent" android:layout_marginEnd="8dp" android:gravity="center"> @@ -58,9 +57,7 @@ android:id="@+id/selectAll" android:layout_width="24dp" android:layout_height="24dp" - android:background="@drawable/dr_circular_sel_off_bg" - android:padding="2dp" - android:src="@drawable/gou_white" /> + android:src="@drawable/icon_select_all_black" /> @@ -68,6 +65,7 @@ android:id="@+id/addBtn" android:layout_width="44dp" android:layout_height="44dp" + android:background="@drawable/dr_click_effect_oval_transparent" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" android:gravity="center"> @@ -76,9 +74,7 @@ android:id="@+id/addAll" android:layout_width="24dp" android:layout_height="24dp" - android:background="@drawable/dr_circular_sel_on_bg" - android:padding="2dp" - android:src="@drawable/add_icon_white" /> + android:src="@drawable/add_icon_black" /> @@ -91,6 +87,7 @@ diff --git a/app/src/main/res/layout/activity_pdf_to_img.xml b/app/src/main/res/layout/activity_pdf_to_img.xml index eeffffd..486833e 100644 --- a/app/src/main/res/layout/activity_pdf_to_img.xml +++ b/app/src/main/res/layout/activity_pdf_to_img.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/bg_color" + android:background="@color/white" android:orientation="vertical"> @@ -52,15 +50,14 @@ android:layout_height="44dp" android:layout_marginStart="8dp" android:layout_marginEnd="8dp" + android:background="@drawable/dr_click_effect_oval_transparent" android:gravity="center"> + android:src="@drawable/icon_select_all_black" /> @@ -74,6 +71,7 @@ diff --git a/app/src/main/res/layout/dialog_list_more.xml b/app/src/main/res/layout/dialog_list_more.xml index efeb709..e8cc120 100644 --- a/app/src/main/res/layout/dialog_list_more.xml +++ b/app/src/main/res/layout/dialog_list_more.xml @@ -283,6 +283,30 @@ android:textSize="14sp" /> + + + + + + + + + + + + + + + + + + + + + +