Browse Source

Hide ink menu when AnnotationAttributeWindow is visible

cooperku_kdanmobile 5 years ago
parent
commit
205f27b136
1 changed files with 15 additions and 4 deletions
  1. 15 4
      src/main/java/com/kdanmobile/reader/ReaderActivity.kt

+ 15 - 4
src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -379,9 +379,8 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
         }
         readerModel.onPdfChangedListener?.onPageUpdated(arrayListOf(currentPageIndex))
 
-        when (annotationMode == ReaderViewModel.AnnotationMode.INK) {
-            true -> AnimationUtil.showViewAlpha(view_ink_menu)
-            false -> AnimationUtil.hideViewAlpha(view_ink_menu)
+        if (viewModel.annotationModeLiveData.value != ReaderViewModel.AnnotationMode.INK) {
+            AnimationUtil.hideViewAlpha(view_ink_menu)
         }
     }
 
@@ -1040,7 +1039,14 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
             }
         }
         iv_readerActivity_ink.apply {
-            setOnClickListener { viewModel.onClickInkBtn() }
+            setOnClickListener {
+                if (viewModel.annotationModeLiveData.value == ReaderViewModel.AnnotationMode.INK) {
+                    AnimationUtil.hideViewAlpha(view_ink_menu)
+                } else {
+                    AnimationUtil.showViewAlpha(view_ink_menu)
+                }
+                viewModel.onClickInkBtn()
+            }
             setOnLongClickListener { btn ->
                 viewModel.onLongClickInkBtn()
                 val context = this@ReaderActivity
@@ -1062,6 +1068,11 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
                     val xOff = (-contentView.measuredWidth - space).toInt()
                     val yOff = -contentView.measuredHeight
                     window.showAsDropDown(btn, xOff, yOff)
+
+                    AnimationUtil.hideViewAlpha(view_ink_menu)
+                    window.setOnDismissListener {
+                        AnimationUtil.showViewAlpha(view_ink_menu)
+                    }
                 }
                 return@setOnLongClickListener true
             }