...

app/src/main/java/com/base/pdfviewerscannerwhite/helper/ConfigHelper.kt

@@ -33,6 +33,7 @@ object ConfigHelper {
         "AdActivity",
         "AppLovinFullscreenActivity",
         SplashActivity::class.java.simpleName,
+        "GmsDocumentScanningDelegateActivity",
         "GmsDocumentScanningDelegateActivity"
 //      com.google.mlkit.vision.documentscanner.internal.GmsDocumentScanningDelegateActivity
 

app/src/main/java/com/base/pdfviewerscannerwhite/ui/document/pdf/PdfSplitActivity.kt

@@ -53,7 +53,7 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView {
         }
         binding.tvBtnSplit.setOnClickListener {
             val splitIndex = pdfPagerAdapter.items.filter { it.isSelect }.map { it.pageIndex }
-            showDocumentRenameDialog { newName ->
+            showDocumentRenameDialog(okAction = { newName ->
                 startActivity(Intent(this, PdfLoadingActivity::class.java).apply {
                     putExtra("doWhat", ConstObject.DO_SPLIT_PDF)
                     putExtra("srcPath", path)
@@ -62,7 +62,7 @@ class PdfSplitActivity : BaseActivity<ActivityPdfSplitBinding>(), PdfView {
                     putExtra("splitIndex", splitIndex.joinToString(separator = ","))
                 })
                 finish()
-            }
+            })
         }
     }
 

app/src/main/java/com/base/pdfviewerscannerwhite/ui/main/MainActivity.kt

@@ -108,7 +108,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
 
     private fun closeScanGuide() {
         binding.flScanGuide.visibility = View.GONE
-        showPermissionThenBanner()
+        showPermissionDialog()
     }
 
     override fun onResume() {
@@ -144,23 +144,21 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
             showMainBanner()
         } else {
             if (stopScanThenPermissionDialog) {
-                stopScanThenPermissionDialog = false
                 return
             }
-            showPermissionThenBanner()
+            showPermissionDialog()
+            return
         }
     }
 
     private var permissionDialog: Dialog? = null
-    private fun showPermissionThenBanner() {
+    private fun showPermissionDialog() {
         if (permissionDialog == null) {
             permissionDialog = showStoragePermission(launcher,
-                allowAction = {
+                noLauncherAction = {
                     showMainBanner()
                 },
-                denyAction = {
-                    showMainBanner()
-                }, dismissAction = {
+                dismissAction = {
                     permissionDialog = null
                 })
         }
@@ -372,15 +370,18 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
         val file = File(pdfUri.toString().replace("file://", ""))
         if (file.exists()) {
 //            binding.tvTest.text = "imageUri=$imageUri\n\n\n\npdfUri=$pdfUri"
-            showDocumentRenameDialog(file.name) {
-                val newFile = File(mainPresenter.getDocumentAppDir(), "$it.pdf")
-                mainPresenter.copyFile(file, newFile)
-                this.updateMediaStore()
+            showDocumentRenameDialog(file.name,
+                okAction = {
+                    val newFile = File(mainPresenter.getDocumentAppDir(), "$it.pdf")
+                    mainPresenter.copyFile(file, newFile)
+                    this.updateMediaStore()
 //                refreshPageList()
-                if (!checkStorePermission()) {
-                    showPermissionThenBanner()
-                }
-            }
+                    if (!checkStorePermission()) {
+                        showPermissionDialog()
+                    }
+                }, dismissAction = {
+                    stopScanThenPermissionDialog = false
+                })
         }
 
     }

app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/DialogView.kt

@@ -49,8 +49,8 @@ object DialogView {
 
     fun Context.showStoragePermission(
         launcher: ActivityLauncher,
-        denyAction: (() -> Unit)? = null,
-        allowAction: (() -> Unit)? = null,
+        launcherAction: ((flag: Boolean) -> Unit)? = null,
+        noLauncherAction: (() -> Unit)? = null,
         dismissAction: (() -> Unit)? = null,
     ): BottomSheetDialog {
         val dialog = BottomSheetDialog(this, R.style.BottomSheetDialog)
@@ -68,12 +68,12 @@ object DialogView {
         binding.tvSet.setOnClickListener {
             dialog.dismiss()
             requestStoragePermission(launcher) {
-                if (it) allowAction?.invoke() else denyAction?.invoke()
+                launcherAction?.invoke(it)
             }
         }
         binding.tvContinue.setOnClickListener {
             dialog.dismiss()
-            denyAction?.invoke()
+            noLauncherAction?.invoke()
         }
         dialog.setOnDismissListener {
             dismissAction?.invoke()
@@ -236,10 +236,10 @@ object DialogView {
             }
         }
         binding.llRename.setOnClickListener {
-            showDocumentRenameDialog(file.name) { newName ->
+            showDocumentRenameDialog(file.name, okAction = { newName ->
                 dialog.dismiss()
                 mainActivity.mainPresenter.renameDocumentBean(file, newName, documentPageFragment)
-            }
+            })
         }
         binding.llDetail.setOnClickListener {
             showDocumentDetail(item.path)
@@ -348,6 +348,7 @@ object DialogView {
     fun Context.showDocumentRenameDialog(
         name: String? = null,
         okAction: ((newName: String) -> Unit)? = null,
+        dismissAction: (() -> Unit)? = null
     ) {
         val dialog = BottomSheetDialog(this, R.style.BottomSheetDialog)
         val binding = DialogDocumentRenameBinding.inflate(LayoutInflater.from(this))
@@ -391,6 +392,9 @@ object DialogView {
             }
             okAction?.invoke(newName)
         }
+        dialog.setOnDismissListener {
+            dismissAction?.invoke()
+        }
     }
 
     fun Context.showDeleteDialog(deleteAction: () -> Unit) {

app/src/main/java/com/base/pdfviewerscannerwhite/ui/view/PdfDialog.kt

@@ -78,10 +78,10 @@ object PdfDialog {
 
         }
         binding.llRename.setOnClickListener {
-            showDocumentRenameDialog(file.name) { newName ->
+            showDocumentRenameDialog(file.name, okAction = { newName ->
                 dialog.dismiss()
                 mainActivity.mainPresenter.renameDocumentBean(file, newName, documentPageFragment)
-            }
+            })
         }
         binding.llSplit.setOnClickListener {
             dialog.dismiss()