Merge branch 'dialogPasswordActivityConstValue' into 'master'

使用常數取代匿名變數

See merge request kdanandroid/pdf/pdfreaderreadermodule!17

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

@@ -76,6 +76,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
 
     companion object {
         const val KEY_FILE_ABSOLUTE = "file_absolutepath"
+        const val KEY_IS_PASSWORD_ACTIVITY_SHOWING = "isShowPasswordActivity"
         const val REQUEST_PASSWORD = 222
     }
 
@@ -148,7 +149,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
         window.setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN)
         setContentView(R.layout.activity_reader)
         setSupportActionBar(toolbar_readerActivity)
-        isShowPasswordActivity = savedInstanceState?.getBoolean("isShowPasswordActivity") ?: false
+        isShowPasswordActivity = savedInstanceState?.getBoolean(KEY_IS_PASSWORD_ACTIVITY_SHOWING) ?: false
         filePath = intent.getStringExtra(KEY_FILE_ABSOLUTE)
 
         val displayMetrics = DisplayMetrics()
@@ -232,14 +233,14 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
 
     override fun onSaveInstanceState(outState: Bundle?) {
         super.onSaveInstanceState(outState)
-        outState?.putBoolean("isShowPasswordActivity", isShowPasswordActivity)
+        outState?.putBoolean(KEY_IS_PASSWORD_ACTIVITY_SHOWING, isShowPasswordActivity)
     }
 
     private fun requestPassword(isIncorrectPassword: Boolean = false) {
         isShowPasswordActivity = true
         val intent = Intent(baseContext, DialogPasswordActivity::class.java)
         val bundle = Bundle()
-        bundle.putBoolean("isIncorrectPassword", isIncorrectPassword)
+        bundle.putBoolean(DialogPasswordActivity.KEY_IS_INCORRECT_PASSWORD, isIncorrectPassword)
         intent.putExtras(bundle)
         startActivityForResult(intent, REQUEST_PASSWORD)
     }
@@ -1163,7 +1164,7 @@ abstract class ReaderActivity : KdanBaseActivity(), ReaderSettingListener, PdfTh
         if (resultCode == Activity.RESULT_OK){
             when (requestCode) {
                 REQUEST_PASSWORD -> {
-                    val password = data?.getStringExtra("password") ?: ""
+                    val password = data?.getStringExtra(DialogPasswordActivity.KEY_USER_INPUT_PASSWORD) ?: ""
                     if (password.isEmpty()) {
                         finish()
                     } else {

src/main/java/com/kdanmobile/reader/password/DialogPasswordActivity.kt

@@ -17,6 +17,11 @@ import kotlinx.android.synthetic.main.activity_reader_password_dialog.*
 
 class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
+    companion object {
+        const val KEY_USER_INPUT_PASSWORD = "password"
+        const val KEY_IS_INCORRECT_PASSWORD = "isIncorrectPassword"
+    }
+
     private var isIncorrectPassword = false
 
     @SuppressLint("HandlerLeak")
@@ -32,7 +37,7 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
     override fun onSaveInstanceState(outState: Bundle?) {
         super.onSaveInstanceState(outState)
-        outState?.putBoolean("isIncorrectPassword", isIncorrectPassword)
+        outState?.putBoolean(KEY_IS_INCORRECT_PASSWORD, isIncorrectPassword)
     }
 
     override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
@@ -57,7 +62,7 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
     private fun updateErrorMessage(bundle: Bundle?) {
         if (null != bundle) {
-            val value = bundle.getBoolean("isIncorrectPassword", false)
+            val value = bundle.getBoolean(KEY_IS_INCORRECT_PASSWORD, false)
             if (value) {
                 layout_dialogPassword_name.error = resources.getString(R.string.reader_dialog_password_error)
                 isIncorrectPassword = value
@@ -94,7 +99,7 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
             R.id.tv_dialogPassword_ok -> {
                 val password = et_dialogPassword_name.text.toString()
                 val data = Intent()
-                data.putExtra("password", password)
+                data.putExtra(KEY_USER_INPUT_PASSWORD, password)
                 setResult(RESULT_OK, data)
                 finish()
             }
@@ -108,7 +113,7 @@ class DialogPasswordActivity : KdanBaseActivity(), View.OnClickListener {
 
     override fun onBackPressed() {
         val data = Intent()
-        data.putExtra("password", "")
+        data.putExtra(KEY_USER_INPUT_PASSWORD, "")
         setResult(RESULT_OK, data)
         super.onBackPressed()
     }