Merge branch 'upperEnumInstanceName'

src/main/java/com/kdanmobile/reader/ReaderActivity.kt

@@ -367,10 +367,10 @@ abstract class ReaderActivity : AppCompatActivity(), ReaderSettingListener, PdfT
         if (annotationMode == null) return
         if (viewModel.isCrop) return
         val map = HashMap<ReaderViewModel.AnnotationMode, View>().apply {
-            put(ReaderViewModel.AnnotationMode.Highlight, iv_readerActivity_highLight)
-            put(ReaderViewModel.AnnotationMode.Strike, iv_readerActivity_strike)
-            put(ReaderViewModel.AnnotationMode.Underline, iv_readerActivity_underline)
-            put(ReaderViewModel.AnnotationMode.Ink, iv_readerActivity_ink)
+            put(ReaderViewModel.AnnotationMode.HIGHLIGHT, iv_readerActivity_highLight)
+            put(ReaderViewModel.AnnotationMode.STRIKE, iv_readerActivity_strike)
+            put(ReaderViewModel.AnnotationMode.UNDERLINE, iv_readerActivity_underline)
+            put(ReaderViewModel.AnnotationMode.INK, iv_readerActivity_ink)
         }
         map.forEach {
             if (it.key == annotationMode) {
@@ -380,7 +380,7 @@ abstract class ReaderActivity : AppCompatActivity(), ReaderSettingListener, PdfT
                 it.value.setBackgroundDrawable(null)
             }
         }
