Merge remote-tracking branch 'origin/master'

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

@@ -35,8 +35,6 @@ import com.base.pdfviewerscannerwhite.utils.LogEx
 import com.base.pdfviewerscannerwhite.utils.SpStringUtils
 import com.base.pdfviewerscannerwhite.utils.SpStringUtils.LAST_VIEW_KEY
 import com.base.pdfviewerscannerwhite.utils.ToastUtils.toast
-import com.cherry.lib.doc.office.constant.EventConstant
-import com.cherry.lib.doc.office.wp.control.WPControl
 import java.io.File
 
 
@@ -141,7 +139,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
             }
             if (uiMode == UI_MODE_EDITE_SAVE) {
                 changeNormalUI()
-                resetPdfView()
+                cancelOperation()
                 return@addCallback
             }
 
@@ -172,30 +170,6 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
             binding.mupdfReaderView.setMode(MuPDFReaderView.Mode.Drawing)
         }
         binding.ivWancheng.setOnClickListener {
-            var success: Boolean = false
-            val pageView = binding.mupdfReaderView.displayedView as MuPDFView
-            when (saveMode) {
-                SAVE_MODE_HIGHLIGHT -> {
-                    success = pageView.markupSelection(Annotation.Type.HIGHLIGHT)
-                }
-
-                SAVE_MODE_GLIDE_LINE -> {
-                    success = pageView.markupSelection(Annotation.Type.UNDERLINE)
-                }
-
-                SAVE_MODE_STRIKETHROUGH -> {
-                    success = pageView.markupSelection(Annotation.Type.STRIKEOUT)
-                }
-
-                SAVE_MODE_PAINTING_BRUSH -> {
-                    success = pageView.saveDraw()
-                }
-            }
-            if (!success) {
-                toast("nothing to save")
-                return@setOnClickListener
-            }
-            binding.mupdfReaderView.setMode(MuPDFReaderView.Mode.Viewing)
             changeEditSaveUI()
         }
         binding.ivBianji.setOnClickListener {
@@ -223,13 +197,13 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
         }
 
         binding.tvBtnSave.setOnClickListener {
-
             PdfLoadingActivity.muPDFCore = muPDFCore
-
-            changeNormalUI()
+            reallySave()
             startActivity(Intent(this, PdfLoadingActivity::class.java).apply {
                 putExtra("doWhat", DO_SAVE_PDF)
+                putExtra("srcPath", path)
             })
+            finish()
         }
         binding.ivXuanzhuan.setOnClickListener {
             switchOrientation()
@@ -246,9 +220,33 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
     /**
      *
      */
-    private fun resetPdfView() {
+    private fun reallySave() {
+        var success: Boolean = false
+        val pageView = binding.mupdfReaderView.displayedView as MuPDFView
+        when (saveMode) {
+            SAVE_MODE_HIGHLIGHT -> {
+                success = pageView.markupSelection(Annotation.Type.HIGHLIGHT)
+            }
+
+            SAVE_MODE_GLIDE_LINE -> {
+                success = pageView.markupSelection(Annotation.Type.UNDERLINE)
+            }
+
+            SAVE_MODE_STRIKETHROUGH -> {
+                success = pageView.markupSelection(Annotation.Type.STRIKEOUT)
+            }
+
+            SAVE_MODE_PAINTING_BRUSH -> {
+                success = pageView.saveDraw()
+            }
+        }
+        if (!success) {
+            toast("nothing to save")
+            return
+        }
     }
 
+
     private fun cancelOperation() {
         val pageView = binding.mupdfReaderView.displayedView as MuPDFView?
         if (pageView != null) {
@@ -509,7 +507,7 @@ class PdfActivity : BaseActivity<ActivityPdfBinding>(), PdfView {
 
 
     /**
-     * 编辑报错UI模式
+     * 编辑保持UI模式
      */
     private fun changeEditSaveUI() {
         uiMode = UI_MODE_EDITE_SAVE

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

@@ -62,6 +62,9 @@ class PdfLoadingActivity : BaseActivity<ActivityPdfLoadingBinding>() {
                 muPDFCore?.save()
                 muPDFCore = null
                 progressFinishAction = {
+                    startActivity(Intent(this, PdfActivity::class.java).apply {
+                        putExtra("path", srcPath)
+                    })
                     finish()
                 }
                 lifecycleScope.launch {

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

@@ -109,7 +109,7 @@ class PdfMergeActivity : BaseActivity<ActivityPdfMergeBinding>() {
                 }
             }
 
-        }else{
+        } else {
             callBack.invoke()
         }
     }
@@ -121,7 +121,7 @@ class PdfMergeActivity : BaseActivity<ActivityPdfMergeBinding>() {
         adapter = PdfMergeAdapter(itemTouchHelper, callBack)
         adapter.removeAction = {
             mergePdfList.remove(it)
-            binding.tvBtnNext.isEnabled = mergePdfList.isNotEmpty()
+            binding.tvBtnNext.isEnabled = mergePdfList.size >= 2
         }
         binding.rv.adapter = adapter
 
@@ -142,6 +142,7 @@ class PdfMergeActivity : BaseActivity<ActivityPdfMergeBinding>() {
         }
 
         mergePdfList.let { adapter.submitList(it) }
+        binding.tvBtnNext.isEnabled = mergePdfList.size >= 2
     }
 
     companion object {

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

@@ -122,6 +122,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
             }
             currentFragment = documentFragment
             isDocumentAdd = true
+            binding.ivScan.visibility = View.VISIBLE
         }
         binding.llDocument.callOnClick()
         binding.llRecent.setOnClickListener {
@@ -138,6 +139,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
             }
             currentFragment = recentFragment
             isRecentAdd = true
+            binding.ivScan.visibility = View.VISIBLE
         }
         binding.llBookmark.setOnClickListener {
             changeTabSelect(it)
@@ -154,6 +156,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
             }
             currentFragment = bookmarkFragment
             isBookmarkAdd = true
+            binding.ivScan.visibility = View.VISIBLE
         }
         binding.llTool.setOnClickListener {
             changeTabSelect(it)
@@ -170,6 +173,7 @@ class MainActivity : BaseActivity<ActivityMain2Binding>(), MainView {
             currentFragment.userVisibleHint = true
             currentFragment = toolFragment
             isToolAdd = true
+            binding.ivScan.visibility = View.INVISIBLE
         }
         binding.llDelete.setOnClickListener {
             if (currentFragment is DocumentPageFragment) {

app/src/main/res/layout/activity_pdf_merge.xml

@@ -81,7 +81,7 @@
         android:layout_height="48dp"
         android:layout_marginBottom="24dp"
         android:background="@drawable/bg_selector_btn"
-        android:enabled="true"
+        android:enabled="false"
         android:gravity="center"
         android:text="Merge"
         android:textColor="@color/white"

app/src/main/res/layout/fragment_tool.xml

@@ -13,44 +13,6 @@
         android:layout_height="60dp"
         app:layout_constraintTop_toTopOf="parent">
 
-        <FrameLayout
-            android:id="@+id/fl_fanhui"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="15dp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@mipmap/fanhui_b"
-                tools:ignore="ContentDescription" />
-        </FrameLayout>
-
-        <EditText
-            android:id="@+id/edit_search"
-            android:layout_width="0dp"
-            android:layout_height="40dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/bg_f8f9fe_10"
-            android:hint="Enter the file name to search for"
-            android:imeOptions="actionDone"
-            android:paddingHorizontal="18dp"
-            android:singleLine="true"
-            android:textColor="@color/black"
-            android:textColorHint="#B8B9BD"
-            android:textSize="14sp"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/iv_search"
-            app:layout_constraintStart_toEndOf="@id/fl_fanhui"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:ignore="Autofill,HardcodedText,RtlSymmetry,TextFields" />
-
         <TextView
             android:id="@+id/tv_tittle"
             android:layout_width="wrap_content"