-        when (annotationMode == ReaderViewModel.AnnotationMode.None) {
+        when (annotationMode == ReaderViewModel.AnnotationMode.NONE) {
             true -> showAllToolbars()
             false -> hideTopLeftBottomToolbars()
         }
@@ -452,7 +452,7 @@ abstract class ReaderActivity : AppCompatActivity(), ReaderSettingListener, PdfT
             }
 
             override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean {
-                val isEditMode = viewModel.annotationModeLiveData.value != ReaderViewModel.AnnotationMode.None
+                val isEditMode = viewModel.annotationModeLiveData.value != ReaderViewModel.AnnotationMode.NONE
                 val isCopyMode = viewModel.isCopyModeLiveData.value != false
 
                 if (!isEditMode && !isCopyMode && !isHideToolbar) {
@@ -789,8 +789,8 @@ abstract class ReaderActivity : AppCompatActivity(), ReaderSettingListener, PdfT
 
     override fun onTurnPageDirectionChanged(direction: Int) {
         viewModel.viewDirection = when (direction == 0) {
-            true -> ReaderViewModel.ViewDirection.VerticalSinglePageContinues
-            false -> ReaderViewModel.ViewDirection.HorizontalSinglePage
+            true -> ReaderViewModel.ViewDirection.VERTICAL_SINGLE_PAGE_CONTINUES
+            false -> ReaderViewModel.ViewDirection.HORIZONTAL_SINGLE_PAGE
         }
     }
 

src/main/java/com/kdanmobile/reader/ReaderViewModel.kt

@@ -38,9 +38,9 @@ import kotlin.collections.ArrayList
 class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMsg: String) : ViewModel() {
 
     enum class ViewDirection(val mode: Config.PDFViewMode) {
-        VerticalSinglePageContinues(Config.PDFViewMode.VERTICAL_SINGLE_PAGE_CONTINUES),
-        VerticalSinglePage(Config.PDFViewMode.VERTICAL_SINGLE_PAGE),
-        HorizontalSinglePage(Config.PDFViewMode.HORIZONTAL_SINGLE_PAGE)
+        VERTICAL_SINGLE_PAGE_CONTINUES(Config.PDFViewMode.VERTICAL_SINGLE_PAGE_CONTINUES),
+        VERTICAL_SINGLE_PAGE(Config.PDFViewMode.VERTICAL_SINGLE_PAGE),
+        HORIZONTAL_SINGLE_PAGE(Config.PDFViewMode.HORIZONTAL_SINGLE_PAGE)
     }
 
     enum class ReadMode(val mode: Config.ReadMode) {
@@ -53,11 +53,11 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
     }
 
     enum class AnnotationMode {
-        None,
-        Highlight,
-        Strike,
-        Underline,
-        Ink,
+        NONE,
+        HIGHLIGHT,
+        STRIKE,
+        UNDERLINE,
+        INK,
     }
 
     companion object {
@@ -77,7 +77,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
         get() {
             return kmpdfFactory?.needPassWord() ?: false
         }
-    var viewDirection = ViewDirection.VerticalSinglePageContinues
+    var viewDirection = ViewDirection.VERTICAL_SINGLE_PAGE_CONTINUES
         set(value) {
             field = value
             updateViewDirection()
@@ -106,7 +106,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
         get() = readerModel.kmpdfDocumentController
     val isOpenedFileLiveData = MutableLiveData<Boolean>().apply { value = false }
     val fileNameLiveData = MutableLiveData<String>()
-    val annotationModeLiveData = MutableLiveData<AnnotationMode>().apply { value = AnnotationMode.None }
+    val annotationModeLiveData = MutableLiveData<AnnotationMode>().apply { value = AnnotationMode.NONE }
     val annotationEitModeLiveData = MutableLiveData<KMPDFAnnotEditMode.Mode>().apply { value = KMPDFAnnotEditMode.Mode.NULL }
     var isCopyModeLiveData = MutableLiveData<Boolean>().apply { value = false }
 
@@ -192,7 +192,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
     }
 
     fun onClickCopyBtn() {
-        if (annotationModeLiveData.value != AnnotationMode.None) stopAnnotationMode()
+        if (annotationModeLiveData.value != AnnotationMode.NONE) stopAnnotationMode()
         if (isCopyModeLiveData.value == true) {
             stopCopyTextMode()
         } else {
@@ -202,7 +202,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     fun onClickHighlightBtn() {
         if (isCopyModeLiveData.value == true) stopCopyTextMode()
-        if (annotationModeLiveData.value == AnnotationMode.Highlight) {
+        if (annotationModeLiveData.value == AnnotationMode.HIGHLIGHT) {
             stopAnnotationMode()
         } else {
             startHighLightEditMode()
@@ -216,7 +216,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     fun onClickStrikeBtn() {
         if (isCopyModeLiveData.value == true) stopCopyTextMode()
-        if (annotationModeLiveData.value == AnnotationMode.Strike) {
+        if (annotationModeLiveData.value == AnnotationMode.STRIKE) {
             stopAnnotationMode()
         } else {
             startStrikeOutEditMode()
@@ -230,7 +230,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     fun onClickUnderlineBtn() {
         if (isCopyModeLiveData.value == true) stopCopyTextMode()
-        if (annotationModeLiveData.value == AnnotationMode.Underline) {
+        if (annotationModeLiveData.value == AnnotationMode.UNDERLINE) {
             stopAnnotationMode()
         } else {
             startUnderLineEditMode()
@@ -244,7 +244,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     fun onClickInkBtn() {
         if (isCopyModeLiveData.value == true) stopCopyTextMode()
-        if (annotationModeLiveData.value == AnnotationMode.Ink) {
+        if (annotationModeLiveData.value == AnnotationMode.INK) {
             stopAnnotationMode()
         } else {
             startInkEditMode()
@@ -281,7 +281,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     private fun startHighLightEditMode() {
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.HIGH_LIGHT)
-        annotationModeLiveData.postValue(AnnotationMode.Highlight)
+        annotationModeLiveData.postValue(AnnotationMode.HIGHLIGHT)
     }
 
     fun setStrikeOutAttributes(annotationAttribute: AnnotationAttribute) {
@@ -299,7 +299,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     private fun startStrikeOutEditMode() {
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.STRIKE_OUT)
-        annotationModeLiveData.postValue(AnnotationMode.Strike)
+        annotationModeLiveData.postValue(AnnotationMode.STRIKE)
     }
 
     fun setUnderLineAttributes(annotationAttribute: AnnotationAttribute) {
@@ -317,7 +317,7 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     private fun startUnderLineEditMode() {
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.UNDER_LINE)
-        annotationModeLiveData.postValue(AnnotationMode.Underline)
+        annotationModeLiveData.postValue(AnnotationMode.UNDERLINE)
     }
 
     fun setInkAttributes(inkAttribute: InkAttribute) {
@@ -338,12 +338,12 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
 
     private fun startInkEditMode() {
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.INK)
-        annotationModeLiveData.postValue(AnnotationMode.Ink)
+        annotationModeLiveData.postValue(AnnotationMode.INK)
     }
 
     fun stopAnnotationMode() {
         kmpdfFactory?.setAnnotationEditMode(KMPDFAnnotationBean.AnnotationType.NULL)
-        annotationModeLiveData.postValue(AnnotationMode.None)
+        annotationModeLiveData.postValue(AnnotationMode.NONE)
     }
 
     fun getReaderView(): ReaderView? {
@@ -505,11 +505,11 @@ class ReaderViewModel(private val pdfSdkLicense: String, private val pdfSdkRsaMs
         } else {
             annotationModeLiveData.value?.also {
                 val annotationEditMode = when (it) {
-                    AnnotationMode.None -> KMPDFAnnotationBean.AnnotationType.NULL
-                    AnnotationMode.Highlight -> KMPDFAnnotationBean.AnnotationType.HIGH_LIGHT
-                    AnnotationMode.Strike -> KMPDFAnnotationBean.AnnotationType.STRIKE_OUT
-                    AnnotationMode.Underline -> KMPDFAnnotationBean.AnnotationType.UNDER_LINE
-                    AnnotationMode.Ink -> KMPDFAnnotationBean.AnnotationType.INK
+                    AnnotationMode.NONE -> KMPDFAnnotationBean.AnnotationType.NULL
+                    AnnotationMode.HIGHLIGHT -> KMPDFAnnotationBean.AnnotationType.HIGH_LIGHT
+                    AnnotationMode.STRIKE -> KMPDFAnnotationBean.AnnotationType.STRIKE_OUT
+                    AnnotationMode.UNDERLINE -> KMPDFAnnotationBean.AnnotationType.UNDER_LINE
+                    AnnotationMode.INK -> KMPDFAnnotationBean.AnnotationType.INK
                 }
                 kmpdfFactory?.setAnnotationEditMode(annotationEditMode)
                 annotationModeLiveData.postValue(it)